3 files changed, 11 insertions, 13 deletions

diff --git a/modules-available/dozmod/inc/pagedozmodlog.inc.php b/modules-available/dozmod/inc/pagedozmodlog.inc.php
index f31edf5b..957abd2f 100644
--- a/modules-available/dozmod/inc/pagedozmodlog.inc.php
+++ b/modules-available/dozmod/inc/pagedozmodlog.inc.php
@@ -29,9 +29,13 @@ class Page_dozmod_log extends Page
 				. " LEFT JOIN sat.lecture l ON (l.lectureid = targetid)"
 				. " ORDER BY al.dateline DESC LIMIT 500", array(), true, true);
 		} elseif ($this->action === 'showuser') {
-			$this->listUser();
+			if (User::hasPermission("log.showuser")) {
+				$this->listUser();
+			}
 		} else {
-			$this->listTarget();
+			if (User::hasPermission("log.showtarget")) {
+				$this->listTarget();
+			}
 		}
 	}
 
@@ -150,6 +154,9 @@ class Page_dozmod_log extends Page
 		if ($showTarget) {
 			$data['showTarget'] = true;
 		}
+
+		$data['allowedShowUser'] = User::hasPermission("log.showuser");
+		$data['allowedShowTarget'] = User::hasPermission("log.showtarget");
 		Render::addTemplate('actionlog-log', $data);
 	}
 
diff --git a/modules-available/dozmod/inc/pagedozmodusers.inc.php b/modules-available/dozmod/inc/pagedozmodusers.inc.php
index 621f7d34..f4ac852b 100644
--- a/modules-available/dozmod/inc/pagedozmodusers.inc.php
+++ b/modules-available/dozmod/inc/pagedozmodusers.inc.php
@@ -22,15 +22,10 @@ class Page_dozmod_users extends Page
 		if ($action === 'setmail' || $action === 'setsu' || $action == 'setlogin') {
 			if (User::hasPermission("users.".$action)) {
 				$this->setUserOption($action);
-			} else {
-				die("No permission.");
 			}
-
 		} elseif ($action === 'setorglogin') {
 			if (User::hasPermission("users.orglogin")) {
 				$this->setOrgOption($action);
-			} else {
-				die("No permission.");
 			}
 		} else {
 			die('No such action');
diff --git a/modules-available/dozmod/inc/pagemailtemplates.inc.php b/modules-available/dozmod/inc/pagemailtemplates.inc.php
index 90734a50..b7b5a8d4 100644
--- a/modules-available/dozmod/inc/pagemailtemplates.inc.php
+++ b/modules-available/dozmod/inc/pagemailtemplates.inc.php
@@ -15,16 +15,10 @@ class Page_mail_templates extends Page
 		} elseif ($action === 'save') {
 			if (User::hasPermission("templates.save")) {
 				$this->handleSave();
-			} else {
-				Message::addError('main.no-permission');
-				Util::redirect('?do=dozmod&section=templates');
 			}
 		} elseif ($action === 'reset') {
 			if(User::hasPermission("templates.reset")) {
 				$this->handleReset();
-			} else {
-				Message::addError('main.no-permission');
-				Util::redirect('?do=dozmod&section=templates');
 			}
 		} else {
 			Message::addError('main.invalid-action', $action);
@@ -70,6 +64,8 @@ class Page_mail_templates extends Page
 	protected function doRender()
 	{
 		$this->enrichHtml();
+		$this->templates['allowedReset'] = User::hasPermission("templates.reset");
+		$this->templates['allowedSave'] = User::hasPermission("templates.save");
 		Render::addTemplate('templates', ['templates' => $this->templates]);
 	}