beenull/EHCP-Force-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use UTF8 and General CI

Browse source
This commit is contained in:
earnolmartin 2019-01-25 11:57:45 -07:00
parent 98abf2ec92
commit 33e43f19ca
6 changed files with 73 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
ehcp/classapp.php
View file

@ -104,16 +104,16 @@ class Application
'createtable'=> 'createtable'=>
"CREATE TABLE IF NOT EXISTS `settings` ( "CREATE TABLE IF NOT EXISTS `settings` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`group` varchar(20) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT '', `group` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '',
`reseller` varchar(30) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT '', `reseller` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '',
`panelusername` varchar(30) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT '', `panelusername` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '',
`name` varchar(40) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT '', `name` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '',
`value` varchar(200) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT '', `value` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '',
`longvalue` text CHARACTER SET utf8 COLLATE utf8_turkish_ci, `longvalue` text CHARACTER SET utf8 COLLATE utf8_general_ci,
`comment` varchar(100) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT '', `comment` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '',
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `group` (`group`,`reseller`,`panelusername`,`name`,`value`) UNIQUE KEY `group` (`group`,`reseller`,`panelusername`,`name`,`value`)
) DEFAULT CHARSET=utf8 COLLATE=utf8_turkish_ci COMMENT='ehcp db - Table for settings of ehcp'" ) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='ehcp db - Table for settings of ehcp'"
), ),
'vpstable'=>array( 'vpstable'=>array(
'tablename'=>'vps', 'tablename'=>'vps',
@ -129,25 +129,25 @@ class Application
'createtable'=> 'createtable'=>
"CREATE TABLE `vps` ( "CREATE TABLE `vps` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`reseller` varchar(30) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `reseller` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`panelusername` varchar(30) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `panelusername` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`status` varchar(10) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `status` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`vpsname` varchar(30) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `vpsname` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`description` varchar(100) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `description` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`hostip` varchar(20) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `hostip` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`ip` varchar(20) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `ip` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`netmask` varchar(20) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `netmask` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`broadcast` varchar(20) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `broadcast` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`gateway` varchar(20) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `gateway` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`image_template` varchar(100) DEFAULT NULL, `image_template` varchar(100) DEFAULT NULL,
`ram` int(11) DEFAULT NULL, `ram` int(11) DEFAULT NULL,
`cpu` int(11) DEFAULT NULL, `cpu` int(11) DEFAULT NULL,
`state` varchar(20) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `state` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`ping` varchar(10) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `ping` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`hdimage` varchar(200) DEFAULT NULL, `hdimage` varchar(200) DEFAULT NULL,
`addvpscmd` text CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `addvpscmd` text CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) DEFAULT CHARSET=utf8 COLLATE=utf8_turkish_ci COMMENT='ehcp db - list of vps and their properties'" ) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='ehcp db - list of vps and their properties'"
), ),
@ -384,7 +384,7 @@ CREATE TABLE transport (
domainname varchar(128) NOT NULL default '', domainname varchar(128) NOT NULL default '',
transport varchar(128) NOT NULL default '', transport varchar(128) NOT NULL default '',
UNIQUE KEY domainname (domainname) UNIQUE KEY domainname (domainname)
) DEFAULT CHARSET=utf8 COLLATE=utf8_turkish_ci ) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci
" "
), ),
'settingstable'=>array( 'settingstable'=>array(
@ -407,10 +407,10 @@ CREATE TABLE transport (
'tablename'=>'hash', 'tablename'=>'hash',
'createtable'=>" 'createtable'=>"
CREATE TABLE IF NOT EXISTS `hash` ( CREATE TABLE IF NOT EXISTS `hash` (
`email` varchar(100) COLLATE utf8_turkish_ci NOT NULL DEFAULT 'NULL', `email` varchar(100) COLLATE utf8_general_ci NOT NULL DEFAULT 'NULL',
`hash` varchar(100) COLLATE utf8_turkish_ci DEFAULT NULL, `hash` varchar(100) COLLATE utf8_general_ci DEFAULT NULL,
KEY `email_index` (`email`) KEY `email_index` (`email`)
) DEFAULT CHARSET=utf8 COLLATE=utf8_turkish_ci COMMENT='to store password remind hash' ) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='to store password remind hash'
" "
), ),
@ -433,7 +433,7 @@ CREATE TABLE IF NOT EXISTS `remote_backups` (
`transfer_pass` varchar(50) default NULL, `transfer_pass` varchar(50) default NULL,
`encryption_pass` varchar(50) default NULL, `encryption_pass` varchar(50) default NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) DEFAULT CHARSET=latin1 COMMENT='Used to schedule cronjobs for remote backups'; ) DEFAULT CHARSET=utf8 COMMENT='Used to schedule cronjobs for remote backups';
", ",
'checkfields'=>array( 'checkfields'=>array(
'encryption_pass'=>'varchar(50)' 'encryption_pass'=>'varchar(50)'
@ -451,7 +451,7 @@ CREATE TABLE IF NOT EXISTS `cronjobs` (
`dayofweek` tinyint(1) default NULL, `dayofweek` tinyint(1) default NULL,
`time` varchar(2), `time` varchar(2),
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) DEFAULT CHARSET=latin1 COMMENT='Used to run any cronjobs an admin may want to run'; ) DEFAULT CHARSET=utf8 COMMENT='Used to run any cronjobs an admin may want to run';
" "
), ),
@ -2100,7 +2100,7 @@ function advancedsettings(){
$optionlist=array( $optionlist=array(
array('morethanoneserver','checkbox','righttext'=>'(This is experimental)','checked'=>$this->miscconfig['morethanoneserver'],'default'=>'Yes'), array('morethanoneserver','checkbox','righttext'=>'(This is experimental)','checked'=>$this->miscconfig['morethanoneserver'],'default'=>'Yes'),
array('mysqlcharset','lefttext'=>'Default mysql charset for new databases','righttext'=>'Example: DEFAULT CHARACTER SET utf8 COLLATE utf8_turkish_ci','default'=>$this->miscconfig['mysqlcharset']), array('mysqlcharset','lefttext'=>'Default mysql charset for new databases','righttext'=>'Example: DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci','default'=>$this->miscconfig['mysqlcharset']),
array('server_id','lefttext'=>'The id of this server, assigned by you, may be empty','righttext'=>'Example: 1 or home, This will be used in future for auto dyndns service inside ehcp','default'=>$this->miscconfig['server_id']), array('server_id','lefttext'=>'The id of this server, assigned by you, may be empty','righttext'=>'Example: 1 or home, This will be used in future for auto dyndns service inside ehcp','default'=>$this->miscconfig['server_id']),
array('defaultdnsserverips','lefttext'=>'Default dns server ip\'s that will host new domains:','righttext'=>'Enter list of ip\'s of your dnsservers here, comma separated list (for this server, you may use localhost)','default'=>$this->miscconfig['defaultdnsserverips']), array('defaultdnsserverips','lefttext'=>'Default dns server ip\'s that will host new domains:','righttext'=>'Enter list of ip\'s of your dnsservers here, comma separated list (for this server, you may use localhost)','default'=>$this->miscconfig['defaultdnsserverips']),
array('defaultwebserverips','lefttext'=>'Default webserver ip\'s that will host new domains:','righttext'=>'Enter list of ip\'s of your webservers here, comma separated list (for this server, you may use localhost)','default'=>$this->miscconfig['defaultwebserverips']), array('defaultwebserverips','lefttext'=>'Default webserver ip\'s that will host new domains:','righttext'=>'Enter list of ip\'s of your webservers here, comma separated list (for this server, you may use localhost)','default'=>$this->miscconfig['defaultwebserverips']),
@ -11737,7 +11737,7 @@ function addMysqlDbDirect($myserver, $domainname, $dbusername, $dbuserpass, $dbu
# actual setup for db and dbuser, local or remote # actual setup for db and dbuser, local or remote
# step 1: setup database: DEFAULT CHARACTER SET utf8 COLLATE utf8_turkish_ci # step 1: setup database: DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci
$s=$this->executeQuery("create database `$dbname` ".$this->miscconfig['mysqlcharset'],'creating db','',$link); $s=$this->executeQuery("create database `$dbname` ".$this->miscconfig['mysqlcharset'],'creating db','',$link);

62
ehcp/ehcp.sql
View file

@ -9,7 +9,7 @@ CREATE TABLE IF NOT EXISTS `scripts` (
`commandsaftercopy` text, `commandsaftercopy` text,
`customfileownerships` text, `customfileownerships` text,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) DEFAULT CHARSET=latin1 COMMENT='ehcp db - stores scripts that can be installed in ehcp'; ) DEFAULT CHARSET=utf8 COMMENT='ehcp db - stores scripts that can be installed in ehcp';
INSERT INTO `scripts` (`id`, `scriptname`, `homepage`, `description`, `filetype`, `fileinfo`, `scriptdirtocopy`, `commandsaftercopy`, `customfileownerships`) VALUES INSERT INTO `scripts` (`id`, `scriptname`, `homepage`, `description`, `filetype`, `fileinfo`, `scriptdirtocopy`, `commandsaftercopy`, `customfileownerships`) VALUES
(1, 'WordPress', NULL, NULL, 'directurl', 'https://wordpress.org/latest.zip', 'wordpress', '', NULL), (1, 'WordPress', NULL, NULL, 'directurl', 'https://wordpress.org/latest.zip', 'wordpress', '', NULL),
@ -255,7 +255,7 @@ INSERT INTO misc (id, name, `value`, longvalue,comment) VALUES
(12, 'quotaupdateinterval', '6', NULL,'this is in hours, quota will be calculated in this interval'), (12, 'quotaupdateinterval', '6', NULL,'this is in hours, quota will be calculated in this interval'),
(13, 'webservertype', 'apache2', NULL,'apache2 or nginx, (or any other that is supported)'), (13, 'webservertype', 'apache2', NULL,'apache2 or nginx, (or any other that is supported)'),
(14, 'webservermode', 'nonssl', NULL,'ssl or nonssl'), (14, 'webservermode', 'nonssl', NULL,'ssl or nonssl'),
(15, 'mysqlcharset', 'DEFAULT CHARACTER SET utf8 COLLATE utf8_turkish_ci', NULL,'Default charset/collation for newly added databases'), (15, 'mysqlcharset', 'DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci', NULL,'Default charset/collation for newly added databases'),
(16, 'enablewebstats', 'on',null,'Webalizer web stats'), (16, 'enablewebstats', 'on',null,'Webalizer web stats'),
(17, 'versionwarningcounter', '5',null,'') (17, 'versionwarningcounter', '5',null,'')
; ;
@ -335,10 +335,10 @@ CREATE TABLE transport (
DROP TABLE IF EXISTS `hash`; DROP TABLE IF EXISTS `hash`;
CREATE TABLE IF NOT EXISTS `hash` ( CREATE TABLE IF NOT EXISTS `hash` (
`email` varchar(100) COLLATE utf8_turkish_ci NOT NULL DEFAULT 'NULL', `email` varchar(100) COLLATE utf8_general_ci NOT NULL DEFAULT 'NULL',
`hash` varchar(100) COLLATE utf8_turkish_ci DEFAULT NULL, `hash` varchar(100) COLLATE utf8_general_ci DEFAULT NULL,
KEY `email_index` (`email`) KEY `email_index` (`email`)
) DEFAULT CHARSET=utf8 COLLATE=utf8_turkish_ci COMMENT='to store password remind hash'; ) DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci COMMENT='to store password remind hash';
# these are net2ftp tables for logging etc... # these are net2ftp tables for logging etc...
DROP TABLE IF EXISTS net2ftp_logAccess; DROP TABLE IF EXISTS net2ftp_logAccess;
@ -358,41 +358,41 @@ CREATE TABLE net2ftp_users (ftpserver varchar(255) NOT NULL default '0',username
CREATE TABLE IF NOT EXISTS `vps` ( CREATE TABLE IF NOT EXISTS `vps` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`reseller` varchar(30) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `reseller` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`panelusername` varchar(30) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `panelusername` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`status` varchar(20) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `status` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`vpsname` varchar(30) CHARACTER SET utf8 COLLATE utf8_turkish_ci NOT NULL, `vpsname` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`description` varchar(100) CHARACTER SET utf8 COLLATE utf8_turkish_ci NOT NULL, `description` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`hostip` varchar(20) CHARACTER SET utf8 COLLATE utf8_turkish_ci NOT NULL, `hostip` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`ip` varchar(20) CHARACTER SET utf8 COLLATE utf8_turkish_ci NOT NULL, `ip` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`ip2` varchar(20) CHARACTER SET utf8 COLLATE utf8_turkish_ci NOT NULL, `ip2` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`netmask` varchar(20) CHARACTER SET utf8 COLLATE utf8_turkish_ci NOT NULL, `netmask` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`broadcast` varchar(20) CHARACTER SET utf8 COLLATE utf8_turkish_ci NOT NULL, `broadcast` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`gateway` varchar(20) CHARACTER SET utf8 COLLATE utf8_turkish_ci NOT NULL, `gateway` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
`image_template` varchar(100) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `image_template` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`cdimage` varchar(100) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `cdimage` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`ram` int(11) DEFAULT NULL, `ram` int(11) DEFAULT NULL,
`cpu` int(11) DEFAULT NULL, `cpu` int(11) DEFAULT NULL,
`state` varchar(20) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `state` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`ping` varchar(10) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT NULL, `ping` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL,
`hdimage` varchar(200) DEFAULT NULL, `hdimage` varchar(200) DEFAULT NULL,
`vncpassword` varchar(20) DEFAULT NULL, `vncpassword` varchar(20) DEFAULT NULL,
`addvpscmd` text default null, `addvpscmd` text default null,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) DEFAULT CHARSET=latin1 COMMENT='ehcp db - list of domains and their properties'; ) DEFAULT CHARSET=utf8 COMMENT='ehcp db - list of domains and their properties';
CREATE TABLE IF NOT EXISTS `settings` ( CREATE TABLE IF NOT EXISTS `settings` (
`id` int(11) NOT NULL AUTO_INCREMENT, `id` int(11) NOT NULL AUTO_INCREMENT,
`group` varchar(20) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT '', `group` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '',
`reseller` varchar(30) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT '', `reseller` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '',
`panelusername` varchar(30) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT '', `panelusername` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '',
`name` varchar(40) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT '', `name` varchar(40) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '',
`value` text CHARACTER SET utf8 COLLATE utf8_turkish_ci, `value` text CHARACTER SET utf8 COLLATE utf8_general_ci,
`longvalue` text CHARACTER SET utf8 COLLATE utf8_turkish_ci, `longvalue` text CHARACTER SET utf8 COLLATE utf8_general_ci,
`comment` varchar(100) CHARACTER SET utf8 COLLATE utf8_turkish_ci DEFAULT '', `comment` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) DEFAULT CHARSET=latin1 COMMENT='ehcp db - Table for misc configruation of ehcp'; ) DEFAULT CHARSET=utf8 COMMENT='ehcp db - Table for misc configruation of ehcp';
CREATE TABLE IF NOT EXISTS `remote_backups` ( CREATE TABLE IF NOT EXISTS `remote_backups` (
`id` tinyint(4) NOT NULL auto_increment, `id` tinyint(4) NOT NULL auto_increment,
@ -406,7 +406,7 @@ CREATE TABLE IF NOT EXISTS `remote_backups` (
`transfer_pass` varchar(50) default NULL, `transfer_pass` varchar(50) default NULL,
`encryption_pass` varchar(50) default NULL, `encryption_pass` varchar(50) default NULL,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) DEFAULT CHARSET=latin1 COMMENT='Used to schedule cronjobs for remote backups'; ) DEFAULT CHARSET=utf8 COMMENT='Used to schedule cronjobs for remote backups';
CREATE TABLE IF NOT EXISTS `cronjobs` ( CREATE TABLE IF NOT EXISTS `cronjobs` (
`id` tinyint(4) NOT NULL auto_increment, `id` tinyint(4) NOT NULL auto_increment,
@ -414,7 +414,7 @@ CREATE TABLE IF NOT EXISTS `cronjobs` (
`dayofweek` tinyint(1) default NULL, `dayofweek` tinyint(1) default NULL,
`time` varchar(2), `time` varchar(2),
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) DEFAULT CHARSET=latin1 COMMENT='Used to run any cronjobs an admin may want to run'; ) DEFAULT CHARSET=utf8 COMMENT='Used to run any cronjobs an admin may want to run';
CREATE TABLE IF NOT EXISTS `pwd_dirs` ( CREATE TABLE IF NOT EXISTS `pwd_dirs` (
id int(11) NOT NULL auto_increment, id int(11) NOT NULL auto_increment,

4
ehcp/ehcp_vsftpd.sh.txt
View file

@ -45,7 +45,7 @@ CREATE TABLE `ftpaccounts` (
`reseller` varchar(30) default NULL, `reseller` varchar(30) default NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `username` (`ftpusername`) UNIQUE KEY `username` (`ftpusername`)
) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ; ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
-- --
-- Tablo d<>k<EFBFBD>m verisi `ftpaccounts` -- Tablo d<>k<EFBFBD>m verisi `ftpaccounts`
@ -67,7 +67,7 @@ CREATE TABLE `ftpaccounts` (
`reseller` varchar(30) default NULL, `reseller` varchar(30) default NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `ftpusername` (`ftpusername`) UNIQUE KEY `ftpusername` (`ftpusername`)
) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ; ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 AUTO_INCREMENT=2 ;
-- --
-- Tablo d<>k<EFBFBD>m verisi `ftpaccounts` -- Tablo d<>k<EFBFBD>m verisi `ftpaccounts`

16
ehcp/install_lib.php
View file

@ -1051,17 +1051,17 @@ function installMySQLServ(){#by earnolmartin@gmail.com
aptget(array("php5-mysqlnd"),$usePrompts); aptget(array("php5-mysqlnd"),$usePrompts);
} }
replacelineinfile("character-set-server","character-set-server = latin1","/etc/mysql/mariadb.conf.d/50-server.cnf", false); replacelineinfile("character-set-server","character-set-server = utf8","/etc/mysql/mariadb.conf.d/50-server.cnf", false);
replacelineinfile("character-set-server","character-set-server = latin1","/etc/mysql/mariadb.conf.d/50-client.cnf", false); replacelineinfile("character-set-server","character-set-server = utf8","/etc/mysql/mariadb.conf.d/50-client.cnf", false);
replacelineinfile("collation-server","collation-server = latin1_swedish_ci","/etc/mysql/mariadb.conf.d/50-server.cnf", false); replacelineinfile("collation-server","collation-server = utf8_general_ci","/etc/mysql/mariadb.conf.d/50-server.cnf", false);
replacelineinfile("collation-server","collation-server = latin1_swedish_ci","/etc/mysql/mariadb.conf.d/50-client.cnf", false); replacelineinfile("collation-server","collation-server = utf8_general_ci","/etc/mysql/mariadb.conf.d/50-client.cnf", false);
replacelineinfile("character-set-server","character-set-server = latin1","/etc/mysql/mysql.conf.d/mysqld.cnf", false); replacelineinfile("character-set-server","character-set-server = utf8","/etc/mysql/mysql.conf.d/mysqld.cnf", false);
replacelineinfile("collation-server","collation-server = latin1_swedish_ci","/etc/mysql/mysql.conf.d/mysqld.cnf", false); replacelineinfile("collation-server","collation-server = utf8_general_ci","/etc/mysql/mysql.conf.d/mysqld.cnf", false);
replacelineinfile("character-set-server","character-set-server = latin1","/etc/mysql/my.cnf", false); replacelineinfile("character-set-server","character-set-server = utf8","/etc/mysql/my.cnf", false);
replacelineinfile("collation-server","collation-server = latin1_swedish_ci","/etc/mysql/my.cnf", false); replacelineinfile("collation-server","collation-server = utf8_general_ci","/etc/mysql/my.cnf", false);
} }
function installPHPMYAdmin(){#by earnolmartin@gmail.com function installPHPMYAdmin(){#by earnolmartin@gmail.com

2
ehcp/scriptsupdate.sql
View file

@ -15,7 +15,7 @@ CREATE TABLE IF NOT EXISTS `scripts` (
`scriptdirtocopy` varchar(50) default NULL, `scriptdirtocopy` varchar(50) default NULL,
`commandsaftercopy` text, `commandsaftercopy` text,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='stores scripts that can be installed in ehcp' AUTO_INCREMENT=29 ; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='stores scripts that can be installed in ehcp' AUTO_INCREMENT=29 ;
-- --
-- Tablo döküm verisi `scripts` -- Tablo döküm verisi `scripts`

2
ehcp/scriptsupdate.sql.html
View file

@ -16,7 +16,7 @@ CREATE TABLE IF NOT EXISTS `scripts` (
`scriptdirtocopy` varchar(50) default NULL, `scriptdirtocopy` varchar(50) default NULL,
`commandsaftercopy` text, `commandsaftercopy` text,
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='ehcp db - stores scripts that can be installed in ehcp'; ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='ehcp db - stores scripts that can be installed in ehcp';
INSERT INTO `scripts` (`id`, `scriptname`, `homepage`, `description`, `filetype`, `fileinfo`, `scriptdirtocopy`, `commandsaftercopy`) VALUES INSERT INTO `scripts` (`id`, `scriptname`, `homepage`, `description`, `filetype`, `fileinfo`, `scriptdirtocopy`, `commandsaftercopy`) VALUES