From 797893d317c4efae49af483746afe2245d89957f Mon Sep 17 00:00:00 2001
From: Stephen Abello <stephen.abello@combodo.com>
Date: Mon, 16 Dec 2019 14:15:03 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B02314=20Regression:=20fix=20crash=20on=20?=
 =?UTF-8?q?setup=20=E2=8C=A8=EF=B8=8F=20=F0=9F=90=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/nicewebpage.class.inc.php |  11 +-
 css/setup.css                         | 130 ++++++++++++++++++++++++
 setup/setuppage.class.inc.php         | 140 ++------------------------
 3 files changed, 143 insertions(+), 138 deletions(-)
 create mode 100644 css/setup.css

diff --git a/application/nicewebpage.class.inc.php b/application/nicewebpage.class.inc.php
index ca3ac1cac..365c8a65d 100644
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -123,8 +123,7 @@ class NiceWebPage extends WebPage
 	$("table.listResults").tableHover(); // hover tables
 EOF
 		);
-	    $sCssThemeUrl = ThemeHandler::GetTheme();
-		$this->add_linked_stylesheet($sCssThemeUrl);
+	    $this->LoadTheme();
 
 		$this->m_sRootUrl = $this->GetAbsoluteUrlAppRoot();
      	$sAbsURLAppRoot = addslashes($this->m_sRootUrl);
@@ -257,6 +256,10 @@ EOF
 		}
 		parent::output();
 	}
-}
 
-?>
+	protected function LoadTheme()
+	{
+		$sCssThemeUrl = ThemeHandler::GetTheme();
+		$this->add_linked_stylesheet($sCssThemeUrl);
+	}
+}
diff --git a/css/setup.css b/css/setup.css
new file mode 100644
index 000000000..f8f59f235
--- /dev/null
+++ b/css/setup.css
@@ -0,0 +1,130 @@
+body {
+    background-color: #eee;
+    margin: 0;
+    padding: 0;
+    font-size: 10pt;
+    overflow-y: auto;
+}
+#header {
+    width: 600px;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 50px;
+    padding: 20px;
+    background: #f6f6f1;
+    height: 54px;
+    border-top: 1px solid #000;
+    border-left: 1px solid #000;
+    border-right: 1px solid #000;
+}
+#header img {
+    border: 0;
+    vertical-align: middle;
+    margin-right: 20px;
+}
+#header h1 {
+    vertical-align: middle;
+    height: 54px;
+    noline-height: 54px;
+    margin: 0;
+}
+#setup {
+    width: 600px;
+    margin-left: auto;
+    margin-right: auto;
+    padding: 20px;
+    background-color: #fff;
+    border-left: 1px solid #000;
+    border-right: 1px solid #000;
+    border-bottom: 1px solid #000;
+}
+.center {
+    text-align: center;
+}
+
+h1 {
+    color: #555555;
+    font-size: 16pt;
+}
+h2 {
+    color: #000;
+    font-size: 14pt;
+}
+h3 {
+    color: #1C94C4;
+    font-size: 12pt;
+    font-weight: bold;
+}
+.next {
+    width: 100%;
+    text-align: right;
+}
+.v-spacer {
+    padding-top: 1em;
+}
+button {
+    margin-top: 1em;
+    padding-left: 1em;
+    padding-right: 1em;
+}
+p.info {
+    padding-left: 50px;
+    background: url(../images/info-mid.png) no-repeat left -5px;
+    min-height: 48px;
+}
+p.ok {
+    padding-left: 50px;
+    background: url(../images/clean-mid.png) no-repeat left -8px;
+    min-height: 48px;
+}
+p.warning {
+    padding-left: 50px;
+    background: url(../images/messagebox_warning-mid.png) no-repeat left -5px;
+    min-height: 48px;
+}
+p.error {
+    padding-left: 50px;
+    background: url(../images/stop-mid.png) no-repeat left -5px;
+    min-height: 48px;
+}
+td.label {
+    text-align: left;
+}
+label.read-only {
+    color: #666;
+    cursor: text;
+}
+td.input {
+    text-align: left;
+}
+table.formTable {
+    border: 0;
+    cellpadding: 2px;
+    cellspacing: 0;
+}
+.wizlabel, .wizinput {
+    color: #000;
+    font-size: 10pt;
+}
+.wizhelp {
+    color: #333;
+    font-size: 8pt;
+}
+#progress {
+    border:1px solid #000000;
+    width: 180px;
+    height: 20px;
+    line-height: 20px;
+    text-align: center;
+    margin: 5px;
+}
+h3.clickable {
+    background: url(../images/plus.gif) no-repeat left;
+    padding-left:16px;
+    cursor: hand;
+}
+h3.clickable.open {
+    background: url(../images/minus.gif) no-repeat left;
+    padding-left:16px;
+    cursor: hand;
+}
\ No newline at end of file
diff --git a/setup/setuppage.class.inc.php b/setup/setuppage.class.inc.php
index 808be36dd..0b85c2ed5 100644
--- a/setup/setuppage.class.inc.php
+++ b/setup/setuppage.class.inc.php
@@ -42,140 +42,7 @@ class SetupPage extends NiceWebPage
 		parent::__construct($sTitle);
 		$this->add_linked_script("../js/jquery.blockUI.js");
 		$this->add_linked_script("../setup/setup.js");
