From 8d1ecbeb70b7be6379f460919c0b8dbbbdfd4826 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 14 Dec 2020 09:27:07 +0100
Subject: [sysconfig] Minor code cleanup

---
 modules-available/sysconfig/addmodule_custommodule.inc.php | 10 ++++------
 modules-available/sysconfig/addmodule_screensaver.inc.php  |  7 ++-----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/modules-available/sysconfig/addmodule_custommodule.inc.php b/modules-available/sysconfig/addmodule_custommodule.inc.php
index 7830b8ed..f7ab863e 100644
--- a/modules-available/sysconfig/addmodule_custommodule.inc.php
+++ b/modules-available/sysconfig/addmodule_custommodule.inc.php
@@ -90,9 +90,7 @@ class CustomModule_ProcessUpload extends AddModule_Base
 
 class CustomModule_CompressModule extends AddModule_Base
 {
-	
-	private $taskId = false;
-	
+
 	protected function preprocessInternal()
 	{
 		$title = Request::post('title');
@@ -102,15 +100,15 @@ class CustomModule_CompressModule extends AddModule_Base
 			Util::redirect('?do=SysConfig&action=addmodule&step=CustomModule_Start');
 		}
 		// Recompress using task manager
-		$this->taskId = 'tgzmod' . mt_rand() . '-' . microtime(true);
+		$taskId = 'tgzmod' . mt_rand() . '-' . microtime(true);
 		$destFile = tempnam(sys_get_temp_dir(), 'bwlp-') . '.tgz';
 		Taskmanager::submit('RecompressArchive', array(
-			'id' => $this->taskId,
+			'id' => $taskId,
 			'inputFiles' => [$tempfile => false],
 			'outputFile' => $destFile,
 			'forceRoot' => Request::post('force-owner', 0, 'int') !== 0,
 		), true);
-		$status = Taskmanager::waitComplete($this->taskId, 5000);
+		$status = Taskmanager::waitComplete($taskId, 5000);
 		unlink($tempfile);
 		if (!isset($status['statusCode'])) {
 			$this->tmError();
diff --git a/modules-available/sysconfig/addmodule_screensaver.inc.php b/modules-available/sysconfig/addmodule_screensaver.inc.php
index d8c189f7..8e5c5d28 100644
--- a/modules-available/sysconfig/addmodule_screensaver.inc.php
+++ b/modules-available/sysconfig/addmodule_screensaver.inc.php
@@ -6,7 +6,6 @@
 
 class Screensaver_Start extends AddModule_Base
 {
-	private $hasSummernote = false;
 	private $session_data;
 
 	protected function preprocessInternal()
@@ -54,8 +53,7 @@ class Screensaver_Start extends AddModule_Base
 	protected function renderInternal()
 	{
 		/* Load summernote module if available */
-		$this->hasSummernote = Module::isAvailable('summernote');
-
+		Module::isAvailable('summernote');
 		Render::addDialog(Dictionary::translateFile('config-module', 'screensaver_title'), false, 'screensaver-start', array(
 			'step' => 'Screensaver_Text',
 			'next' => 'idle-kill',
@@ -69,7 +67,6 @@ class Screensaver_Start extends AddModule_Base
 
 class Screensaver_Text extends AddModule_Base
 {
-	private $hasSummernote = false;
 	private $session_data;
 	private $id;
 
@@ -100,7 +97,7 @@ class Screensaver_Text extends AddModule_Base
 	protected function renderInternal()
 	{
 		/* Load summernote module if available */
-		$this->hasSummernote = Module::isAvailable('summernote');
+		Module::isAvailable('summernote');
 		$next = $this->session_data['next'];
 
 		$data = array(
-- 
cgit v1.2.3-55-g7522