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

- fix selection of default-ip/port combination in admin_domains

Browse Source 
- beautification of update-process
This commit is contained in:
Michael Kaufmann (d00p)
2010-04-29 06:49:03 +00:00
parent 862265ab60
commit fde4d53f1d
4 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
admin_domains.php
View File

@@ -563,7 +563,7 @@ if($page == 'domains'
$row_ipandport['ip'] = '[' . $row_ipandport['ip'] . ']';
}
$ipsandports.= makeoption($row_ipandport['ip'] . ':' . $row_ipandport['port'], $row_ipandport['id']);
$ipsandports.= makeoption($row_ipandport['ip'] . ':' . $row_ipandport['port'], $row_ipandport['id'], $settings['system']['defaultip']);
}
$ssl_ipsandports = '';

41
install/updates/preconfig/0.9/preconfig_0.9.inc.php
View File

@@ -31,11 +31,13 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
if(versionInUpdate($current_version, '0.9.4-svn2'))
{
$has_preconfig = true;
$return .= 'Froxlor now enables the usage of a domain-wildcard entry and subdomains for this domain at the same time (subdomains are parsed before the main-domain vhost container).';
$return .= 'This makes it possible to catch all non-existing subdomains with the main vhost but also have the ability to use subdomains for that domain.<br />';
$return .= 'If you would like Froxlor to do so with your domains, the update script can set the correct values for existing domains for you. Note: future domains will have wildcard-entries enabled by default no matter how you decide here.<br /><br />';
$return .= '<strong>Do you want to use wildcard-entries for existing domains?:</strong>&nbsp;';
$return .= makeyesno('update_domainwildcardentry', '1', '0', '1').'<br /><br />';
$description = 'Froxlor now enables the usage of a domain-wildcard entry and subdomains for this domain at the same time (subdomains are parsed before the main-domain vhost container).';
$description.= 'This makes it possible to catch all non-existing subdomains with the main vhost but also have the ability to use subdomains for that domain.<br />';
$description.= 'If you would like Froxlor to do so with your domains, the update script can set the correct values for existing domains for you. Note: future domains will have wildcard-entries enabled by default no matter how you decide here.';
$question = '<strong>Do you want to use wildcard-entries for existing domains?:</strong>&nbsp;';
$question.= makeyesno('update_domainwildcardentry', '1', '0', '1');
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
if(versionInUpdate($current_version, '0.9.6-svn2'))
@@ -43,35 +45,38 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version)
if(!PHPMailer::ValidateAddress($settings['panel']['adminmail']))
{
$has_preconfig = true;
$return .= 'Froxlor uses a newer version of the phpMailerClass and determined that your current admin-mail address is invalid.';
$return .= '<br /><br /><strong>Please specify a new admin-email address:</strong>&nbsp;<input type="text" name="update_adminmail" value="'.$settings['panel']['adminmail'].'" /><br /><br />';
$description = 'Froxlor uses a newer version of the phpMailerClass and determined that your current admin-mail address is invalid.';
$question = '<strong>Please specify a new admin-email address:</strong>&nbsp;<input type="text" class="text" name="update_adminmail" value="'.$settings['panel']['adminmail'].'" />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
}
if(versionInUpdate($current_version, '0.9.6-svn3'))
{
$has_preconfig = true;
$return .= 'You now have the possibility to define default error-documents for your webserver which replace the default webserver output.<br /><br />';
$return .= '<strong>Do you want to enable default error-documents?:</strong>&nbsp;';
$return .= makeyesno('update_deferr_enable', '1', '0', '0').'<br /><br />';
$description = 'You now have the possibility to define default error-documents for your webserver which replace the default webserver error-messages.';
$question = '<strong>Do you want to enable default error-documents?:</strong>&nbsp;';
$question .= makeyesno('update_deferr_enable', '1', '0', '0').'<br /><br />';
if($settings['system']['webserver'] == 'apache2')
{
$return .= '<strong>Path/URL for error 500:</strong>&nbsp;<input type="text" name="update_deferr_500" /><br />';
$return .= '<strong>Path/URL for error 401:</strong>&nbsp;<input type="text" name="update_deferr_401" /><br />';
$return .= '<strong>Path/URL for error 403:</strong>&nbsp;<input type="text" name="update_deferr_403" /><br />';
$question .= 'Path/URL for error 500:&nbsp;<input type="text" class="text" name="update_deferr_500" /><br /><br />';
$question .= 'Path/URL for error 401:&nbsp;<input type="text" class="text" name="update_deferr_401" /><br /><br />';
$question .= 'Path/URL for error 403:&nbsp;<input type="text" class="text" name="update_deferr_403" /><br /><br />';
}
$return .= '<strong>Path/URL for error 404:</strong>&nbsp;<input type="text" name="update_deferr_404" /><br /><br />';
$question .= 'Path/URL for error 404:&nbsp;<input type="text" class="text" name="update_deferr_404" />';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
if(versionInUpdate($current_version, '0.9.6-svn4'))
{
$has_preconfig = true;
$return .= 'You can define a default support-ticket priority level which is pre-selected for new support-tickets.<br /><br />';
$return .= '<strong>Which should be the default ticket-priority?:</strong>&nbsp;';
$return .= '<select name="update_deftic_priority">';
$description = 'You can define a default support-ticket priority level which is pre-selected for new support-tickets.';
$question = '<strong>Which should be the default ticket-priority?:</strong>&nbsp;';
$question .= '<select name="update_deftic_priority">';
$priorities = makeoption($lng['ticket']['unf_high'], '1', '2');
$priorities.= makeoption($lng['ticket']['unf_normal'], '2', '2');
$priorities.= makeoption($lng['ticket']['unf_low'], '3', '2');
$return .= $priorities.'</select><br /><br />';
$question .= $priorities.'</select>';
eval("\$return.=\"" . getTemplate("update/preconfigitem") . "\";");
}
}

6
templates/admin/update/preconfigitem.tpl Normal file
View File

@@ -0,0 +1,6 @@
<div class="preconfigitem">
<p>
<span class="preconfdesc">{$description}</span>
{$question}
</p>
</div>

11
templates/main.css
View File

@@ -458,3 +458,14 @@ TR.RowOverSelected {
margin-left: 15px;
}
.preconfigitem
{
padding: 0.15em;
border-bottom: 1px solid #cccccc;
}
.preconfdesc
{
display: block;
margin-bottom: 0.5em;
}