From 2c4579ffbb4b3af0dfc78281884c8ce60998a3fb Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Thu, 11 Dec 2008 08:17:20 -0500
Subject: [PATCH] All language are now full merge
---
install/sql/ispconfig3.sql | 208 +++++++++++++++++++++++++++++++++-------------------
1 files changed, 132 insertions(+), 76 deletions(-)
diff --git a/install/sql/ispconfig3.sql b/install/sql/ispconfig3.sql
index 774b4a0..35df222 100644
--- a/install/sql/ispconfig3.sql
+++ b/install/sql/ispconfig3.sql
@@ -1,13 +1,39 @@
--- phpMyAdmin SQL Dump
--- version 2.9.0.3
--- http://www.phpmyadmin.net
+
+/*
+Copyright (c) 2007, Till Brehm, projektfarm Gmbh
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of ISPConfig nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+-- 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 +62,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 +97,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 +127,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 +157,7 @@
PRIMARY KEY (`id`),
UNIQUE KEY `origin` (`origin`),
KEY `active` (`active`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
@@ -151,7 +177,7 @@
`template` text,
`visible` varchar(255) NOT NULL default 'Y',
PRIMARY KEY (`template_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=3 ;
+) ENGINE=MyISAM AUTO_INCREMENT=3 ;
--
-- Daten f�r Tabelle `dns_template`
@@ -180,7 +206,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`
@@ -219,7 +245,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`
@@ -246,7 +272,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`
@@ -273,7 +299,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 ;
-- --------------------------------------------------------
@@ -294,7 +320,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`
@@ -321,7 +347,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`
@@ -350,7 +376,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`
@@ -372,7 +398,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`
@@ -394,7 +420,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`
@@ -413,7 +439,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`
@@ -441,7 +467,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`
@@ -480,7 +506,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`
@@ -509,7 +535,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 ;
-- --------------------------------------------------------
@@ -523,7 +549,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`
@@ -542,7 +568,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`
@@ -575,7 +601,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`
@@ -598,7 +624,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`
@@ -625,7 +651,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;
--
@@ -648,7 +674,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`
@@ -673,7 +699,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`
@@ -701,7 +727,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`
@@ -721,7 +747,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`
@@ -780,7 +806,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`
@@ -815,7 +841,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`
@@ -842,7 +868,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`
@@ -868,7 +894,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 ;
-- --------------------------------------------------------
@@ -885,8 +911,10 @@
`tstamp` bigint(20) NOT NULL default '0',
`user` varchar(255) NOT NULL default '',
`data` text NOT NULL,
- PRIMARY KEY (`datalog_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=1 ;
+ `status` set('pending','ok','warning','error') NOT NULL default 'pending',
+ PRIMARY KEY (`datalog_id`),
+ KEY `server_id` (`server_id`,`status`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
--
-- Daten f�r Tabelle `sys_datalog`
@@ -915,7 +943,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`
@@ -940,7 +968,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`
@@ -959,13 +987,32 @@
`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`
--
INSERT INTO `sys_group` (`groupid`, `name`, `description`, `client_id`) VALUES (1, 'admin', 'Administrators group', 0);
+
+-- --------------------------------------------------------
+
+--
+-- Tabellenstruktur f�r Tabelle `sys_log`
+--
+
+CREATE TABLE `sys_log` (
+ `syslog_id` int(10) unsigned NOT NULL auto_increment,
+ `server_id` int(10) unsigned NOT NULL default '0',
+ `loglevel` tinyint(4) NOT NULL default '0',
+ `tstamp` int(10) unsigned NOT NULL,
+ `message` text,
+ PRIMARY KEY (`syslog_id`)
+) ENGINE=MyISAM AUTO_INCREMENT=1 ;
+
+--
+-- Daten f�r Tabelle `sys_log`
+--
-- --------------------------------------------------------
@@ -992,7 +1039,7 @@
`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`
@@ -1045,7 +1092,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 ;
--
@@ -1074,7 +1121,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`
@@ -1090,7 +1137,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;
--
@@ -1102,35 +1149,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 beta');
+-- --------------------------------------------------------
+--
+-- 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');
@@ -1372,9 +1431,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