diff options
| author | Pim van den Berg | 2015-06-22 10:20:29 +0200 |
|---|---|---|
| committer | Pim van den Berg | 2015-06-22 10:20:46 +0200 |
| commit | 94ecdc72a5f244b3ffdeb9cfe256ad6e544b7228 (patch) | |
| tree | 2e02c39bc51a70a48adca54f9dbafeb45f3631d5 /graph.php | |
| parent | responsive: introduce a hamburger navicon to toggle the menu on smaller devices (diff) | |
| parent | Adding support for local plugin json to override the global stuff (diff) | |
| download | apt-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
Diffstat (limited to 'graph.php')
| -rw-r--r-- | graph.php | 22 |
1 files changed, 17 insertions, 5 deletions
| @@ -35,12 +35,24 @@ if ($plugin == 'aggregation') { | |||
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | # plugin json | 37 | # plugin json |
| 38 | if (function_exists('json_decode') && file_exists('plugin/'.$plugin.'.json')) { | 38 | if(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 | ||
| 46 | if (!isset($plugin_json[$type]['type'])) | 58 | if (!isset($plugin_json[$type]['type'])) |