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

fix inline-css (violation of Content Security Policy)

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2014-12-29 20:48:56 +01:00
parent c6f3b03891
commit dd34ab8d9b
27 changed files with 95 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/classes/output/class.htmlform.php
View File

@@ -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 '&nbsp;<span style="color:#ff0000;">*</span>';
return '&nbsp;<span class="red">*</span>';
}
elseif(isset($data['mandatory_ex']))
{
return '&nbsp;<span style="color:#ff0000;">**</span>';
return '&nbsp;<span class="red">**</span>';
}
return '';
}

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

@@ -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',

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

@@ -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',

4
lib/formfields/admin/ipsandports/formfield.ipsandports_add.php
View File

@@ -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',

4
lib/formfields/admin/ipsandports/formfield.ipsandports_edit.php
View File

@@ -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',

2
lib/formfields/admin/phpconfig/formfield.phpconfig_add.php
View File

@@ -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,

2
lib/formfields/admin/phpconfig/formfield.phpconfig_edit.php
View File

@@ -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,

2
lib/formfields/admin/tickets/formfield.ticket_new.php
View File

@@ -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,

2
lib/formfields/admin/tickets/formfield.ticket_reply.php
View File

@@ -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,

8
lib/formfields/customer/domains/formfield.domain_ssleditor.php
View File

@@ -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',

14
lib/functions/froxlor/function.updateFunctions.php
View File

@@ -110,11 +110,13 @@ function showUpdateStep($task = null, $needs_status = true) {
global $updatelog, $filelog;
if (!$needs_status) echo "<b>";
// output
echo $task;
if (!$needs_status) {
echo "<br />";
echo "</b><br />";
}
$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 "<span style=\"margin-left: 5em; font-weight: bold; color: #".$status_color."\">".$status_sign."</span><br />";
echo "<span class=\"update-step update-step-".$status_color."\">".$status_sign."</span><br />";
if ($status == -1 || $status == 2) {
$updatelog->logAction(ADM_ACTION, LOG_WARNING, 'Attention - last update task failed!!!');