PLEASE NOTE - Important update notifications
';
include_once makeCorrectFile(dirname(__FILE__).'/preconfig/0.9/preconfig_0.9.inc.php');
parseAndOutputPreconfig($has_preconfig, $return, $current_version);
diff --git a/install/updates/preconfig/0.9/preconfig_0.9.inc.php b/install/updates/preconfig/0.9/preconfig_0.9.inc.php
index 206d871b..47c48bae 100644
--- a/install/updates/preconfig/0.9/preconfig_0.9.inc.php
+++ b/install/updates/preconfig/0.9/preconfig_0.9.inc.php
@@ -440,7 +440,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version) {
$description = 'This version introduces a lot of profound changes:';
$description .= '
- Improving the whole template system
- Full UTF-8 support
- Removing support for the former default theme \'Classic\'
';
$description .= '
Notice: This update will
alter your Froxlor database to use UTF-8 as default charset. ';
- $description .= 'Even though this is already tested, we
strongly recommend to ';
+ $description .= 'Even though this is already tested, we
strongly recommend to ';
$description .= 'test this update in a testing environment using your existing data.
';
$question = '
Select your preferred Classic Theme replacement: ';
@@ -560,7 +560,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version) {
) {
$has_preconfig = true;
$description = 'The PHP-FPM implementation for apache2 has changed. Please look for the "
fastcgi.conf" (Debian/Ubuntu) or "
70_fastcgi.conf" (Gentoo) within /etc/apache2/ and change it as shown below:
';
- $description .= '
<IfModule mod_fastcgi.c>
+ $description .= '<IfModule mod_fastcgi.c>
FastCgiIpcDir /var/lib/apache2/fastcgi/
<Location "/fastcgiphp">
Order Deny,Allow
diff --git a/lib/classes/output/class.htmlform.php b/lib/classes/output/class.htmlform.php
index 93b73422..692a86aa 100644
--- a/lib/classes/output/class.htmlform.php
+++ b/lib/classes/output/class.htmlform.php
@@ -65,7 +65,7 @@ class htmlform
if ($nexto === false || (isset($fielddata['next_to']) && $nexto['field'] != $fielddata['next_to'])) {
$label = $fielddata['label'];
$desc = (isset($fielddata['desc']) ? $fielddata['desc'] : '');
- $style = (isset($fielddata['style']) ? ' style="'.$fielddata['style'].'"' : '');
+ $style = (isset($fielddata['style']) ? ' class="'.$fielddata['style'].'"' : '');
$mandatory = self::_getMandatoryFlag($fielddata);
$data_field = self::_parseDataField($fieldname, $fielddata);
//$data_field = str_replace("\n", "", $data_field);
@@ -132,11 +132,11 @@ class htmlform
{
if(isset($data['mandatory']))
{
- return ' *';
+ return ' *';
}
elseif(isset($data['mandatory_ex']))
{
- return ' **';
+ return ' **';
}
return '';
}
diff --git a/lib/formfields/admin/domains/formfield.domains_add.php b/lib/formfields/admin/domains/formfield.domains_add.php
index 38ba8a17..12dbae4a 100644
--- a/lib/formfields/admin/domains/formfield.domains_add.php
+++ b/lib/formfields/admin/domains/formfield.domains_add.php
@@ -136,7 +136,7 @@ return array(
),
'specialsettings' => array(
'visible' => ($userinfo['change_serversettings'] == '1' ? true : false),
- 'style' => 'vertical-align:top;',
+ 'style' => 'align-top',
'label' => $lng['admin']['ownvhostsettings'],
'desc' => $lng['serversettings']['default_vhostconf']['description'],
'type' => 'textarea',
diff --git a/lib/formfields/admin/domains/formfield.domains_edit.php b/lib/formfields/admin/domains/formfield.domains_edit.php
index 793ab8ad..d4d79698 100644
--- a/lib/formfields/admin/domains/formfield.domains_edit.php
+++ b/lib/formfields/admin/domains/formfield.domains_edit.php
@@ -147,7 +147,7 @@ return array(
),
'specialsettings' => array(
'visible' => ($userinfo['change_serversettings'] == '1' ? true : false),
- 'style' => 'vertical-align:top;',
+ 'style' => 'align-top',
'label' => $lng['admin']['ownvhostsettings'],
'desc' => $lng['serversettings']['default_vhostconf']['description'],
'type' => 'textarea',
diff --git a/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php b/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php
index 5d4fbcec..289a30d4 100644
--- a/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php
+++ b/lib/formfields/admin/ipsandports/formfield.ipsandports_add.php
@@ -69,7 +69,7 @@ return array(
'type' => 'text'
),
'specialsettings' => array(
- 'style' => 'vertical-align:top;',
+ 'style' => 'align-top',
'label' => $lng['admin']['ownvhostsettings'],
'desc' => $lng['serversettings']['default_vhostconf']['description'],
'type' => 'textarea',
@@ -91,7 +91,7 @@ return array(
'image' => 'icons/ipsports_add.png',
'fields' => array(
'default_vhostconf_domain' => array(
- 'style' => 'vertical-align:top;',
+ 'style' => 'align-top',
'label' => $lng['admin']['ipsandports']['default_vhostconf_domain'],
'desc' => $lng['serversettings']['default_vhostconf_domain']['description'],
'type' => 'textarea',
diff --git a/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php b/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php
index 56d73c19..49dd8bf4 100644
--- a/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php
+++ b/lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php
@@ -72,7 +72,7 @@ return array(
'value' => $result['docroot']
),
'specialsettings' => array(
- 'style' => 'vertical-align:top;',
+ 'style' => 'align-top',
'label' => $lng['admin']['ownvhostsettings'],
'desc' => $lng['serversettings']['default_vhostconf']['description'],
'type' => 'textarea',
@@ -95,7 +95,7 @@ return array(
'image' => 'icons/ipsports_edit.png',
'fields' => array(
'default_vhostconf_domain' => array(
- 'style' => 'vertical-align:top;',
+ 'style' => 'align-top',
'label' => $lng['admin']['ipsandports']['default_vhostconf_domain'],
'desc' => $lng['serversettings']['default_vhostconf_domain']['description'],
'type' => 'textarea',
diff --git a/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php b/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php
index a273230d..bbad9529 100644
--- a/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php
+++ b/lib/formfields/admin/phpconfig/formfield.phpconfig_add.php
@@ -78,7 +78,7 @@ return array(
'value' => '5s'
),
'phpsettings' => array(
- 'style' => 'vertical-align:top;',
+ 'style' => 'align-top',
'label' => $lng['admin']['phpsettings']['phpinisettings'],
'type' => 'textarea',
'cols' => 80,
diff --git a/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php b/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php
index 1d52d498..83dbbd44 100644
--- a/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php
+++ b/lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php
@@ -81,7 +81,7 @@ return array(
'value' => $result['fpm_reqslow']
),
'phpsettings' => array(
- 'style' => 'vertical-align:top;',
+ 'style' => 'align-top',
'label' => $lng['admin']['phpsettings']['phpinisettings'],
'type' => 'textarea',
'cols' => 80,
diff --git a/lib/formfields/admin/tickets/formfield.ticket_new.php b/lib/formfields/admin/tickets/formfield.ticket_new.php
index b88974e6..9ddf489e 100644
--- a/lib/formfields/admin/tickets/formfield.ticket_new.php
+++ b/lib/formfields/admin/tickets/formfield.ticket_new.php
@@ -45,7 +45,7 @@ return array(
'select_var' => $categories
),
'message' => array(
- 'style' => 'vertical-align:top;',
+ 'style' => 'align-top',
'label' => $lng['ticket']['message'],
'type' => 'textarea',
'cols' => 60,
diff --git a/lib/formfields/admin/tickets/formfield.ticket_reply.php b/lib/formfields/admin/tickets/formfield.ticket_reply.php
index d3ebe80c..b8604aa8 100644
--- a/lib/formfields/admin/tickets/formfield.ticket_reply.php
+++ b/lib/formfields/admin/tickets/formfield.ticket_reply.php
@@ -41,7 +41,7 @@ return array(
'value' => htmlentities($row['name']),
),
'message' => array(
- 'style' => 'vertical-align:top;',
+ 'style' => 'align-top',
'label' => $lng['ticket']['message'],
'type' => 'textarea',
'cols' => 60,
diff --git a/lib/formfields/customer/domains/formfield.domain_ssleditor.php b/lib/formfields/customer/domains/formfield.domain_ssleditor.php
index 0192d509..1e4de102 100644
--- a/lib/formfields/customer/domains/formfield.domain_ssleditor.php
+++ b/lib/formfields/customer/domains/formfield.domain_ssleditor.php
@@ -25,7 +25,7 @@ return array(
'image' => 'icons/ssl.png',
'fields' => array(
'ssl_cert_file' => array(
- 'style' => 'vertical-align:top;',
+ 'style' => 'align-top',
'label' => $lng['admin']['ipsandports']['ssl_cert_file_content'],
'desc' => $lng['admin']['ipsandports']['ssl_paste_description'],
'type' => 'textarea',
@@ -34,7 +34,7 @@ return array(
'value' => $result['ssl_cert_file']
),
'ssl_key_file' => array(
- 'style' => 'vertical-align:top;',
+ 'style' => 'align-top',
'label' => $lng['admin']['ipsandports']['ssl_key_file_content'],
'desc' => $lng['admin']['ipsandports']['ssl_paste_description'],
'type' => 'textarea',
@@ -43,7 +43,7 @@ return array(
'value' => $result['ssl_key_file']
),
'ssl_cert_chainfile' => array(
- 'style' => 'vertical-align:top;',
+ 'style' => 'align-top',
'label' => $lng['admin']['ipsandports']['ssl_cert_chainfile_content'],
'desc' => $lng['admin']['ipsandports']['ssl_paste_description'].$lng['admin']['ipsandports']['ssl_cert_chainfile_content_desc'],
'type' => 'textarea',
@@ -52,7 +52,7 @@ return array(
'value' => $result['ssl_cert_chainfile']
),
'ssl_ca_file' => array(
- 'style' => 'vertical-align:top;',
+ 'style' => 'align-top',
'label' => $lng['admin']['ipsandports']['ssl_ca_file_content'],
'desc' => $lng['admin']['ipsandports']['ssl_paste_description'].$lng['admin']['ipsandports']['ssl_ca_file_content_desc'],
'type' => 'textarea',
diff --git a/lib/functions/froxlor/function.updateFunctions.php b/lib/functions/froxlor/function.updateFunctions.php
index 138567d3..2ba95f6f 100644
--- a/lib/functions/froxlor/function.updateFunctions.php
+++ b/lib/functions/froxlor/function.updateFunctions.php
@@ -110,11 +110,13 @@ function showUpdateStep($task = null, $needs_status = true) {
global $updatelog, $filelog;
+ if (!$needs_status) echo "";
+
// output
echo $task;
if (!$needs_status) {
- echo "
";
+ echo "
";
}
$updatelog->logAction(ADM_ACTION, LOG_WARNING, $task);
@@ -139,24 +141,24 @@ function lastStepStatus($status = -1, $message = '') {
case 0:
$status_sign = ($message != '') ? '['.$message.']' : '[OK]';
- $status_color = '1dcd00';
+ $status_color = 'ok';
break;
case 1:
$status_sign = ($message != '') ? '['.$message.']' : '[??]';
- $status_color = 'db7100';
+ $status_color = 'warn';
break;
case 2:
$status_sign = ($message != '') ? '['.$message.']' : '[!!]';
- $status_color = 'ff0000';
+ $status_color = 'err';
break;
default:
$status_sign = '[unknown]';
- $status_color = '000000';
+ $status_color = 'unknown';
break;
}
// output
- echo "".$status_sign."
";
+ echo "".$status_sign."
";
if ($status == -1 || $status == 2) {
$updatelog->logAction(ADM_ACTION, LOG_WARNING, 'Attention - last update task failed!!!');
diff --git a/lng/dutch.lng.php b/lng/dutch.lng.php
index e4a7197a..085bcde6 100644
--- a/lng/dutch.lng.php
+++ b/lng/dutch.lng.php
@@ -1087,12 +1087,12 @@ $lng['ticket']['orderdesc'] = 'Hier kunt u uw eigen logische volgorde instellen
// ADDED IN FROXLOR 0.9.6-svn3
$lng['serversettings']['defaultwebsrverrhandler_enabled'] = 'Standaard foutdocumenten voor alle klanten activeren';
$lng['serversettings']['defaultwebsrverrhandler_err401']['title'] = 'Bestand/URL voor foutcode 401';
-$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = 'Wordt niet ondersteund in: lighttpd
';
+$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = 'Wordt niet ondersteund in: lighttpd
';
$lng['serversettings']['defaultwebsrverrhandler_err403']['title'] = 'Bestand/URL voor foutcode 403';
-$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = 'Wordt niet ondersteund in: lighttpd
';
+$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = 'Wordt niet ondersteund in: lighttpd
';
$lng['serversettings']['defaultwebsrverrhandler_err404'] = 'Bestand/URL voor foutcode 404';
$lng['serversettings']['defaultwebsrverrhandler_err500']['title'] = 'Bestand/URL voor foutcode 500';
-$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = 'Wordt niet ondersteund in: lighttpd
';
+$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = 'Wordt niet ondersteund in: lighttpd
';
// ADDED IN FROXLOR 0.9.6-svn4
$lng['serversettings']['ticket']['default_priority'] = 'Standaardprioriteit voor support-tickets';
diff --git a/lng/english.lng.php b/lng/english.lng.php
index de12f853..9a6943c3 100644
--- a/lng/english.lng.php
+++ b/lng/english.lng.php
@@ -690,7 +690,7 @@ $lng['serversettings']['ticket']['noreply_name'] = 'Ticket e-mail sendername';
// ADDED IN 1.2.19-svn1
$lng['serversettings']['mod_fcgid']['configdir']['title'] = 'Configuration directory';
-$lng['serversettings']['mod_fcgid']['configdir']['description'] = 'Where should all fcgid-configuration files be stored? If you don\'t use a self compiled suexec binary, which is the normal situation, this path must be under /var/www/
NOTE: This folder\'s content gets deleted regulary so avoid storing data in there manually.
';
+$lng['serversettings']['mod_fcgid']['configdir']['description'] = 'Where should all fcgid-configuration files be stored? If you don\'t use a self compiled suexec binary, which is the normal situation, this path must be under /var/www/
NOTE: This folder\'s content gets deleted regulary so avoid storing data in there manually.
';
$lng['serversettings']['mod_fcgid']['tmpdir']['title'] = 'Temp directory';
// ADDED IN 1.2.19-svn3
@@ -809,7 +809,7 @@ $lng['admin']['allips'] = 'All IP\'s';
$lng['panel']['nosslipsavailable'] = 'There are currently no ssl ip/port combinations for this server';
$lng['ticket']['by'] = 'by';
$lng['dkim']['use_dkim']['title'] = 'Activate DKIM support?';
-$lng['dkim']['use_dkim']['description'] = 'Would you like to use the Domain Keys (DKIM) system?
Note: DKIM is only supported using dkim-filter, not opendkim (yet)';
+$lng['dkim']['use_dkim']['description'] = 'Would you like to use the Domain Keys (DKIM) system?
Note: DKIM is only supported using dkim-filter, not opendkim (yet)';
$lng['error']['invalidmysqlhost'] = 'Invalid MySQL host address: %s';
$lng['error']['cannotuseawstatsandwebalizeratonetime'] = 'You cannot enable Webalizer and AWstats at the same time, please chose one of them';
$lng['serversettings']['webalizer_enabled'] = 'Enable webalizer statistics';
@@ -1157,12 +1157,12 @@ $lng['ticket']['orderdesc'] = 'Here you can define your own logical order for th
// ADDED IN FROXLOR 0.9.6-svn3
$lng['serversettings']['defaultwebsrverrhandler_enabled'] = 'Enable default errordocuments for all customers';
$lng['serversettings']['defaultwebsrverrhandler_err401']['title'] = 'File/URL for error 401';
-$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = 'Not supported in: lighttpd
';
+$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = 'Not supported in: lighttpd
';
$lng['serversettings']['defaultwebsrverrhandler_err403']['title'] = 'File/URL for error 403';
-$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = 'Not supported in: lighttpd
';
+$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = 'Not supported in: lighttpd
';
$lng['serversettings']['defaultwebsrverrhandler_err404'] = 'File/URL for error 404';
$lng['serversettings']['defaultwebsrverrhandler_err500']['title'] = 'File/URL for error 500';
-$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = 'Not supported in: lighttpd
';
+$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = 'Not supported in: lighttpd
';
// ADDED IN FROXLOR 0.9.6-svn4
$lng['serversettings']['ticket']['default_priority'] = 'Default support-ticket priority';
@@ -1681,7 +1681,7 @@ $lng['serversettings']['catchall_enabled']['description'] = 'Do you want to pro
// ADDED IN 0.9.28.svn6
$lng['serversettings']['apache_24']['title'] = 'Use modifications for Apache 2.4';
-$lng['serversettings']['apache_24']['description'] = 'ATTENTION: use only if you acutally have apache version 2.4 or higher installed
otherwise your webserver will not be able to start';
+$lng['serversettings']['apache_24']['description'] = 'ATTENTION: use only if you acutally have apache version 2.4 or higher installed
otherwise your webserver will not be able to start';
$lng['admin']['tickets_see_all'] = 'Can see all ticket-categories?';
$lng['serversettings']['nginx_fastcgiparams']['title'] = 'Path to fastcgi_params file';
$lng['serversettings']['nginx_fastcgiparams']['description'] = 'Specify the path to nginx\'s fastcgi_params file including filename';
@@ -1726,14 +1726,14 @@ $lng['error']['sslcertificateinvalidcertkeypair'] = 'The given private-key does
$lng['error']['sslcertificateinvalidca'] = 'The given CA certificate data does not seem to be a valid certificate';
$lng['error']['sslcertificateinvalidchain'] = 'The given certificate chain data does not seem to be a valid certificate';
$lng['serversettings']['customerssl_directory']['title'] = 'Webserver customer-ssl certificates-directory';
-$lng['serversettings']['customerssl_directory']['description'] = 'Where should customer-specified ssl-certificates be created?
NOTE: This folder\'s content gets deleted regulary so avoid storing data in there manually.
';
+$lng['serversettings']['customerssl_directory']['description'] = 'Where should customer-specified ssl-certificates be created?
NOTE: This folder\'s content gets deleted regulary so avoid storing data in there manually.
';
$lng['admin']['note'] = 'Please note';
$lng['admin']['phpfpm.ininote'] = 'Not all values you may want to define can be used in the php-fpm pool configuration';
// Added in Froxlor 0.9.30
$lng['crondesc']['cron_mailboxsize'] = 'Calculating of mailbox-sizes';
$lng['domains']['ipandport_multi']['title'] = 'IP address(es)';
-$lng['domains']['ipandport_multi']['description'] = 'Specify one or more IP address for the domain.
NOTE: IP addresses cannot be changed when the domain is configured as alias-domain of another domain.
';
+$lng['domains']['ipandport_multi']['description'] = 'Specify one or more IP address for the domain.
NOTE: IP addresses cannot be changed when the domain is configured as alias-domain of another domain.
';
$lng['domains']['ipandport_ssl_multi']['title'] = 'SSL IP address(es)';
$lng['domains']['ssl_redirect']['title'] = 'SSL redirect';
$lng['domains']['ssl_redirect']['description'] = 'This option creates redirects for non-ssl vhosts so that all requests are redirected to the SSL-vhost.
e.g. a request to http://domain.tld/ will redirect you to https://domain.tld/';
@@ -1816,7 +1816,7 @@ $lng['serversettings']['system_croncmdline']['description'] = 'Command to execut
$lng['error']['cannotdeletehostnamephpconfig'] = 'This PHP-configuration is used by the Froxlor-vhost and cannot be deleted.';
$lng['error']['cannotdeletedefaultphpconfig'] = 'This PHP-configuration is set as default and cannot be deleted.';
$lng['serversettings']['system_cron_allowautoupdate']['title'] = 'Allow automatic database updates';
-$lng['serversettings']['system_cron_allowautoupdate']['description'] = 'ATTENTION:
This settings allows the cronjob to bypass the version-check of froxlors files and database and runs the database-updates in case a version-mismatch occurs.
Auto-update will always set default values for new settings or changes. This might not always suite your system. Please think twice before activating this option
';
+$lng['serversettings']['system_cron_allowautoupdate']['description'] = 'ATTENTION:
This settings allows the cronjob to bypass the version-check of froxlors files and database and runs the database-updates in case a version-mismatch occurs.
Auto-update will always set default values for new settings or changes. This might not always suite your system. Please think twice before activating this option
';
$lng['error']['passwordshouldnotbeusername'] = 'The password should not be the same as the username.';
// Added in Froxlor 0.9.33
diff --git a/lng/german.lng.php b/lng/german.lng.php
index 0df0e3ff..e60bca8a 100644
--- a/lng/german.lng.php
+++ b/lng/german.lng.php
@@ -688,7 +688,7 @@ $lng['serversettings']['ticket']['noreply_name'] = 'E-Mail-Absendername für Tic
// ADDED IN 1.2.19-svn
$lng['serversettings']['mod_fcgid']['configdir']['title'] = 'Konfigurations-Verzeichnis';
-$lng['serversettings']['mod_fcgid']['configdir']['description'] = 'Wo sollen alle Konfigurationsdateien von fcgid liegen? Wenn Sie keine selbst kompilierte suexec Binary benutzen, was in der Regel der Fall ist, muss dieser Pfad unter /var/www/ liegen.
ACHTUNG: Der Inhalt dieses Ordners wird regelmäßig geleert, daher sollten dort keinerlei Daten manuell abgelegt werden.
';
+$lng['serversettings']['mod_fcgid']['configdir']['description'] = 'Wo sollen alle Konfigurationsdateien von fcgid liegen? Wenn Sie keine selbst kompilierte suexec Binary benutzen, was in der Regel der Fall ist, muss dieser Pfad unter /var/www/ liegen.
ACHTUNG: Der Inhalt dieses Ordners wird regelmäßig geleert, daher sollten dort keinerlei Daten manuell abgelegt werden.
';
$lng['serversettings']['mod_fcgid']['tmpdir']['title'] = 'Temporäres Verzeichnis';
// ADDED IN 1.2.19-svn3
@@ -807,7 +807,7 @@ $lng['admin']['allips'] = 'Alle IPs';
$lng['panel']['nosslipsavailable'] = 'Für diesen Server wurden noch keine SSL IP/Port Kombinationen eingetragen';
$lng['ticket']['by'] = 'von';
$lng['dkim']['use_dkim']['title'] = 'DKIM-Support aktivieren?';
-$lng['dkim']['use_dkim']['description'] = 'Wollen Sie das Domain-Keys-System (DKIM) benutzen?
Hinweis: Derzeit wird DKIM nur via dkim-filter unterstützt, nicht opendkim.';
+$lng['dkim']['use_dkim']['description'] = 'Wollen Sie das Domain-Keys-System (DKIM) benutzen?
Hinweis: Derzeit wird DKIM nur via dkim-filter unterstützt, nicht opendkim.';
$lng['error']['invalidmysqlhost'] = 'Ungültige MySQL-Host-Adresse: "%s"';
$lng['error']['cannotuseawstatsandwebalizeratonetime'] = 'Webalizer und AWstats können nicht zur gleichen Zeit aktiviert werden, bitte wählen Sie eines aus.';
$lng['serversettings']['webalizer_enabled'] = 'Nutze Webalizer-Statistiken';
@@ -1148,12 +1148,12 @@ $lng['ticket']['orderdesc'] = 'Hier kann eine logische Sortierung für die Ticke
// ADDED IN FROXLOR 0.9.6-svn3
$lng['serversettings']['defaultwebsrverrhandler_enabled'] = 'Verwende Standard-Fehlerdokumente für alle Kunden';
$lng['serversettings']['defaultwebsrverrhandler_err401']['title'] = 'Datei/URL für Fehler 401';
-$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = 'Nicht unterstüzt in: lighttpd
';
+$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = 'Nicht unterstüzt in: lighttpd
';
$lng['serversettings']['defaultwebsrverrhandler_err403']['title'] = 'Datei/URL für Fehler 403';
-$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = 'Nicht unterstüzt in: lighttpd
';
+$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = 'Nicht unterstüzt in: lighttpd
';
$lng['serversettings']['defaultwebsrverrhandler_err404'] = 'Datei/URL für Fehler 404';
$lng['serversettings']['defaultwebsrverrhandler_err500']['title'] = 'Datei/URL für Fehler 500';
-$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = 'Nicht unterstüzt in: lighttpd
';
+$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = 'Nicht unterstüzt in: lighttpd
';
// ADDED IN FROXLOR 0.9.6-svn4
$lng['serversettings']['ticket']['default_priority'] = 'Voreingestellte Support-Ticket Priorität';
@@ -1406,7 +1406,7 @@ $lng['serversettings']['catchall_enabled']['description'] = 'Möchten Sie Ihren
// ADDED IN 0.9.28.svn6
$lng['serversettings']['apache_24']['title'] = 'Anpassungen für Apache 2.4 verwenden';
-$lng['serversettings']['apache_24']['description'] = 'Achtung: Bitte nur verwenden, wenn wirklich Apache mit Version 2.4 oder höher installiert ist, ansonsten wird der Webserver nicht starten.
';
+$lng['serversettings']['apache_24']['description'] = 'Achtung: Bitte nur verwenden, wenn wirklich Apache mit Version 2.4 oder höher installiert ist, ansonsten wird der Webserver nicht starten.
';
$lng['admin']['tickets_see_all'] = 'Kann alle Ticket-Kategorien sehen?';
$lng['serversettings']['nginx_fastcgiparams']['title'] = 'Pfad zur fastcgi_params Datei';
$lng['serversettings']['nginx_fastcgiparams']['description'] = 'Geben Sie den Pfad zu nginx\'s fastcgi_params Datei an. Inklusive Dateiname!';
@@ -1451,14 +1451,14 @@ $lng['error']['sslcertificateinvalidcertkeypair'] = 'Der angegebene Key (Private
$lng['error']['sslcertificateinvalidca'] = 'Das angegebene CA-Zertifikat scheint nicht gültig zu sein.';
$lng['error']['sslcertificateinvalidchain'] = 'Das angegebene CertificateChainFile scheint nicht gültig zu sein.';
$lng['serversettings']['customerssl_directory']['title'] = 'Webserver-Kunden-SSL-Zertifikatsverzeichnis';
-$lng['serversettings']['customerssl_directory']['description'] = 'Wo sollen kundenspezifizierte SSL-Zertifikate erstellt werden?
ACHTUNG: Der Inhalt dieses Ordners wird regelmäßig geleert, daher sollten dort keinerlei Daten manuell abgelegt werden.
';
+$lng['serversettings']['customerssl_directory']['description'] = 'Wo sollen kundenspezifizierte SSL-Zertifikate erstellt werden?
ACHTUNG: Der Inhalt dieses Ordners wird regelmäßig geleert, daher sollten dort keinerlei Daten manuell abgelegt werden.
';
$lng['admin']['note'] = 'Bitte beachten';
$lng['admin']['phpfpm.ininote'] = 'Nicht alle gewünschten Werte können in der php-fpm-pool-Konfiguration verwendet werden.';
// Added in Froxlor 0.9.30
$lng['crondesc']['cron_mailboxsize'] = 'Berechnung der Mailbox-Größen';
$lng['domains']['ipandport_multi']['title'] = 'IP-Adresse(n)';
-$lng['domains']['ipandport_multi']['description'] = 'Definiere eine oder mehrere IP-Adresse(n) für diese Domain.
Hinweis: Die IP-Adressen können nicht geändert werden, sollte die Domain als Alias-Domain für eine andere Domain konfiguriert worden sein.
';
+$lng['domains']['ipandport_multi']['description'] = 'Definiere eine oder mehrere IP-Adresse(n) für diese Domain.
Hinweis: Die IP-Adressen können nicht geändert werden, sollte die Domain als Alias-Domain für eine andere Domain konfiguriert worden sein.
';
$lng['domains']['ipandport_ssl_multi']['title'] = 'SSL-IP-Adresse(n)';
$lng['domains']['ssl_redirect']['title'] = 'SSL-Weiterleitung';
$lng['domains']['ssl_redirect']['description'] = 'Diese Option erstellt für alle Nicht-SSL-vHosts eine Weiterleitung (Redirect), so dass alle Anfragen an den SSL-vHost übermittelt werden (z. B. würde eine Anfrage an http://domain.tld/ weitergeleitet werden zu https://domain.tld/).';
@@ -1540,7 +1540,7 @@ $lng['serversettings']['system_croncmdline']['description'] = 'Befehl zum Ausfü
$lng['error']['cannotdeletehostnamephpconfig'] = 'Diese PHP-Konfiguration ist dem Froxlor-Vhost zugewiesen und kann daher nicht gelöscht werden.';
$lng['error']['cannotdeletedefaultphpconfig'] = 'Diese PHP-Konfiguration ist als Standard hinterlegt und kann daher nicht gelöscht werden.';
$lng['serversettings']['system_cron_allowautoupdate']['title'] = 'Erlaube automatische Datenbank-Aktualisierungen';
-$lng['serversettings']['system_cron_allowautoupdate']['description'] = 'WARNUNG: Diese Einstellung erlaubt es dem Cronjob die Prüfung der Dateien- und Datenbank-Version zu umgehen und bei einem Versions-Unterschied die Datenbank-Aktualisierungen automatisiert auszuführen.
Das automatische Update setzt für neue Einstellungen und Änderungen immer die default-Werte. Diese müssen nicht zwingend zu dem genutzten System passen. Bitte zwei mal nachdenken, bevor diese Option aktiviert wird.
';
+$lng['serversettings']['system_cron_allowautoupdate']['description'] = 'WARNUNG: Diese Einstellung erlaubt es dem Cronjob die Prüfung der Dateien- und Datenbank-Version zu umgehen und bei einem Versions-Unterschied die Datenbank-Aktualisierungen automatisiert auszuführen.
Das automatische Update setzt für neue Einstellungen und Änderungen immer die default-Werte. Diese müssen nicht zwingend zu dem genutzten System passen. Bitte zwei mal nachdenken, bevor diese Option aktiviert wird.
';
$lng['error']['passwordshouldnotbeusername'] = 'Das Passwort sollte nicht mit dem Benutzernamen übereinstimmen.';
// Added in Froxlor 0.9.33
diff --git a/lng/italian.lng.php b/lng/italian.lng.php
index 6f9e641d..50f3117c 100644
--- a/lng/italian.lng.php
+++ b/lng/italian.lng.php
@@ -1119,12 +1119,12 @@ $lng['ticket']['orderdesc'] = 'Qui è possibile definire il tuo ordine logico pe
// ADDED IN FROXLOR 0.9.6-svn3
$lng['serversettings']['defaultwebsrverrhandler_enabled'] = 'Abilita errordocuments in automatico per tutti i clienti';
$lng['serversettings']['defaultwebsrverrhandler_err401']['title'] = 'File/URL per l\'errore 401';
-$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = 'Non supportato in: lighttpd
';
+$lng['serversettings']['defaultwebsrverrhandler_err401']['description'] = 'Non supportato in: lighttpd
';
$lng['serversettings']['defaultwebsrverrhandler_err403']['title'] = 'File/URL per l\'errore 403';
-$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = 'Non supportato in: lighttpd
';
+$lng['serversettings']['defaultwebsrverrhandler_err403']['description'] = 'Non supportato in: lighttpd
';
$lng['serversettings']['defaultwebsrverrhandler_err404'] = 'File/URL per l\'errore 404';
$lng['serversettings']['defaultwebsrverrhandler_err500']['title'] = 'File/URL per l\'errore 500';
-$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = 'Non supportato in: lighttpd
';
+$lng['serversettings']['defaultwebsrverrhandler_err500']['description'] = 'Non supportato in: lighttpd
';
// ADDED IN FROXLOR 0.9.6-svn4
$lng['serversettings']['ticket']['default_priority'] = 'Priorità predefinita per il supporto ticket';
diff --git a/logs/index.html b/logs/index.html
new file mode 100644
index 00000000..e69de29b
diff --git a/templates/Sparkle/admin/update/update_start.tpl b/templates/Sparkle/admin/update/update_start.tpl
index a06aac96..55e4e688 100644
--- a/templates/Sparkle/admin/update/update_start.tpl
+++ b/templates/Sparkle/admin/update/update_start.tpl
@@ -3,4 +3,4 @@ $header
{$lng['update']['update']}
-
+
diff --git a/templates/Sparkle/assets/css/main.css b/templates/Sparkle/assets/css/main.css
index 066a5ad2..1d2fef53 100644
--- a/templates/Sparkle/assets/css/main.css
+++ b/templates/Sparkle/assets/css/main.css
@@ -989,6 +989,12 @@ label.nobr {
.green {
color: green;
}
+.orange {
+ color: orange;
+}
+.blue {
+ color: blue;
+}
.phpinfo, .overflow {
overflow: scroll;
@@ -1376,4 +1382,27 @@ table thead th.tablesorter-headerDesc {
}
.bar[aria-valuemax="100"][aria-valuemin="0"][aria-valuenow="100"] {
width: 100%;
-}
\ No newline at end of file
+}
+
+.update-step {
+ margin-left: 5em;
+ font-weight: bold;
+}
+
+.update-step-ok { color: #1dcd00; }
+.update-step-warn { color: #db7100; }
+.update-step-err { color: #ff0000; }
+.update-step-unknown { color: #000000; }
+
+.align-top { vertical-align:top; }
+
+.code-block {
+ width: 500px;
+ border: 1px solid #ccc;
+ padding: 4px;
+}
+
+.install-block { width: 65%; }
+.install-step { width: 250px; }
+.install-h3 { text-align: center; }
+.install-text { margin: 20px 20px 0 !important; }