maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Add multistack options to userpanel, fixes #586

Browse Source
This commit is contained in:
Tilman Klaeger (tilman19)
2012-12-02 15:16:22 +01:00
committed by Michael Kaufmann (d00p)
parent 0d3daace49
commit 80f19c7dfb
9 changed files with 312 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
lib/classes/htmlpurifier/library/HTMLPurifier/DefinitionCache/Serializer/README Normal file → Executable file
View File

26
lib/formfields/admin/domains/formfield.domains_add.php
View File

@@ -88,18 +88,16 @@ return array(
),
'ipandport' => array(
'label' => 'IP/Port',
'type' => 'select',
'select_var' => $ipsandports,
'mandatory' => true,
),
'ssl' => array(
'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false),
'label' => 'SSL',
'type' => 'checkbox',
'values' => array(
array ('label' => $lng['panel']['yes'], 'value' => '1')
),
'value' => array()
'values' => $ipsandports,
'value' => array($settings['system']['defaultip']),
'mandatory' => true
),
'ssl_ipandport' => array(
'label' => 'IP/Port (SSL)',
'type' => 'checkbox',
'values' => $ssl_ipsandports,
'value' => ''
),
'ssl_redirect' => array(
'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false),
@@ -110,12 +108,6 @@ return array(
),
'value' => array()
),
'ssl_ipandport' => array(
'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false),
'label' => 'SSL IP/Port',
'type' => 'select',
'select_var' => $ssl_ipsandports
),
'no_ssl_available_info' => array(
'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports == '' ? true : false) : false),
'label' => 'SSL',

26
lib/formfields/admin/domains/formfield.domains_edit.php
View File

@@ -99,18 +99,16 @@ return array(
),
'ipandport' => array(
'label' => 'IP/Port',
'type' => 'select',
'select_var' => $ipsandports,
'mandatory' => true,
),
'ssl' => array(
'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false),
'label' => 'SSL',
'type' => 'checkbox',
'values' => array(
array ('label' => $lng['panel']['yes'], 'value' => '1')
),
'value' => array($result['ssl'])
'values' => $ipsandports,
'value' => $usedips,
'mandatory' => true
),
'ssl_ipandport' => array(
'label' => 'IP/Port (SSL)',
'type' => 'checkbox',
'values' => $ssl_ipsandports,
'value' => $usedips
),
'ssl_redirect' => array(
'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false),
@@ -121,12 +119,6 @@ return array(
),
'value' => array($result['ssl_redirect'])
),
'ssl_ipandport' => array(
'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports != '' ? true : false) : false),
'label' => 'SSL IP/Port',
'type' => 'select',
'select_var' => $ssl_ipsandports
),
'no_ssl_available_info' => array(
'visible' => ($settings['system']['use_ssl'] == '1' ? ($ssl_ipsandports == '' ? true : false) : false),
'label' => 'SSL',

4
lib/tables.inc.php
View File

@@ -54,6 +54,7 @@ define('TABLE_PANEL_REDIRECTCODES', 'redirect_codes');
define('TABLE_PANEL_DOMAINREDIRECTS', 'domain_redirect_codes');
define('TABLE_PANEL_IPDOCROOTSETTINGS', 'ipsandports_docrootsettings');
define('TABLE_PANEL_DOMDOCROOTSETTINGS', 'domain_docrootsettings');
define('TABLE_DOMAINTOIP', 'panel_domaintoip');
// APS constants
@@ -72,7 +73,6 @@ define('PACKAGE_LOCKED', 1);
define('PACKAGE_ENABLED', 2);
// VERSION INFO
$version = '0.9.29-dev3';
$version = '0.9.29-dev4';
$dbversion = '2';
$branding = '';