aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorPim van den Berg2015-06-22 10:20:29 +0200
committerPim van den Berg2015-06-22 10:20:46 +0200
commit94ecdc72a5f244b3ffdeb9cfe256ad6e544b7228 (patch)
tree2e02c39bc51a70a48adca54f9dbafeb45f3631d5
parentresponsive: introduce a hamburger navicon to toggle the menu on smaller devices (diff)
parentAdding support for local plugin json to override the global stuff (diff)
downloadapt-panopticon_cgp-94ecdc72a5f244b3ffdeb9cfe256ad6e544b7228.zip
apt-panopticon_cgp-94ecdc72a5f244b3ffdeb9cfe256ad6e544b7228.tar.gz
apt-panopticon_cgp-94ecdc72a5f244b3ffdeb9cfe256ad6e544b7228.tar.bz2
apt-panopticon_cgp-94ecdc72a5f244b3ffdeb9cfe256ad6e544b7228.tar.xz
Merge branch 'local_plugins'
Closes #114
-rw-r--r--conf/.gitignore1
-rw-r--r--graph.php22
2 files changed, 18 insertions, 5 deletions
diff --git a/conf/.gitignore b/conf/.gitignore
index 529bf01..880b7c3 100644
--- a/conf/.gitignore
+++ b/conf/.gitignore
@@ -1 +1,2 @@
1config.local.php 1config.local.php
2plugin
diff --git a/graph.php b/graph.php
index 67224b2..83d6caa 100644
--- a/graph.php
+++ b/graph.php
@@ -35,12 +35,24 @@ if ($plugin == 'aggregation') {
35} 35}
36 36
37# plugin json 37# plugin json
38if (function_exists('json_decode') && file_exists('plugin/'.$plugin.'.json')) { 38if(function_exists('json_decode'))
39 $json = file_get_contents('plugin/'.$plugin.'.json'); 39{
40 $plugin_json = json_decode($json, true); 40 if (file_exists('plugin/'.$plugin.'.json')) {
41 $json = file_get_contents('plugin/'.$plugin.'.json');
42 $plugin_json = json_decode($json, true);
43
44 if (is_null($plugin_json))
45 error_log('CGP Error: invalid json in plugin/'.$plugin.'.json');
46 }
47 if (file_exists('conf/plugin/'.$plugin.'.json')) {
48 $json = file_get_contents('conf/plugin/'.$plugin.'.json');
49 $user_plugin_json = json_decode($json, true);
50
51 if (is_null($user_plugin_json))
52 error_log('CGP Error: invalid json in conf/plugin/'.$plugin.'.json');
41 53
42 if (is_null($plugin_json)) 54 $plugin_json = array_replace_recursive($plugin_json, $user_plugin_json);
43 error_log('CGP Error: invalid json in plugin/'.$plugin.'.json'); 55 }
44} 56}
45 57
46if (!isset($plugin_json[$type]['type'])) 58if (!isset($plugin_json[$type]['type']))