From 3ddf56c399746efe3c56194b7be522a92caefb59 Mon Sep 17 00:00:00 2001
From: Christian Hofmaier
Date: Tue, 16 Jan 2018 17:50:22 +0100
Subject: [minilinux] implemented permission-system. you can't see the side
 without any permission. there are only 2 permissions: show the side and
 update content (which includes the show permission).

---
 .../minilinux/lang/de/permissions.json             |  4 ++
 .../minilinux/lang/en/permissions.json             |  4 ++
 modules-available/minilinux/page.inc.php           | 80 ++++++++++++----------
 .../minilinux/permissions/permissions.json         |  4 ++
 .../minilinux/templates/filelist.html              |  6 +-
 5 files changed, 59 insertions(+), 39 deletions(-)
 create mode 100644 modules-available/minilinux/lang/de/permissions.json
 create mode 100644 modules-available/minilinux/lang/en/permissions.json
 create mode 100644 modules-available/minilinux/permissions/permissions.json

(limited to 'modules-available/minilinux')

diff --git a/modules-available/minilinux/lang/de/permissions.json b/modules-available/minilinux/lang/de/permissions.json
new file mode 100644
index 00000000..372ffc88
--- /dev/null
+++ b/modules-available/minilinux/lang/de/permissions.json
@@ -0,0 +1,4 @@
+{
+	"show": "Zeige Komponenten des Minilinux. Wird nicht benötigt, wenn Nutzer eine der anderen Rechte hat.",
+	"update": "Aktualisieren von Komponenten des Minilinux."
+}
\ No newline at end of file
diff --git a/modules-available/minilinux/lang/en/permissions.json b/modules-available/minilinux/lang/en/permissions.json
new file mode 100644
index 00000000..878388b0
--- /dev/null
+++ b/modules-available/minilinux/lang/en/permissions.json
@@ -0,0 +1,4 @@
+{
+	"show": "Show list of minilinux components. Not needed if User has any of the other permissions.",
+	"update": "Update minilinux components."
+}
\ No newline at end of file
diff --git a/modules-available/minilinux/page.inc.php b/modules-available/minilinux/page.inc.php
index 2623500b..df4f14a3 100644
--- a/modules-available/minilinux/page.inc.php
+++ b/modules-available/minilinux/page.inc.php
@@ -7,7 +7,12 @@ class Page_MiniLinux extends Page
 	{
 		User::load();
 
-		if (!User::hasPermission('superadmin')) {
+		if (!User::isLoggedIn()) {
+			Message::addError('main.no-permission');
+			Util::redirect('?do=Main');
+		}
+
+		if (!(User::hasPermission("show") || User::hasPermission("update"))) {
 			Message::addError('main.no-permission');
 			Util::redirect('?do=Main');
 		}
@@ -81,48 +86,51 @@ class Page_MiniLinux extends Page
 				$system['version'] = $selected['version'];
 			}
 			$data['versions'] = array_values($versionNumbers);
+			$data['allowedToUpdate'] = User::hasPermission("update");
 			echo Render::parse('filelist', $data);
 			return;
 		case 'download':
-			$id = Request::post('id');
-			$name = Request::post('name');
-			if (!$id || !$name || strpos("$id$name", '/') !== false) {
-				echo "Invalid download request";
-				return;
-			}
-			$file = false;
-			$gpg = 'missing';
-			foreach ($data['systems'] as &$system) {
-				if ($system['id'] !== $id) continue;
-				foreach ($system['versions'] as &$version) {
-					if ($version['version'] != $selectedVersion) continue;
-					foreach ($version['files'] as &$f) {
-						if ($f['name'] !== $name) continue;
-						$file = $f;
-						if (!empty($f['gpg'])) $gpg = $f['gpg'];
-						break;
+			if (User::hasPermission("update")) {
+				$id = Request::post('id');
+				$name = Request::post('name');
+				if (!$id || !$name || strpos("$id$name", '/') !== false) {
+					echo "Invalid download request";
+					return;
+				}
+				$file = false;
+				$gpg = 'missing';
+				foreach ($data['systems'] as &$system) {
+					if ($system['id'] !== $id) continue;
+					foreach ($system['versions'] as &$version) {
+						if ($version['version'] != $selectedVersion) continue;
+						foreach ($version['files'] as &$f) {
+							if ($f['name'] !== $name) continue;
+							$file = $f;
+							if (!empty($f['gpg'])) $gpg = $f['gpg'];
+							break;
+						}
 					}
 				}
-			}
-			if ($file === false) {
-				echo "Nonexistent system/file: $id / $name";
-				return;
-			}
-			$task = Taskmanager::submit('DownloadFile', array(
-				'url' => CONFIG_REMOTE_ML . '/' . $id . '/' . $selectedVersion . '/' . $name,
-				'destination' => CONFIG_HTTP_DIR . '/' . $id . '/' . $name,
-				'gpg' => $gpg
-			));
-			if (!isset($task['id'])) {
-				echo 'Error launching download task: ' . $task['statusCode'];
+				if ($file === false) {
+					echo "Nonexistent system/file: $id / $name";
+					return;
+				}
+				$task = Taskmanager::submit('DownloadFile', array(
+					'url' => CONFIG_REMOTE_ML . '/' . $id . '/' . $selectedVersion . '/' . $name,
+					'destination' => CONFIG_HTTP_DIR . '/' . $id . '/' . $name,
+					'gpg' => $gpg
+				));
+				if (!isset($task['id'])) {
+					echo 'Error launching download task: ' . $task['statusCode'];
+					return;
+				}
+				Property::setDownloadTask($file['md5'], $task['id']);
+				echo Render::parse('download', array(
+					'name' => $name,
+					'task' => $task['id']
+				));
 				return;
 			}
-			Property::setDownloadTask($file['md5'], $task['id']);
-			echo Render::parse('download', array(
-				'name' => $name,
-				'task' => $task['id']
-			));
-			return;
 		}
 	}
 
diff --git a/modules-available/minilinux/permissions/permissions.json b/modules-available/minilinux/permissions/permissions.json
new file mode 100644
index 00000000..457d9810
--- /dev/null
+++ b/modules-available/minilinux/permissions/permissions.json
@@ -0,0 +1,4 @@
+[
+	"show",
+	"update"
+]
\ No newline at end of file
diff --git a/modules-available/minilinux/templates/filelist.html b/modules-available/minilinux/templates/filelist.html
index a1d0aa48..34138c14 100644
--- a/modules-available/minilinux/templates/filelist.html
+++ b/modules-available/minilinux/templates/filelist.html
@@ -18,7 +18,7 @@
 			<p>
 				{{lang_canUpdate1}} <b>{{title}}</b> {{lang_canUpdate2}}
 			</p>
-			<p><span class="btn btn-primary" onclick="slxUpdateAll(this, 'download-{{id}}')">{{lang_update}}</span></p>
+			<button {{^allowedToUpdate}}disabled{{/allowedToUpdate}} class="btn btn-primary" onclick="slxUpdateAll(this, 'download-{{id}}')"><span class="glyphicon glyphicon-refresh"></span> {{lang_update}}<span></span></button>
 			{{/systemChanged}}
 			{{^systemChanged}}
 			<p>{{lang_systemUpdated}}</p>
@@ -35,8 +35,8 @@
 							{{#fileChanged}}<span class="glyphicon glyphicon-exclamation-sign"></span> <b>{{lang_outdated}}</b>{{/fileChanged}}
 						</div>
 						<div class="col-xs-2">
-							{{#fileChanged}}<span class="btn btn-primary btn-xs update-button" onclick="slxUpdate('{{uid}}', '{{id}}', '{{name}}')">{{lang_update}}</span>{{/fileChanged}}
-							{{^fileChanged}}<span class="btn btn-default btn-xs" onclick="slxUpdate('{{uid}}', '{{id}}', '{{name}}')">{{lang_redownload}}</span>{{/fileChanged}}
+							{{#fileChanged}}<button {{^allowedToUpdate}}disabled{{/allowedToUpdate}} class="btn btn-primary btn-xs update-button" onclick="slxUpdate('{{uid}}', '{{id}}', '{{name}}')"><span class="glyphicon glyphicon-refresh"></span> {{lang_update}}</button> {{/fileChanged}}
+							{{^fileChanged}}<button {{^allowedToUpdate}}disabled{{/allowedToUpdate}} class="btn btn-default btn-xs" onclick="slxUpdate('{{uid}}', '{{id}}', '{{name}}')"><span class="glyphicon glyphicon-download-alt"></span> {{lang_redownload}}</button> {{/fileChanged}}
 						</div>
 					</div>
 					{{{download}}}
-- 
cgit v1.2.3-55-g7522


From a8b0095b335780ae0bb950bc44021215d43a6b2d Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 12 Feb 2018 14:17:07 +0100
Subject: [permissionmanager] Introduce "location-aware" flag for permissions

This flag tells wether the permission can be restricted to certain
locations in a meaningful way. This flag has to be set in the
permissions.json of the according module.
For example, the permission to reboot the server cannot be limited
to certain locations in a meaningful way, while the view of the
client log can be filtered to only show log entries for clients
in specific locations.
---
 .../backup/permissions/permissions.json            | 12 +++--
 .../permissions/permissions.json                   | 24 +++++++---
 .../dozmod/permissions/permissions.json            | 52 ++++++++++++++++------
 .../eventlog/permissions/permissions.json          |  8 ++--
 .../exams/permissions/permissions.json             | 13 +++---
 .../internetaccess/permissions/permissions.json    |  8 ++--
 .../locations/permissions/permissions.json         | 32 +++++++++----
 .../minilinux/permissions/permissions.json         | 12 +++--
 .../news/permissions/permissions.json              | 20 ++++++---
 .../permissionmanager/inc/permissionutil.inc.php   |  9 ++--
 modules-available/permissionmanager/page.inc.php   | 21 +++++----
 modules-available/permissionmanager/style.css      | 28 ++++++------
 .../permissionmanager/templates/roleeditor.html    | 42 +++++++----------
 .../permissionmanager/templates/treenode.html      | 23 +++++-----
 .../permissionmanager/templates/treepanel.html     |  2 +-
 .../rebootcontrol/permissions/permissions.json     | 16 ++++---
 .../serversetup-bwlp/permissions/permissions.json  | 16 ++++---
 .../statistics/permissions/permissions.json        | 16 ++++---
 .../permissions/permissions.json                   | 36 ++++++++++-----
 .../syslog/permissions/permissions.json            |  8 ++--
 .../systemstatus/permissions/permissions.json      | 48 ++++++++++++++------
 .../vmstore/permissions/permissions.json           | 16 ++++---
 .../webinterface/permissions/permissions.json      | 16 ++++---
 23 files changed, 309 insertions(+), 169 deletions(-)

(limited to 'modules-available/minilinux')

diff --git a/modules-available/backup/permissions/permissions.json b/modules-available/backup/permissions/permissions.json
index feeffe33..1f778ab6 100644
--- a/modules-available/backup/permissions/permissions.json
+++ b/modules-available/backup/permissions/permissions.json
@@ -1,4 +1,8 @@
-[
-	"create",
-	"restore"
-]
\ No newline at end of file
+{
+    "create": {
+        "location-aware": false
+    },
+    "restore": {
+        "location-aware": false
+    }
+}
\ No newline at end of file
diff --git a/modules-available/baseconfig_partitions_cdn/permissions/permissions.json b/modules-available/baseconfig_partitions_cdn/permissions/permissions.json
index 286a975b..3acd5230 100644
--- a/modules-available/baseconfig_partitions_cdn/permissions/permissions.json
+++ b/modules-available/baseconfig_partitions_cdn/permissions/permissions.json
@@ -1,7 +1,17 @@
-[
-	"show",
-	"partitions.add",
-	"partitions.delete",
-	"partitions.edit",
-	"partitions.reset"
-]
\ No newline at end of file
+{
+    "partitions.add": {
+        "location-aware": false
+    },
+    "partitions.delete": {
+        "location-aware": false
+    },
+    "partitions.edit": {
+        "location-aware": false
+    },
+    "partitions.reset": {
+        "location-aware": false
+    },
+    "show": {
+        "location-aware": false
+    }
+}
\ No newline at end of file
diff --git a/modules-available/dozmod/permissions/permissions.json b/modules-available/dozmod/permissions/permissions.json
index e8dfb558..b4ff034b 100644
--- a/modules-available/dozmod/permissions/permissions.json
+++ b/modules-available/dozmod/permissions/permissions.json
@@ -1,14 +1,38 @@
-[
-	"images.delete",
-	"mail.save",
-	"mail.testmail",
-	"runtimeconfig.save",
-	"templates.save",
-	"templates.reset",
-	"users.setmail",
-	"users.setlogin",
-	"users.setsu",
-	"users.orglogin",
-	"log.showuser",
-	"log.showtarget"
-]
\ No newline at end of file
+{
+    "images.delete": {
+        "location-aware": false
+    },
+    "log.showtarget": {
+        "location-aware": false
+    },
+    "log.showuser": {
+        "location-aware": false
+    },
+    "mail.save": {
+        "location-aware": false
+    },
+    "mail.testmail": {
+        "location-aware": false
+    },
+    "runtimeconfig.save": {
+        "location-aware": false
+    },
+    "templates.reset": {
+        "location-aware": false
+    },
+    "templates.save": {
+        "location-aware": false
+    },
+    "users.orglogin": {
+        "location-aware": false
+    },
+    "users.setlogin": {
+        "location-aware": false
+    },
+    "users.setmail": {
+        "location-aware": false
+    },
+    "users.setsu": {
+        "location-aware": false
+    }
+}
\ No newline at end of file
diff --git a/modules-available/eventlog/permissions/permissions.json b/modules-available/eventlog/permissions/permissions.json
index f04ea714..a1748957 100644
--- a/modules-available/eventlog/permissions/permissions.json
+++ b/modules-available/eventlog/permissions/permissions.json
@@ -1,3 +1,5 @@
-[
-	"view"
-]
\ No newline at end of file
+{
+    "view": {
+        "location-aware": false
+    }
+}
\ No newline at end of file
diff --git a/modules-available/exams/permissions/permissions.json b/modules-available/exams/permissions/permissions.json
index 215b3399..e44974b6 100644
--- a/modules-available/exams/permissions/permissions.json
+++ b/modules-available/exams/permissions/permissions.json
@@ -1,5 +1,8 @@
-[
-	"exams.add",
-	"exams.delete",
-	"exams.edit"
-]
\ No newline at end of file
+{
+    "exams.edit": {
+        "location-aware": true
+    },
+    "exams.view": {
+        "location-aware": true
+    }
+}
\ No newline at end of file
diff --git a/modules-available/internetaccess/permissions/permissions.json b/modules-available/internetaccess/permissions/permissions.json
index 67998da7..09652e51 100644
--- a/modules-available/internetaccess/permissions/permissions.json
+++ b/modules-available/internetaccess/permissions/permissions.json
@@ -1,3 +1,5 @@
-[
-	"configuration.safe"
-]
\ No newline at end of file
+{
+    "configuration.safe": {
+        "location-aware": false
+    }
+}
\ No newline at end of file
diff --git a/modules-available/locations/permissions/permissions.json b/modules-available/locations/permissions/permissions.json
index 609a673a..06b01d2c 100644
--- a/modules-available/locations/permissions/permissions.json
+++ b/modules-available/locations/permissions/permissions.json
@@ -1,9 +1,23 @@
-[
-	"location.view",
-	"location.edit",
-	"location.add",
-	"location.delete",
-	"subnet.edit",
-	"subnet.add",
-	"subnet.delete"
-]
\ No newline at end of file
+{
+    "location.add": {
+        "location-aware": false
+    },
+    "location.delete": {
+        "location-aware": false
+    },
+    "location.edit": {
+        "location-aware": false
+    },
+    "location.view": {
+        "location-aware": false
+    },
+    "subnet.add": {
+        "location-aware": false
+    },
+    "subnet.delete": {
+        "location-aware": false
+    },
+    "subnet.edit": {
+        "location-aware": false
+    }
+}
\ No newline at end of file
diff --git a/modules-available/minilinux/permissions/permissions.json b/modules-available/minilinux/permissions/permissions.json
index 457d9810..650f7e71 100644
--- a/modules-available/minilinux/permissions/permissions.json
+++ b/modules-available/minilinux/permissions/permissions.json
@@ -1,4 +1,8 @@
-[
-	"show",
-	"update"
-]
\ No newline at end of file
+{
+    "show": {
+        "location-aware": false
+    },
+    "update": {
+        "location-aware": false
+    }
+}
\ No newline at end of file
diff --git a/modules-available/news/permissions/permissions.json b/modules-available/news/permissions/permissions.json
index 321e73ea..0d9435d7 100644
--- a/modules-available/news/permissions/permissions.json
+++ b/modules-available/news/permissions/permissions.json
@@ -1,6 +1,14 @@
-[
-	"news.save",
-	"news.delete",
-	"help.save",
-	"help.delete"
-]
\ No newline at end of file
+{
+    "help.delete": {
+        "location-aware": false
+    },
+    "help.save": {
+        "location-aware": false
+    },
+    "news.delete": {
+        "location-aware": false
+    },
+    "news.save": {
+        "location-aware": false
+    }
+}
\ No newline at end of file
diff --git a/modules-available/permissionmanager/inc/permissionutil.inc.php b/modules-available/permissionmanager/inc/permissionutil.inc.php
index 5ff41046..3daf422e 100644
--- a/modules-available/permissionmanager/inc/permissionutil.inc.php
+++ b/modules-available/permissionmanager/inc/permissionutil.inc.php
@@ -100,9 +100,9 @@ class PermissionUtil
 			if (!is_array($data))
 				continue;
 			preg_match('#^modules/([^/]+)/#', $file, $out);
-			foreach( $data as $p ) {
+			foreach( $data as $p => $data) {
 				$description = Dictionary::translateFileModule($out[1], "permissions", $p);
-				self::putInPermissionTree($out[1].".".$p, $description, $permissions);
+				self::putInPermissionTree($out[1].".".$p, $data['location-aware'], $description, $permissions);
 			}
 		}
 		ksort($permissions);
@@ -120,10 +120,11 @@ class PermissionUtil
 	 * Place a permission into the given permission tree.
 	 *
 	 * @param string $permission the permission to place in the tree
+	 * @param bool $locationAware whether this permissions can be restricted to specific locations only
 	 * @param string $description the description of the permission
 	 * @param array $tree the permission tree to modify
 	 */
-	private static function putInPermissionTree($permission, $description, &$tree)
+	private static function putInPermissionTree($permission, $locationAware, $description, &$tree)
 	{
 		$subPermissions = explode('.', $permission);
 		foreach ($subPermissions as $subPermission) {
@@ -134,6 +135,6 @@ class PermissionUtil
 				$tree =& $tree[$subPermission];
 			}
 		}
-		$tree = $description;
+		$tree = array('description' => $description, 'location-aware' => $locationAware, 'isLeaf' => true);
 	}
 }
\ No newline at end of file
diff --git a/modules-available/permissionmanager/page.inc.php b/modules-available/permissionmanager/page.inc.php
index 13d81c6a..bb8482af 100644
--- a/modules-available/permissionmanager/page.inc.php
+++ b/modules-available/permissionmanager/page.inc.php
@@ -100,18 +100,21 @@ class Page_PermissionManager extends Page
 		$toplevel = $permString == "";
 		if ($toplevel && in_array("*", $selectedPermissions)) $selectAll = true;
 		foreach ($permissions as $k => $v) {
-			$leaf = !is_array($v);
+			$leaf = isset($v['isLeaf']) && $v['isLeaf'];
 			$nextPermString = $permString ? $permString.".".$k : $k;
 			$id = $leaf ? $nextPermString : $nextPermString.".*";
 			$selected = $selectAll || in_array($id, $selectedPermissions);
-			$res .= Render::parse("treenode",
-				array("id" =>  $id,
-						"name" => $toplevel ? Module::get($k)->getDisplayName() : $k,
-						"toplevel" => $toplevel,
-						"checkboxname" => "permissions",
-						"selected" => $selected,
-						"HTML" => $leaf ? "" : self::generatePermissionHTML($v, $selectedPermissions, $selected, $nextPermString),
-						"description" => $leaf ? $v : ""));
+			$data = array("id" =>  $id,
+				"name" => $toplevel ? Module::get($k)->getDisplayName() : $k,
+				"toplevel" => $toplevel,
+				"checkboxname" => "permissions",
+				"selected" => $selected,
+				"HTML" => $leaf ? "" : self::generatePermissionHTML($v, $selectedPermissions, $selected, $nextPermString),
+			);
+			if ($leaf) {
+				$data += $v;
+			}
+			$res .= Render::parse("treenode", $data);
 		}
 		if ($toplevel) {
 			$res = Render::parse("treepanel",
diff --git a/modules-available/permissionmanager/style.css b/modules-available/permissionmanager/style.css
index 49d631a8..9c39af64 100644
--- a/modules-available/permissionmanager/style.css
+++ b/modules-available/permissionmanager/style.css
@@ -55,28 +55,28 @@
     background-color: rgba(0, 182, 41, 0.23);
 }
 
-.tree-container {
-    -moz-column-gap: 20px;
-    -webkit-column-gap: 20px;
-    column-gap: 20px;
-}
-
-
 .tree-container > ul {
     display: inline-block;
     width: 100%;
     padding: 0;
 }
 
-@media (max-width: 767px) {
-    .tree-container {
-        -moz-column-count: 1;
-        -webkit-column-count: 1;
-        column-count: 1;
-    }
+.tree-container > ul > li > div > label {
+    font-weight: bold;
+}
+
+.tree-container {
+    -moz-column-gap: 20px;
+    -webkit-column-gap: 20px;
+    column-gap: 20px;
+    -moz-column-count: 1;
+    -webkit-column-count: 1;
+    column-count: 1;
+    padding-left: 20px;
+    padding-right: 20px;
 }
 
-@media (min-width: 768px) and (max-width: 991px) {
+@media (min-width: 768px) {
     .tree-container {
         -moz-column-count: 2;
         -webkit-column-count: 2;
diff --git a/modules-available/permissionmanager/templates/roleeditor.html b/modules-available/permissionmanager/templates/roleeditor.html
index 871fd0cc..eadce027 100644
--- a/modules-available/permissionmanager/templates/roleeditor.html
+++ b/modules-available/permissionmanager/templates/roleeditor.html
@@ -4,32 +4,24 @@
 	<input type="hidden" name="token" value="{{token}}">
 	<input type="hidden" name="roleid" value="{{roleid}}">
 
-	<div class="row">
-		<div class="col-md-12" style="margin-bottom: 20px;">
-			<ul class="nav nav-tabs text-center" role="tablist">
-				<li role="presentation" class="active"><a href="#permissions" role="tab" data-toggle="tab">{{lang_permissions}}</a></li>
-				<li role="presentation"><a href="#locations" role="tab" data-toggle="tab">{{lang_locations}}</a></li>
-				<li style="float: none; display: inline-block">
-					<label for="rolename">{{lang_name}}:</label>
-					<input id="rolename" name="rolename" value="{{rolename}}" type="text" class="form-control">
-				</li>
-				<li style="float: right;">
-					<span><a href="?do=permissionmanager&show={{cancelShow}}" id="cancelButton" class="btn btn-default">{{lang_cancel}}</a></span>
-					<button type="submit" id="saveButton" class="btn btn-primary"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button>
-				</li>
-			</ul>
+	<ul class="nav nav-tabs text-center" role="tablist">
+		<li role="presentation" class="active"><a href="#permissions" role="tab" data-toggle="tab">{{lang_permissions}}</a></li>
+		<li role="presentation"><a href="#locations" role="tab" data-toggle="tab">{{lang_locations}}</a></li>
+		<li style="float: none; display: inline-block">
+			<label for="rolename">{{lang_name}}:</label>
+			<input id="rolename" name="rolename" value="{{rolename}}" type="text" class="form-control">
+		</li>
+		<li style="float: right;">
+			<span><a href="?do=permissionmanager&show={{cancelShow}}" id="cancelButton" class="btn btn-default">{{lang_cancel}}</a></span>
+			<button type="submit" id="saveButton" class="btn btn-primary"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button>
+		</li>
+	</ul>
+	<div class="tab-content">
+		<div role="tabpanel" class="tab-pane active" id="permissions">
+			{{{permissionHTML}}}
 		</div>
-	</div>
-	<div class="row" style="margin-bottom: 20px;">
-		<div class="col-md-12">
-			<div class="tab-content">
-				<div role="tabpanel" class="tab-pane active" id="permissions">
-					{{{permissionHTML}}}
-				</div>
-				<div role="tabpanel" class="tab-pane" id="locations">
-					{{{locationHTML}}}
-				</div>
-			</div>
+		<div role="tabpanel" class="tab-pane" id="locations">
+			{{{locationHTML}}}
 		</div>
 	</div>
 
diff --git a/modules-available/permissionmanager/templates/treenode.html b/modules-available/permissionmanager/templates/treenode.html
index ced973ca..43509237 100644
--- a/modules-available/permissionmanager/templates/treenode.html
+++ b/modules-available/permissionmanager/templates/treenode.html
@@ -1,11 +1,14 @@
 {{#toplevel}}<ul>{{/toplevel}}
-	<li title="{{description}}" data-toggle="tooltip" data-placement="left">
-		<div class='checkbox'>
-			<input id="{{id}}" name="{{checkboxname}}[]" value="{{id}}" type="checkbox" class="form-control" {{#selected}}checked{{/selected}}>
-			<label for="{{id}}">{{#toplevel}}<b>{{/toplevel}}{{name}}{{#toplevel}}</b>{{/toplevel}}</label>
-		</div>
-		<ul>
-			{{{HTML}}}
-		</ul>
-	</li>
-{{#toplevel}}</ul>{{/toplevel}}
+<li title="{{description}}" data-toggle="tooltip" data-placement="left">
+	<div class='checkbox'>
+		<input id="{{id}}" name="{{checkboxname}}[]" value="{{id}}" type="checkbox" class="form-control" {{#selected}}checked{{/selected}}>
+		<label for="{{id}}">
+			{{name}}
+			{{#location-aware}}<span class="glyphicon glyphicon-home text-muted"></span>{{/location-aware}}
+		</label>
+	</div>
+	<ul>
+		{{{HTML}}}
+	</ul>
+</li>
+{{#toplevel}}</ul>{{/toplevel}}
\ No newline at end of file
diff --git a/modules-available/permissionmanager/templates/treepanel.html b/modules-available/permissionmanager/templates/treepanel.html
index 6f358825..8b510407 100644
--- a/modules-available/permissionmanager/templates/treepanel.html
+++ b/modules-available/permissionmanager/templates/treepanel.html
@@ -6,7 +6,7 @@
 		</div>
 	</div>
 	<div class="panel-body">
-		<div class="tree-container" style="padding-left: 20px; padding-right: 20px;">
+		<div class="tree-container">
 			{{{HTML}}}
 		</div>
 	</div>
diff --git a/modules-available/rebootcontrol/permissions/permissions.json b/modules-available/rebootcontrol/permissions/permissions.json
index 5230c9bd..5de9b633 100644
--- a/modules-available/rebootcontrol/permissions/permissions.json
+++ b/modules-available/rebootcontrol/permissions/permissions.json
@@ -1,5 +1,11 @@
-[
-	"shutdown",
-	"reboot",
-	"newkeypair"
-]
\ No newline at end of file
+{
+    "newkeypair": {
+        "location-aware": false
+    },
+    "reboot": {
+        "location-aware": true
+    },
+    "shutdown": {
+        "location-aware": true
+    }
+}
\ No newline at end of file
diff --git a/modules-available/serversetup-bwlp/permissions/permissions.json b/modules-available/serversetup-bwlp/permissions/permissions.json
index 2166cf8e..6bae5422 100644
--- a/modules-available/serversetup-bwlp/permissions/permissions.json
+++ b/modules-available/serversetup-bwlp/permissions/permissions.json
@@ -1,5 +1,11 @@
-[
-	"edit.address",
-	"edit.menu",
-	"download"
-]
\ No newline at end of file
+{
+    "download": {
+        "location-aware": false
+    },
+    "edit.address": {
+        "location-aware": false
+    },
+    "edit.menu": {
+        "location-aware": false
+    }
+}
\ No newline at end of file
diff --git a/modules-available/statistics/permissions/permissions.json b/modules-available/statistics/permissions/permissions.json
index 97a49036..c9dca9f3 100644
--- a/modules-available/statistics/permissions/permissions.json
+++ b/modules-available/statistics/permissions/permissions.json
@@ -1,5 +1,11 @@
-[
-	"view",
-	"note",
-	"delete"
-]
\ No newline at end of file
+{
+    "machine.delete": {
+        "location-aware": true
+    },
+    "machine.note": {
+        "location-aware": true
+    },
+    "machine.view": {
+        "location-aware": true
+    }
+}
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/permissions/permissions.json b/modules-available/statistics_reporting/permissions/permissions.json
index d967b75d..1244027e 100644
--- a/modules-available/statistics_reporting/permissions/permissions.json
+++ b/modules-available/statistics_reporting/permissions/permissions.json
@@ -1,10 +1,26 @@
-[
-	"table.view.total",
-	"table.view.location",
-	"table.view.client",
-	"table.view.user",
-	"table.view.vm",
-	"table.export",
-	"reporting.download",
-	"reporting.change"
-]
\ No newline at end of file
+{
+    "reporting.change": {
+        "location-aware": false
+    },
+    "reporting.download": {
+        "location-aware": false
+    },
+    "table.export": {
+        "location-aware": false
+    },
+    "table.view.client": {
+        "location-aware": true
+    },
+    "table.view.location": {
+        "location-aware": true
+    },
+    "table.view.total": {
+        "location-aware": false
+    },
+    "table.view.user": {
+        "location-aware": false
+    },
+    "table.view.vm": {
+        "location-aware": false
+    }
+}
\ No newline at end of file
diff --git a/modules-available/syslog/permissions/permissions.json b/modules-available/syslog/permissions/permissions.json
index f04ea714..fcf530c5 100644
--- a/modules-available/syslog/permissions/permissions.json
+++ b/modules-available/syslog/permissions/permissions.json
@@ -1,3 +1,5 @@
-[
-	"view"
-]
\ No newline at end of file
+{
+    "view": {
+        "location-aware": true
+    }
+}
\ No newline at end of file
diff --git a/modules-available/systemstatus/permissions/permissions.json b/modules-available/systemstatus/permissions/permissions.json
index 0333564b..8324f708 100644
--- a/modules-available/systemstatus/permissions/permissions.json
+++ b/modules-available/systemstatus/permissions/permissions.json
@@ -1,13 +1,35 @@
-[
-	"show.overview.diskstat",
-	"show.overview.services",
-	"show.overview.adresses",
-	"show.overview.systeminfo",
-	"show.overview.dmsdusers",
-	"show.logs.bwlpserver",
-	"show.logs.netstat",
-	"show.logs.pslist",
-	"show.logs.ldapad",
-	"show.logs.lighttpd",
-	"serverreboot"
-]
\ No newline at end of file
+{
+    "serverreboot": {
+        "location-aware": false
+    },
+    "show.logs.bwlpserver": {
+        "location-aware": false
+    },
+    "show.logs.ldapad": {
+        "location-aware": false
+    },
+    "show.logs.lighttpd": {
+        "location-aware": false
+    },
+    "show.logs.netstat": {
+        "location-aware": false
+    },
+    "show.logs.pslist": {
+        "location-aware": false
+    },
+    "show.overview.adresses": {
+        "location-aware": false
+    },
+    "show.overview.diskstat": {
+        "location-aware": false
+    },
+    "show.overview.dmsdusers": {
+        "location-aware": false
+    },
+    "show.overview.services": {
+        "location-aware": false
+    },
+    "show.overview.systeminfo": {
+        "location-aware": false
+    }
+}
\ No newline at end of file
diff --git a/modules-available/vmstore/permissions/permissions.json b/modules-available/vmstore/permissions/permissions.json
index f2c22c72..29ee6a51 100644
--- a/modules-available/vmstore/permissions/permissions.json
+++ b/modules-available/vmstore/permissions/permissions.json
@@ -1,5 +1,11 @@
-[
-	"choose.internal",
-	"choose.nfs",
-	"choose.cifs"
-]
\ No newline at end of file
+{
+    "choose.cifs": {
+        "location-aware": false
+    },
+    "choose.internal": {
+        "location-aware": false
+    },
+    "choose.nfs": {
+        "location-aware": false
+    }
+}
\ No newline at end of file
diff --git a/modules-available/webinterface/permissions/permissions.json b/modules-available/webinterface/permissions/permissions.json
index 45b5395d..fa6f493f 100644
--- a/modules-available/webinterface/permissions/permissions.json
+++ b/modules-available/webinterface/permissions/permissions.json
@@ -1,5 +1,11 @@
-[
-	"edit.https",
-	"edit.password",
-	"edit.design"
-]
\ No newline at end of file
+{
+    "edit.design": {
+        "location-aware": false
+    },
+    "edit.https": {
+        "location-aware": false
+    },
+    "edit.password": {
+        "location-aware": false
+    }
+}
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522


From db4cf34ba9782dd5709a79a2d9a8e0337661486c Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 14 Feb 2018 14:30:18 +0100
Subject: [minilinux] Use new permission helpers

---
 modules-available/minilinux/page.inc.php           | 80 ++++++++++------------
 .../minilinux/templates/filelist.html              |  6 +-
 2 files changed, 41 insertions(+), 45 deletions(-)

(limited to 'modules-available/minilinux')

diff --git a/modules-available/minilinux/page.inc.php b/modules-available/minilinux/page.inc.php
index 710ffd15..6a331e1e 100644
--- a/modules-available/minilinux/page.inc.php
+++ b/modules-available/minilinux/page.inc.php
@@ -12,10 +12,7 @@ class Page_MiniLinux extends Page
 			Util::redirect('?do=Main');
 		}
 
-		if (!(User::hasPermission("show") || User::hasPermission("update"))) {
-			Message::addError('main.no-permission');
-			Util::redirect('?do=Main');
-		}
+		User::assertPermission('show');
 	}
 
 	protected function doRender()
@@ -87,51 +84,50 @@ class Page_MiniLinux extends Page
 				$system['version'] = $selected['version'];
 			}
 			$data['versions'] = array_values($versionNumbers);
-			$data['allowedToUpdate'] = User::hasPermission("update");
+			Permission::addGlobalTags($data['perms'], null, ['update']);
 			echo Render::parse('filelist', $data);
 			return;
 		case 'download':
-			if (User::hasPermission("update")) {
-				$id = Request::post('id');
-				$name = Request::post('name');
-				if (!$id || !$name || strpos("$id$name", '/') !== false) {
-					echo "Invalid download request";
-					return;
-				}
-				$file = false;
-				$gpg = 'missing';
-				foreach ($data['systems'] as &$system) {
-					if ($system['id'] !== $id) continue;
-					foreach ($system['versions'] as &$version) {
-						if ($version['version'] != $selectedVersion) continue;
-						foreach ($version['files'] as &$f) {
-							if ($f['name'] !== $name) continue;
-							$file = $f;
-							if (!empty($f['gpg'])) $gpg = $f['gpg'];
-							break;
-						}
+			User::assertPermission('update');
+			$id = Request::post('id');
+			$name = Request::post('name');
+			if (!$id || !$name || strpos("$id$name", '/') !== false) {
+				echo "Invalid download request";
+				return;
+			}
+			$file = false;
+			$gpg = 'missing';
+			foreach ($data['systems'] as &$system) {
+				if ($system['id'] !== $id) continue;
+				foreach ($system['versions'] as &$version) {
+					if ($version['version'] != $selectedVersion) continue;
+					foreach ($version['files'] as &$f) {
+						if ($f['name'] !== $name) continue;
+						$file = $f;
+						if (!empty($f['gpg'])) $gpg = $f['gpg'];
+						break;
 					}
 				}
-				if ($file === false) {
-					echo "Nonexistent system/file: $id / $name";
-					return;
-				}
-				$task = Taskmanager::submit('DownloadFile', array(
-					'url' => CONFIG_REMOTE_ML . '/' . $id . '/' . $selectedVersion . '/' . $name,
-					'destination' => CONFIG_HTTP_DIR . '/' . $id . '/' . $name,
-					'gpg' => $gpg
-				));
-				if (!isset($task['id'])) {
-					echo 'Error launching download task: ' . $task['statusCode'];
-					return;
-				}
-				Property::setDownloadTask($file['md5'], $task['id']);
-				echo Render::parse('download', array(
-					'name' => $name,
-					'task' => $task['id']
-				));
+			}
+			if ($file === false) {
+				echo "Nonexistent system/file: $id / $name";
 				return;
 			}
+			$task = Taskmanager::submit('DownloadFile', array(
+				'url' => CONFIG_REMOTE_ML . '/' . $id . '/' . $selectedVersion . '/' . $name,
+				'destination' => CONFIG_HTTP_DIR . '/' . $id . '/' . $name,
+				'gpg' => $gpg
+			));
+			if (!isset($task['id'])) {
+				echo 'Error launching download task: ' . $task['statusCode'];
+				return;
+			}
+			Property::setDownloadTask($file['md5'], $task['id']);
+			echo Render::parse('download', array(
+				'name' => $name,
+				'task' => $task['id']
+			));
+			return;
 		}
 	}
 
diff --git a/modules-available/minilinux/templates/filelist.html b/modules-available/minilinux/templates/filelist.html
index 34138c14..8df868d2 100644
--- a/modules-available/minilinux/templates/filelist.html
+++ b/modules-available/minilinux/templates/filelist.html
@@ -18,7 +18,7 @@
 			<p>
 				{{lang_canUpdate1}} <b>{{title}}</b> {{lang_canUpdate2}}
 			</p>
-			<button {{^allowedToUpdate}}disabled{{/allowedToUpdate}} class="btn btn-primary" onclick="slxUpdateAll(this, 'download-{{id}}')"><span class="glyphicon glyphicon-refresh"></span> {{lang_update}}<span></span></button>
+			<button {{perms.update.disabled}} class="btn btn-primary" onclick="slxUpdateAll(this, 'download-{{id}}')"><span class="glyphicon glyphicon-refresh"></span> {{lang_update}}<span></span></button>
 			{{/systemChanged}}
 			{{^systemChanged}}
 			<p>{{lang_systemUpdated}}</p>
@@ -35,8 +35,8 @@
 							{{#fileChanged}}<span class="glyphicon glyphicon-exclamation-sign"></span> <b>{{lang_outdated}}</b>{{/fileChanged}}
 						</div>
 						<div class="col-xs-2">
-							{{#fileChanged}}<button {{^allowedToUpdate}}disabled{{/allowedToUpdate}} class="btn btn-primary btn-xs update-button" onclick="slxUpdate('{{uid}}', '{{id}}', '{{name}}')"><span class="glyphicon glyphicon-refresh"></span> {{lang_update}}</button> {{/fileChanged}}
-							{{^fileChanged}}<button {{^allowedToUpdate}}disabled{{/allowedToUpdate}} class="btn btn-default btn-xs" onclick="slxUpdate('{{uid}}', '{{id}}', '{{name}}')"><span class="glyphicon glyphicon-download-alt"></span> {{lang_redownload}}</button> {{/fileChanged}}
+							{{#fileChanged}}<button {{perms.update.disabled}} class="btn btn-primary btn-xs update-button" onclick="slxUpdate('{{uid}}', '{{id}}', '{{name}}')"><span class="glyphicon glyphicon-refresh"></span> {{lang_update}}</button> {{/fileChanged}}
+							{{^fileChanged}}<button {{perms.update.disabled}} class="btn btn-default btn-xs" onclick="slxUpdate('{{uid}}', '{{id}}', '{{name}}')"><span class="glyphicon glyphicon-download-alt"></span> {{lang_redownload}}</button> {{/fileChanged}}
 						</div>
 					</div>
 					{{{download}}}
-- 
cgit v1.2.3-55-g7522


From 938aa3821b29058c3ec51be85cea79d40a31d708 Mon Sep 17 00:00:00 2001
From: Steffen Ritter
Date: Fri, 23 Mar 2018 15:39:12 +0100
Subject: [translation] Minor wording

---
 modules-available/minilinux/templates/filelist.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules-available/minilinux')

diff --git a/modules-available/minilinux/templates/filelist.html b/modules-available/minilinux/templates/filelist.html
index 8df868d2..3c840c57 100644
--- a/modules-available/minilinux/templates/filelist.html
+++ b/modules-available/minilinux/templates/filelist.html
@@ -18,7 +18,7 @@
 			<p>
 				{{lang_canUpdate1}} <b>{{title}}</b> {{lang_canUpdate2}}
 			</p>
-			<button {{perms.update.disabled}} class="btn btn-primary" onclick="slxUpdateAll(this, 'download-{{id}}')"><span class="glyphicon glyphicon-refresh"></span> {{lang_update}}<span></span></button>
+			<button {{perms.update.disabled}} class="btn btn-primary" onclick="slxUpdateAll(this, 'download-{{id}}')"><span class="glyphicon glyphicon-refresh"></span> {{lang_updateAll}}<span></span></button>
 			{{/systemChanged}}
 			{{^systemChanged}}
 			<p>{{lang_systemUpdated}}</p>
-- 
cgit v1.2.3-55-g7522


From 49a2b4662fbc8950a28a22ff7b09f30f30c8b338 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 27 Mar 2018 15:35:28 +0200
Subject: [minilinux] permission 'show' => 'view'

Refs #3338
---
 modules-available/minilinux/lang/de/permissions.json     | 2 +-
 modules-available/minilinux/lang/de/template-tags.json   | 5 +++--
 modules-available/minilinux/lang/en/permissions.json     | 2 +-
 modules-available/minilinux/lang/en/template-tags.json   | 5 +++--
 modules-available/minilinux/page.inc.php                 | 2 +-
 modules-available/minilinux/permissions/permissions.json | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'modules-available/minilinux')

diff --git a/modules-available/minilinux/lang/de/permissions.json b/modules-available/minilinux/lang/de/permissions.json
index 372ffc88..29012620 100644
--- a/modules-available/minilinux/lang/de/permissions.json
+++ b/modules-available/minilinux/lang/de/permissions.json
@@ -1,4 +1,4 @@
 {
-	"show": "Zeige Komponenten des Minilinux. Wird nicht benötigt, wenn Nutzer eine der anderen Rechte hat.",
+	"view": "Zeige Komponenten des Minilinux. Wird nicht benötigt, wenn Nutzer eine der anderen Rechte hat.",
 	"update": "Aktualisieren von Komponenten des Minilinux."
 }
\ No newline at end of file
diff --git a/modules-available/minilinux/lang/de/template-tags.json b/modules-available/minilinux/lang/de/template-tags.json
index 18a8b7af..60a11db9 100644
--- a/modules-available/minilinux/lang/de/template-tags.json
+++ b/modules-available/minilinux/lang/de/template-tags.json
@@ -1,5 +1,4 @@
 {
-    "lang_uptodate": "Aktuell",
     "lang_canUpdate1": "Mindestens eine Komponente von",
     "lang_canUpdate2": "kann aktualisiert werden. F\u00fcr einen reibungslosen Betrieb wird empfohlen, alle Komponenten auf dem aktuellen Stand zu halten.",
     "lang_configurationPackageNotFound": "Keine Konfigurationspakete gefunden!",
@@ -10,5 +9,7 @@
     "lang_outdated": "Veraltet",
     "lang_redownload": "Erneut herunterladen",
     "lang_systemUpdated": "Das System ist auf dem aktuellen Stand.",
-    "lang_update": "Aktualisieren"
+    "lang_update": "Aktualisieren",
+    "lang_updateAll": "Alle Module aktualisieren",
+    "lang_uptodate": "Aktuell"
 }
\ No newline at end of file
diff --git a/modules-available/minilinux/lang/en/permissions.json b/modules-available/minilinux/lang/en/permissions.json
index 878388b0..b8389e62 100644
--- a/modules-available/minilinux/lang/en/permissions.json
+++ b/modules-available/minilinux/lang/en/permissions.json
@@ -1,4 +1,4 @@
 {
-	"show": "Show list of minilinux components. Not needed if User has any of the other permissions.",
+	"view": "Show list of minilinux components. Not needed if User has any of the other permissions.",
 	"update": "Update minilinux components."
 }
\ No newline at end of file
diff --git a/modules-available/minilinux/lang/en/template-tags.json b/modules-available/minilinux/lang/en/template-tags.json
index aef15c03..48ba0c15 100644
--- a/modules-available/minilinux/lang/en/template-tags.json
+++ b/modules-available/minilinux/lang/en/template-tags.json
@@ -1,5 +1,4 @@
 {
-    "lang_uptodate": "Up to date",
     "lang_canUpdate1": "At least one component of",
     "lang_canUpdate2": "Can be updated. For a smooth operation, it is recommended to keep all components up to date.",
     "lang_configurationPackageNotFound": "Configuration package not found!",
@@ -10,5 +9,7 @@
     "lang_outdated": "Outdated",
     "lang_redownload": "Download again",
     "lang_systemUpdated": "The system is up to date.",
-    "lang_update": "Update"
+    "lang_update": "Update",
+    "lang_updateAll": "Update all modules",
+    "lang_uptodate": "Up to date"
 }
\ No newline at end of file
diff --git a/modules-available/minilinux/page.inc.php b/modules-available/minilinux/page.inc.php
index 6a331e1e..2488b2dc 100644
--- a/modules-available/minilinux/page.inc.php
+++ b/modules-available/minilinux/page.inc.php
@@ -12,7 +12,7 @@ class Page_MiniLinux extends Page
 			Util::redirect('?do=Main');
 		}
 
-		User::assertPermission('show');
+		User::assertPermission('view');
 	}
 
 	protected function doRender()
diff --git a/modules-available/minilinux/permissions/permissions.json b/modules-available/minilinux/permissions/permissions.json
index 650f7e71..b018ee72 100644
--- a/modules-available/minilinux/permissions/permissions.json
+++ b/modules-available/minilinux/permissions/permissions.json
@@ -1,5 +1,5 @@
 {
-    "show": {
+    "view": {
         "location-aware": false
     },
     "update": {
-- 
cgit v1.2.3-55-g7522


From 5370b98936418b2b548c023813039b8bf2074a55 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 13 Apr 2018 17:31:56 +0200
Subject: [inc/Module] Overhaul dependency loading and handling of js/css

This is supposed to prevent unneeded js/css from being pulled in
---
 inc/module.inc.php                                 | 63 ++++++++++++++--------
 inc/render.inc.php                                 |  4 +-
 index.php                                          |  2 +-
 modules-available/adduser/config.json              |  4 +-
 modules-available/backup/config.json               |  4 +-
 modules-available/baseconfig/config.json           |  7 ++-
 modules-available/baseconfig_bwidm/config.json     |  6 ++-
 modules-available/baseconfig_bwlp/config.json      |  6 ++-
 .../baseconfig_partitions_cdn/config.json          |  8 +--
 modules-available/bootstrap_datepicker/config.json | 17 +++---
 modules-available/bootstrap_dialog/config.json     | 17 +++---
 .../bootstrap_multiselect/config.json              | 17 +++---
 modules-available/bootstrap_switch/config.json     | 13 ++---
 modules-available/bootstrap_timepicker/config.json | 17 +++---
 modules-available/citymanagement/config.json       |  6 +--
 modules-available/dnbd3/config.json                |  9 ++--
 modules-available/dozmod/config.json               |  4 +-
 modules-available/eventlog/config.json             |  4 +-
 modules-available/exams/config.json                | 13 +++--
 modules-available/imgmanagement/config.json        |  6 +--
 modules-available/internetaccess/config.json       |  4 +-
 modules-available/js_chart/config.json             | 13 ++---
 modules-available/js_circles/config.json           | 13 ++---
 modules-available/js_jqueryui/config.json          | 17 +++---
 modules-available/js_moment/config.json            | 17 +++---
 modules-available/js_selectize/config.json         | 17 +++---
 modules-available/js_stupidtable/config.json       | 13 ++---
 modules-available/js_vis/config.json               | 19 ++++---
 modules-available/locationinfo/config.json         | 11 ++--
 modules-available/locations/config.json            |  4 +-
 modules-available/main/config.json                 |  3 +-
 modules-available/minilinux/config.json            |  4 +-
 modules-available/news/config.json                 |  8 +--
 modules-available/permissionmanager/config.json    | 10 ++--
 modules-available/rebootcontrol/config.json        |  9 ++--
 modules-available/roomplanner/config.json          | 11 +++-
 modules-available/runmode/config.json              |  9 ++--
 modules-available/serversetup-bwlp/config.json     |  4 +-
 modules-available/session/config.json              |  3 +-
 modules-available/statistics/config.json           | 12 +++--
 modules-available/statistics_reporting/config.json |  9 +++-
 modules-available/summernote/config.json           | 17 +++---
 modules-available/support/config.json              |  4 +-
 modules-available/sysconfig/config.json            |  4 +-
 modules-available/sysconfignew/config.json         |  4 +-
 modules-available/syslog/config.json               |  8 +--
 modules-available/systemstatus/config.json         |  8 +--
 modules-available/translation/config.json          |  4 +-
 modules-available/usermanagement/config.json       |  6 +--
 modules-available/vmstore/config.json              |  4 +-
 modules-available/webinterface/config.json         |  4 +-
 51 files changed, 293 insertions(+), 207 deletions(-)

(limited to 'modules-available/minilinux')

diff --git a/inc/module.inc.php b/inc/module.inc.php
index 7610c720..fa2c4b98 100644
--- a/inc/module.inc.php
+++ b/inc/module.inc.php
@@ -35,7 +35,7 @@ class Module
 		if ($module === false)
 			return false;
 		if ($activate) {
-			$module->activate();
+			$module->activate(1, true);
 		}
 		return !$module->hasMissingDependencies();
 	}
@@ -139,9 +139,11 @@ class Module
 	 */
 
 	private $category = false;
+	private $clientPlugin = false;
 	private $depsMissing = false;
 	private $depsChecked = false;
 	private $activated = false;
+	private $directActivation = false;
 	private $dependencies = array();
 	private $name;
 	/**
@@ -165,6 +167,9 @@ class Module
 		if (isset($json['category']) && is_string($json['category'])) {
 			$this->category = $json['category'];
 		}
+		if (isset($json['client-plugin'])) {
+			$this->clientPlugin = (bool)$json['client-plugin'];
+		}
 		$this->name = $name;
 	}
 	
@@ -184,21 +189,33 @@ class Module
 		return new $class();
 	}
 
-	public function activate($depth = 1)
+	public function activate($depth, $direct)
 	{
-		if ($this->activated !== false || $this->depsMissing)
-			return $this->activated !== false;
+		if ($this->depsMissing)
+			return false;
+		if ($this->activated !== false && ($this->directActivation || !$direct))
+			return true;
+		if ($depth === null && $direct === null) {
+			// This is the current page, always load its scripts
+			$this->clientPlugin = true;
+			$direct = true;
+		}
+		if ($this->activated === false) {
+			spl_autoload_register(function ($class) {
+				$file = 'modules/' . $this->name . '/inc/' . preg_replace('/[^a-z0-9]/', '', strtolower($class)) . '.inc.php';
+				if (!file_exists($file))
+					return;
+				require_once $file;
+			});
+		}
 		$this->activated = $depth;
-		spl_autoload_register(function($class) {
-			$file = 'modules/' . $this->name . '/inc/' . preg_replace('/[^a-z0-9]/', '', strtolower($class)) . '.inc.php';
-			if (!file_exists($file))
-				return;
-			require_once $file;
-		});
+		if ($direct) {
+			$this->directActivation = true;
+		}
 		foreach ($this->dependencies as $dep) {
 			$get = self::get($dep);
 			if ($get !== false) {
-				$get->activate($depth + 1);
+				$get->activate($depth + 1, $direct && $this->clientPlugin);
 			}
 		}
 		return true;
@@ -263,26 +280,26 @@ class Module
 		return 'modules/' . $this->name;
 	}
 
-	public function getScripts($externalOnly)
+	public function getScripts()
 	{
-		if (!$externalOnly) {
-			if (!isset($this->scripts['clientscript.js']) && file_exists($this->getDir() . '/clientscript.js')) {
-				$this->scripts['clientscript.js'] = false;
+		if ($this->directActivation && $this->clientPlugin) {
+			if (!in_array('clientscript.js', $this->scripts)) {
+				$this->scripts[] = 'clientscript.js';
 			}
-			return array_keys($this->scripts);
+			return $this->scripts;
 		}
-		return array_keys(array_filter($this->scripts));
+		return [];
 	}
 
-	public function getCss($externalOnly)
+	public function getCss()
 	{
-		if (!$externalOnly) {
-			if (!isset($this->css['style.css']) && file_exists($this->getDir() . '/style.css')) {
-				$this->css['style.css'] = false;
+		if ($this->directActivation && $this->clientPlugin) {
+			if (!in_array('style.css', $this->css)) {
+				$this->css[] = 'style.css';
 			}
-			return array_keys($this->css);
+			return $this->css;
 		}
-		return array_keys(array_filter($this->css));
+		return [];
 	}
 
 }
diff --git a/inc/render.inc.php b/inc/render.inc.php
index 0ce39dbe..4b1d3643 100644
--- a/inc/render.inc.php
+++ b/inc/render.inc.php
@@ -84,7 +84,7 @@ class Render
 	';
 		// Include any module specific styles
 		foreach ($modules as $module) {
-			$files = $module->getCss($module !== $pageModule);
+			$files = $module->getCss();
 			foreach ($files as $file) {
 				echo '<link href="', $module->getDir(), '/', $file, '" rel="stylesheet" media="screen">';
 			}
@@ -113,7 +113,7 @@ class Render
 		<script src="script/slx-fixes.js"></script>
 	';
 		foreach ($modules as $module) {
-			$files = $module->getScripts($module !== $pageModule);
+			$files = $module->getScripts();
 			foreach ($files as $file) {
 				echo '<script src="', $module->getDir(), '/', $file, '"></script>';
 			}
diff --git a/index.php b/index.php
index 4816ef42..1ecd2109 100644
--- a/index.php
+++ b/index.php
@@ -79,7 +79,7 @@ abstract class Page
 		if (self::$module === false) {
 			Util::traceError('Invalid Module: ' . $name);
 		}
-		self::$module->activate();
+		self::$module->activate(null, null);
 		self::$instance = self::$module->newPage();
 	}
 
diff --git a/modules-available/adduser/config.json b/modules-available/adduser/config.json
index 706412d0..110f8b67 100644
--- a/modules-available/adduser/config.json
+++ b/modules-available/adduser/config.json
@@ -1,3 +1,3 @@
 {
-	"category":"main.content"
-}
+	"category": "main.content"
+}
\ No newline at end of file
diff --git a/modules-available/backup/config.json b/modules-available/backup/config.json
index 706412d0..110f8b67 100644
--- a/modules-available/backup/config.json
+++ b/modules-available/backup/config.json
@@ -1,3 +1,3 @@
 {
-	"category":"main.content"
-}
+	"category": "main.content"
+}
\ No newline at end of file
diff --git a/modules-available/baseconfig/config.json b/modules-available/baseconfig/config.json
index e4d906e1..357a117e 100644
--- a/modules-available/baseconfig/config.json
+++ b/modules-available/baseconfig/config.json
@@ -1,4 +1,7 @@
 {
 	"category": "main.settings-client",
-	"dependencies" : ["js_selectize", "bootstrap_multiselect"]
-}
+	"dependencies": [
+	    "js_selectize",
+	    "bootstrap_multiselect"
+	]
+}
\ No newline at end of file
diff --git a/modules-available/baseconfig_bwidm/config.json b/modules-available/baseconfig_bwidm/config.json
index af67a188..7e6cf06a 100644
--- a/modules-available/baseconfig_bwidm/config.json
+++ b/modules-available/baseconfig_bwidm/config.json
@@ -1,3 +1,5 @@
 {
-	"dependencies": ["baseconfig"]
-}
+	"dependencies": [
+	    "baseconfig"
+	]
+}
\ No newline at end of file
diff --git a/modules-available/baseconfig_bwlp/config.json b/modules-available/baseconfig_bwlp/config.json
index af67a188..7e6cf06a 100644
--- a/modules-available/baseconfig_bwlp/config.json
+++ b/modules-available/baseconfig_bwlp/config.json
@@ -1,3 +1,5 @@
 {
-	"dependencies": ["baseconfig"]
-}
+	"dependencies": [
+	    "baseconfig"
+	]
+}
\ No newline at end of file
diff --git a/modules-available/baseconfig_partitions_cdn/config.json b/modules-available/baseconfig_partitions_cdn/config.json
index a355eef3..fd4c6f4b 100644
--- a/modules-available/baseconfig_partitions_cdn/config.json
+++ b/modules-available/baseconfig_partitions_cdn/config.json
@@ -1,4 +1,6 @@
 {
-    "category": "main.settings-client",
-    "dependencies": [ "baseconfig" ]
-}
+	"category": "main.settings-client",
+	"dependencies": [
+	    "baseconfig"
+	]
+}
\ No newline at end of file
diff --git a/modules-available/bootstrap_datepicker/config.json b/modules-available/bootstrap_datepicker/config.json
index 5a0c7960..69bb0aa9 100644
--- a/modules-available/bootstrap_datepicker/config.json
+++ b/modules-available/bootstrap_datepicker/config.json
@@ -1,9 +1,10 @@
 {
-	"dependencies" : [],
-	"css": {
-		"style.css": true
-	},
-	"scripts": {
-		"clientscript.js": true
-	}
-}
+	"dependencies": [],
+	"css": [
+	    "style.css"
+	],
+	"scripts": [
+	    "clientscript.js"
+	],
+	"client-plugin": true
+}
\ No newline at end of file
diff --git a/modules-available/bootstrap_dialog/config.json b/modules-available/bootstrap_dialog/config.json
index 5a0c7960..69bb0aa9 100644
--- a/modules-available/bootstrap_dialog/config.json
+++ b/modules-available/bootstrap_dialog/config.json
@@ -1,9 +1,10 @@
 {
-	"dependencies" : [],
-	"css": {
-		"style.css": true
-	},
-	"scripts": {
-		"clientscript.js": true
-	}
-}
+	"dependencies": [],
+	"css": [
+	    "style.css"
+	],
+	"scripts": [
+	    "clientscript.js"
+	],
+	"client-plugin": true
+}
\ No newline at end of file
diff --git a/modules-available/bootstrap_multiselect/config.json b/modules-available/bootstrap_multiselect/config.json
index 5a0c7960..69bb0aa9 100644
--- a/modules-available/bootstrap_multiselect/config.json
+++ b/modules-available/bootstrap_multiselect/config.json
@@ -1,9 +1,10 @@
 {
-	"dependencies" : [],
-	"css": {
-		"style.css": true
-	},
-	"scripts": {
-		"clientscript.js": true
-	}
-}
+	"dependencies": [],
+	"css": [
+	    "style.css"
+	],
+	"scripts": [
+	    "clientscript.js"
+	],
+	"client-plugin": true
+}
\ No newline at end of file
diff --git a/modules-available/bootstrap_switch/config.json b/modules-available/bootstrap_switch/config.json
index de4d37b4..3cf0d162 100644
--- a/modules-available/bootstrap_switch/config.json
+++ b/modules-available/bootstrap_switch/config.json
@@ -1,8 +1,9 @@
 {
-	"css": {
-		"style.css": true
-	},
-	"scripts": {
-		"clientscript.js": true
-	}
+	"css": [
+	    "style.css"
+	],
+	"scripts": [
+	    "clientscript.js"
+	],
+	"client-plugin": true
 }
\ No newline at end of file
diff --git a/modules-available/bootstrap_timepicker/config.json b/modules-available/bootstrap_timepicker/config.json
index 5a0c7960..69bb0aa9 100644
--- a/modules-available/bootstrap_timepicker/config.json
+++ b/modules-available/bootstrap_timepicker/config.json
@@ -1,9 +1,10 @@
 {
-	"dependencies" : [],
-	"css": {
-		"style.css": true
-	},
-	"scripts": {
-		"clientscript.js": true
-	}
-}
+	"dependencies": [],
+	"css": [
+	    "style.css"
+	],
+	"scripts": [
+	    "clientscript.js"
+	],
+	"client-plugin": true
+}
\ No newline at end of file
diff --git a/modules-available/citymanagement/config.json b/modules-available/citymanagement/config.json
index e87cbf7d..b356dfc6 100644
--- a/modules-available/citymanagement/config.json
+++ b/modules-available/citymanagement/config.json
@@ -1,4 +1,4 @@
 {
-	"category":"citymanagement.cities",
-	"permission":"0"
-}
+	"category": "citymanagement.cities",
+	"permission": "0"
+}
\ No newline at end of file
diff --git a/modules-available/dnbd3/config.json b/modules-available/dnbd3/config.json
index f84a4170..9670ded9 100644
--- a/modules-available/dnbd3/config.json
+++ b/modules-available/dnbd3/config.json
@@ -1,4 +1,7 @@
 {
-	"category":"main.settings-server",
-	"dependencies":["locations","runmode"]
-}
+	"category": "main.settings-server",
+	"dependencies": [
+	    "locations",
+	    "runmode"
+	]
+}
\ No newline at end of file
diff --git a/modules-available/dozmod/config.json b/modules-available/dozmod/config.json
index 706412d0..110f8b67 100644
--- a/modules-available/dozmod/config.json
+++ b/modules-available/dozmod/config.json
@@ -1,3 +1,3 @@
 {
-	"category":"main.content"
-}
+	"category": "main.content"
+}
\ No newline at end of file
diff --git a/modules-available/eventlog/config.json b/modules-available/eventlog/config.json
index 6778348d..aa23adb5 100644
--- a/modules-available/eventlog/config.json
+++ b/modules-available/eventlog/config.json
@@ -1,3 +1,3 @@
 {
-	"category":"main.status"
-}
+	"category": "main.status"
+}
\ No newline at end of file
diff --git a/modules-available/exams/config.json b/modules-available/exams/config.json
index 0780ebef..a99d1c1a 100644
--- a/modules-available/exams/config.json
+++ b/modules-available/exams/config.json
@@ -1,5 +1,12 @@
 {
-	"category":"main.content",
-	"dependencies": [ "locations", "js_vis", "js_stupidtable", "bootstrap_datepicker", "bootstrap_timepicker", "bootstrap_multiselect"],
+	"category": "main.content",
+	"dependencies": [
+	    "locations",
+	    "js_vis",
+	    "js_stupidtable",
+	    "bootstrap_datepicker",
+	    "bootstrap_timepicker",
+	    "bootstrap_multiselect"
+	],
 	"permission": "0"
-}
+}
\ No newline at end of file
diff --git a/modules-available/imgmanagement/config.json b/modules-available/imgmanagement/config.json
index 6454d96f..2fbb822f 100644
--- a/modules-available/imgmanagement/config.json
+++ b/modules-available/imgmanagement/config.json
@@ -1,4 +1,4 @@
 {
-	"category":"main.content",
-	"permission":"1"
-}
+	"category": "main.content",
+	"permission": "1"
+}
\ No newline at end of file
diff --git a/modules-available/internetaccess/config.json b/modules-available/internetaccess/config.json
index 706412d0..110f8b67 100644
--- a/modules-available/internetaccess/config.json
+++ b/modules-available/internetaccess/config.json
@@ -1,3 +1,3 @@
 {
-	"category":"main.content"
-}
+	"category": "main.content"
+}
\ No newline at end of file
diff --git a/modules-available/js_chart/config.json b/modules-available/js_chart/config.json
index de4d37b4..3cf0d162 100644
--- a/modules-available/js_chart/config.json
+++ b/modules-available/js_chart/config.json
@@ -1,8 +1,9 @@
 {
-	"css": {
-		"style.css": true
-	},
-	"scripts": {
-		"clientscript.js": true
-	}
+	"css": [
+	    "style.css"
+	],
+	"scripts": [
+	    "clientscript.js"
+	],
+	"client-plugin": true
 }
\ No newline at end of file
diff --git a/modules-available/js_circles/config.json b/modules-available/js_circles/config.json
index de4d37b4..3cf0d162 100644
--- a/modules-available/js_circles/config.json
+++ b/modules-available/js_circles/config.json
@@ -1,8 +1,9 @@
 {
-	"css": {
-		"style.css": true
-	},
-	"scripts": {
-		"clientscript.js": true
-	}
+	"css": [
+	    "style.css"
+	],
+	"scripts": [
+	    "clientscript.js"
+	],
+	"client-plugin": true
 }
\ No newline at end of file
diff --git a/modules-available/js_jqueryui/config.json b/modules-available/js_jqueryui/config.json
index 5a0c7960..69bb0aa9 100644
--- a/modules-available/js_jqueryui/config.json
+++ b/modules-available/js_jqueryui/config.json
@@ -1,9 +1,10 @@
 {
-	"dependencies" : [],
-	"css": {
-		"style.css": true
-	},
-	"scripts": {
-		"clientscript.js": true
-	}
-}
+	"dependencies": [],
+	"css": [
+	    "style.css"
+	],
+	"scripts": [
+	    "clientscript.js"
+	],
+	"client-plugin": true
+}
\ No newline at end of file
diff --git a/modules-available/js_moment/config.json b/modules-available/js_moment/config.json
index 5a0c7960..69bb0aa9 100644
--- a/modules-available/js_moment/config.json
+++ b/modules-available/js_moment/config.json
@@ -1,9 +1,10 @@
 {
-	"dependencies" : [],
-	"css": {
-		"style.css": true
-	},
-	"scripts": {
-		"clientscript.js": true
-	}
-}
+	"dependencies": [],
+	"css": [
+	    "style.css"
+	],
+	"scripts": [
+	    "clientscript.js"
+	],
+	"client-plugin": true
+}
\ No newline at end of file
diff --git a/modules-available/js_selectize/config.json b/modules-available/js_selectize/config.json
index 5a0c7960..69bb0aa9 100644
--- a/modules-available/js_selectize/config.json
+++ b/modules-available/js_selectize/config.json
@@ -1,9 +1,10 @@
 {
-	"dependencies" : [],
-	"css": {
-		"style.css": true
-	},
-	"scripts": {
-		"clientscript.js": true
-	}
-}
+	"dependencies": [],
+	"css": [
+	    "style.css"
+	],
+	"scripts": [
+	    "clientscript.js"
+	],
+	"client-plugin": true
+}
\ No newline at end of file
diff --git a/modules-available/js_stupidtable/config.json b/modules-available/js_stupidtable/config.json
index cf932d7e..3cf0d162 100644
--- a/modules-available/js_stupidtable/config.json
+++ b/modules-available/js_stupidtable/config.json
@@ -1,8 +1,9 @@
 {
-	"css": {
-	"style.css": true
-	},
-	"scripts": {
-	"clientscript.js": true
-	}
+	"css": [
+	    "style.css"
+	],
+	"scripts": [
+	    "clientscript.js"
+	],
+	"client-plugin": true
 }
\ No newline at end of file
diff --git a/modules-available/js_vis/config.json b/modules-available/js_vis/config.json
index 3b027d31..4c870a22 100644
--- a/modules-available/js_vis/config.json
+++ b/modules-available/js_vis/config.json
@@ -1,9 +1,12 @@
 {
-	"dependencies" : ["js_moment"],
-	"css": {
-		"style.css": true
-	},
-	"scripts": {
-		"clientscript.js": true
-	}
-}
+	"dependencies": [
+	    "js_moment"
+	],
+	"css": [
+	    "style.css"
+	],
+	"scripts": [
+	    "clientscript.js"
+	],
+	"client-plugin": true
+}
\ No newline at end of file
diff --git a/modules-available/locationinfo/config.json b/modules-available/locationinfo/config.json
index 87825809..837acfcf 100644
--- a/modules-available/locationinfo/config.json
+++ b/modules-available/locationinfo/config.json
@@ -1,4 +1,9 @@
 {
-	"category":"main.beta",
-	"dependencies": ["js_jqueryui", "bootstrap_timepicker", "locations", "bootstrap_switch"]
-}
+	"category": "main.beta",
+	"dependencies": [
+	    "js_jqueryui",
+	    "bootstrap_timepicker",
+	    "locations",
+	    "bootstrap_switch"
+	]
+}
\ No newline at end of file
diff --git a/modules-available/locations/config.json b/modules-available/locations/config.json
index 706412d0..110f8b67 100644
--- a/modules-available/locations/config.json
+++ b/modules-available/locations/config.json
@@ -1,3 +1,3 @@
 {
-	"category":"main.content"
-}
+	"category": "main.content"
+}
\ No newline at end of file
diff --git a/modules-available/main/config.json b/modules-available/main/config.json
index 2c63c085..0637a088 100644
--- a/modules-available/main/config.json
+++ b/modules-available/main/config.json
@@ -1,2 +1 @@
-{
-}
+[]
\ No newline at end of file
diff --git a/modules-available/minilinux/config.json b/modules-available/minilinux/config.json
index 28d71577..6c7b7146 100644
--- a/modules-available/minilinux/config.json
+++ b/modules-available/minilinux/config.json
@@ -1,3 +1,3 @@
 {
-	"category":"main.settings-client"
-}
+	"category": "main.settings-client"
+}
\ No newline at end of file
diff --git a/modules-available/news/config.json b/modules-available/news/config.json
index e076ea5c..23cd1443 100644
--- a/modules-available/news/config.json
+++ b/modules-available/news/config.json
@@ -1,4 +1,6 @@
 {
-	"category":"main.content",
-	"dependencies": [ "js_stupidtable" ]
-}
+	"category": "main.content",
+	"dependencies": [
+	    "js_stupidtable"
+	]
+}
\ No newline at end of file
diff --git a/modules-available/permissionmanager/config.json b/modules-available/permissionmanager/config.json
index d2071984..25b61de3 100644
--- a/modules-available/permissionmanager/config.json
+++ b/modules-available/permissionmanager/config.json
@@ -1,4 +1,8 @@
 {
-	"category":"main.content",
-	"dependencies": [ "locations", "js_stupidtable", "js_selectize" ]
-}
+	"category": "main.content",
+	"dependencies": [
+	    "locations",
+	    "js_stupidtable",
+	    "js_selectize"
+	]
+}
\ No newline at end of file
diff --git a/modules-available/rebootcontrol/config.json b/modules-available/rebootcontrol/config.json
index d8ab5868..43d2c28f 100644
--- a/modules-available/rebootcontrol/config.json
+++ b/modules-available/rebootcontrol/config.json
@@ -1,4 +1,7 @@
 {
-	"category":"main.beta",
-	"dependencies": [ "locations", "js_stupidtable" ]
-}
+	"category": "main.beta",
+	"dependencies": [
+	    "locations",
+	    "js_stupidtable"
+	]
+}
\ No newline at end of file
diff --git a/modules-available/roomplanner/config.json b/modules-available/roomplanner/config.json
index 537714c3..62f38773 100644
--- a/modules-available/roomplanner/config.json
+++ b/modules-available/roomplanner/config.json
@@ -1,3 +1,10 @@
 {
-	"dependencies": ["js_jqueryui", "js_selectize", "bootstrap_dialog", "statistics", "locations", "runmode"]
-}
+	"dependencies": [
+	    "js_jqueryui",
+	    "js_selectize",
+	    "bootstrap_dialog",
+	    "statistics",
+	    "locations",
+	    "runmode"
+	]
+}
\ No newline at end of file
diff --git a/modules-available/runmode/config.json b/modules-available/runmode/config.json
index e3c07d48..84e044ce 100644
--- a/modules-available/runmode/config.json
+++ b/modules-available/runmode/config.json
@@ -1,4 +1,7 @@
 {
-	"dependencies": [ "statistics", "js_selectize" ],
-	"permission":"0"
-}
+	"dependencies": [
+	    "statistics",
+	    "js_selectize"
+	],
+	"permission": "0"
+}
\ No newline at end of file
diff --git a/modules-available/serversetup-bwlp/config.json b/modules-available/serversetup-bwlp/config.json
index 7205d70a..36268c6a 100644
--- a/modules-available/serversetup-bwlp/config.json
+++ b/modules-available/serversetup-bwlp/config.json
@@ -1,3 +1,3 @@
 {
-	"category":"main.settings-server"
-}
+	"category": "main.settings-server"
+}
\ No newline at end of file
diff --git a/modules-available/session/config.json b/modules-available/session/config.json
index 2c63c085..0637a088 100644
--- a/modules-available/session/config.json
+++ b/modules-available/session/config.json
@@ -1,2 +1 @@
-{
-}
+[]
\ No newline at end of file
diff --git a/modules-available/statistics/config.json b/modules-available/statistics/config.json
index 333f881a..412dc3cb 100644
--- a/modules-available/statistics/config.json
+++ b/modules-available/statistics/config.json
@@ -1,5 +1,9 @@
 {
-	"category":"main.status",
-	"dependencies": [ "js_chart", "js_selectize", "bootstrap_datepicker"],
-	"permission":"0"
-}
+	"category": "main.status",
+	"dependencies": [
+	    "js_chart",
+	    "js_selectize",
+	    "bootstrap_datepicker"
+	],
+	"permission": "0"
+}
\ No newline at end of file
diff --git a/modules-available/statistics_reporting/config.json b/modules-available/statistics_reporting/config.json
index 78ca35ba..c439efa8 100644
--- a/modules-available/statistics_reporting/config.json
+++ b/modules-available/statistics_reporting/config.json
@@ -1,4 +1,9 @@
 {
 	"category": "main.status",
-	"dependencies": [ "statistics", "locations", "js_stupidtable", "js_jqueryui" ]
-}
+	"dependencies": [
+	    "statistics",
+	    "locations",
+	    "js_stupidtable",
+	    "js_jqueryui"
+	]
+}
\ No newline at end of file
diff --git a/modules-available/summernote/config.json b/modules-available/summernote/config.json
index 5a0c7960..69bb0aa9 100644
--- a/modules-available/summernote/config.json
+++ b/modules-available/summernote/config.json
@@ -1,9 +1,10 @@
 {
-	"dependencies" : [],
-	"css": {
-		"style.css": true
-	},
-	"scripts": {
-		"clientscript.js": true
-	}
-}
+	"dependencies": [],
+	"css": [
+	    "style.css"
+	],
+	"scripts": [
+	    "clientscript.js"
+	],
+	"client-plugin": true
+}
\ No newline at end of file
diff --git a/modules-available/support/config.json b/modules-available/support/config.json
index 706412d0..110f8b67 100644
--- a/modules-available/support/config.json
+++ b/modules-available/support/config.json
@@ -1,3 +1,3 @@
 {
-	"category":"main.content"
-}
+	"category": "main.content"
+}
\ No newline at end of file
diff --git a/modules-available/sysconfig/config.json b/modules-available/sysconfig/config.json
index 28d71577..6c7b7146 100644
--- a/modules-available/sysconfig/config.json
+++ b/modules-available/sysconfig/config.json
@@ -1,3 +1,3 @@
 {
-	"category":"main.settings-client"
-}
+	"category": "main.settings-client"
+}
\ No newline at end of file
diff --git a/modules-available/sysconfignew/config.json b/modules-available/sysconfignew/config.json
index 28d71577..6c7b7146 100644
--- a/modules-available/sysconfignew/config.json
+++ b/modules-available/sysconfignew/config.json
@@ -1,3 +1,3 @@
 {
-	"category":"main.settings-client"
-}
+	"category": "main.settings-client"
+}
\ No newline at end of file
diff --git a/modules-available/syslog/config.json b/modules-available/syslog/config.json
index 2b718a8e..691bd4df 100644
--- a/modules-available/syslog/config.json
+++ b/modules-available/syslog/config.json
@@ -1,4 +1,6 @@
 {
-	"category":"main.status",
-	"dependencies":["js_selectize"]
-}
+	"category": "main.status",
+	"dependencies": [
+	    "js_selectize"
+	]
+}
\ No newline at end of file
diff --git a/modules-available/systemstatus/config.json b/modules-available/systemstatus/config.json
index 3c2efce7..cf774d1b 100644
--- a/modules-available/systemstatus/config.json
+++ b/modules-available/systemstatus/config.json
@@ -1,4 +1,6 @@
 {
-	"category":"main.status",
-	"dependencies": [ "js_circles" ]
-}
+	"category": "main.status",
+	"dependencies": [
+	    "js_circles"
+	]
+}
\ No newline at end of file
diff --git a/modules-available/translation/config.json b/modules-available/translation/config.json
index 706412d0..110f8b67 100644
--- a/modules-available/translation/config.json
+++ b/modules-available/translation/config.json
@@ -1,3 +1,3 @@
 {
-	"category":"main.content"
-}
+	"category": "main.content"
+}
\ No newline at end of file
diff --git a/modules-available/usermanagement/config.json b/modules-available/usermanagement/config.json
index 9c66d6bf..428315ba 100644
--- a/modules-available/usermanagement/config.json
+++ b/modules-available/usermanagement/config.json
@@ -1,4 +1,4 @@
 {
-	"category":"main.users",
-	"permission":"0"
-}
+	"category": "main.users",
+	"permission": "0"
+}
\ No newline at end of file
diff --git a/modules-available/vmstore/config.json b/modules-available/vmstore/config.json
index 7205d70a..36268c6a 100644
--- a/modules-available/vmstore/config.json
+++ b/modules-available/vmstore/config.json
@@ -1,3 +1,3 @@
 {
-	"category":"main.settings-server"
-}
+	"category": "main.settings-server"
+}
\ No newline at end of file
diff --git a/modules-available/webinterface/config.json b/modules-available/webinterface/config.json
index 7205d70a..36268c6a 100644
--- a/modules-available/webinterface/config.json
+++ b/modules-available/webinterface/config.json
@@ -1,3 +1,3 @@
 {
-	"category":"main.settings-server"
-}
+	"category": "main.settings-server"
+}
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522