diff options
| author | Pim van den Berg | 2014-02-10 22:21:47 +0100 | 
|---|---|---|
| committer | Pim van den Berg | 2014-02-10 22:21:47 +0100 | 
| commit | 4ef46afbf05c52ad3a225e2238529c5f717fe049 (patch) | |
| tree | 2eaabc89de20ad07bd8b739e7c9962859a3f13ca /inc | |
| parent | Plugin/nut: Add support for power graphs (diff) | |
| download | apt-panopticon_cgp-4ef46afbf05c52ad3a225e2238529c5f717fe049.zip apt-panopticon_cgp-4ef46afbf05c52ad3a225e2238529c5f717fe049.tar.gz apt-panopticon_cgp-4ef46afbf05c52ad3a225e2238529c5f717fe049.tar.bz2 apt-panopticon_cgp-4ef46afbf05c52ad3a225e2238529c5f717fe049.tar.xz | |
use & instead of & in html
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/collectd.inc.php | 4 | ||||
| -rw-r--r-- | inc/html.inc.php | 6 | 
2 files changed, 5 insertions, 5 deletions
| diff --git a/inc/collectd.inc.php b/inc/collectd.inc.php index c41a6f5..7269e68 100644 --- a/inc/collectd.inc.php +++ b/inc/collectd.inc.php | |||
| @@ -206,11 +206,11 @@ function build_url($base, $items, $s=NULL) { | |||
| 206 | if ($value == 'NULL') | 206 | if ($value == 'NULL') | 
| 207 | continue; | 207 | continue; | 
| 208 | 208 | ||
| 209 | $base .= sprintf('%s%s=%s', $i==0 ? '?' : '&', $key, $value); | 209 | $base .= sprintf('%s%s=%s', $i==0 ? '?' : '&', $key, $value); | 
| 210 | $i++; | 210 | $i++; | 
| 211 | } | 211 | } | 
| 212 | if (!isset($items['s'])) | 212 | if (!isset($items['s'])) | 
| 213 | $base .= '&s='.$s; | 213 | $base .= '&s='.$s; | 
| 214 | 214 | ||
| 215 | return $base; | 215 | return $base; | 
| 216 | } | 216 | } | 
| diff --git a/inc/html.inc.php b/inc/html.inc.php index b07be8a..e6c6f6d 100644 --- a/inc/html.inc.php +++ b/inc/html.inc.php | |||
| @@ -109,7 +109,7 @@ EOT; | |||
| 109 | function plugin_header($host, $plugin) { | 109 | function plugin_header($host, $plugin) { | 
| 110 | global $CONFIG; | 110 | global $CONFIG; | 
| 111 | 111 | ||
| 112 | return printf("<h2><a href='%shost.php?h=%s&p=%s'>%s</a></h2>\n", $CONFIG['weburl'], $host, $plugin, $plugin); | 112 | return printf("<h2><a href='%shost.php?h=%s&p=%s'>%s</a></h2>\n", $CONFIG['weburl'], $host, $plugin, $plugin); | 
| 113 | } | 113 | } | 
| 114 | 114 | ||
| 115 | function plugins_list($host, $selected_plugins = array()) { | 115 | function plugins_list($host, $selected_plugins = array()) { | 
| @@ -130,7 +130,7 @@ function plugins_list($host, $selected_plugins = array()) { | |||
| 130 | # first the ones defined as ordered | 130 | # first the ones defined as ordered | 
| 131 | foreach($CONFIG['overview'] as $plugin) { | 131 | foreach($CONFIG['overview'] as $plugin) { | 
| 132 | if (in_array($plugin, $plugins)) { | 132 | if (in_array($plugin, $plugins)) { | 
| 133 | printf("<li><a %s href='%shost.php?h=%s&p=%s'>%4\$s</a></li>\n", | 133 | printf("<li><a %s href='%shost.php?h=%s&p=%s'>%4\$s</a></li>\n", | 
| 134 | selected_plugin($plugin, $selected_plugins), | 134 | selected_plugin($plugin, $selected_plugins), | 
| 135 | $CONFIG['weburl'], | 135 | $CONFIG['weburl'], | 
| 136 | $host, | 136 | $host, | 
| @@ -142,7 +142,7 @@ function plugins_list($host, $selected_plugins = array()) { | |||
| 142 | # other plugins | 142 | # other plugins | 
| 143 | foreach($plugins as $plugin) { | 143 | foreach($plugins as $plugin) { | 
| 144 | if (!in_array($plugin, $CONFIG['overview'])) { | 144 | if (!in_array($plugin, $CONFIG['overview'])) { | 
| 145 | printf("<li><a %s href='%shost.php?h=%s&p=%s'>%4\$s</a></li>\n", | 145 | printf("<li><a %s href='%shost.php?h=%s&p=%s'>%4\$s</a></li>\n", | 
| 146 | selected_plugin($plugin, $selected_plugins), | 146 | selected_plugin($plugin, $selected_plugins), | 
| 147 | $CONFIG['weburl'], | 147 | $CONFIG['weburl'], | 
| 148 | $host, | 148 | $host, | 
