Commit 634d3a71 authored by Till Brehm's avatar Till Brehm
Browse files

Added missing http_port and https_port fields.

parent 5882e86f

install/sql/incremental/upd_dev_collection.sql

+1 −0
Original line number Diff line number Diff line
@@ -248,5 +248,6 @@ UPDATE `sys_session` SET `date_created` = NULL WHERE `date_created` = '0000-00-0 
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

+2 −0
Original line number Diff line number Diff line
@@ -1979,6 +1979,8 @@ CREATE TABLE `web_domain` ( 
  `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

+24 −0
Original line number Diff line number Diff line
@@ -894,6 +894,30 @@ if($_SESSION["s"]["user"]["typ"] == 'admin' 
				'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

+4 −0
Original line number Diff line number Diff line
@@ -129,4 +129,8 @@ $wb['backup_excludes_error_regex'] = 'The excluded directories contain invalid c 
$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.';

?>
 
 No newline at end of file

interface/web/sites/lib/lang/en_web_subdomain.lng

+4 −0
Original line number Diff line number Diff line
@@ -43,4 +43,8 @@ $wb['no_flag_txt'] = 'No flag'; 
$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.';

?>