From fc63b67940db2bdd01e698651b66c33f99cb4b0f Mon Sep 17 00:00:00 2001 From: David Hummel <6109326+hummeltech@users.noreply.github.com> Date: Mon, 20 Dec 2021 21:24:23 -0700 Subject: [PATCH] Added function for picz js links --- lib/Monitorix.pm | 19 +++++++++++++++---- lib/ambsens.pm | 2 +- lib/apache.pm | 16 ++++++++-------- lib/apcupsd.pm | 12 ++++++------ lib/bind.pm | 14 +++++++------- lib/chrony.pm | 12 ++++++------ lib/disk.pm | 6 +++--- lib/du.pm | 2 +- lib/fail2ban.pm | 2 +- lib/fs.pm | 8 ++++---- lib/ftp.pm | 6 +++--- lib/gensens.pm | 2 +- lib/hptemp.pm | 6 +++--- lib/icecast.pm | 4 ++-- lib/int.pm | 6 +++--- lib/ipmi.pm | 2 +- lib/kern.pm | 6 +++--- lib/libvirt.pm | 8 ++++---- lib/lighttpd.pm | 6 +++--- lib/lmsens.pm | 10 +++++----- lib/mail.pm | 12 ++++++------ lib/memcached.pm | 14 +++++++------- lib/mongodb.pm | 16 ++++++++-------- lib/mysql.pm | 12 ++++++------ lib/net.pm | 6 +++--- lib/netstat.pm | 10 +++++----- lib/nfsc.pm | 12 ++++++------ lib/nfss.pm | 18 +++++++++--------- lib/nginx.pm | 6 +++--- lib/ntp.pm | 6 +++--- lib/nut.pm | 12 ++++++------ lib/nvidia.pm | 6 +++--- lib/pagespeed.pm | 16 ++++++++-------- lib/pgsql.pm | 22 +++++++++++----------- lib/phpapc.pm | 6 +++--- lib/phpfpm.pm | 12 ++++++------ lib/port.pm | 2 +- lib/proc.pm | 2 +- lib/process.pm | 20 ++++++++++---------- lib/raspberrypi.pm | 6 +++--- lib/redis.pm | 12 ++++++------ lib/serv.pm | 6 +++--- lib/squid.pm | 18 +++++++++--------- lib/system.pm | 12 ++++++------ lib/tc.pm | 8 ++++---- lib/tinyproxy.pm | 6 +++--- lib/traffacct.pm | 4 ++-- lib/unbound.pm | 20 ++++++++++---------- lib/user.pm | 6 +++--- lib/varnish.pm | 12 ++++++------ lib/verlihub.pm | 6 +++--- lib/wowza.pm | 10 +++++----- lib/zfs.pm | 14 +++++++------- 53 files changed, 255 insertions(+), 244 deletions(-) diff --git a/lib/Monitorix.pm b/lib/Monitorix.pm index 6e10817..cfdba1d 100644 --- a/lib/Monitorix.pm +++ b/lib/Monitorix.pm @@ -25,7 +25,7 @@ use warnings; use Exporter 'import'; use POSIX qw(setuid setgid setsid getgid getuid); use Socket; -our @EXPORT = qw(logger trim min max celsius_to uptime2str setup_riglim httpd_setup get_nvidia_data get_ati_data flush_accounting_rules); +our @EXPORT = qw(logger trim min max celsius_to picz_js_link uptime2str setup_riglim httpd_setup get_nvidia_data get_ati_data flush_accounting_rules); sub logger { my ($msg) = @_; @@ -70,6 +70,17 @@ sub celsius_to { return $celsius; } +sub picz_js_link { + my %params = @_; + + my $zoom = ($params{config}->{image_format} eq "SVG") ? (4 / 3) : 1; + + my $picz_width = POSIX::ceil($params{width} * $zoom); + my $picz_height = POSIX::ceil($params{height} * $zoom); + + return " {url} . "/" . $params{config}->{imgs_dir} . $params{IMGz} . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"; +} + sub uptime2str { my $uptime = shift || 0; my $str; @@ -203,7 +214,7 @@ sub get_nvidia_data { next; } } - if($check_mem) { + if($check_mem) { if($data[$l] =~ /Total/) { my (undef, $tmp) = split(':', $data[$l]); if($tmp eq "\n") { @@ -237,7 +248,7 @@ sub get_nvidia_data { $check_cpu = 1; next; } - if($check_cpu) { + if($check_cpu) { if($data[$l] =~ /Gpu/) { my (undef, $tmp) = split(':', $data[$l]); if($tmp eq "\n") { @@ -274,7 +285,7 @@ sub get_nvidia_data { $check_temp = 1; next; } - if($check_temp) { + if($check_temp) { if($data[$l] =~ /Gpu.*?(?:Current Temp)?/i) { my (undef, $tmp) = split(':', $data[$l]); if($tmp eq "\n") { diff --git a/lib/ambsens.pm b/lib/ambsens.pm index 739d7da..2821686 100644 --- a/lib/ambsens.pm +++ b/lib/ambsens.pm @@ -509,7 +509,7 @@ sub ambsens_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$n] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$n], IMG => $IMG[$n])); } } else { push(@output, " \n"); diff --git a/lib/apache.pm b/lib/apache.pm index 0544531..7201959 100644 --- a/lib/apache.pm +++ b/lib/apache.pm @@ -674,7 +674,7 @@ sub apache_update { my $timeintvl = trim($al[0]); my $threshold = trim($al[1]); my $script = trim($al[2]); - + if(!$threshold || $slot >= $threshold) { $config->{apache_hist_alerts}->{$url} = 0; } else { @@ -691,7 +691,7 @@ sub apache_update { $config->{apache_hist_alerts}->{$url} = time; } } - + } if(!$acc && !$kb && !$busy && !$idle) { @@ -951,7 +951,7 @@ sub apache_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6])); } } else { push(@output, " \n"); @@ -1085,7 +1085,7 @@ sub apache_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6])); } } else { push(@output, " \n"); @@ -1173,7 +1173,7 @@ sub apache_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6])); } } else { push(@output, " \n"); @@ -1257,7 +1257,7 @@ sub apache_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6])); } } else { push(@output, " \n"); @@ -1354,7 +1354,7 @@ sub apache_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 4] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6])); } } else { push(@output, " \n"); @@ -1438,7 +1438,7 @@ sub apache_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 5] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6])); } } else { push(@output, " \n"); diff --git a/lib/apcupsd.pm b/lib/apcupsd.pm index 0c8e22a..6424657 100644 --- a/lib/apcupsd.pm +++ b/lib/apcupsd.pm @@ -550,7 +550,7 @@ sub apcupsd_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6])); } } else { push(@output, " \n"); @@ -653,7 +653,7 @@ sub apcupsd_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 1], IMG => $IMG[$e * 6 + 1])); } } else { push(@output, " \n"); @@ -755,7 +755,7 @@ sub apcupsd_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 2], IMG => $IMG[$e * 6 + 2])); } } else { push(@output, " \n"); @@ -842,7 +842,7 @@ sub apcupsd_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 3], IMG => $IMG[$e * 6 + 3])); } } else { push(@output, " \n"); @@ -929,7 +929,7 @@ sub apcupsd_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 4] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 4], IMG => $IMG[$e * 6 + 4])); } } else { push(@output, " \n"); @@ -1011,7 +1011,7 @@ sub apcupsd_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 5] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 5], IMG => $IMG[$e * 6 + 5])); } } else { push(@output, " \n"); diff --git a/lib/bind.pm b/lib/bind.pm index 169f3d6..0fc31df 100644 --- a/lib/bind.pm +++ b/lib/bind.pm @@ -943,7 +943,7 @@ sub bind_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 7] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 7], IMG => $IMG[$e * 7])); } } else { push(@output, " \n"); @@ -1069,7 +1069,7 @@ sub bind_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 7 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 7 + 1], IMG => $IMG[$e * 7 + 1])); } } else { push(@output, " \n"); @@ -1193,7 +1193,7 @@ sub bind_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 7 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 7 + 2], IMG => $IMG[$e * 7 + 2])); } } else { push(@output, " \n"); @@ -1319,7 +1319,7 @@ sub bind_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 7 + 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 7 + 3], IMG => $IMG[$e * 7 + 3])); } } else { push(@output, " \n"); @@ -1443,7 +1443,7 @@ sub bind_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 7 + 4] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 7 + 4], IMG => $IMG[$e * 7 + 4])); } } else { push(@output, " \n"); @@ -1547,7 +1547,7 @@ sub bind_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 7 + 5] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 7 + 5], IMG => $IMG[$e * 7 + 5])); } } else { push(@output, " \n"); @@ -1630,7 +1630,7 @@ sub bind_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 7 + 6] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 7 + 6], IMG => $IMG[$e * 7 + 6])); } } else { push(@output, " \n"); diff --git a/lib/chrony.pm b/lib/chrony.pm index 4178f86..cdd814d 100644 --- a/lib/chrony.pm +++ b/lib/chrony.pm @@ -482,7 +482,7 @@ sub chrony_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 5] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 5], IMG => $IMG[$e * 5])); } } else { push(@output, " \n"); @@ -575,7 +575,7 @@ sub chrony_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 1], IMG => $IMG[$e * 6 + 1])); } } else { push(@output, " \n"); @@ -662,7 +662,7 @@ sub chrony_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 2], IMG => $IMG[$e * 6 + 2])); } } else { push(@output, " \n"); @@ -747,7 +747,7 @@ sub chrony_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 3], IMG => $IMG[$e * 6 + 3])); } } else { push(@output, " \n"); @@ -829,7 +829,7 @@ sub chrony_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 4] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 4], IMG => $IMG[$e * 6 + 4])); } } else { push(@output, " \n"); @@ -911,7 +911,7 @@ sub chrony_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 5] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 5], IMG => $IMG[$e * 6 + 5])); } } else { push(@output, " \n"); diff --git a/lib/disk.pm b/lib/disk.pm index 6fa093c..f18c51e 100644 --- a/lib/disk.pm +++ b/lib/disk.pm @@ -608,7 +608,7 @@ sub disk_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 3], IMG => $IMG[$e * 3])); } } else { push(@output, " \n"); @@ -759,7 +759,7 @@ sub disk_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 3 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 3 + 1], IMG => $IMG[$e * 3 + 1])); } } else { push(@output, " \n"); @@ -906,7 +906,7 @@ sub disk_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 3 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 3 + 2], IMG => $IMG[$e * 3 + 2])); } } else { push(@output, " \n"); diff --git a/lib/du.pm b/lib/du.pm index be684e9..fb3501d 100644 --- a/lib/du.pm +++ b/lib/du.pm @@ -483,7 +483,7 @@ sub du_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$n] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$n], IMG => $IMG[$n])); } } else { push(@output, " \n"); diff --git a/lib/fail2ban.pm b/lib/fail2ban.pm index 364cdcd..f26a089 100644 --- a/lib/fail2ban.pm +++ b/lib/fail2ban.pm @@ -485,7 +485,7 @@ sub fail2ban_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$n] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$n], IMG => $IMG[$n])); } } else { push(@output, " \n"); diff --git a/lib/fs.pm b/lib/fs.pm index f97efb6..d6a3d6a 100644 --- a/lib/fs.pm +++ b/lib/fs.pm @@ -1072,7 +1072,7 @@ sub fs_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 4] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 4], IMG => $IMG[$e * 4])); } } else { push(@output, " \n"); @@ -1190,7 +1190,7 @@ sub fs_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 4 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 4 + 1], IMG => $IMG[$e * 4 + 1])); } } else { push(@output, " \n"); @@ -1305,7 +1305,7 @@ sub fs_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 4 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 4 + 2], IMG => $IMG[$e * 4 + 2])); } } else { push(@output, " \n"); @@ -1474,7 +1474,7 @@ sub fs_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 4 + 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 4 + 3], IMG => $IMG[$e * 4 + 3])); } } else { push(@output, " \n"); diff --git a/lib/ftp.pm b/lib/ftp.pm index 6406ac6..144a552 100644 --- a/lib/ftp.pm +++ b/lib/ftp.pm @@ -539,7 +539,7 @@ sub ftp_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -642,7 +642,7 @@ sub ftp_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -740,7 +740,7 @@ sub ftp_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); diff --git a/lib/gensens.pm b/lib/gensens.pm index b6e69f7..6c3d0d0 100644 --- a/lib/gensens.pm +++ b/lib/gensens.pm @@ -574,7 +574,7 @@ sub gensens_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e], IMG => $IMG[$e])); } } else { push(@output, " \n"); diff --git a/lib/hptemp.pm b/lib/hptemp.pm index 03e3343..94651e2 100644 --- a/lib/hptemp.pm +++ b/lib/hptemp.pm @@ -542,7 +542,7 @@ sub hptemp_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -671,7 +671,7 @@ sub hptemp_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -796,7 +796,7 @@ sub hptemp_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); diff --git a/lib/icecast.pm b/lib/icecast.pm index 58b2927..08a0d19 100644 --- a/lib/icecast.pm +++ b/lib/icecast.pm @@ -513,7 +513,7 @@ sub icecast_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 2], IMG => $IMG[$e * 2])); } } else { push(@output, " \n"); @@ -616,7 +616,7 @@ sub icecast_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 2 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 2 + 1], IMG => $IMG[$e * 2 + 1])); } } else { push(@output, " \n"); diff --git a/lib/int.pm b/lib/int.pm index b9ea858..1833d2a 100644 --- a/lib/int.pm +++ b/lib/int.pm @@ -1110,7 +1110,7 @@ sub int_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -1189,7 +1189,7 @@ sub int_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -1264,7 +1264,7 @@ sub int_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); diff --git a/lib/ipmi.pm b/lib/ipmi.pm index afd3752..8c53eae 100644 --- a/lib/ipmi.pm +++ b/lib/ipmi.pm @@ -467,7 +467,7 @@ sub ipmi_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$n] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$n], IMG => $IMG[$n])); } } else { push(@output, " \n"); diff --git a/lib/kern.pm b/lib/kern.pm index e98bca6..dc67c8a 100644 --- a/lib/kern.pm +++ b/lib/kern.pm @@ -767,7 +767,7 @@ sub kern_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -871,7 +871,7 @@ sub kern_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -972,7 +972,7 @@ sub kern_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); diff --git a/lib/libvirt.pm b/lib/libvirt.pm index 20b103a..1d8d140 100644 --- a/lib/libvirt.pm +++ b/lib/libvirt.pm @@ -580,7 +580,7 @@ sub libvirt_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 4] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 4], IMG => $IMG[$e * 4])); } } else { push(@output, " \n"); @@ -709,7 +709,7 @@ sub libvirt_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 4 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 4 + 1], IMG => $IMG[$e * 4 + 1])); } } else { push(@output, " \n"); @@ -835,7 +835,7 @@ sub libvirt_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 4 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 4 + 2], IMG => $IMG[$e * 4 + 2])); } } else { push(@output, " \n"); @@ -967,7 +967,7 @@ sub libvirt_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 4 + 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 4 + 3], IMG => $IMG[$e * 4 + 3])); } } else { push(@output, " \n"); diff --git a/lib/lighttpd.pm b/lib/lighttpd.pm index 044f19c..75febe8 100644 --- a/lib/lighttpd.pm +++ b/lib/lighttpd.pm @@ -445,7 +445,7 @@ sub lighttpd_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 3], IMG => $IMG[$e * 3])); } } else { push(@output, " \n"); @@ -538,7 +538,7 @@ sub lighttpd_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 3 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 3 + 1], IMG => $IMG[$e * 3 + 1])); } } else { push(@output, " \n"); @@ -622,7 +622,7 @@ sub lighttpd_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 3 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 3 + 2], IMG => $IMG[$e * 3 + 2])); } } else { push(@output, " \n"); diff --git a/lib/lmsens.pm b/lib/lmsens.pm index 68ffb95..18cfc28 100644 --- a/lib/lmsens.pm +++ b/lib/lmsens.pm @@ -824,7 +824,7 @@ sub lmsens_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -1011,7 +1011,7 @@ sub lmsens_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -1145,7 +1145,7 @@ sub lmsens_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); @@ -1289,7 +1289,7 @@ sub lmsens_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG4z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG4z, IMG => $IMG4)); } } else { push(@output, " \n"); @@ -1446,7 +1446,7 @@ sub lmsens_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG5z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG5z, IMG => $IMG5)); } } else { push(@output, " \n"); diff --git a/lib/mail.pm b/lib/mail.pm index 2a6caca..4247848 100644 --- a/lib/mail.pm +++ b/lib/mail.pm @@ -1161,7 +1161,7 @@ sub mail_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -1279,7 +1279,7 @@ sub mail_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -1366,7 +1366,7 @@ sub mail_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); @@ -1450,7 +1450,7 @@ sub mail_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG4z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG4z, IMG => $IMG4)); } } else { push(@output, " \n"); @@ -1546,7 +1546,7 @@ sub mail_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG5z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG5z, IMG => $IMG5)); } } else { push(@output, " \n"); @@ -1659,7 +1659,7 @@ sub mail_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG6z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG6z, IMG => $IMG6)); } } else { push(@output, " \n"); diff --git a/lib/memcached.pm b/lib/memcached.pm index 19f0fcf..d2e473e 100644 --- a/lib/memcached.pm +++ b/lib/memcached.pm @@ -712,7 +712,7 @@ sub memcached_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 7] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 7], IMG => $IMG[$e * 7])); } } else { push(@output, " \n"); @@ -847,7 +847,7 @@ sub memcached_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 7 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 7 + 1], IMG => $IMG[$e * 7 + 1])); } } else { push(@output, " \n"); @@ -940,7 +940,7 @@ sub memcached_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 7 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 7 + 2], IMG => $IMG[$e * 7 + 2])); } } else { push(@output, " \n"); @@ -1022,7 +1022,7 @@ sub memcached_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 7 + 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 7 + 3], IMG => $IMG[$e * 7 + 3])); } } else { push(@output, " \n"); @@ -1114,7 +1114,7 @@ sub memcached_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 7 + 4] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 7 + 4], IMG => $IMG[$e * 7 + 4])); } } else { push(@output, " \n"); @@ -1206,7 +1206,7 @@ sub memcached_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 7 + 5] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 7 + 5], IMG => $IMG[$e * 7 + 5])); } } else { push(@output, " \n"); @@ -1299,7 +1299,7 @@ sub memcached_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 7 + 6] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 7 + 6], IMG => $IMG[$e * 7 + 6])); } } else { push(@output, " \n"); diff --git a/lib/mongodb.pm b/lib/mongodb.pm index 5799ec4..137b90d 100644 --- a/lib/mongodb.pm +++ b/lib/mongodb.pm @@ -892,7 +892,7 @@ sub mongodb_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6])); } } else { push(@output, " \n"); @@ -997,7 +997,7 @@ sub mongodb_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 1], IMG => $IMG[$e * 6 + 1])); } } else { push(@output, " \n"); @@ -1088,7 +1088,7 @@ sub mongodb_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 2], IMG => $IMG[$e * 6 + 2])); } } else { push(@output, " \n"); @@ -1175,7 +1175,7 @@ sub mongodb_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 3], IMG => $IMG[$e * 6 + 3])); } } else { push(@output, " \n"); @@ -1262,7 +1262,7 @@ sub mongodb_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 4] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 4], IMG => $IMG[$e * 6 + 4])); } } else { push(@output, " \n"); @@ -1370,7 +1370,7 @@ sub mongodb_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 5] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 5], IMG => $IMG[$e * 6 + 5])); } } else { push(@output, " \n"); @@ -1488,7 +1488,7 @@ sub mongodb_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + $e2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + $e2], IMG => $IMG[$e * 6 + $e2])); } } else { push(@output, " \n"); @@ -1585,7 +1585,7 @@ sub mongodb_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + $e2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + $e2], IMG => $IMG[$e * 6 + $e2])); } } else { push(@output, " \n"); diff --git a/lib/mysql.pm b/lib/mysql.pm index 868d79d..835e45a 100644 --- a/lib/mysql.pm +++ b/lib/mysql.pm @@ -798,7 +798,7 @@ sub mysql_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6])); } } else { push(@output, " \n"); @@ -928,7 +928,7 @@ sub mysql_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 1], IMG => $IMG[$e * 6 + 1])); } } else { push(@output, " \n"); @@ -1024,7 +1024,7 @@ sub mysql_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 2], IMG => $IMG[$e * 6 + 2])); } } else { push(@output, " \n"); @@ -1116,7 +1116,7 @@ sub mysql_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 3], IMG => $IMG[$e * 6 + 3])); } } else { push(@output, " \n"); @@ -1215,7 +1215,7 @@ sub mysql_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 4] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 4], IMG => $IMG[$e * 6 + 4])); } } else { push(@output, " \n"); @@ -1323,7 +1323,7 @@ sub mysql_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 5] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 5], IMG => $IMG[$e * 6 + 5])); } } else { push(@output, " \n"); diff --git a/lib/net.pm b/lib/net.pm index b4dba7f..c81bf4a 100644 --- a/lib/net.pm +++ b/lib/net.pm @@ -528,7 +528,7 @@ sub net_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -631,7 +631,7 @@ sub net_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -730,7 +730,7 @@ sub net_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); diff --git a/lib/netstat.pm b/lib/netstat.pm index caade59..9210c74 100644 --- a/lib/netstat.pm +++ b/lib/netstat.pm @@ -592,7 +592,7 @@ sub netstat_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -719,7 +719,7 @@ sub netstat_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -822,7 +822,7 @@ sub netstat_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); @@ -931,7 +931,7 @@ sub netstat_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG4z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG4z, IMG => $IMG4)); } } else { push(@output, " \n"); @@ -1018,7 +1018,7 @@ sub netstat_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG5z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG5z, IMG => $IMG5)); } } else { push(@output, " \n"); diff --git a/lib/nfsc.pm b/lib/nfsc.pm index f5ce82a..c31157c 100644 --- a/lib/nfsc.pm +++ b/lib/nfsc.pm @@ -492,7 +492,7 @@ sub nfsc_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -587,7 +587,7 @@ sub nfsc_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -694,7 +694,7 @@ sub nfsc_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); @@ -797,7 +797,7 @@ sub nfsc_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG4z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG4z, IMG => $IMG4)); } } else { push(@output, " \n"); @@ -900,7 +900,7 @@ sub nfsc_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG5z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG5z, IMG => $IMG5)); } } else { push(@output, " \n"); @@ -997,7 +997,7 @@ sub nfsc_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG6z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG6z, IMG => $IMG6)); } } else { push(@output, " \n"); diff --git a/lib/nfss.pm b/lib/nfss.pm index 69dc0d7..9366b23 100644 --- a/lib/nfss.pm +++ b/lib/nfss.pm @@ -654,7 +654,7 @@ sub nfss_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -749,7 +749,7 @@ sub nfss_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -844,7 +844,7 @@ sub nfss_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); @@ -940,7 +940,7 @@ sub nfss_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG4z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG4z, IMG => $IMG4)); } } else { push(@output, " \n"); @@ -1039,7 +1039,7 @@ sub nfss_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG5z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG5z, IMG => $IMG5)); } } else { push(@output, " \n"); @@ -1140,7 +1140,7 @@ sub nfss_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG6z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG6z, IMG => $IMG6)); } } else { push(@output, " \n"); @@ -1271,7 +1271,7 @@ sub nfss_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG7z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG7z, IMG => $IMG7)); } } else { push(@output, " \n"); @@ -1368,7 +1368,7 @@ sub nfss_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG8z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG8z, IMG => $IMG8)); } } else { push(@output, " \n"); @@ -1469,7 +1469,7 @@ sub nfss_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG9z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG9z, IMG => $IMG9)); } } else { push(@output, " \n"); diff --git a/lib/nginx.pm b/lib/nginx.pm index 09ea4bb..c4918b8 100644 --- a/lib/nginx.pm +++ b/lib/nginx.pm @@ -482,7 +482,7 @@ sub nginx_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -569,7 +569,7 @@ sub nginx_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -728,7 +728,7 @@ sub nginx_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); diff --git a/lib/ntp.pm b/lib/ntp.pm index 9bd039e..77dd3b0 100644 --- a/lib/ntp.pm +++ b/lib/ntp.pm @@ -463,7 +463,7 @@ sub ntp_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 3], IMG => $IMG[$e * 3])); } } else { push(@output, " \n"); @@ -546,7 +546,7 @@ sub ntp_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 3 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 3 + 1], IMG => $IMG[$e * 3 + 1])); } } else { push(@output, " \n"); @@ -652,7 +652,7 @@ sub ntp_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 3 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 3 + 2], IMG => $IMG[$e * 3 + 2])); } } else { push(@output, " \n"); diff --git a/lib/nut.pm b/lib/nut.pm index a224578..136c012 100644 --- a/lib/nut.pm +++ b/lib/nut.pm @@ -538,7 +538,7 @@ sub nut_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6])); } } else { push(@output, " \n"); @@ -641,7 +641,7 @@ sub nut_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 1], IMG => $IMG[$e * 6 + 1])); } } else { push(@output, " \n"); @@ -743,7 +743,7 @@ sub nut_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 2], IMG => $IMG[$e * 6 + 2])); } } else { push(@output, " \n"); @@ -830,7 +830,7 @@ sub nut_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 3], IMG => $IMG[$e * 6 + 3])); } } else { push(@output, " \n"); @@ -921,7 +921,7 @@ sub nut_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 4] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 4], IMG => $IMG[$e * 6 + 4])); } } else { push(@output, " \n"); @@ -1003,7 +1003,7 @@ sub nut_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 5] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 5], IMG => $IMG[$e * 6 + 5])); } } else { push(@output, " \n"); diff --git a/lib/nvidia.pm b/lib/nvidia.pm index 6dedfef..8076b59 100644 --- a/lib/nvidia.pm +++ b/lib/nvidia.pm @@ -543,7 +543,7 @@ sub nvidia_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -653,7 +653,7 @@ sub nvidia_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -759,7 +759,7 @@ sub nvidia_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); diff --git a/lib/pagespeed.pm b/lib/pagespeed.pm index 2d27fe7..0f33964 100644 --- a/lib/pagespeed.pm +++ b/lib/pagespeed.pm @@ -934,7 +934,7 @@ sub pagespeed_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 8] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 8], IMG => $IMG[$e * 8])); } } else { push(@output, " \n"); @@ -1063,7 +1063,7 @@ sub pagespeed_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 8 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 8 + 1], IMG => $IMG[$e * 8 + 1])); } } else { push(@output, " \n"); @@ -1175,7 +1175,7 @@ sub pagespeed_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 8 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 8 + 2], IMG => $IMG[$e * 8 + 2])); } } else { push(@output, " \n"); @@ -1278,7 +1278,7 @@ sub pagespeed_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 8 + 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 8 + 3], IMG => $IMG[$e * 8 + 3])); } } else { push(@output, " \n"); @@ -1377,7 +1377,7 @@ sub pagespeed_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 8 + 4] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 8 + 4], IMG => $IMG[$e * 8 + 4])); } } else { push(@output, " \n"); @@ -1471,7 +1471,7 @@ sub pagespeed_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 8 + 5] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 8 + 5], IMG => $IMG[$e * 8 + 5])); } } else { push(@output, " \n"); @@ -1570,7 +1570,7 @@ sub pagespeed_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 8 + 6] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 8 + 6], IMG => $IMG[$e * 8 + 6])); } } else { push(@output, " \n"); @@ -1644,7 +1644,7 @@ sub pagespeed_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 8 + 7] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 8 + 7], IMG => $IMG[$e * 8 + 7])); } } else { push(@output, " \n"); diff --git a/lib/pgsql.pm b/lib/pgsql.pm index 6e39a31..16020ff 100644 --- a/lib/pgsql.pm +++ b/lib/pgsql.pm @@ -939,7 +939,7 @@ sub pgsql_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6])); } } else { push(@output, " \n"); @@ -1069,7 +1069,7 @@ sub pgsql_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 1], IMG => $IMG[$e * 6 + 1])); } } else { push(@output, " \n"); @@ -1155,7 +1155,7 @@ sub pgsql_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 2], IMG => $IMG[$e * 6 + 2])); } } else { push(@output, " \n"); @@ -1257,7 +1257,7 @@ sub pgsql_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 3], IMG => $IMG[$e * 6 + 3])); } } else { push(@output, " \n"); @@ -1348,7 +1348,7 @@ sub pgsql_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 4] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 4], IMG => $IMG[$e * 6 + 4])); } } else { push(@output, " \n"); @@ -1439,7 +1439,7 @@ sub pgsql_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 5] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 5], IMG => $IMG[$e * 6 + 5])); } } else { push(@output, " \n"); @@ -1572,7 +1572,7 @@ sub pgsql_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + $e2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + $e2], IMG => $IMG[$e * 6 + $e2])); } } else { push(@output, " \n"); @@ -1684,7 +1684,7 @@ sub pgsql_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + $e2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + $e2], IMG => $IMG[$e * 6 + $e2])); } } else { push(@output, " \n"); @@ -1773,7 +1773,7 @@ sub pgsql_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + $e2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + $e2], IMG => $IMG[$e * 6 + $e2])); } } else { push(@output, " \n"); @@ -1869,7 +1869,7 @@ sub pgsql_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + $e2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + $e2], IMG => $IMG[$e * 6 + $e2])); } } else { push(@output, " \n"); @@ -1965,7 +1965,7 @@ sub pgsql_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + $e2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + $e2], IMG => $IMG[$e * 6 + $e2])); } } else { push(@output, " \n"); diff --git a/lib/phpapc.pm b/lib/phpapc.pm index 547914e..a283a3b 100644 --- a/lib/phpapc.pm +++ b/lib/phpapc.pm @@ -466,7 +466,7 @@ sub phpapc_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 3], IMG => $IMG[$e * 3])); } } else { push(@output, " \n"); @@ -561,7 +561,7 @@ sub phpapc_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 3 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 3 + 1], IMG => $IMG[$e * 3 + 1])); } } else { push(@output, " \n"); @@ -649,7 +649,7 @@ sub phpapc_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 3 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 3 + 2], IMG => $IMG[$e * 3 + 2])); } } else { push(@output, " \n"); diff --git a/lib/phpfpm.pm b/lib/phpfpm.pm index fb3c9d3..464f025 100644 --- a/lib/phpfpm.pm +++ b/lib/phpfpm.pm @@ -526,7 +526,7 @@ sub phpfpm_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6])); } } else { push(@output, " \n"); @@ -621,7 +621,7 @@ sub phpfpm_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 1], IMG => $IMG[$e * 6 + 1])); } } else { push(@output, " \n"); @@ -718,7 +718,7 @@ sub phpfpm_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 2], IMG => $IMG[$e * 6 + 2])); } } else { push(@output, " \n"); @@ -842,7 +842,7 @@ sub phpfpm_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 3], IMG => $IMG[$e * 6 + 3])); } } else { push(@output, " \n"); @@ -934,7 +934,7 @@ sub phpfpm_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 4] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 4], IMG => $IMG[$e * 6 + 4])); } } else { push(@output, " \n"); @@ -1026,7 +1026,7 @@ sub phpfpm_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 5] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 5], IMG => $IMG[$e * 6 + 5])); } } else { push(@output, " \n"); diff --git a/lib/port.pm b/lib/port.pm index 841155e..e769fb5 100644 --- a/lib/port.pm +++ b/lib/port.pm @@ -712,7 +712,7 @@ sub port_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$n3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$n3], IMG => $IMG[$n3])); } } else { push(@output, " \n"); diff --git a/lib/proc.pm b/lib/proc.pm index 46a3c6b..f08cb4e 100644 --- a/lib/proc.pm +++ b/lib/proc.pm @@ -684,7 +684,7 @@ sub proc_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$n] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$n], IMG => $IMG[$n])); } } else { push(@output, " \n"); diff --git a/lib/process.pm b/lib/process.pm index 3b29d42..ba547a7 100644 --- a/lib/process.pm +++ b/lib/process.pm @@ -614,7 +614,7 @@ sub process_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 10] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 10], IMG => $IMG[$e * 10])); } } else { push(@output, " \n"); @@ -747,7 +747,7 @@ sub process_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 10 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 10 + 1], IMG => $IMG[$e * 10 + 1])); } } else { push(@output, " \n"); @@ -877,7 +877,7 @@ sub process_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 10 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 10 + 2], IMG => $IMG[$e * 10 + 2])); } } else { push(@output, " \n"); @@ -1013,7 +1013,7 @@ sub process_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 10 + 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 10 + 3], IMG => $IMG[$e * 10 + 3])); } } else { push(@output, " \n"); @@ -1123,7 +1123,7 @@ sub process_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 10 + 4] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 10 + 4], IMG => $IMG[$e * 10 + 4])); } } else { push(@output, " \n"); @@ -1236,7 +1236,7 @@ sub process_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 10 + 5] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 10 + 5], IMG => $IMG[$e * 10 + 5])); } } else { push(@output, " \n"); @@ -1413,7 +1413,7 @@ sub process_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 10 + 6] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 10 + 6], IMG => $IMG[$e * 10 + 6])); } } else { push(@output, " \n"); @@ -1526,7 +1526,7 @@ sub process_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 10 + 7] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 10 + 7], IMG => $IMG[$e * 10 + 7])); } } else { push(@output, " \n"); @@ -1672,7 +1672,7 @@ sub process_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 10 + 8] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 10 + 8], IMG => $IMG[$e * 10 + 8])); } } else { push(@output, " \n"); @@ -1785,7 +1785,7 @@ sub process_cgi { # $picz_width = $width + 115; # $picz_height = $height + 100; # } -# push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 10 + 9] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); +# push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 10 + 9], IMG => $IMG[$e * 10 + 9])); # } # } else { # push(@output, " \n"); diff --git a/lib/raspberrypi.pm b/lib/raspberrypi.pm index f173499..394b3da 100644 --- a/lib/raspberrypi.pm +++ b/lib/raspberrypi.pm @@ -475,7 +475,7 @@ sub raspberrypi_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -566,7 +566,7 @@ sub raspberrypi_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -662,7 +662,7 @@ sub raspberrypi_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); diff --git a/lib/redis.pm b/lib/redis.pm index aa833f9..dd9647d 100644 --- a/lib/redis.pm +++ b/lib/redis.pm @@ -600,7 +600,7 @@ sub redis_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6], IMG => $IMG[$e * 6])); } } else { push(@output, " \n"); @@ -708,7 +708,7 @@ sub redis_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 1], IMG => $IMG[$e * 6 + 1])); } } else { push(@output, " \n"); @@ -805,7 +805,7 @@ sub redis_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 2], IMG => $IMG[$e * 6 + 2])); } } else { push(@output, " \n"); @@ -892,7 +892,7 @@ sub redis_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 3], IMG => $IMG[$e * 6 + 3])); } } else { push(@output, " \n"); @@ -984,7 +984,7 @@ sub redis_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 4] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 4], IMG => $IMG[$e * 6 + 4])); } } else { push(@output, " \n"); @@ -1092,7 +1092,7 @@ sub redis_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 6 + 5] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 6 + 5], IMG => $IMG[$e * 6 + 5])); } } else { push(@output, " \n"); diff --git a/lib/serv.pm b/lib/serv.pm index 605c8ba..8211045 100644 --- a/lib/serv.pm +++ b/lib/serv.pm @@ -977,7 +977,7 @@ sub serv_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -1090,7 +1090,7 @@ sub serv_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -1216,7 +1216,7 @@ sub serv_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); diff --git a/lib/squid.pm b/lib/squid.pm index 33b3b0b..fac575c 100644 --- a/lib/squid.pm +++ b/lib/squid.pm @@ -818,7 +818,7 @@ sub squid_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -914,7 +914,7 @@ sub squid_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -1053,7 +1053,7 @@ sub squid_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); @@ -1152,7 +1152,7 @@ sub squid_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG4z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG4z, IMG => $IMG4)); } } else { push(@output, " \n"); @@ -1247,7 +1247,7 @@ sub squid_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG5z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG5z, IMG => $IMG5)); } } else { push(@output, " \n"); @@ -1344,7 +1344,7 @@ sub squid_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG6z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG6z, IMG => $IMG6)); } } else { push(@output, " \n"); @@ -1448,7 +1448,7 @@ sub squid_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG7z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG7z, IMG => $IMG7)); } } else { push(@output, " \n"); @@ -1555,7 +1555,7 @@ sub squid_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG8z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG8z, IMG => $IMG8)); } } else { push(@output, " \n"); @@ -1662,7 +1662,7 @@ sub squid_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG9z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG9z, IMG => $IMG9)); } } else { push(@output, " \n"); diff --git a/lib/system.pm b/lib/system.pm index 0efb22a..b633d87 100644 --- a/lib/system.pm +++ b/lib/system.pm @@ -359,7 +359,7 @@ sub system_update { last; } } - } + } close(IN); $mtotl = `sysctl -n hw.physmem`; chomp($mtotl); @@ -668,7 +668,7 @@ sub system_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -786,7 +786,7 @@ sub system_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -914,7 +914,7 @@ sub system_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); @@ -993,7 +993,7 @@ sub system_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG4z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG4z, IMG => $IMG4)); } } else { push(@output, " \n"); @@ -1090,7 +1090,7 @@ sub system_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG5z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG5z, IMG => $IMG5)); } } else { push(@output, " \n"); diff --git a/lib/tc.pm b/lib/tc.pm index 61d08bf..90a7a07 100644 --- a/lib/tc.pm +++ b/lib/tc.pm @@ -592,7 +592,7 @@ sub tc_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 4] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 4], IMG => $IMG[$e * 4])); } } else { push(@output, " \n"); @@ -704,7 +704,7 @@ sub tc_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 4 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 4 + 1], IMG => $IMG[$e * 4 + 1])); } } else { push(@output, " \n"); @@ -812,7 +812,7 @@ sub tc_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 4 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 4 + 2], IMG => $IMG[$e * 4 + 2])); } } else { push(@output, " \n"); @@ -924,7 +924,7 @@ sub tc_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 4 + 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 4 + 3], IMG => $IMG[$e * 4 + 3])); } } else { push(@output, " \n"); diff --git a/lib/tinyproxy.pm b/lib/tinyproxy.pm index 1f5cb61..d200061 100644 --- a/lib/tinyproxy.pm +++ b/lib/tinyproxy.pm @@ -471,7 +471,7 @@ sub tinyproxy_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 3], IMG => $IMG[$e * 3])); } } else { push(@output, " \n"); @@ -557,7 +557,7 @@ sub tinyproxy_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 3 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 3 + 1], IMG => $IMG[$e * 3 + 1])); } } else { push(@output, " \n"); @@ -649,7 +649,7 @@ sub tinyproxy_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 3 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 3 + 2], IMG => $IMG[$e * 3 + 2])); } } else { push(@output, " \n"); diff --git a/lib/traffacct.pm b/lib/traffacct.pm index 86a51b7..91b82f2 100644 --- a/lib/traffacct.pm +++ b/lib/traffacct.pm @@ -667,7 +667,7 @@ sub traffacct_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - print(" {url} . "/" . $config->{imgs_dir} . $IMGz[$n] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + print(picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$n], IMG => $IMG[$n])); } } else { print(" \n"); @@ -784,7 +784,7 @@ sub traffacct_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - print(" {url} . "/" . $config->{imgs_dir} . $IMGz[$cgi->{val}] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + print(picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$cgi->{val}], IMG => $IMG[$cgi->{val}])); } } else { print(" \n"); diff --git a/lib/unbound.pm b/lib/unbound.pm index b1f178c..0b3511f 100644 --- a/lib/unbound.pm +++ b/lib/unbound.pm @@ -1151,7 +1151,7 @@ sub unbound_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -1277,7 +1277,7 @@ sub unbound_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -1367,7 +1367,7 @@ sub unbound_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); @@ -1451,7 +1451,7 @@ sub unbound_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG4z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG4z, IMG => $IMG4)); } } else { push(@output, " \n"); @@ -1565,7 +1565,7 @@ sub unbound_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG5z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG5z, IMG => $IMG5)); } } else { push(@output, " \n"); @@ -1671,7 +1671,7 @@ sub unbound_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG6z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG6z, IMG => $IMG6)); } } else { push(@output, " \n"); @@ -1824,7 +1824,7 @@ sub unbound_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG7z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG7z, IMG => $IMG7)); } } else { push(@output, " \n"); @@ -1976,7 +1976,7 @@ sub unbound_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG8z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG8z, IMG => $IMG8)); } } else { push(@output, " \n"); @@ -2129,7 +2129,7 @@ sub unbound_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG9z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG9z, IMG => $IMG9)); } } else { push(@output, " \n"); @@ -2281,7 +2281,7 @@ sub unbound_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG10z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG10z, IMG => $IMG10)); } } else { push(@output, " \n"); diff --git a/lib/user.pm b/lib/user.pm index 9fce913..cd7af76 100644 --- a/lib/user.pm +++ b/lib/user.pm @@ -351,7 +351,7 @@ sub user_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -438,7 +438,7 @@ sub user_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -521,7 +521,7 @@ sub user_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); diff --git a/lib/varnish.pm b/lib/varnish.pm index 6920301..badd806 100644 --- a/lib/varnish.pm +++ b/lib/varnish.pm @@ -640,7 +640,7 @@ sub varnish_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -775,7 +775,7 @@ sub varnish_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -871,7 +871,7 @@ sub varnish_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); @@ -962,7 +962,7 @@ sub varnish_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG4z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG4z, IMG => $IMG4)); } } else { push(@output, " \n"); @@ -1058,7 +1058,7 @@ sub varnish_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG5z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG5z, IMG => $IMG5)); } } else { push(@output, " \n"); @@ -1150,7 +1150,7 @@ sub varnish_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG6z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG6z, IMG => $IMG6)); } } else { push(@output, " \n"); diff --git a/lib/verlihub.pm b/lib/verlihub.pm index a26b7a0..9ecd724 100644 --- a/lib/verlihub.pm +++ b/lib/verlihub.pm @@ -353,7 +353,7 @@ sub verlihub_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -444,7 +444,7 @@ sub verlihub_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -529,7 +529,7 @@ sub verlihub_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); diff --git a/lib/wowza.pm b/lib/wowza.pm index d3d12b9..186e194 100644 --- a/lib/wowza.pm +++ b/lib/wowza.pm @@ -685,7 +685,7 @@ sub wowza_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 5] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 5], IMG => $IMG[$e * 5])); } } else { push(@output, " \n"); @@ -804,7 +804,7 @@ sub wowza_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 5 + 1] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 5 + 1], IMG => $IMG[$e * 5 + 1])); } } else { push(@output, " \n"); @@ -903,7 +903,7 @@ sub wowza_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 5 + 2] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 5 + 2], IMG => $IMG[$e * 5 + 2])); } } else { push(@output, " \n"); @@ -997,7 +997,7 @@ sub wowza_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 5 + 3] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 5 + 3], IMG => $IMG[$e * 5 + 3])); } } else { push(@output, " \n"); @@ -1091,7 +1091,7 @@ sub wowza_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e * 5 + 4] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e * 5 + 4], IMG => $IMG[$e * 5 + 4])); } } else { push(@output, " \n"); diff --git a/lib/zfs.pm b/lib/zfs.pm index 4727c6b..5a7491f 100644 --- a/lib/zfs.pm +++ b/lib/zfs.pm @@ -671,7 +671,7 @@ sub zfs_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG1z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG1z, IMG => $IMG1)); } } else { push(@output, " \n"); @@ -766,7 +766,7 @@ sub zfs_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG2z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG2z, IMG => $IMG2)); } } else { push(@output, " \n"); @@ -852,7 +852,7 @@ sub zfs_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMG3z . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMG3z, IMG => $IMG3)); } } else { push(@output, " \n"); @@ -953,7 +953,7 @@ sub zfs_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e], IMG => $IMG[$e])); } } else { push(@output, " \n"); @@ -1040,7 +1040,7 @@ sub zfs_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e], IMG => $IMG[$e])); } } else { push(@output, " \n"); @@ -1133,7 +1133,7 @@ sub zfs_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e], IMG => $IMG[$e])); } } else { push(@output, " \n"); @@ -1226,7 +1226,7 @@ sub zfs_cgi { $picz_width = $width + 115; $picz_height = $height + 100; } - push(@output, " {url} . "/" . $config->{imgs_dir} . $IMGz[$e] . "','','width=" . $picz_width . ",height=" . $picz_height . ",scrollbars=0,resizable=0'))\">\n"); + push(@output, picz_js_link(width => $picz_width, height => $picz_height, config => $config, IMGz => $IMGz[$e], IMG => $IMG[$e])); } } else { push(@output, " \n");