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 +++--------
 modules-available/sysconfig/page.inc.php      | 36 ++++++++++-----------------
 2 files changed, 17 insertions(+), 33 deletions(-)

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 {
diff --git a/modules-available/sysconfig/page.inc.php b/modules-available/sysconfig/page.inc.php
index fa04d088..7f2277dc 100644
--- a/modules-available/sysconfig/page.inc.php
+++ b/modules-available/sysconfig/page.inc.php
@@ -113,7 +113,7 @@ class Page_SysConfig extends Page
 
 		Render::addTemplate('sysconfig_heading');
 
-		$action = Request::any('action', 'list');
+		$action = Request::any('action', 'list', 'string');
 		switch ($action) {
 		case 'addmodule':
 			User::assertPermission('module.edit');
@@ -144,20 +144,14 @@ class Page_SysConfig extends Page
 			return;
 		case 'module':
 			User::assertPermission('module.view-list');
-			$listid = Request::post('list');
-			if ($listid !== false) {
-				$this->listModuleContents($listid);
-				return;
-			}
-			break;
+			$listid = Request::post('list', Request::REQUIRED, 'int');
+			$this->listModuleContents($listid);
+			return;
 		case 'config':
 			User::assertPermission('config.view-list');
-			$listid = Request::post('list');
-			if ($listid !== false) {
-				$this->listConfigContents($listid);
-				return;
-			}
-			break;
+			$listid = Request::post('list', Request::REQUIRED, 'int');
+			$this->listConfigContents($listid);
+			return;
 		}
 		Message::addError('invalid-action', $action, 'main');
 	}
@@ -330,11 +324,7 @@ class Page_SysConfig extends Page
 
 	private function activateConfig()
 	{
-		$configid = Request::post('activate', false, 'int');
-		if ($configid === false) {
-			Message::addError('main.empty-field');
-			Util::redirect('?do=sysconfig&locationid=' . $this->currentLoc);
-		}
+		$configid = Request::post('activate', Request::REQUIRED, 'int');
 		// Validate that either the configid is valid (in case we override for a specific location)
 		// or that if the locationid is 0 (=global) that the configid exists, because it's not allowed
 		// to unset the global config
@@ -359,7 +349,7 @@ class Page_SysConfig extends Page
 
 	private function rebuildConfig()
 	{
-		$configid = Request::post('rebuild', 'MISSING');
+		$configid = Request::post('rebuild', Request::REQUIRED, 'int');
 		$config = ConfigTgz::get($configid);
 		if ($config === false) {
 			Message::addError('config-invalid', $configid);
@@ -377,7 +367,7 @@ class Page_SysConfig extends Page
 
 	private function delModule()
 	{
-		$moduleid = Request::post('del', 'MISSING');
+		$moduleid = Request::post('del', Request::REQUIRED, 'int');
 		$module = Database::queryFirst("SELECT title, filepath FROM configtgz_module WHERE moduleid = :moduleid LIMIT 1", array('moduleid' => $moduleid));
 		if ($module === false) {
 			Message::addError('config-invalid', $moduleid);
@@ -411,7 +401,7 @@ class Page_SysConfig extends Page
 
 	private function downloadModule()
 	{
-		$moduleid = Request::post('download', 'MISSING');
+		$moduleid = Request::post('download', Request::REQUIRED);
 		$row = Database::queryFirst("SELECT title, filepath FROM configtgz_module WHERE moduleid = :moduleid LIMIT 1", array('moduleid' => $moduleid));
 		if ($row === false) {
 			Message::addError('config-invalid', $moduleid);
@@ -424,7 +414,7 @@ class Page_SysConfig extends Page
 
 	private function rebuildModule()
 	{
-		$moduleid = Request::post('rebuild', 'MISSING');
+		$moduleid = Request::post('rebuild', Request::REQUIRED);
 		$module = ConfigModule::get($moduleid);
 		if ($module === false) {
 			Message::addError('config-invalid', $moduleid);
@@ -442,7 +432,7 @@ class Page_SysConfig extends Page
 
 	private function delConfig()
 	{
-		$configid = Request::post('del', 'MISSING');
+		$configid = Request::post('del', Request::REQUIRED);
 		$config = ConfigTgz::get($configid);
 		if ($config === false) {
 			Message::addError('config-invalid', $configid);
-- 
cgit v1.2.3-55-g7522