From 06bff0b9b84d47c43f9bc8aff06a29d85ebb7ed0 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 14 Nov 2023 14:47:55 +0100
Subject: Add function param/return types, fix a lot more phpstorm complaints

---
 .../sysconfig/addmodule_screensaver.inc.php        | 46 +++++++++++-----------
 1 file changed, 23 insertions(+), 23 deletions(-)

(limited to 'modules-available/sysconfig/addmodule_screensaver.inc.php')

diff --git a/modules-available/sysconfig/addmodule_screensaver.inc.php b/modules-available/sysconfig/addmodule_screensaver.inc.php
index 24dfadd0..7b6d0afb 100644
--- a/modules-available/sysconfig/addmodule_screensaver.inc.php
+++ b/modules-available/sysconfig/addmodule_screensaver.inc.php
@@ -14,7 +14,7 @@ class Screensaver_Start extends AddModule_Base
 		if (Request::get('back', 'false', 'string') !== 'false')
 			/* If coming via the back button, load the session data */
 			$this->session_data = Session::get('data');
-		elseif ($this->edit !== false) {
+		elseif ($this->edit !== null) {
 			$this->session_data = array(
 				'title' => $this->edit->title(),
 				'qss' => $this->edit->getData('qss'),
@@ -24,22 +24,22 @@ class Screensaver_Start extends AddModule_Base
 		} else {
 			$this->session_data = array(
 				'title' => '',
-				'qss' => Dictionary::translate('saver_QssDefault', true),
+				'qss' => Dictionary::translate('saver_QssDefault'),
 				'messages' => array(
 					'General' => array(
-						'shutdown' => Dictionary::translate('saver_MessageDefaultShutdown', true),
-						'shutdown-locked' => Dictionary::translate('saver_MessageDefaultShutdownLocked', true),
-						'idle-kill' => Dictionary::translate('saver_MessageDefaultIdleKill', true),
-						'idle-kill-locked' => Dictionary::translate('saver_MessageDefaultIdleKillLocked', true),
-						'no-timeout' => Dictionary::translate('saver_MessageDefaultNoTimeout', true),
-						'no-timeout-locked' => Dictionary::translate('saver_MessageDefaultNoTimeoutLocked', true),
+						'shutdown' => Dictionary::translate('saver_MessageDefaultShutdown'),
+						'shutdown-locked' => Dictionary::translate('saver_MessageDefaultShutdownLocked'),
+						'idle-kill' => Dictionary::translate('saver_MessageDefaultIdleKill'),
+						'idle-kill-locked' => Dictionary::translate('saver_MessageDefaultIdleKillLocked'),
+						'no-timeout' => Dictionary::translate('saver_MessageDefaultNoTimeout'),
+						'no-timeout-locked' => Dictionary::translate('saver_MessageDefaultNoTimeoutLocked'),
 					)
 				),
 				'texts' => array(
-					'text-shutdown' => Dictionary::translate('saver_TextDefaultShutdown', true),
+					'text-shutdown' => Dictionary::translate('saver_TextDefaultShutdown'),
 					'text-shutdown-locked' => '',
-					'text-idle-kill' => Dictionary::translate('saver_TextDefaultIdleKill', true),
-					'text-idle-kill-locked' => Dictionary::translate('saver_TextDefaultIdleKillLocked', true),
+					'text-idle-kill' => Dictionary::translate('saver_TextDefaultIdleKill'),
+					'text-idle-kill-locked' => Dictionary::translate('saver_TextDefaultIdleKillLocked'),
 					'text-no-timeout' => '',
 					'text-no-timeout-locked' => '',
 				),
@@ -56,7 +56,7 @@ class Screensaver_Start extends AddModule_Base
 		Render::addDialog(Dictionary::translateFile('config-module', 'screensaver_title'), false, 'screensaver-start', array(
 			'step' => 'Screensaver_Text',
 			'next' => 'idle-kill',
-			'edit' => $this->edit ? $this->edit->id() : 0,
+			'edit' => $this->edit !== null ? $this->edit->id() : 0,
 			'id' => 'start',
 			'title' => $this->session_data['title'],
 			'qss' => $this->session_data['qss'],
@@ -98,7 +98,7 @@ class Screensaver_Text extends AddModule_Base
 		$next = $this->session_data['next'];
 
 		$data = array(
-			'edit' => $this->edit ? $this->edit->id() : 0,
+			'edit' => $this->edit !== null ? $this->edit->id() : 0,
 		);
 
 		/* Prepare and translate labels for the frontend */
@@ -114,8 +114,8 @@ class Screensaver_Text extends AddModule_Base
 		 * Dictionary::translate('saver_TitleShutdown');
 		 * Dictionary::translate('saver_DescriptionShutdown');
 		 */
-		$data['title'] = Dictionary::translate('saver_Title' . $tag, true);
-		$data['description'] = Dictionary::translate('saver_Description' . $tag, true);
+		$data['title'] = Dictionary::translate('saver_Title' . $tag);
+		$data['description'] = Dictionary::translate('saver_Description' . $tag);
 		$data['msg_value'] = $this->session_data['messages']['General'][$next];
 		$data['msg_locked_value'] = $this->session_data['messages']['General'][$next . '-locked'];
 		$data['text_value'] = $this->session_data['texts']['text-' . $next];
@@ -150,14 +150,14 @@ class Screensaver_Finish extends AddModule_Base
 		if (empty($session_data['title'])) {
 			Message::addError('missing-title');
 			Util::redirect('?do=SysConfig');
-			return;
 		}
 
 		/* Only create an instance, if it's a new one */
-		if ($this->edit !== false)
+		if ($this->edit !== null) {
 			$module = $this->edit;
-		else
+		} else {
 			$module = ConfigModule::getInstance('Screensaver');
+		}
 
 		/* Set all the data to the module instance */
 		$module->setData('qss', $session_data['qss']);
@@ -165,15 +165,16 @@ class Screensaver_Finish extends AddModule_Base
 		$module->setData('texts', $session_data['texts']);
 
 		/* Insert or update database entries */
-		if ($this->edit !== false)
+		if ($this->edit !== null) {
 			$module->update($session_data['title']);
-		else
+		} else {
 			$module->insert($session_data['title']);
+		}
 
-		$task = $module->generate($this->edit === false);
+		$task = $module->generate($this->edit === null);
 
 		// Yay
-		if ($task !== false && $this->edit !== false)
+		if ($task !== false && $this->edit !== null)
 			Message::addSuccess('module-edited');
 		elseif ($task !== false) {
 			Message::addSuccess('module-added');
@@ -192,7 +193,6 @@ class Screensaver_Helper
 		if (empty($session_data['title'])) {
 			Message::addError('missing-title');
 			Util::redirect('?do=SysConfig');
-			return;
 		}
 		$session_data['qss'] = Request::post('qss', $session_data['qss'], 'string');
 		$helperMode = Request::post('helper_mode', 'false', 'string');
-- 
cgit v1.2.3-55-g7522