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

12
install/lib/class.FroxlorInstall.php
View File

@@ -692,25 +692,25 @@ class FroxlorInstall {
$formdata .= $this->_getSectionItemString('mysql_database', true);
// unpriv-user has to be different from root
if ($this->_data['mysql_unpriv_user'] == $this->_data['mysql_root_user']) {
$style = 'color:blue;';
$style = 'blue';
} else { $style = '';
}
$formdata .= $this->_getSectionItemString('mysql_unpriv_user', true, $style);
// is we posted and no password was given -> red
if (!empty($_POST['installstep']) && $this->_data['mysql_unpriv_pass'] == '') {
$style = 'color:red;';
$style = 'red';
} else { $style = '';
}
$formdata .= $this->_getSectionItemString('mysql_unpriv_pass', true, $style, 'password');
// unpriv-user has to be different from root
if ($this->_data['mysql_unpriv_user'] == $this->_data['mysql_root_user']) {
$style = 'color:blue;';
$style = 'blue';
} else { $style = '';
}
$formdata .= $this->_getSectionItemString('mysql_root_user', true, $style);
// is we posted and no password was given -> red
if (!empty($_POST['installstep']) && $this->_data['mysql_root_pass'] == '') {
$style = 'color:red;';
$style = 'red';
} else { $style = '';
}
$formdata .= $this->_getSectionItemString('mysql_root_pass', true, $style, 'password');
@@ -1064,9 +1064,9 @@ class FroxlorInstall {
*/
private function _status_message($case, $text) {
if ($case == 'begin') {
return '<tr><td style="width: 250px;">'.$text;
return '<tr><td class="install-step">'.$text;
} else {
return '</td><td><span style="color:'.$case.';">'.$text.'</span></td></tr>';
return '</td><td><span class="'.$case.'">'.$text.'</span></td></tr>';
}
}

2
install/templates/dataform.tpl
View File

@@ -1,4 +1,4 @@
<p style="margin: 20px 20px 0 !important">{$this->_lng['install']['title']}</p>
<p class="install-text">{$this->_lng['install']['title']}</p>
<form action="{$formaction}" method="get">
<fieldset>
{$formdata}

2
install/templates/dataform2.tpl
View File

@@ -1,4 +1,4 @@
<p style="margin: 20px 20px 0 !important">{$this->_lng['install']['welcometext']}</p>
<p class="install-text">{$this->_lng['install']['welcometext']}</p>
<form action="{$formaction}" method="post">
<hr class="line">
<fieldset>

2
install/templates/dataitem.tpl
View File

@@ -1,4 +1,4 @@
<p>
<label for="{$fieldname}" style="width:65%;{$style}">{$fieldlabel}:</label>&nbsp;
<label for="{$fieldname}" class="install-block {$style}">{$fieldlabel}:</label>&nbsp;
<input type="{$type}" name="{$fieldname}" id="{$fieldname}" value="{$fieldvalue}" {$required} />
</p>

2
install/templates/dataitemchk.tpl
View File

@@ -1,4 +1,4 @@
<p>
<label for="{$fieldname}" style="width:65%;{$style}">{$this->_lng['install']['webserver']} {$fieldlabel}:</label>
<label for="{$fieldname}" class="install-block {$style}">{$this->_lng['install']['webserver']} {$fieldlabel}:</label>
<input type="radio" name="webserver" id="{$fieldname}" value="{$fieldname}" {$checked} /><span>{$fieldlabel}<span>
</p>

2
install/templates/pagebottom.tpl
View File

@@ -1,4 +1,4 @@
<h3 style="color:{$msgcolor};text-align: center">{$message}</h3>
<h3 class="install-h3 {$msgcolor}">{$message}</h3>
<aside>
<a href="{$link}">{$linktext}</a>
</aside>

2
install/updates/preconfig.php
View File

@@ -28,7 +28,7 @@
function getPreConfig($current_version)
{
$has_preconfig = false;
$return = '<div class="preconfig"><h3 style="color:#ff0000;">PLEASE NOTE - Important update notifications</h3>';
$return = '<div class="preconfig"><h3 class="red">PLEASE NOTE - Important update notifications</h3>';
include_once makeCorrectFile(dirname(__FILE__).'/preconfig/0.9/preconfig_0.9.inc.php');
parseAndOutputPreconfig($has_preconfig, $return, $current_version);

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

@@ -440,7 +440,7 @@ function parseAndOutputPreconfig(&$has_preconfig, &$return, $current_version) {
$description = 'This version introduces a lot of profound changes:';
$description .= '<br /><ul><li>Improving the whole template system</li><li>Full UTF-8 support</li><li><strong>Removing support for the former default theme \'Classic\'</strong></li></ul>';
$description .= '<br /><br />Notice: This update will <strong>alter your Froxlor database to use UTF-8</strong> as default charset. ';
$description .= 'Even though this is already tested, we <span style="color:#ff0000;font-weight:bold;">strongly recommend</span> to ';
$description .= 'Even though this is already tested, we <span class="red">strongly recommend</span> to ';
$description .= 'test this update in a testing environment using your existing data.<br /><br />';
$question = '<strong>Select your preferred Classic Theme replacement:</strong>&nbsp;';
@@ -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 "<b>fastcgi.conf</b>" (Debian/Ubuntu) or "<b>70_fastcgi.conf</b>" (Gentoo) within /etc/apache2/ and change it as shown below:<br /><br />';
$description .= '<pre style="width:500px;border:1px solid #ccc;padding:4px;">&lt;IfModule mod_fastcgi.c&gt;
$description .= '<pre class="code-block">&lt;IfModule mod_fastcgi.c&gt;
FastCgiIpcDir /var/lib/apache2/fastcgi/
&lt;Location "/fastcgiphp"&gt;
Order Deny,Allow