From 2111c8b11e8847e4193bf19343e0543897494038 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 16 Jan 2020 14:25:00 +0100
Subject: [sysconfig] Modernize Request::* calls

---
 modules-available/sysconfig/addconfig.inc.php | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

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

diff --git a/modules-available/sysconfig/addconfig.inc.php b/modules-available/sysconfig/addconfig.inc.php
index e804bbda..68efc29c 100644
--- a/modules-available/sysconfig/addconfig.inc.php
+++ b/modules-available/sysconfig/addconfig.inc.php
@@ -30,8 +30,8 @@ abstract class AddConfig_Base
 			Util::redirect('?do=SysConfig');
 		}
 		self::$instance = new $step();
-		if (Request::any('edit')) {
-			self::$instance->edit = ConfigTgz::get(Request::any('edit'));
+		if (($editId = Request::any('edit', false, 'int')) !== false) {
+			self::$instance->edit = ConfigTgz::get($editId);
 			if (self::$instance->edit === false)
 				Util::traceError('Invalid config id for editing');
 			Util::addRedirectParam('edit', self::$instance->edit->id());
@@ -155,10 +155,8 @@ class AddConfig_Start extends AddConfig_Base
 		}
 		if ($this->edit !== false) {
 			$title = $this->edit->title();
-		} elseif (Request::any('title')) {
-			$title = Request::any('title');
 		} else {
-			$title = '';
+			$title = Request::any('title', '', 'string');
 		}
 		$dummy = 0;
 		$sort = [];
@@ -196,15 +194,11 @@ class AddConfig_Finish extends AddConfig_Base
 	protected function preprocessInternal()
 	{
 		$modules = Request::post('module');
-		$title = Request::post('title');
+		$title = Request::post('title', Request::REQUIRED, 'string');
 		if (!is_array($modules)) {
 			Message::addError('missing-file');
 			Util::redirect('?do=SysConfig&action=addconfig');
 		}
-		if (empty($title)) {
-			Message::addError('missing-title');
-			Util::redirect('?do=SysConfig&action=addconfig');
-		}
 		if ($this->edit === false) {
 			$this->config = ConfigTgz::insert($title, $modules);
 		} else {
-- 
cgit v1.2.3-55-g7522