From afdedd1b184692b1aacde4d81c2b1b1fb0726c15 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 13 Feb 2018 16:26:31 +0100
Subject: index.php: Hacky way of telling the php error handler to skip stack
frames
This can be used to show more meaningful error messages in debug mode at
the bottom of the page. Prefix the error message with [skip:N] where
N is the number of stack frames to skip when printing the error message.
The php error log will still receive the complete stack trace.
---
index.php | 9 +++++++++
1 file changed, 9 insertions(+)
(limited to 'index.php')
diff --git a/index.php b/index.php
index d7018e17..4816ef42 100644
--- a/index.php
+++ b/index.php
@@ -104,6 +104,15 @@ spl_autoload_register(function ($class) {
if (defined('CONFIG_DEBUG') && CONFIG_DEBUG) {
set_error_handler(function ($errno, $errstr, $errfile, $errline) {
+ if (preg_match('/^\[skip:\s*(\d+)\]\s*(.*)/is', $errstr, $out)) {
+ $errstr = $out[2];
+ $trace = debug_backtrace();
+ $idx = (int)$out[1] + 1;
+ if (count($trace) > $idx) {
+ $errfile = $trace[$idx]['file'];
+ $errline = $trace[$idx]['line'];
+ }
+ }
global $SLX_ERRORS;
$SLX_ERRORS[] = array(
'errno' => $errno,
--
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 'index.php')
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 '';
}
@@ -113,7 +113,7 @@ class Render
';
foreach ($modules as $module) {
- $files = $module->getScripts($module !== $pageModule);
+ $files = $module->getScripts();
foreach ($files as $file) {
echo '';
}
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