Skip to content

Commit

Permalink
Merge ISPConfig 3.0.5.4p9 modifications
Browse files Browse the repository at this point in the history
  • Loading branch information
@idrassi
idrassi committed Apr 23, 2016
1 parent 89a5bb2 commit ddc3f7c
Show file tree
Hide file tree
Showing 613 changed files with 6,273 additions and 5,811 deletions.
4 changes: 2 additions & 2 deletions ispconfig3_install/install/dist/conf/centos52.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@
$conf['mysql']['admin_password'] = '';
$conf['mysql']['charset'] = 'utf8';
$conf['mysql']['ispconfig_user'] = 'ispconfig';
$conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
$conf['mysql']['ispconfig_password'] = md5(uniqid(rand()));
$conf['mysql']['master_slave_setup'] = 'n';
$conf['mysql']['master_host'] = '';
$conf['mysql']['master_database'] = 'dbispconfig';
$conf['mysql']['master_admin_user'] = 'root';
$conf['mysql']['master_admin_password'] = '';
$conf['mysql']['master_ispconfig_user'] = '';
$conf['mysql']['master_ispconfig_password'] = md5 (uniqid (rand()));
$conf['mysql']['master_ispconfig_password'] = md5(uniqid(rand()));

//* Apache
$conf['apache']['installed'] = false; // will be detected automatically during installation
Expand Down
4 changes: 2 additions & 2 deletions ispconfig3_install/install/dist/conf/centos53.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@
$conf['mysql']['admin_password'] = '';
$conf['mysql']['charset'] = 'utf8';
$conf['mysql']['ispconfig_user'] = 'ispconfig';
$conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
$conf['mysql']['ispconfig_password'] = md5(uniqid(rand()));
$conf['mysql']['master_slave_setup'] = 'n';
$conf['mysql']['master_host'] = '';
$conf['mysql']['master_database'] = 'dbispconfig';
$conf['mysql']['master_admin_user'] = 'root';
$conf['mysql']['master_admin_password'] = '';
$conf['mysql']['master_ispconfig_user'] = '';
$conf['mysql']['master_ispconfig_password'] = md5 (uniqid (rand()));
$conf['mysql']['master_ispconfig_password'] = md5(uniqid(rand()));

//* Apache
$conf['apache']['installed'] = false; // will be detected automatically during installation
Expand Down
4 changes: 2 additions & 2 deletions ispconfig3_install/install/dist/conf/debian40.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@
$conf['mysql']['admin_password'] = '';
$conf['mysql']['charset'] = 'utf8';
$conf['mysql']['ispconfig_user'] = 'ispconfig';
$conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
$conf['mysql']['ispconfig_password'] = md5(uniqid(rand()));
$conf['mysql']['master_slave_setup'] = 'n';
$conf['mysql']['master_host'] = '';
$conf['mysql']['master_database'] = 'dbispconfig';
$conf['mysql']['master_admin_user'] = 'root';
$conf['mysql']['master_admin_password'] = '';
$conf['mysql']['master_ispconfig_user'] = '';
$conf['mysql']['master_ispconfig_password'] = md5 (uniqid (rand()));
$conf['mysql']['master_ispconfig_password'] = md5(uniqid(rand()));

//* Apache
$conf['apache']['installed'] = false; // will be detected automatically during installation
Expand Down
4 changes: 2 additions & 2 deletions ispconfig3_install/install/dist/conf/fedora9.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@
$conf['mysql']['admin_password'] = '';
$conf['mysql']['charset'] = 'utf8';
$conf['mysql']['ispconfig_user'] = 'ispconfig';
$conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
$conf['mysql']['ispconfig_password'] = md5(uniqid(rand()));
$conf['mysql']['master_slave_setup'] = 'n';
$conf['mysql']['master_host'] = '';
$conf['mysql']['master_database'] = 'dbispconfig';
$conf['mysql']['master_admin_user'] = 'root';
$conf['mysql']['master_admin_password'] = '';
$conf['mysql']['master_ispconfig_user'] = '';
$conf['mysql']['master_ispconfig_password'] = md5 (uniqid (rand()));
$conf['mysql']['master_ispconfig_password'] = md5(uniqid(rand()));

