From ded51ef4f52ca88dc75c2d3f0cea1597c7fd5c44 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 16 Feb 2018 13:42:28 +0100
Subject: [vmstore] Simplify permissions

---
 modules-available/vmstore/page.inc.php | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'modules-available/vmstore/page.inc.php')

diff --git a/modules-available/vmstore/page.inc.php b/modules-available/vmstore/page.inc.php
index c3d5da77..126e56d3 100644
--- a/modules-available/vmstore/page.inc.php
+++ b/modules-available/vmstore/page.inc.php
@@ -8,10 +8,7 @@ class Page_VmStore extends Page
 	{
 		User::load();
 
-		if (!User::isLoggedIn()) {
-			Message::addError('main.no-permission');
-			Util::redirect('?do=Main');
-		}
+		User::assertPermission('edit');
 		
 		$action = Request::post('action');
 		
@@ -33,10 +30,6 @@ class Page_VmStore extends Page
 		if (isset($vmstore['storetype'])) {
 			$vmstore['pre-' . $vmstore['storetype']] = 'checked';
 		}
-		$vmstore['internalAllowed'] = User::hasPermission("choose.internal");
-		$vmstore['nfsAllowed'] = User::hasPermission("choose.nfs");
-		$vmstore['cifsAllowed'] = User::hasPermission("choose.cifs");
-		$vmstore['saveAllowed'] = $vmstore['internalAllowed'] || $vmstore['nfsAllowed'] || $vmstore['cifsAllowed'];
 		Render::addTemplate('page-vmstore', $vmstore);
 	}
 	
@@ -51,12 +44,6 @@ class Page_VmStore extends Page
 			Message::addError('main.value-invalid', 'type', $storetype);
 			Util::redirect('?do=VmStore');
 		}
-		if (($storetype === 'internal' && !User::hasPermission("choose.internal")) ||
-			 ($storetype === 'nfs' && !User::hasPermission("choose.nfs")) ||
-			 ($storetype === 'cifs' && !User::hasPermission("choose.cifs"))) {
-			Message::addError('main.no-permission');
-			Util::redirect('?do=VmStore');
-		}
 		// Validate syntax of nfs/cifs
 		if ($storetype === 'nfs' && !preg_match('#^\S+:\S+$#is', $vmstore['nfsaddr'])) {
 			Message::addError('main.value-invalid', 'nfsaddr', $vmstore['nfsaddr']);
-- 
cgit v1.2.3-55-g7522