[sysconfig] screensaver: Minor refactor

1 files changed, 15 insertions, 9 deletions

diff --git a/modules-available/sysconfig/addmodule_screensaver.inc.php b/modules-available/sysconfig/addmodule_screensaver.inc.php
index 7b6d0afb..c84f021e 100644
--- a/modules-available/sysconfig/addmodule_screensaver.inc.php
+++ b/modules-available/sysconfig/addmodule_screensaver.inc.php
@@ -11,10 +11,10 @@ class Screensaver_Start extends AddModule_Base
 	protected function preprocessInternal()
 	{
 		/* Load or initialise session data */
-		if (Request::get('back', 'false', 'string') !== 'false')
+		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 !== null) {
+			$this->session_data = Session::get(Screensaver_Helper::SESSION_KEY);
+		} elseif ($this->edit !== null) {
 			$this->session_data = array(
 				'title' => $this->edit->title(),
 				'qss' => $this->edit->getData('qss'),
@@ -46,7 +46,7 @@ class Screensaver_Start extends AddModule_Base
 			);
 		}
 		$this->session_data['next'] = 'idle-kill';
-		Session::set('data', $this->session_data);
+		Session::set(Screensaver_Helper::SESSION_KEY, $this->session_data);
 	}
 
 	protected function renderInternal()
@@ -71,7 +71,7 @@ class Screensaver_Text extends AddModule_Base
 	protected function preprocessInternal()
 	{
 		/* Load session data */
-		$this->session_data = Session::get('data');
+		$this->session_data = Session::get(Screensaver_Helper::SESSION_KEY);
 		$id = Request::post('id', '', 'string');
 
 		if ($id === 'start') {
@@ -82,7 +82,7 @@ class Screensaver_Text extends AddModule_Base
 
 		$next = Request::post('next', $this->session_data['next'], 'string');
 		$this->session_data['next'] = $next;
-		Session::set('data', $this->session_data);
+		Session::set(Screensaver_Helper::SESSION_KEY, $this->session_data);
 
 
 		if ($next === 'finish')
@@ -145,7 +145,7 @@ class Screensaver_Finish extends AddModule_Base
 	protected function preprocessInternal()
 	{
 		/* Get session data */
-		$session_data = Session::get('data');
+		$session_data = Session::get(Screensaver_Helper::SESSION_KEY);
 
 		if (empty($session_data['title'])) {
 			Message::addError('missing-title');
@@ -181,13 +181,17 @@ class Screensaver_Finish extends AddModule_Base
 			AddModule_Base::setStep('AddModule_Assign', $module->id());
 			return;
 		}
+		Session::set(Screensaver_Helper::SESSION_KEY, false);
 		Util::redirect('?do=SysConfig');
 	}
 }
 
 class Screensaver_Helper
 {
-	public static function processQssData(&$session_data) {
+	const SESSION_KEY = 'scrsvrmod';
+
+	public static function processQssData(&$session_data)
+	{
 		/* Process post data from the Screensaver_Start */
 		$session_data['title'] = Request::post('title', $session_data['title'], 'string');
 		if (empty($session_data['title'])) {
@@ -227,7 +231,8 @@ class Screensaver_Helper
 		}
 	}
 
-	public static function processScreensaverText(&$session_data, $name) {
+	public static function processScreensaverText(&$session_data, $name)
+	{
 		/* Process post data from the Screensaver_Text */
 		$session_data['messages']['General'][$name] = Request::post('msg_value', '', 'string');
 		$session_data['texts']['text-' . $name] = Request::post('text_value', '', 'string');
@@ -242,5 +247,6 @@ class Screensaver_Helper
 			$session_data['texts']['text-' . $name . '-locked'] = Request::post('text_locked_value', '', 'string');
 		}
 	}
+
 }