//* Apache
$conf['apache']['installed'] = false; // will be detected automatically during installation
Expand Down
8 changes: 4 additions & 4 deletions ispconfig3_install/install/dist/conf/gentoo.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@
$conf['mysql']['admin_password'] = '';
$conf['mysql']['charset'] = 'utf8';
$conf['mysql']['ispconfig_user'] = 'ispconfig';
$conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
$conf['mysql']['ispconfig_password'] = md5(uniqid(rand()));
$conf['mysql']['master_slave_setup'] = 'n';
$conf['mysql']['master_host'] = '';
$conf['mysql']['master_database'] = 'dbispconfig';
$conf['mysql']['master_admin_user'] = 'root';
$conf['mysql']['master_admin_password'] = '';
$conf['mysql']['master_ispconfig_user'] = '';
$conf['mysql']['master_ispconfig_password'] = md5 (uniqid (rand()));
$conf['mysql']['master_ispconfig_password'] = md5(uniqid(rand()));

//* SuPHP
$conf['suphp']['config_file'] = '/etc/suphp.conf';
Expand All @@ -85,7 +85,7 @@
$conf['apache']['config_file'] = $conf['apache']['config_dir'] .'/httpd.conf';
$conf['apache']['ssl_dir'] = '/etc/ssl/apache2';
$conf['apache']['vhost_conf_dir'] = $conf['apache']['config_dir'] . '/vhosts.d';
$conf['apache']['vhost_conf_enabled_dir'] = $conf['apache']['vhost_conf_dir'];
$conf['apache']['vhost_conf_enabled_dir'] = $conf['apache']['vhost_conf_dir'];
$conf['apache']['vhost_default'] = '00_default_vhost.conf';
$conf['apache']['vhost_port'] = '8080';
$conf['apache']['php_ini_path_apache'] = '/etc/php/apache2-php5/php.ini';
Expand Down Expand Up @@ -154,7 +154,7 @@
//* SASL
$conf['saslauthd']['installed'] = false; // will be detected automatically during installation
$conf['saslauthd']['config_file'] = '/etc/conf.d/saslauthd';
$conf['saslauthd']['config_dir'] = '/etc/sasl2';
$conf['saslauthd']['config_dir'] = '/etc/sasl2';
$conf['saslauthd']['init_script'] = 'saslauthd';

//* Amavisd
Expand Down
4 changes: 2 additions & 2 deletions ispconfig3_install/install/dist/conf/opensuse110.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@
$conf['mysql']['admin_password'] = '';
$conf['mysql']['charset'] = 'utf8';
$conf['mysql']['ispconfig_user'] = 'ispconfig';
$conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
$conf['mysql']['ispconfig_password'] = md5(uniqid(rand()));
$conf['mysql']['master_slave_setup'] = 'n';
$conf['mysql']['master_host'] = '';
$conf['mysql']['master_database'] = 'dbispconfig';
$conf['mysql']['master_admin_user'] = 'root';
$conf['mysql']['master_admin_password'] = '';
$conf['mysql']['master_ispconfig_user'] = '';
$conf['mysql']['master_ispconfig_password'] = md5 (uniqid (rand()));
$conf['mysql']['master_ispconfig_password'] = md5(uniqid(rand()));

//* Apache
$conf['apache']['installed'] = false; // will be detected automatically during installation
Expand Down
4 changes: 2 additions & 2 deletions ispconfig3_install/install/dist/conf/opensuse112.conf.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@
$conf['mysql']['admin_password'] = '';
$conf['mysql']['charset'] = 'utf8';
$conf['mysql']['ispconfig_user'] = 'ispconfig';
$conf['mysql']['ispconfig_password'] = md5 (uniqid (rand()));
$conf['mysql']['ispconfig_password'] = md5(uniqid(rand()));
$conf['mysql']['master_slave_setup'] = 'n';
$conf['mysql']['master_host'] = '';
$conf['mysql']['master_database'] = 'dbispconfig';
$conf['mysql']['master_admin_user'] = 'root';
$conf['mysql']['master_admin_password'] = '';
$conf['mysql']['master_ispconfig_user'] = '';
$conf['mysql']['master_ispconfig_password'] = md5 (uniqid (rand()));
$conf['mysql']['master_ispconfig_password'] = md5(uniqid(rand()));