-		$this->add_style(
-			<<<CSS
-body {
-	background-color: #eee;
-	margin: 0;
-	padding: 0;
-	font-size: 10pt;
-	overflow-y: auto;
-}
-#header {
-	width: 600px;
-	margin-left: auto;
-	margin-right: auto;
-	margin-top: 50px;
-	padding: 20px;
-	background: #f6f6f1;
-	height: 54px;
-	border-top: 1px solid #000;
-	border-left: 1px solid #000;
-	border-right: 1px solid #000;
-}
-#header img {
-	border: 0;
-	vertical-align: middle;
-	margin-right: 20px;
-}
-#header h1 {
-	vertical-align: middle;
-	height: 54px;
-	noline-height: 54px;
-	margin: 0;
-}
-#setup {
-	width: 600px;
-	margin-left: auto;
-	margin-right: auto;
-	padding: 20px;
-	background-color: #fff;
-	border-left: 1px solid #000;
-	border-right: 1px solid #000;
-	border-bottom: 1px solid #000;
-}
-.center {
-	text-align: center;
-}
-
-h1 {
-	color: #555555;
-	font-size: 16pt;
-}
-h2 {
-	color: #000;
-	font-size: 14pt;
-}
-h3 {
-	color: #1C94C4;
-	font-size: 12pt;
-	font-weight: bold;
-}
-.next {
-	width: 100%;
-	text-align: right;
-}
-.v-spacer {
-	padding-top: 1em;
-}
-button {
-	margin-top: 1em;
-	padding-left: 1em;
-	padding-right: 1em;
-}
-p.info {
-	padding-left: 50px;
-	background: url(../images/info-mid.png) no-repeat left -5px;
-	min-height: 48px;
-}
-p.ok {
-	padding-left: 50px;
-	background: url(../images/clean-mid.png) no-repeat left -8px;
-	min-height: 48px;
-}
-p.warning {
-	padding-left: 50px;
-	background: url(../images/messagebox_warning-mid.png) no-repeat left -5px;
-	min-height: 48px;
-}
-p.error {
-	padding-left: 50px;
-	background: url(../images/stop-mid.png) no-repeat left -5px;
-	min-height: 48px;
-}
-td.label {
-	text-align: left;
-}
-label.read-only {
-	color: #666;
-	cursor: text;
-}
-td.input {
-	text-align: left;
-}
-table.formTable {
-	border: 0;
-	cellpadding: 2px;
-	cellspacing: 0;
-}
-.wizlabel, .wizinput {
-	color: #000;
-	font-size: 10pt;
-}
-.wizhelp {
-	color: #333;
-	font-size: 8pt;
-}
-#progress { 
-    border:1px solid #000000; 
-    width: 180px; 
-    height: 20px; 
-    line-height: 20px; 
-    text-align: center;
-    margin: 5px;
-}
-h3.clickable {
-	background: url(../images/plus.gif) no-repeat left;
-	padding-left:16px;
-	cursor: hand;	
-}
-h3.clickable.open {
-	background: url(../images/minus.gif) no-repeat left;
-	padding-left:16px;
-	cursor: hand;	
-}
-CSS
-		);
+		$this->add_linked_stylesheet("../css/setup.css");
 	}
 
 	/**
@@ -315,4 +182,9 @@ CSS
 	{
 		SetupLog::Ok($sText);
 	}
+
+	protected function LoadTheme()
+	{
+		// Do nothing
+	}
 }