admin/cacti
1
0 Fork 0
mirror of https://github.com/Cacti/cacti.git synced 2026-11-09 14:02:54 +09:00
Code Issues Packages Projects Releases Wiki Activity

Correct spelling of watermark variable

Browse Source
This commit is contained in:
cigamit committed 2017-01-22 03:42:43 -06:00
1 parent dacd82a734
commit 75bcfe747b
3 files changed
+8 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/global_settings.php
+2 -2
View File
@@ -664,12 +664,12 @@ $settings = array(
'default' => 60,
'array' => $page_refresh_interval,
),
'wathermark_header' => array(
'watermark_header' => array(
'friendly_name' => __('RRDtool Graph Watermark'),
'collapsible' => 'true',
'method' => 'spacer'
),
'graph_wathermark' => array(
'graph_watermark' => array(
'friendly_name' => __('Watermark Text'),
'description' => __('Test to place at the bottom center of every Graph.'),
'method' => 'textbox',
install/0_8_8h_to_1_0_0.php
+4
View File
@@ -1725,5 +1725,9 @@ function upgrade_to_1_0_0() {
db_install_execute("UPDATE graph_templates_graph SET unit_value='' WHERE unit_value='on'");
db_install_add_key('data_local', 'INDEX', 'snmp_index', array('snmp_index(191)'));
if (db_fetch_cell('SELECT name FROM settings WHERE name = "graph_wathermark"', 'name') == 'graph_wathermark') {
db_install_execute('UPDATE settings SET name = "graph_watermark" WHERE name = "graph_wathermark"');
}
}
lib/rrd.php
+2 -2
View File
@@ -1100,8 +1100,8 @@ function rrd_function_process_graph_options($graph_start, $graph_end, &$graph, &
}
/* if the user desires a wartermark set it */
if (read_config_option('graph_wathermark') != '') {
$graph_opts .= '--watermark ' . cacti_escapeshellarg(read_config_option('graph_wathermark')) . RRD_NL;
if (read_config_option('graph_watermark') != '') {
$graph_opts .= '--watermark ' . cacti_escapeshellarg(read_config_option('graph_watermark')) . RRD_NL;
}
return $graph_opts;