//* Apache
$conf['apache']['installed'] = false; // will be detected automatically during installation
Expand Down
4 changes: 4 additions & 0 deletions ispconfig3_install/install/install.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@
include_once $cmd_opt['autoinstall'];
} elseif($path_parts['extension'] == 'ini') {
$tmp = ini_to_array(file_get_contents('autoinstall.ini'));
if(!is_array($tmp['install'])) $tmp['install'] = array();
if(!is_array($tmp['ssl_cert'])) $tmp['ssl_cert'] = array();
if(!is_array($tmp['expert'])) $tmp['expert'] = array();
if(!is_array($tmp['update'])) $tmp['update'] = array();
$autoinstall = $tmp['install'] + $tmp['ssl_cert'] + $tmp['expert'] + $tmp['update'];
unset($tmp);
}
Expand Down
2 changes: 1 addition & 1 deletion ispconfig3_install/install/sql/ispconfig3.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2292,7 +2292,7 @@ INSERT INTO `sys_user` (`userid`, `sys_userid`, `sys_groupid`, `sys_perm_user`,
-- Dumping data for table `sys_config`
--

INSERT INTO sys_config VALUES ('db','db_version','3.0.5.4p8');
INSERT INTO sys_config VALUES ('db','db_version','3.0.5.4p9');
INSERT INTO sys_config VALUES ('interface','session_timeout','0');

SET FOREIGN_KEY_CHECKS = 1;
2 changes: 1 addition & 1 deletion ispconfig3_install/install/tpl/config.inc.php.master
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ $revision = str_replace(array('Revision:','$',' '), '', $svn_revision);

//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
define('ISPC_APP_VERSION', '3.0.5.4p8');
define('ISPC_APP_VERSION', '3.0.5.4p9');
define('DEVSYSTEM', 0);


Expand Down
4 changes: 4 additions & 0 deletions ispconfig3_install/install/update.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,10 @@
include_once $cmd_opt['autoinstall'];
} elseif($path_parts['extension'] == 'ini') {
$tmp = ini_to_array(file_get_contents('autoinstall.ini'));
if(!is_array($tmp['install'])) $tmp['install'] = array();
if(!is_array($tmp['ssl_cert'])) $tmp['ssl_cert'] = array();
if(!is_array($tmp['expert'])) $tmp['expert'] = array();
if(!is_array($tmp['update'])) $tmp['update'] = array();
$autoinstall = $tmp['install'] + $tmp['ssl_cert'] + $tmp['expert'] + $tmp['update'];
unset($tmp);
}
Expand Down
4 changes: 2 additions & 2 deletions ispconfig3_install/interface/lib/classes/ini_parser.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ public function get_ini_string($config_array = '') {
$content .= "[$section]\n";
foreach($data as $item => $value) {
if($item != ''){
$value = trim($value);
$item = trim($item);
$value = trim($value);
$item = trim($item);
$content .= "$item=$value\n";
}
}
Expand Down
2 changes: 1 addition & 1 deletion ispconfig3_install/interface/lib/config.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

//** Application
define('ISPC_APP_TITLE', 'ISPConfig');
define('ISPC_APP_VERSION', '3.0.5.4p8');
define('ISPC_APP_VERSION', '3.0.5.4p9');
define('DEVSYSTEM', 0);


Expand Down
2 changes: 2 additions & 0 deletions ispconfig3_install/interface/lib/lang/cz.lng
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,5 +149,7 @@ $wb['weak_password_txt'] = 'Zvolené heslo neodpovídá požadavkům zásad pro
$wb['weak_password_length_txt'] = 'Zvolené heslo neodpovídá požadavkům zásad pro tvorbu hesel. Heslo musí být alespoň {chars} znaků dlouhé.';
$wb['security_check1_txt'] = 'Check for security permission:';
$wb['security_check2_txt'] = 'failed.';
$wb['err_csrf_attempt_blocked'] = 'CSRF attempt blocked.';
?>


Loading

0 comments on commit ddc3f7c

Please sign in to comment.