From 00dfbafa919e12b7fb4fb869b273ec724e0ade07 Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Sun, 30 Nov 2008 15:11:25 -0500
Subject: [PATCH] charset corrections
---
install/sql/ispconfig3.sql | 189 ++++++++++++++++++++++++++++-------------------
1 files changed, 112 insertions(+), 77 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 62fe5f6..01ef1ec 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1,13 +1,11 @@
--- phpMyAdmin SQL Dump
--- version 2.9.0.3
--- http://www.phpmyadmin.net
+
+-- ISPConfig 3
+-- 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 @@
`mobile` varchar(255) default NULL,
`fax` 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,
`notes` text,
`default_mailserver` int(11) NOT NULL default '1',
@@ -71,7 +69,7 @@
`language` varchar(255) NOT NULL default 'en',
`usertheme` varchar(255) NOT NULL default 'default',
PRIMARY KEY (`client_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `client`
@@ -101,7 +99,7 @@
`active` enum('N','Y') NOT NULL default 'Y',
PRIMARY KEY (`id`),
UNIQUE KEY `rr` (`zone`,`name`,`type`,`data`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
@@ -131,7 +129,34 @@
PRIMARY KEY (`id`),
UNIQUE KEY `origin` (`origin`),
KEY `active` (`active`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+
+-- --------------------------------------------------------
+
+--
+-- Tabellenstruktur f�r Tabelle `dns_template`
+--
+
+CREATE TABLE `dns_template` (
+ `template_id` bigint(20) NOT NULL auto_increment,
+ `sys_userid` int(11) NOT NULL default '0',
+ `sys_groupid` int(11) NOT NULL default '0',
+ `sys_perm_user` varchar(5) default NULL,
+ `sys_perm_group` varchar(5) default NULL,
+ `sys_perm_other` varchar(5) default NULL,
+ `name` varchar(255) default NULL,
+ `fields` varchar(255) default NULL,
+ `template` text,
+ `visible` varchar(255) NOT NULL default 'Y',
+ PRIMARY KEY (`template_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=3 ;
+
+--
+-- Daten f�r Tabelle `dns_template`
+--
+
+INSERT INTO `dns_template` (`template_id`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `name`, `fields`, `template`, `visible`) VALUES (1, 1, 1, 'riud', 'riud', '', 'Default', 'DOMAIN,IP,NS1,NS2,EMAIL', '[ZONE]\norigin={DOMAIN}.\nns={NS1}.\nmbox={EMAIL}.\nrefresh=28800\nretry=7200\nexpire=604800\nminimum=86400\nttl=86400\n\n[DNS_RECORDS]\nA|{DOMAIN}.|{IP}|0|86400\nA|www|{IP}|0|86400\nA|mail|{IP}|0|86400\nNS|{DOMAIN}.|{NS1}.|0|86400\nNS|{DOMAIN}.|{NS2}.|0|86400\nMX|{DOMAIN}.|mail.{DOMAIN}.|10|86400', 'y');
+
@@ -153,7 +178,7 @@
`udp_port` varchar(255) default NULL,
`active` varchar(255) NOT NULL default 'y',
PRIMARY KEY (`firewall_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `firewall`
@@ -192,7 +217,7 @@
KEY `server_id` (`server_id`),
KEY `username` (`username`),
KEY `quota_files` (`quota_files`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `ftp_user`
@@ -219,7 +244,7 @@
`active` enum('n','y') NOT NULL default 'y',
PRIMARY KEY (`access_id`),
KEY `server_id` (`server_id`,`source`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `mail_access`
@@ -246,7 +271,7 @@
`action` varchar(255) default NULL,
`active` varchar(255) NOT NULL default 'y',
PRIMARY KEY (`content_filter_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
@@ -267,7 +292,7 @@
PRIMARY KEY (`domain_id`),
KEY `server_id` (`server_id`,`domain`),
KEY `domain_active` (`domain`,`active`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `mail_domain`
@@ -294,7 +319,7 @@
`active` enum('y','n') NOT NULL,
PRIMARY KEY (`forwarding_id`),
KEY `server_id` (`server_id`,`source`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `mail_forwarding`
@@ -323,7 +348,7 @@
`destination` varchar(255) default NULL,
`active` varchar(255) NOT NULL default 'y',
PRIMARY KEY (`mailget_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `mail_get`
@@ -345,7 +370,7 @@
`origin_type` enum('MANUAL','AUTO') NOT NULL default 'AUTO',
`create_time` datetime NOT NULL default '0000-00-00 00:00:00',
PRIMARY KEY (`greylist_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `mail_greylist`
@@ -367,7 +392,7 @@
`mm_user` varchar(50) NOT NULL default '',
`mm_group` varchar(50) NOT NULL default '',
PRIMARY KEY (`mailman_id`,`server_id`,`domain`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `mail_mailman_domain`
@@ -386,7 +411,7 @@
`traffic` bigint(20) unsigned NOT NULL,
PRIMARY KEY (`traffic_id`),
KEY `mailuser_id` (`mailuser_id`,`month`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;
+) ENGINE=MyISAM AUTO_INCREMENT=2 ;
--
-- Daten f�r Tabelle `mail_traffic`
@@ -414,7 +439,7 @@
PRIMARY KEY (`transport_id`),
KEY `server_id` (`server_id`,`transport`),
KEY `server_id_2` (`server_id`,`domain`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `mail_transport`
@@ -444,7 +469,7 @@
`quota` int(11) NOT NULL default '0',
`homedir` varchar(255) NOT NULL,
`autoresponder` enum('n','y') NOT NULL default 'n',
- `autoresponder_text` tinytext NOT NULL,
+ `autoresponder_text` tinytext NULL,
`custom_mailfilter` text,
`postfix` enum('y','n') NOT NULL,
`access` enum('y','n') NOT NULL,
@@ -453,7 +478,7 @@
PRIMARY KEY (`mailuser_id`),
KEY `server_id` (`server_id`,`email`),
KEY `email_access` (`email`,`access`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `mail_user`
@@ -482,7 +507,7 @@
`target` varchar(255) default NULL,
`active` varchar(255) NOT NULL default 'y',
PRIMARY KEY (`filter_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
@@ -496,7 +521,7 @@
`remote_functions` text NOT NULL,
`tstamp` int(10) unsigned NOT NULL,
PRIMARY KEY (`remote_session`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM;
--
-- Daten f�r Tabelle `remote_session`
@@ -515,7 +540,7 @@
`remote_password` varchar(255) NOT NULL,
`remote_functions` text NOT NULL,
PRIMARY KEY (`remote_userid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `remote_user`
@@ -548,7 +573,7 @@
`updated` tinyint(4) NOT NULL default '0',
`active` tinyint(4) NOT NULL default '1',
PRIMARY KEY (`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `server`
@@ -571,7 +596,7 @@
`ip_address` varchar(15) default NULL,
`virtualhost` char(1) NOT NULL default 'y',
PRIMARY KEY (`server_ip_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `server_ip`
@@ -598,7 +623,7 @@
`dir` varchar(255) default NULL,
`chroot` varchar(255) NOT NULL,
PRIMARY KEY (`shell_user_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1;
+) ENGINE=MyISAM AUTO_INCREMENT=1;
--
@@ -621,7 +646,7 @@
`package_version` varchar(255) default NULL,
PRIMARY KEY (`package_id`),
UNIQUE KEY `package_name` (`package_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `software_package`
@@ -646,7 +671,7 @@
`repo_password` varchar(30) default NULL,
`active` varchar(255) NOT NULL default 'y',
PRIMARY KEY (`software_repo_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `software_repo`
@@ -674,7 +699,7 @@
`v4` tinyint(4) NOT NULL default '0',
`type` enum('full','update') NOT NULL default 'full',
PRIMARY KEY (`software_update_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `software_update`
@@ -694,7 +719,7 @@
`status` enum('none','installing','installed','deleting') NOT NULL default 'none',
PRIMARY KEY (`software_update_inst_id`),
UNIQUE KEY `software_update_id` (`software_update_id`,`package_name`,`server_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `software_update_inst`
@@ -753,7 +778,7 @@
`message_size_limit` int(11) default NULL,
`banned_rulenames` varchar(64) default NULL,
PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=13 ;
+) ENGINE=MyISAM AUTO_INCREMENT=13 ;
--
-- Daten f�r Tabelle `spamfilter_policy`
@@ -788,7 +813,7 @@
`local` char(1) default NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `email` (`email`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `spamfilter_users`
@@ -815,7 +840,7 @@
`priority` int(11) NOT NULL,
`active` enum('y','n') NOT NULL default 'y',
PRIMARY KEY (`wblist_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `spamfilter_wblist`
@@ -841,7 +866,7 @@
`message` varchar(255) default NULL,
`tstamp` int(11) NOT NULL default '1187707778',
PRIMARY KEY (`support_message_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
@@ -859,7 +884,7 @@
`user` varchar(255) NOT NULL default '',
`data` text NOT NULL,
PRIMARY KEY (`datalog_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `sys_datalog`
@@ -888,7 +913,7 @@
`last_datalog_id` bigint(20) NOT NULL default '0',
PRIMARY KEY (`id`),
KEY `last_datalog_id` (`last_datalog_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `sys_dbsync`
@@ -913,7 +938,7 @@
`wput_options` varchar(255) NOT NULL default '--timestamping --reupload --dont-continue',
`active` int(11) NOT NULL default '1',
PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `sys_filesync`
@@ -932,7 +957,7 @@
`description` text NOT NULL,
`client_id` int(11) NOT NULL default '0',
PRIMARY KEY (`groupid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=4 ;
+) ENGINE=MyISAM AUTO_INCREMENT=4 ;
--
-- Daten f�r Tabelle `sys_group`
@@ -965,13 +990,13 @@
`default_group` int(11) NOT NULL default '0',
`client_id` int(11) NOT NULL default '0',
PRIMARY KEY (`userid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
+) ENGINE=MyISAM AUTO_INCREMENT=3 ;
--
-- Daten f�r Tabelle `sys_user`
--
-INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `username`, `passwort`, `modules`, `startmodule`, `app_theme`, `typ`, `active`, `language`, `groups`, `default_group`, `client_id`) VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin,client,mail,monitor,sites,dns,tools', 'mail', 'default', 'admin', 1, 'en', '1,2', 1, 0);
+INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`, `sys_perm_group`, `sys_perm_other`, `username`, `passwort`, `modules`, `startmodule`, `app_theme`, `typ`, `active`, `language`, `groups`, `default_group`, `client_id`) VALUES (1, 1, 0, 'riud', 'riud', '', 'admin', '21232f297a57a5a743894a0e4a801fc3', 'admin,client,mail,monitor,sites,dns,tools,help', 'mail', 'default', 'admin', 1, 'en', '1,2', 1, 0);
-- --------------------------------------------------------
@@ -1000,7 +1025,8 @@
`cgi` char(1) NOT NULL default 'y',
`ssi` char(1) NOT NULL default 'y',
`suexec` char(1) NOT NULL default 'y',
- `errordocs` char(1) NOT NULL default 'y',
+ `errordocs` tinyint(1) NOT NULL default '1',
+ `is_subdomainwww` tinyint(1) NOT NULL default '1',
`php` varchar(255) NOT NULL default 'y',
`redirect_type` varchar(255) default NULL,
`redirect_path` varchar(255) default NULL,
@@ -1017,7 +1043,7 @@
`apache_directives` text,
`active` varchar(255) NOT NULL default 'y',
PRIMARY KEY (`domain_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
@@ -1046,7 +1072,7 @@
`remote_access` varchar(255) NOT NULL default 'y',
`active` varchar(255) NOT NULL default 'y',
PRIMARY KEY (`database_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `web_database`
@@ -1062,7 +1088,7 @@
`ip` varchar(12) NOT NULL,
`times` tinyint(1) NOT NULL default '1',
`login_time` timestamp NOT NULL default '0000-00-00 00:00:00'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM;
--
@@ -1074,35 +1100,47 @@
`type` varchar(255) NOT NULL,
`created` int(11) NOT NULL,
`data` mediumtext NOT NULL,
- `state` enum('unknown','ok','warning','critical', 'error') NOT NULL default 'unknown',
+ `state` enum('no_state', 'unknown', 'ok', 'info', 'warning', 'critical', 'error') NOT NULL default 'unknown',
PRIMARY KEY (`server_id`,`type`,`created`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=MyISAM;
-SET FOREIGN_KEY_CHECKS = 1;
+--
+-- Tabellenstruktur f�r Tabelle `sys_config`
+--
+
+CREATE TABLE `sys_config` (
+ `config_id` int(11) NOT NULL,
+ `group` varchar(255) NOT NULL,
+ `name` varchar(255) NOT NULL,
+ `value` varchar(255) NOT NULL
+) ENGINE=MyISAM;
+
+INSERT INTO sys_config VALUES ('1','db','db_version','3.0.0.8');
+-- --------------------------------------------------------
+--
+-- iso_country_list.sql
+--
+-- This will create and then populate a MySQL table with a list of the names and
+-- ISO 3166 codes for countries in existence as of the date below.
+--
+-- For updates to this file, see http://27.org/isocountrylist/
+-- For more about ISO 3166, see http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html
+--
+-- Created by getisocountrylist.pl on Sun Nov 2 14:59:20 2003.
+-- Wm. Rhodes <iso_country_list@27.org>
+--
-# iso_country_list.sql
-#
-# This will create and then populate a MySQL table with a list of the names and
-# ISO 3166 codes for countries in existence as of the date below.
-#
-# For updates to this file, see http://27.org/isocountrylist/
-# For more about ISO 3166, see http://www.iso.ch/iso/en/prods-services/iso3166ma/02iso-3166-code-lists/list-en1.html
-#
-# Created by getisocountrylist.pl on Sun Nov 2 14:59:20 2003.
-# Wm. Rhodes <iso_country_list@27.org>
-#
-
-CREATE TABLE IF NOT EXISTS country (
- iso CHAR(2) NOT NULL PRIMARY KEY,
- name VARCHAR(80) NOT NULL,
- printable_name VARCHAR(80) NOT NULL,
- iso3 CHAR(3),
- numcode SMALLINT
-);
+CREATE TABLE `country` (
+ `iso` CHAR(2) NOT NULL PRIMARY KEY,
+ `name` VARCHAR(80) NOT NULL,
+ `printable_name` VARCHAR(80) NOT NULL,
+ `iso3` CHAR(3),
+ `numcode` SMALLINT
+) ENGINE=MyISAM;
INSERT INTO country VALUES ('AF','AFGHANISTAN','Afghanistan','AFG','004');
INSERT INTO country VALUES ('AL','ALBANIA','Albania','ALB','008');
@@ -1344,9 +1382,6 @@
INSERT INTO country VALUES ('ZM','ZAMBIA','Zambia','ZMB','894');
INSERT INTO country VALUES ('ZW','ZIMBABWE','Zimbabwe','ZWE','716');
+-- --------------------------------------------------------
-
-
-
-
-
+SET FOREIGN_KEY_CHECKS = 1;
--
Gitblit v1.9.1