diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php index 4691db5fd..13cada349 100644 --- a/html/includes/functions.inc.php +++ b/html/includes/functions.inc.php @@ -191,7 +191,7 @@ function overlib_link($url, $text, $contents, $class) if ($config['web_mouseover'] === FALSE) { $output .= ">"; } else { - $output .= " onmouseover=\"return wrap_overlib('".str_replace('data-original', 'src', $contents)."'".$config['overlib_defaults'].",WRAP,HAUTO,VAUTO); \" onmouseout=\"return nd();\">"; + $output .= " onmouseover=\"return overlib('".$contents."'".$config['overlib_defaults'].",WRAP,HAUTO,VAUTO); \" onmouseout=\"return nd();\">"; } $output .= $text.""; @@ -336,6 +336,17 @@ function print_graph_tag($args) function generate_graph_tag($args) { + $urlargs = array(); + foreach ($args as $key => $arg) + { + $urlargs[] = $key."=".urlencode($arg); + } + + return ''; + +} + +function generate_lazy_graph_tag($args) { $urlargs = array(); $w = 0; $h = 0; @@ -347,12 +358,12 @@ function generate_graph_tag($args) break; case 'height': $h = $arg; + break; } $urlargs[] = $key."=".urlencode($arg); } return ''; - } function generate_graph_js_state($args) { diff --git a/html/includes/print-graphrow.inc.php b/html/includes/print-graphrow.inc.php index c502c61cd..ea2ec43fd 100644 --- a/html/includes/print-graphrow.inc.php +++ b/html/includes/print-graphrow.inc.php @@ -29,9 +29,9 @@ foreach ($periods as $period) $link = generate_url($link_array); if ($return_data === TRUE) { - $graph_data[] = overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), 'lazy'); + $graph_data[] = overlib_link($link, generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); } else { - echo(overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), 'lazy')); + echo(overlib_link($link, generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL)); } } diff --git a/html/includes/table/mempool.inc.php b/html/includes/table/mempool.inc.php index d3968a531..a219b3c96 100644 --- a/html/includes/table/mempool.inc.php +++ b/html/includes/table/mempool.inc.php @@ -43,7 +43,7 @@ foreach (dbFetchRows($sql,$param) as $mempool) { $graph_array_zoom['height'] = "150"; $graph_array_zoom['width'] = "400"; $link = "graphs/id=" . $graph_array['id'] . "/type=" . $graph_array['type'] . "/from=" . $graph_array['from'] . "/to=" . $graph_array['to'] . "/"; - $mini_graph = overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); + $mini_graph = overlib_link($link, generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); $background = get_percentage_colours($perc); $bar_link = overlib_link($link, print_percentage_bar (400, 20, $perc, "$used / $total", "ffffff", $background['left'], $free, "ffffff", $background['right']), generate_graph_tag($graph_array_zoom), NULL); diff --git a/html/includes/table/processor.inc.php b/html/includes/table/processor.inc.php index a7b3d9745..4007a138a 100644 --- a/html/includes/table/processor.inc.php +++ b/html/includes/table/processor.inc.php @@ -40,7 +40,7 @@ foreach (dbFetchRows($sql,$param) as $processor) { $graph_array_zoom['height'] = "150"; $graph_array_zoom['width'] = "400"; $link = "graphs/id=" . $graph_array['id'] . "/type=" . $graph_array['type'] . "/from=" . $graph_array['from'] . "/to=" . $graph_array['to'] . "/"; - $mini_graph = overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); + $mini_graph = overlib_link($link, generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); $background = get_percentage_colours($perc); $bar_link = overlib_link($link, print_percentage_bar (400, 20, $perc, $perc."%", "ffffff", $background['left'], (100 - $perc)."%" , "ffffff", $background['right']), generate_graph_tag($graph_array_zoom), NULL); diff --git a/html/includes/table/storage.inc.php b/html/includes/table/storage.inc.php index a912ba1d2..db7a36a9d 100644 --- a/html/includes/table/storage.inc.php +++ b/html/includes/table/storage.inc.php @@ -59,7 +59,7 @@ foreach (dbFetchRows($sql,$param) as $drive) { $graph_array_zoom['height'] = "150"; $graph_array_zoom['width'] = "400"; $link = "graphs/id=" . $graph_array['id'] . "/type=" . $graph_array['type'] . "/from=" . $graph_array['from'] . "/to=" . $graph_array['to'] . "/"; - $mini_graph = overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); + $mini_graph = overlib_link($link, generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); $background = get_percentage_colours($perc); $bar_link = overlib_link($link, print_percentage_bar (400, 20, $perc, "$used / $total", "ffffff", $background['left'], $free, "ffffff", $background['right']), generate_graph_tag($graph_array_zoom), NULL); diff --git a/html/js/lazyload.js b/html/js/lazyload.js index 6f62204bf..723d4e7e6 100644 --- a/html/js/lazyload.js +++ b/html/js/lazyload.js @@ -29,15 +29,6 @@ $(document).ready(function(){ }); }); -//We have to wrap the original overlib library to remove the WxH attributes -function wrap_overlib() { - var ret = overlib.apply(null,arguments); - //Since RRD takes the width and height params for only the canvas, we must unset them - //from the final (larger) image to prevent the browser from resizing them. - $('div#overDiv img').removeAttr('width').removeAttr('height').removeClass('lazy'); - return ret; -} - function lazyload_done() { //Since RRD takes the width and height params for only the canvas, we must unset them //from the final (larger) image to prevent the browser from resizing them. diff --git a/html/pages/apps/default.inc.php b/html/pages/apps/default.inc.php index e33367405..e22ca0884 100644 --- a/html/pages/apps/default.inc.php +++ b/html/pages/apps/default.inc.php @@ -33,7 +33,7 @@ foreach ($app_devices as $app_device) $link = generate_url(array('page' => 'device', 'device' => $app_device['device_id'],'tab'=>'apps','app'=>$vars['app'])); - echo(overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL)); + echo(overlib_link($link, generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL)); } echo(''); diff --git a/html/pages/device/hrdevice.inc.php b/html/pages/device/hrdevice.inc.php index 68928187b..aa28f5e38 100644 --- a/html/pages/device/hrdevice.inc.php +++ b/html/pages/device/hrdevice.inc.php @@ -25,7 +25,7 @@ foreach (dbFetchRows("SELECT * FROM `hrDevice` WHERE `device_id` = ? ORDER BY `h $graph_array['from'] = $config['time']['day']; $graph_array_zoom = $graph_array; $graph_array_zoom['height'] = "150"; $graph_array_zoom['width'] = "400"; - $mini_graph = overlib_link($proc_url, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); + $mini_graph = overlib_link($proc_url, generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); echo(''.$mini_graph.''); } @@ -46,7 +46,7 @@ foreach (dbFetchRows("SELECT * FROM `hrDevice` WHERE `device_id` = ? ORDER BY `h $graph_array_zoom = $graph_array; $graph_array_zoom['height'] = "150"; $graph_array_zoom['width'] = "400"; // FIXME click on graph should also link to port, but can't use generate_port_link here... - $mini_graph = overlib_link(generate_port_url($interface), generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); + $mini_graph = overlib_link(generate_port_url($interface), generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); echo("$mini_graph"); } else { diff --git a/html/pages/device/overview/c6kxbar.inc.php b/html/pages/device/overview/c6kxbar.inc.php index 14f5d54e4..e695de074 100644 --- a/html/pages/device/overview/c6kxbar.inc.php +++ b/html/pages/device/overview/c6kxbar.inc.php @@ -76,7 +76,7 @@ foreach ($entity_state['group']['c6kxbar'] as $index => $entry) $graph_array['width'] = 80; $graph_array['height'] = 20; $graph_array['bg'] = 'ffffff00'; # the 00 at the end makes the area transparent. - $minigraph = generate_graph_tag($graph_array); + $minigraph = generate_lazy_graph_tag($graph_array); echo(" diff --git a/html/pages/device/overview/generic/sensor.inc.php b/html/pages/device/overview/generic/sensor.inc.php index 6194c37c0..9743a2a03 100644 --- a/html/pages/device/overview/generic/sensor.inc.php +++ b/html/pages/device/overview/generic/sensor.inc.php @@ -54,7 +54,7 @@ if (count($sensors)) $graph_array['width'] = 80; $graph_array['height'] = 20; $graph_array['bg'] = 'ffffff00'; # the 00 at the end makes the area transparent. $graph_array['from'] = $config['time']['day']; - $sensor_minigraph = generate_graph_tag($graph_array); + $sensor_minigraph = generate_lazy_graph_tag($graph_array); $sensor['sensor_descr'] = truncate($sensor['sensor_descr'], 48, ''); diff --git a/html/pages/device/overview/mempools.inc.php b/html/pages/device/overview/mempools.inc.php index 3d35a8d55..01ed5c02d 100644 --- a/html/pages/device/overview/mempools.inc.php +++ b/html/pages/device/overview/mempools.inc.php @@ -55,7 +55,7 @@ if (count($mempools)) $graph_array['width'] = 80; $graph_array['height'] = 20; $graph_array['bg'] = 'ffffff00'; # the 00 at the end makes the area transparent. - $minigraph = generate_graph_tag($graph_array); + $minigraph = generate_lazy_graph_tag($graph_array); echo(" ".overlib_link($link, $text_descr, $overlib_content)." diff --git a/html/pages/device/overview/ports.inc.php b/html/pages/device/overview/ports.inc.php index 807f8ee4f..4c2cb8301 100644 --- a/html/pages/device/overview/ports.inc.php +++ b/html/pages/device/overview/ports.inc.php @@ -18,7 +18,7 @@ if ($ports['total']) $graph_array['type'] = "device_bits"; $graph_array['from'] = $config['time']['day']; $graph_array['legend'] = "no"; - $graph = generate_graph_tag($graph_array); + $graph = generate_lazy_graph_tag($graph_array); $link_array = $graph_array; $link_array['page'] = "graphs"; diff --git a/html/pages/device/overview/processors.inc.php b/html/pages/device/overview/processors.inc.php index 3394e263c..bcb9248b6 100644 --- a/html/pages/device/overview/processors.inc.php +++ b/html/pages/device/overview/processors.inc.php @@ -45,7 +45,7 @@ if (count($processors)) $graph_array['width'] = 80; $graph_array['height'] = 20; $graph_array['bg'] = 'ffffff00'; # the 00 at the end makes the area transparent. - $minigraph = generate_graph_tag($graph_array); + $minigraph = generate_lazy_graph_tag($graph_array); echo(" ".overlib_link($link, $text_descr, $overlib_content)." diff --git a/html/pages/device/overview/storage.inc.php b/html/pages/device/overview/storage.inc.php index 01c02edb4..d7216d669 100644 --- a/html/pages/device/overview/storage.inc.php +++ b/html/pages/device/overview/storage.inc.php @@ -68,7 +68,7 @@ if (count($drives)) $graph_array['width'] = 80; $graph_array['height'] = 20; $graph_array['bg'] = 'ffffff00'; # the 00 at the end makes the area transparent. - $minigraph = generate_graph_tag($graph_array); + $minigraph = generate_lazy_graph_tag($graph_array); echo(" ".overlib_link($link, $drive['storage_descr'], $overlib_content)." diff --git a/html/pages/device/overview/toner.inc.php b/html/pages/device/overview/toner.inc.php index 347a63619..7e634a460 100644 --- a/html/pages/device/overview/toner.inc.php +++ b/html/pages/device/overview/toner.inc.php @@ -42,7 +42,7 @@ if (count($toners)) $graph_array['width'] = 80; $graph_array['height'] = 20; $graph_array['bg'] = 'ffffff00'; # the 00 at the end makes the area transparent. - $minigraph = generate_graph_tag($graph_array); + $minigraph = generate_lazy_graph_tag($graph_array); echo(" ".overlib_link($link, $toner['toner_descr'], $overlib_content)." diff --git a/html/pages/device/port/junose-atm-vp.inc.php b/html/pages/device/port/junose-atm-vp.inc.php index 0c57c75d6..627375064 100644 --- a/html/pages/device/port/junose-atm-vp.inc.php +++ b/html/pages/device/port/junose-atm-vp.inc.php @@ -28,7 +28,7 @@ foreach (dbFetchRows("SELECT * FROM juniAtmVp WHERE port_id = ?", array($interfa { $graph_array['from'] = $$period; $graph_array_zoom = $graph_array; $graph_array_zoom['height'] = "150"; $graph_array_zoom['width'] = "400"; - echo(overlib_link("#", generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL)); + echo(overlib_link("#", generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL)); } echo(''); diff --git a/html/pages/devices.inc.php b/html/pages/devices.inc.php index 17e5f814a..bfab38767 100644 --- a/html/pages/devices.inc.php +++ b/html/pages/devices.inc.php @@ -168,7 +168,7 @@ $query .= " ORDER BY hostname";
".$device['hostname']." - ".$interface['ifDescr']."
\ \ ', CENTER, LEFT, FGCOLOR, '#e5e5e5', BGCOLOR, '#e5e5e5', WIDTH, 400, HEIGHT, 150);\" onmouseout=\"return nd();\" >". - " + " "); } diff --git a/html/pages/graphs.inc.php b/html/pages/graphs.inc.php index 0cc268fce..6e29089c0 100644 --- a/html/pages/graphs.inc.php +++ b/html/pages/graphs.inc.php @@ -98,7 +98,7 @@ if (!$auth) echo(''); echo(''.$text.'
'); echo(''); - echo(generate_graph_tag($graph_array)); + echo(generate_lazy_graph_tag($graph_array)); echo(''); echo(''); @@ -201,7 +201,7 @@ if (!$auth) echo generate_graph_js_state($graph_array); echo('
'); - echo(generate_graph_tag($graph_array)); + echo(generate_lazy_graph_tag($graph_array)); echo("
"); if (isset($config['graph_descr'][$vars['type']])) diff --git a/html/pages/health/sensors.inc.php b/html/pages/health/sensors.inc.php index 02224d485..019f9aee2 100644 --- a/html/pages/health/sensors.inc.php +++ b/html/pages/health/sensors.inc.php @@ -71,7 +71,7 @@ foreach (dbFetchRows($sql, $param) as $sensor) $graph_array['width'] = 80; $graph_array['height'] = 20; $graph_array['bg'] = 'ffffff00'; # the 00 at the end makes the area transparent. $graph_array['from'] = $config['time']['day']; - $sensor_minigraph = generate_graph_tag($graph_array); + $sensor_minigraph = generate_lazy_graph_tag($graph_array); $sensor['sensor_descr'] = truncate($sensor['sensor_descr'], 48, ''); diff --git a/html/pages/health/toner.inc.php b/html/pages/health/toner.inc.php index 4008fbee2..60b621b67 100644 --- a/html/pages/health/toner.inc.php +++ b/html/pages/health/toner.inc.php @@ -30,7 +30,7 @@ foreach (dbFetchRows("SELECT * FROM `toner` AS S, `devices` AS D WHERE S.device_ $graph_array_zoom['height'] = "150"; $graph_array_zoom['width'] = "400"; $link = "graphs/id=" . $graph_array['id'] . "/type=" . $graph_array['type'] . "/from=" . $graph_array['from'] . "/to=" . $graph_array['to'] . "/"; - $mini_graph = overlib_link($link, generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); + $mini_graph = overlib_link($link, generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL); $background = get_percentage_colours(100 - $perc); diff --git a/html/pages/ports/graph.inc.php b/html/pages/ports/graph.inc.php index 90455b2d1..a5403e356 100644 --- a/html/pages/ports/graph.inc.php +++ b/html/pages/ports/graph.inc.php @@ -40,7 +40,7 @@ foreach ($ports as $port) $overlib_content = generate_overlib_content($graph_array, $port['hostname'] . " - " . $port['label']); $graph_array['title'] = "yes"; $graph_array['width'] = $width; $graph_array['height'] = 119; - $graph = generate_graph_tag($graph_array); + $graph = generate_lazy_graph_tag($graph_array); echo("
"); echo(overlib_link($link, $graph, $overlib_content)); diff --git a/html/pages/services.inc.php b/html/pages/services.inc.php index 8070d5d61..391631e2e 100644 --- a/html/pages/services.inc.php +++ b/html/pages/services.inc.php @@ -88,7 +88,7 @@ if ($_SESSION['userlevel'] >= '5') { $graph_array['from'] = $$period; $graph_array_zoom = $graph_array; $graph_array_zoom['height'] = "150"; $graph_array_zoom['width'] = "400"; - echo(overlib_link("", generate_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL)); + echo(overlib_link("", generate_lazy_graph_tag($graph_array), generate_graph_tag($graph_array_zoom), NULL)); } echo(""); }