From 662315be2b5f6153fda03e8ec48ea3f8b343f68b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 21 Mar 2018 11:05:25 +0100
Subject: Update permission translations

---
 modules-available/dnbd3/lang/de/permissions.json | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 modules-available/dnbd3/lang/de/permissions.json

(limited to 'modules-available/dnbd3/lang/de/permissions.json')

diff --git a/modules-available/dnbd3/lang/de/permissions.json b/modules-available/dnbd3/lang/de/permissions.json
new file mode 100644
index 00000000..9229d6d9
--- /dev/null
+++ b/modules-available/dnbd3/lang/de/permissions.json
@@ -0,0 +1,8 @@
+{
+    "configure.external": "Externen Proxy bearbeiten",
+    "configure.proxy": "Automatischen Proxy bearbeiten",
+    "refresh": "Serverliste aktualisieren",
+    "toggle-usage": "Aktivieren\/Deaktivieren",
+    "view.details": "Proxydetails anzeigen",
+    "view.list": "Proxyliste anzeigen"
+}
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From 06ee20606d537f8995bb8f9ae466a7e99bc2a6b8 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 27 Mar 2018 15:25:57 +0200
Subject: [dnbd3] Renamed view.list permission to access-page

Refs #3340
---
 modules-available/dnbd3/lang/de/permissions.json     | 4 ++--
 modules-available/dnbd3/lang/en/permissions.json     | 4 ++--
 modules-available/dnbd3/page.inc.php                 | 2 +-
 modules-available/dnbd3/permissions/permissions.json | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'modules-available/dnbd3/lang/de/permissions.json')

diff --git a/modules-available/dnbd3/lang/de/permissions.json b/modules-available/dnbd3/lang/de/permissions.json
index 9229d6d9..15d17336 100644
--- a/modules-available/dnbd3/lang/de/permissions.json
+++ b/modules-available/dnbd3/lang/de/permissions.json
@@ -1,8 +1,8 @@
 {
+    "access-page": "Seite sehen",
     "configure.external": "Externen Proxy bearbeiten",
     "configure.proxy": "Automatischen Proxy bearbeiten",
     "refresh": "Serverliste aktualisieren",
     "toggle-usage": "Aktivieren\/Deaktivieren",
-    "view.details": "Proxydetails anzeigen",
-    "view.list": "Proxyliste anzeigen"
+    "view.details": "Proxydetails anzeigen"
 }
\ No newline at end of file
diff --git a/modules-available/dnbd3/lang/en/permissions.json b/modules-available/dnbd3/lang/en/permissions.json
index 0762af2c..112deb94 100644
--- a/modules-available/dnbd3/lang/en/permissions.json
+++ b/modules-available/dnbd3/lang/en/permissions.json
@@ -1,8 +1,8 @@
 {
+    "access-page": "View this page",
     "configure.external": "Edit external proxy",
     "configure.proxy": "Edit automatic proxy",
     "refresh": "Refresh server list",
     "toggle-usage": "Activate\/Deactivate",
-    "view.details": "Show proxy details",
-    "view.list": "Show proxy list"
+    "view.details": "Show proxy details"
 }
\ No newline at end of file
diff --git a/modules-available/dnbd3/page.inc.php b/modules-available/dnbd3/page.inc.php
index 4fe5dea1..6e4f8885 100644
--- a/modules-available/dnbd3/page.inc.php
+++ b/modules-available/dnbd3/page.inc.php
@@ -163,7 +163,7 @@ class Page_Dnbd3 extends Page
 
 	private function showServerList()
 	{
-		User::assertPermission('view.list');
+		User::assertPermission('access-page');
 		$dynClients = RunMode::getForMode(Page::getModule(), 'proxy', true, true);
 		$res = Database::simpleQuery('SELECT s.serverid, s.machineuuid, s.fixedip, s.lastseen AS dnbd3lastseen,
 			s.uptime, s.totalup, s.totaldown, s.clientcount, s.disktotal, s.diskfree, GROUP_CONCAT(sxl.locationid) AS locations,
diff --git a/modules-available/dnbd3/permissions/permissions.json b/modules-available/dnbd3/permissions/permissions.json
index 1939e32a..77a72d62 100644
--- a/modules-available/dnbd3/permissions/permissions.json
+++ b/modules-available/dnbd3/permissions/permissions.json
@@ -1,11 +1,11 @@
 {
-	"toggle-usage": {
+	"access-page": {
 		"location-aware": false
 	},
-	"refresh": {
+	"toggle-usage": {
 		"location-aware": false
 	},
-	"view.list": {
+	"refresh": {
 		"location-aware": false
 	},
 	"view.details": {
-- 
cgit v1.2.3-55-g7522