Till Brehm
2016-04-19 634d3a71e91d6f2ba8b4bc97df6f766a4f556d43
Added missing http_port and https_port fields.
7 files modified
43 ■■■■■ changed files
install/sql/incremental/upd_dev_collection.sql 1 ●●●● patch | view | raw | blame | history
install/sql/ispconfig3.sql 2 ●●●●● patch | view | raw | blame | history
interface/web/sites/form/web_vhost_domain.tform.php 24 ●●●●● patch | view | raw | blame | history
interface/web/sites/lib/lang/en_web_domain.lng 4 ●●●● patch | view | raw | blame | history
interface/web/sites/lib/lang/en_web_subdomain.lng 4 ●●●● patch | view | raw | blame | history
interface/web/sites/lib/lang/en_web_vhost_domain.lng 4 ●●●● patch | view | raw | blame | history
interface/web/sites/lib/lang/en_web_vhost_subdomain.lng 4 ●●●● patch | view | raw | blame | history
install/sql/incremental/upd_dev_collection.sql
@@ -248,5 +248,6 @@
UPDATE `sys_session` SET `last_updated` = NULL WHERE `last_updated` = '0000-00-00 00:00:00';
UPDATE `web_domain` SET `added_date` = NULL WHERE `added_date` = '0000-00-00';
UPDATE `web_traffic` SET `traffic_date` = NULL WHERE `traffic_date` = '0000-00-00';
ALTER TABLE `web_domain` ADD `http_port` INT NOT NULL DEFAULT '80' , ADD `https_port` INT NOT NULL DEFAULT '443' ;
install/sql/ispconfig3.sql
@@ -1979,6 +1979,8 @@
  `http_port` int(11) unsigned NOT NULL DEFAULT '80',
  `https_port` int(11) unsigned NOT NULL DEFAULT '443',
  `folder_directive_snippets` text NOT NULL,
  `http_port` INT NOT NULL DEFAULT '80',
  `https_port` INT NOT NULL DEFAULT '443',
  PRIMARY KEY  (`domain_id`),
  UNIQUE KEY `serverdomain` (  `server_id` , `ip_address`,  `domain` )
) ENGINE=MyISAM DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
interface/web/sites/form/web_vhost_domain.tform.php
@@ -894,6 +894,30 @@
                'rows'  => '',
                'cols'  => ''
            ),
            'http_port' => array (
                'datatype' => 'INTEGER',
                'formtype' => 'TEXT',
                'validators' => array (  0 => array ( 'type' => 'REGEX',
                        'regex' => '/^([0-9]{1,5})$/',
                        'errmsg'=> 'http_port_error_regex'),
                ),
                'default' => '0',
                'value'  => '',
                'width'  => '3',
                'maxlength' => '6'
            ),
            'https_port' => array (
                'datatype' => 'INTEGER',
                'formtype' => 'TEXT',
                'validators' => array (  0 => array ( 'type' => 'REGEX',
                        'regex' => '/^([0-9]{1,5})$/',
                        'errmsg'=> 'https_port_error_regex'),
                ),
                'default' => '0',
                'value'  => '',
                'width'  => '3',
                'maxlength' => '6'
            )
            //#################################
            // ENDE Datatable fields
            //#################################
interface/web/sites/lib/lang/en_web_domain.lng
@@ -129,4 +129,8 @@
$wb['invalid_custom_php_ini_settings_txt'] = 'Invalid php.ini settings';
$wb['invalid_system_user_or_group_txt'] = 'Invalid system user or group';
$wb['apache_directive_blocked_error'] = 'Apache directive blocked by security settings:';
$wb['http_port_txt'] = 'HTTP Port';
$wb['https_port_txt'] = 'HTTPS Port';
$wb['http_port_error_regex'] = 'HTTP Port invalid.';
$wb['https_port_error_regex'] = 'HTTPS Port invalid.';
?>
interface/web/sites/lib/lang/en_web_subdomain.lng
@@ -43,4 +43,8 @@
$wb['proxy_directives_txt'] = 'Proxy Directives';
$wb['available_proxy_directive_snippets_txt'] = 'Available Proxy Directive Snippets:';
$wb['error_proxy_requires_url'] = 'Redirect Type "proxy" requires a URL as the redirect path.';
$wb['http_port_txt'] = 'HTTP Port';
$wb['https_port_txt'] = 'HTTPS Port';
$wb['http_port_error_regex'] = 'HTTP Port invalid.';
$wb['https_port_error_regex'] = 'HTTPS Port invalid.';
?>
interface/web/sites/lib/lang/en_web_vhost_domain.lng
@@ -148,4 +148,8 @@
$wb['rewrite_to_https_txt'] = 'Rewrite HTTP to HTTPS';
$wb['password_strength_txt'] = 'Password strength';
$wb['directive_snippets_id_txt'] = 'Web server config';
$wb['http_port_txt'] = 'HTTP Port';
$wb['https_port_txt'] = 'HTTPS Port';
$wb['http_port_error_regex'] = 'HTTP Port invalid.';
$wb['https_port_error_regex'] = 'HTTPS Port invalid.';
?>
interface/web/sites/lib/lang/en_web_vhost_subdomain.lng
@@ -125,4 +125,8 @@
$wb['backup_excludes_note_txt'] = '(Separate multiple directories with commas. Example: web/cache/*,web/backup)';
$wb['backup_excludes_error_regex'] = 'The excluded directories contain invalid characters.';
$wb['subdomain_error_empty'] = 'The subdommain field is empty or contains invalid characters.';
$wb['http_port_txt'] = 'HTTP Port';
$wb['https_port_txt'] = 'HTTPS Port';
$wb['http_port_error_regex'] = 'HTTP Port invalid.';
$wb['https_port_error_regex'] = 'HTTPS Port invalid.';
?>