From d72f9fdac0c0aaa20e146ef089577548d9f03d83 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 16 Dec 2020 17:38:40 +0100
Subject: [PATCH 01/22] SAML login in mobile console

---
 pandora_console/mobile/include/user.class.php | 59 ++++++++++++++++++-
 pandora_console/mobile/operation/home.php     |  7 +++
 2 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/pandora_console/mobile/include/user.class.php b/pandora_console/mobile/include/user.class.php
index 61267f2023..eb1af4c10d 100644
--- a/pandora_console/mobile/include/user.class.php
+++ b/pandora_console/mobile/include/user.class.php
@@ -86,6 +86,36 @@ class User
     {
         $system = System::getInstance();
 
+        if ((bool) $system->getRequest('saml', false) === true) {
+            if ($system->getConfig('auth', 'mysql') !== 'saml') {
+                // Ignore.
+                return false;
+            } else {
+                \enterprise_include_once('include/auth/saml.php');
+                $saml_user_id = enterprise_hook('saml_process_user_login');
+                if (!$saml_user_id) {
+                    $this->logged = false;
+                } else {
+                    $this->logged = true;
+                    $this->user = $saml_user_id;
+                    $this->loginTime = time();
+                    $this->errorLogin = false;
+                }
+
+                $this->saveLogin();
+                return $this->logged;
+            }
+        } else if ($system->getConfig('auth', 'mysql') === 'saml') {
+            // Maybe back from SAML login.
+            $saml_session = $system->getSession('samlid', null);
+            if ($saml_session !== null) {
+                $this->user = $system->getSession('id_usuario', null);
+                $this->loginTime = time();
+                $this->errorLogin = false;
+                $this->logged = true;
+            }
+        }
+
         if (($user == null) && ($password == null)) {
             $user = $system->getRequest('user', null);
             $password = $system->getRequest('password', null);
@@ -205,6 +235,12 @@ class User
 
     public function logout()
     {
+        $system = System::getInstance();
+        if ($system->getConfig('auth', 'mysql') === 'saml') {
+            \enterprise_include_once('include/auth/saml.php');
+            \enterprise_hook('saml_logout');
+        }
+
         $this->user = null;
         $this->logged = false;
         $this->loginTime = false;
@@ -213,7 +249,6 @@ class User
         $this->needDoubleAuth = false;
         $this->errorDoubleAuth = false;
 
-        $system = System::getInstance();
         $system->setSession('user', null);
         $system->sessionDestroy();
     }
@@ -286,7 +321,29 @@ class User
             'name'     => 'login_btn',
         ];
         $ui->formAddSubmitButton($options);
+
         $ui->endForm();
+
+        if ($system->getConfig('auth', 'mysql') === 'saml') {
+            // Add SAML login button.
+            $ui->beginForm('');
+            $ui->formAddHtml(
+                html_print_input_hidden('action', 'login', true)
+            );
+            $ui->formAddHtml(
+                html_print_input_hidden('saml', '1', true)
+            );
+            $ui->formAddSubmitButton(
+                [
+                    'value'    => __('Login with SAML'),
+                    'icon'     => 'arrow-r',
+                    'icon_pos' => 'right',
+                    'name'     => 'login_button_saml',
+                ]
+            );
+            $ui->endForm('');
+        }
+
         $ui->contentAddHtml('</div>');
         $ui->endContent();
         $ui->showPage();
diff --git a/pandora_console/mobile/operation/home.php b/pandora_console/mobile/operation/home.php
index b172d16021..d49f42eb0b 100644
--- a/pandora_console/mobile/operation/home.php
+++ b/pandora_console/mobile/operation/home.php
@@ -59,6 +59,12 @@ class Home
             'menu_item' => true,
             'icon'      => 'groups',
         ];
+        $items['console'] = [
+            'name'      => __('Visual consoles'),
+            'filename'  => 'vconsole.php',
+            'menu_item' => true,
+            'icon'      => 'consoles',
+        ];
 
         if (!$system->getConfig('metaconsole')) {
             $items['alerts'] = [
@@ -74,6 +80,7 @@ class Home
                 'menu_item' => true,
                 'icon'      => 'agents',
             ];
+
             $items['modules'] = [
                 'name'      => __('Modules'),
                 'filename'  => 'modules.php',

From 03569f79b6a41b6af643c971a09ce183168bd19d Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 16 Dec 2020 18:06:12 +0100
Subject: [PATCH 02/22] Avoid users with success login in SAML access console
 if not in console

---
 pandora_console/mobile/include/user.class.php | 38 ++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/pandora_console/mobile/include/user.class.php b/pandora_console/mobile/include/user.class.php
index eb1af4c10d..749233df99 100644
--- a/pandora_console/mobile/include/user.class.php
+++ b/pandora_console/mobile/include/user.class.php
@@ -86,34 +86,41 @@ class User
     {
         $system = System::getInstance();
 
-        if ((bool) $system->getRequest('saml', false) === true) {
-            if ($system->getConfig('auth', 'mysql') !== 'saml') {
-                // Ignore.
-                return false;
-            } else {
+        if ($system->getConfig('auth', 'mysql') === 'saml') {
+            if ((bool) $system->getRequest('saml', false) === true) {
                 \enterprise_include_once('include/auth/saml.php');
                 $saml_user_id = enterprise_hook('saml_process_user_login');
                 if (!$saml_user_id) {
                     $this->logged = false;
+                    $this->errorLogin = $system->getConfig('auth_error');
+                    \enterprise_hook('saml_logout', [true]);
                 } else {
                     $this->logged = true;
                     $this->user = $saml_user_id;
                     $this->loginTime = time();
                     $this->errorLogin = false;
                 }
-
-                $this->saveLogin();
-                return $this->logged;
             }
-        } else if ($system->getConfig('auth', 'mysql') === 'saml') {
+
             // Maybe back from SAML login.
             $saml_session = $system->getSession('samlid', null);
             if ($saml_session !== null) {
                 $this->user = $system->getSession('id_usuario', null);
-                $this->loginTime = time();
-                $this->errorLogin = false;
-                $this->logged = true;
+                if ($this->user !== null) {
+                    $this->loginTime = time();
+                    $this->errorLogin = false;
+                    $this->logged = true;
+                } else {
+                    // SAML Session OK but not in DB.
+                    $this->logged = false;
+                    $this->errorLogin = __(
+                        'User cannot log in into this console, please contact administrator'
+                    );
+                }
             }
+
+            $this->saveLogin();
+            return $this->logged;
         }
 
         if (($user == null) && ($password == null)) {
@@ -265,7 +272,12 @@ class User
         if ($this->errorLogin) {
             $options['type'] = 'onStart';
             $options['title_text'] = __('Login Failed');
-            $options['content_text'] = __('User not found in database or incorrect password.');
+            if ($this->errorLogin !== false) {
+                $options['content_text'] = $this->errorLogin;
+            } else {
+                $options['content_text'] = __('User not found in database or incorrect password.');
+            }
+
             $ui->addDialog($options);
         }
 

From 5b176d9370e2921714591c111ada5b9fa49f41c3 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 16 Dec 2020 18:30:21 +0100
Subject: [PATCH 03/22] minor fixes

---
 pandora_console/mobile/include/user.class.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pandora_console/mobile/include/user.class.php b/pandora_console/mobile/include/user.class.php
index 749233df99..3a46ebac1d 100644
--- a/pandora_console/mobile/include/user.class.php
+++ b/pandora_console/mobile/include/user.class.php
@@ -100,6 +100,9 @@ class User
                     $this->loginTime = time();
                     $this->errorLogin = false;
                 }
+
+                $this->saveLogin();
+                return $this->logged;
             }
 
             // Maybe back from SAML login.
@@ -117,10 +120,10 @@ class User
                         'User cannot log in into this console, please contact administrator'
                     );
                 }
-            }
 
-            $this->saveLogin();
-            return $this->logged;
+                $this->saveLogin();
+                return $this->logged;
+            }
         }
 
         if (($user == null) && ($password == null)) {

From b7e64f14776a62616617ea290033e652dfae7217 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 18 Dec 2020 13:23:35 +0100
Subject: [PATCH 04/22] Visual console list mobile view

---
 .../images/visual_console.menu.png            | Bin 0 -> 8400 bytes
 pandora_console/mobile/include/style/main.css |   6 +
 .../mobile/include/system.class.php           |   2 +-
 pandora_console/mobile/index.php              |  12 ++
 pandora_console/mobile/operation/home.php     |  16 +-
 .../mobile/operation/visualmaps.php           | 187 +++++++++++-------
 6 files changed, 150 insertions(+), 73 deletions(-)
 create mode 100644 pandora_console/images/visual_console.menu.png

diff --git a/pandora_console/images/visual_console.menu.png b/pandora_console/images/visual_console.menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..818beae6f2355799893dd2be8baaca5fa5239824
GIT binary patch
literal 8400
zcmeHLc{r49+o#RGM5t_IB*YkFEHjLK-?A?u8M82$#mrzRWJ#8?q=b~RXARj#Ng+$N
zvSo=DlBJYXBJ~dS^z?l1^F8nP9LM+m_sntJGxv2}zw>vV*Y7&d>%Omvvp#Ih#lD}N
ziHV8J)WpD+@hh--vF>7gUl+<xWAs;s*gI2gkwE|wnTW;tVF1)%5(a>w;jm0hw6U^`
zBWW+xxedNG#JfkrQXf2{9bUS6aY`s}@g@R|X>yt|dmt#wtpnh_I<z_!Ubx2d&8<oo
zE^gN$A@YSXim_WwPTZ&{4GOLQ&~#_D+Va>^$?>RXX)`{bM)vf6ty^EyYHr%2_4#y!
zt%mS?jYK2m%ZhUHsF0l8xxNh%ne6RHs)bkJI-}$2dWYZna|A3deEy=kJ=|>4jjpgh
zbG$X=2{cIs>x}1_Jgah?IdDVP)mw2v^P$cAL&Kx>ZzdcgbtgyXXwDZxK6Y)SekFbD
zlvQ0^j~8}A#jJmL9eV4;?Qrg*v^a5W?Q5;~Ghq*1w28AH)x4~HdMksR+?w;AO$_4Y
z7WhTw4%RJHHp?x~eij*#dvC_RqUtu86lm{m>4hgf7(5(wbY&2A^b$e-VFnWDgvzX3
zaIboZ9%%JlHF6Kh^saub`m819I4Gzm6co~PX@qJieeg}@6(eXm?TJkAx^P9(_8!^f
z_U1W)+%RTGw7fn-dTHgJM93s*`eFpJVmAD_Qv%C|62&uWrs#O={D(Nu-ISw=wbT{2
zpwhX=eawoxDaQr3&tKMxtaWDzH9+MIKZZQZzNgda>~%<?fAUiAp|jPhPep(+4Z#QJ
zhel}C#Fitld*eC)DG~d(7or|FTT$6K1&FubPqK)IE{|UHh~m(S=8Z}|7N<&og^Gm~
zq@zq#8>a0{AW|2|hepvH@HG)~x9qGNd#a$30^;Z^YcrK0N2gFOm0^1dh-+1O<OBz(
zHqV8Se~F-hc&MMG`C;Ng|8^NJwJ)raiOS0|{6&@;PgbDauz~LCiQ5H3feQ~7X59zW
zDl%qd=k_kSzj(NpsPBD^AFS1ax{pJMwQXk_i|tFyy9_mRlh)Fxk~nk=dBHtvpoYfD
zL%()5d+kjlxbNtff~<9?FsNFetpAg#w^@86p>HQjrY31+=C!!f4iEJCVmt?1_`;qD
zrLOYGeSKaWw%(k?lBrPn7>9z?2u~b7cxK<N)s(XL;&)`eRfmOt$@w~%lzgCirE=tu
zoPZ|4ch&{lEZ5X?&Y?TFeoU`Tb9gu{ASv*`xVfn&UH#@|XuE1*UNX#hfxCNI*H<hD
zKd3l+VA!(`#?Lxz|78mLQOzl*r%uERx~sGYcUJ`GFX%`uQu0aJ;70ZnVoEE9aPMy*
z`9iPrYe*K(eMsM72ioE8aWhj&+hUab7E@%6?urnwIDctZbMFN=%Jt~BbwLrG6@-Fw
z8IMDfBHQxBP5kGgM7Mp;9J`B->acRvri{Q$8m>4$P*&*-%4%KSCOf{%ZG2)mUatS8
z2;{iJ<tB==w9)SS$zrt^kP!2a%a&-niYjgm0l(CewDF9}&%CZjq5>Nl3Z)Ny+C~^y
z8kGb*YG{n$Eh?7SEm3<W?aYhxj;4o&azm(ib_LJMYWyB%d!od}-CnF^R@QXKPQDtu
zB|?r#25+5PyP5l)iBXik9eeiaM<p#Y9jOsU%We7BtC@_|n!8W#wq0*A8mfAqUHZlQ
zg)zqz=b2y!w-|T9$&VYao-S>apyx9@DR6`FgLJk5p0m6Mj$<mGAvsDh`{rcPe&xpi
zPI~nmHzMC#E9`zd_;K$x>F%T<1>LJ+IZqqjsc=VU9<({_kT|hEZ%jB>GOyED&F9*x
z(0Nv(&bW-DQxZOQ>%5G6W2jX1+1%me?xHKLr*t&=bQh?5dot4a_76B#jj`4U?v<xj
zvkV0E?LRGORnRh>E^;M6>or@dW25h@rjQZa{_879gE-_;(K9D$4!8#=kAD;CJRWUw
z>|$l-XVJmbX|(mqHU$OQDi59zm7?ZDlQVisBQ271Q4y3;h-jmVWUHU%BXFvDbuR(X
zR#ITi*HPIa+%lEXboNYWic|pd`kC4+yJX>fIq@9fagLqdZ8y|E2;`tS@06aHD9^mH
zr<zlVrKY{g?G)`uN_)=IrRjIB`<dUIGwD@+{`uQP&YOJ&mu5#HZlk(%n@Wg3@SeT_
zV%{1pY}_<!__Wt~NsWfg8&kF|$d%5_|5ABVhhr=#kHU3WWKic0u@$**dw5Y?{etj`
z8hvQB`17Tcb$a;Wb~itnVVXg5iEWemi&HxMA?y+`MPmusL&ryZ6Z}v2QXGt;-^&~<
zFMG*!dC#=C{qy3*wyV{J?vN<NB5E5^#BU+F=9J?|LFnAw(gU8>R}2sZyB(ROkG-;A
z-+nEor?tqBKbNm%?~q^a82!wCL7y9QyULGn9IgY{*YR|8BgX=zH8B|d(gx9uCPOof
zE>FL3mn6sOJ?;W6&+A=VUW69tE>E_ETV>6T-Fao?D(Aj^F5#9;uCBVyCyfXAd!tke
znTuygESH0iEo71N&1uCI>(2DC4$W-!es28R&qF15p$=vj<Z1Q}z~X&vXSlfZ#L}XN
zQdTqU^V%Qz!s>3C<pIl-;!cL{vU%9Vw~D7~a|MLQo|L!MUWsZ0%OvJ>Hf+RRDIdLB
zoS!@|z&bzXCA{0f9CH5Y3TrpVRqL}^73PsLXA`72FXvQCvg<2@Z_-H$HC2!%6BUGz
z46<DS)v`#l?~LdXZL_22OG%)4ohkh7GGd9ZLlPp>qzpfG-BP4<4s@-ZTb_t58ge^W
z%fZ*b!-~(Rn7}`xdkMlbQG1lzM70itwc9|~zJ9Aww-Gz~IGy)#4tNIK{qZpsSzDqL
zhOVtP%-4pF7y1P~Q&kbFMoxmU{HQtlS%Dx`LkG_UNf7Eb-pPw4mab*UFSR3GNxE~|
zpF<0x?Fz0Wdh_!YNjpRYzMRo04zbR))mEKW5s=SFWMv*RcqgH!S<_(q=DCff^QcXn
z*!W52`-jto7gCl;*qGE%Jm_&N1%R+(LCva7n_6bp)kz6Db{*6bO3ff8OtmXiXinN(
zThkP3D%AUMT;YV(srgTCt5?{E)ZB_n7E)af=pHzAS<QEiRkX|0rG+m?<8i%=x3~i#
zG~?>n)!p&Yt}!LnVYe*@_o`>F?2*TCxg0#lW0^nfW53^cvc%8(k&S?DSfo!<o>CI<
zC6AL&&%wLfr6l3k@k4X_y0nVAUbGi-UkucJIMgs+0~6Fq>yww1pq(fzzq8}!TG0HO
zxm!s%qtRNkmO|ep`+}s@PYOM4vEZuB&g0$6vt8<Z<!SzBl5+E|T|_&Jt0cG{_}uLf
zIsa5<hmXlVJ|-PRwbJv~hRUzb(2k{!Dku6j^C$ou@*u2^Y7za|oi=wYh1o69p>X;)
zy=b~#bboeO7k_N%cH##k(C|&cf*d{o%cZu3+6ueN#j@4F^GgC$QBkC6e4(UVxhePc
zWZRx`RY2#Yr)F3A%$wsb8hjbW7;~3hIi)gz`{MFD2o@a3F%QIIj=oh{7wsm@`p~lj
z@By8hwms-v=xxa?yhR|XT8)!fy2C?9l{etdIkNi`z*kTZDCFFJ?}!&>?p~MZ%35!Q
zK7DbTtnX^Ls9Inz9=wRIbhy>c)zpUCTgJmhh2~eXr31t~tmgpI^s^y%?z%59>7G6s
zIa0mt;u=wwxmEp<8{l%0=qI+5Q_@UF%FbEeV83g!adfTtPQI2~=H1|AH>I%<qfQI%
z`RKC+-r*y$iIGn=N*y}n$x{{vB?xnSmwgpi?!sHf#00MN2Os5=^wrpJF7#T-mct%A
zxRC+y*s;TaIr1*hB)^yycEMAU^I}B)srbr|20=0KUB1}3b&GqFjeD;a7ZwmT!bhA!
z1JdY$mqya-RaMsuE|fzE&gD&Kq>OE((xe0h8nerD<63S+d4F8i?aNgQZH<n6o$xsC
zcze3kI6ja`I+^9bLVr>Oc2E7_!@5o=dth*Da@RJoYxkp=4xeV-b3HTef>(Nx#^H~q
zJ-a&Cc;MGN*E^bRV?tv!Bu@B@)vczy5as~sSI||?zkNHHa$u*ZGPyk`;7Ss4&^#s>
zmUqGod@*fy!2CmBBKTOve1%AbHus8Eo$*Fw>wCit-cB3(K29;&B+x!76>o$H87O#5
zn=WT!KW=7a9qW+*5bZF#-M4L@QY!9s`s^HUqKmhbRQ@YdlCr!$S8~Qow>`U{vTzs9
zDWlYOK3aB}W@5x~vUFwiftGyUs;h7;CHvFu@RhZ^wb>;1Z2Q^VeAAP5Od%v`ZQz5X
zGbO;)XMLdgce~i&`V&JgD|-YExt%v~X&c|xH?vzE%wazhXnT8@bz64Or=FIizT#}{
zEV<E%IUWU@Ypm;HLvG@A>r_XlS3-$TSg<^BUeydp9Q&gq_8ZoR`_p~TNCG3vzI?e5
zT9s`T*;G#IdMU6{XZU&KW>o}4#b%`eRY<*gx7>tRs_^PLuKmxfE7~qc`zL;yC>BdC
z9n9(Qhx3KgPI_oqjg=me#!r_WmATAc5n`V*^c?>FmYfglGmC4Z+fd`}T+xw-GY<*I
z7hfWnlc%a*zW+M%W(c7s9_Fku;Ts$F<i^^VKWcsBhN~4z_&hFj9yfxF41*^%xeXP@
zTr4qOakS+t(&hDLsrOq#pK7r&cGzhpIsxgQ0(L#Gdv(4#PQE?tzP$8mmGXm)+UXae
z9yJ~AVbLyqO-tvrxae1ITa<*UEzRPFmR@ck%GRFT$}V)^=@Xkij=#n>5M_1XqBF|3
zcN#G>yJ|$11=dY&bGw~oZ(&;A{WiSjnE27VD~LrVCgxK(eSK?Fef{4KZ;T^bR%nW*
zNsEq1+cCQu+e49oy#5{5m*r#QVLk%!))Is4W$Ni}V=ms0lJn|e?BzRIv;|AJ6?*CF
z_3V*PSz=RjQ*#o|uinY)2i}i*5q7KbQ~hxk)(=VprHK%o0X+1wMeOKA{N5159ifbu
zd4-H4_e&4tKh<b@v-|17(JZge+3S>*qTmE(<`i1Yz5>fzhY>Y6;jB+_xqkYNaeZ;d
zmUO^7$q|91DVWevK^k_jJ8w2Nx7D-q>;+Y<aDfrRRK!l@^75(D_CvFvUYCZh%umzc
zGt(btq{;_G^!PZOqj&6PFP6E+d1>vCu5_DT=0|?5ueu}P6mtnDwlgB{i*%wE*Y19M
z8dT?q^qeq{KX9^FsQvTaU3!f=xi4W;?TG_0=E%P03zN%E^UW*Lb2Vv#8rwqZA`%wT
z3Kp3!YBV>eN?fXv+lga8we4+~(bW0vYs84R#Urj1@j@P*7`oXLCYIC9CMi`TCnldf
znH<04mASFOWH~`jm$)=@jfsgT0mnE^J6l?)qlkC~B%0`nQJ~>TjMFv~6GEFtLZW;z
zRDdVO3rEldE;Zf(0&r+epp%NFq9sWm<Bc;3A!F=94%?$bd{J;TP+N-~K~rZC;4xGr
zfQI)YP}FIfz%5>N#{FhD7zo&cP<=Il&X(2yeIgkHP*zY@Py`v$aDhrdEp`BcjK-?l
z8W{bcV6-%W-c%|{9SjZ%3Q`DyDiFzDU<e!z2P-Opm6SjX1c(w$pdx7?0!4C@;yZ@{
zhJqsFNK_n=0NCV2dJ+Sunm{099PopjF^V#zF*<)Z*lcgnQ>bXLDWjpxm=6O0R#H@i
zffSWMN^tP6_KZ<W%b(T+$`2J8dV*<45*VVO2*%_8U_qf82LA5vPc10+j6XHNwipUA
zfQ-Tz24V<Q$zPq4`~oPy`V638HoLas_CsUAjG(qW|7v4wYH9t`W>ZEl9G<jgv5Ec_
ziAMdzkpjqmTNpG7jPb+Z8G%q3%#c6esW|NK3-pKiY>xa}APjdu`Tv0aO|Pw3wsciD
zAff^`otheG0ypDTM-x#vwEEU95(>jAqG75axGEA0Qug#jg5WC35D*5Agdm|xiV$T_
z)nBMg2^1=lfWmB2F~}8g3?4WZ>j}Xsp+GQ*A_}Cef>Z-}!c?Ikh_Z?r7L8HHK%vUN
zP*{<1j7mWI{TkIK6`DbXhIy)~crsWpiYN?7Sq+K>!Qm)HkTO&mgHl03kuVf$i)wQn
z)OD>*HGxVBiof?*`yr`VA{nm<w7?MpXul8G<M0?eDsodah^it?2?kS!s=(FMU{L7q
zAV&<D!btK>PKcs{lG4@)8l`T;U_>&K4Tnd1VZbDU*Ve%1vZymA!w?p^SsM)It$xN_
z)b+_2B$Y_ECldWMft#@cHYvAC3V`@gEb10S)Ry5E7=zxdw;vU!hx7t(H4)&y0{<J6
zoi{Ov@PFg^9r}|+mrM;Jl6|enR-Qf>6!oup{tWz+$(FI#QK;l#)BiB3|A9k%PgfI$
zEs-4ji+?+e|M%AS4apC;B^3a$wF#&rQQzgKAOkVzttDXS_<acFjU;$s7`yF{Qv0nR
z_a|wrgjB*RdZLgZD2$QI%5YCK2&oE3f|QgQ$$~|p)YN`d!cTSz5lan1k}<koj2vLB
zGo!S&))^qPm3^{*j3vk$!^jaiMTokhBJlh20ubQM4fVI_AvU)hOH1`%1wd?WN$RGX
znP(S3BKhGk<Ub1YTcZ3gxL@plB;|iH{}uM#TAxS?W)!VA)hdYam+t=r_?^K5hr$pj
z#J>vtSIBo+etGUNV*cL8c%CsHkKmur#~*32Svmj3&yRHbFM425|KsFu>HCjd|H$>X
z6!=@<f3oWzx&D>{e+&FicKyG}#s2#V8$)2c=mjy(&)rx1<rru0U7qH~23x0arqB9~
z;fy;rlF1PY6B7sj=EcmEnYEYE$wD=?G-R3P<YNc(yc?3>VEn^EGd0k)hdr1X1jp{t
z+0*{6Ps0fwRGH2h5A%T4=cw9n%g1{tdRGc_9^6^7>uxyf!Gtz#%NuN`v*sfATEv)B
zykRr2FHt$M_o~m3<=<2_Mz%#D)779;pL=eJCw-&u9CT58A%XoG`C)&%x$Ke#=!USd
zzgYG`CPJ&_Vw+we@f|@H6A%i3=HB+$`6SkPPI}m-(0^m(gwNv-8KZ5lhqIq{$W&?Q
zpA<#h7jg98_sJ-N+b*Ptnct~WKuC#VjP1p|TzqWy?%LTt$>&CP+NWCTqY`NF@<&3n
z_|fiLX&LLTX=+H};rn4>24B4U#d@D{(qRv?6tz3E@9CNIEw;#tw06d>B096<W4$uq
z1B0*c1ue$K2EA}DcJ+N-#v=~~hqr8KRexIRwfx3LkEw9>5zNfPH;+&4%zxs3gVG#f
z4(pev1~y+&%Rir=A~onDKIBq8Oox%@gqi4(C_G)%_3h3I7r)B$<dBKQse4fp3*z5!
aGvC;<Oex8rHT#LpRWmg_Y*4P}5&18c$-A@w

literal 0
HcmV?d00001

diff --git a/pandora_console/mobile/include/style/main.css b/pandora_console/mobile/include/style/main.css
index b3e066c893..347dce6732 100755
--- a/pandora_console/mobile/include/style/main.css
+++ b/pandora_console/mobile/include/style/main.css
@@ -26,6 +26,12 @@ body {
   font-weight: bold;
 }
 
+td.flex-center {
+  display: flex !important;
+  align-items: center;
+  justify-content: space-between;
+}
+
 /*INIT----------Tactical styles-----------------------------------------*/
 /* Common */
 
diff --git a/pandora_console/mobile/include/system.class.php b/pandora_console/mobile/include/system.class.php
index 8b79ef0139..de3b021edb 100644
--- a/pandora_console/mobile/include/system.class.php
+++ b/pandora_console/mobile/include/system.class.php
@@ -151,7 +151,7 @@ class System
     }
 
 
-    public function getDefaultACLFailText()
+    public static function getDefaultACLFailText()
     {
         return __('Access to this page is restricted to authorized users only, please contact your system administrator if you should need help.').'<br><br>'.__('Please remember that any attempts to access this page will be recorded on the %s System Database.', get_product_name());
     }
diff --git a/pandora_console/mobile/index.php b/pandora_console/mobile/index.php
index 71b6db82ac..6cb2b4a56c 100644
--- a/pandora_console/mobile/index.php
+++ b/pandora_console/mobile/index.php
@@ -349,6 +349,18 @@ switch ($action) {
                 $agent = new Agent();
                 $agent->show();
             break;
+
+            case 'visualmap':
+                $id = $system->getRequest('id', null);
+                if ($id !== null) {
+                    $vc = new Visualmap();
+                    $vc->show();
+                } else {
+                    // Show a list ov VC.
+                    $vc_list = new Visualmaps();
+                    $vc_list->show();
+                }
+            break;
         }
     break;
 }
diff --git a/pandora_console/mobile/operation/home.php b/pandora_console/mobile/operation/home.php
index d49f42eb0b..1fd8a79a47 100644
--- a/pandora_console/mobile/operation/home.php
+++ b/pandora_console/mobile/operation/home.php
@@ -59,12 +59,16 @@ class Home
             'menu_item' => true,
             'icon'      => 'groups',
         ];
-        $items['console'] = [
-            'name'      => __('Visual consoles'),
-            'filename'  => 'vconsole.php',
-            'menu_item' => true,
-            'icon'      => 'consoles',
-        ];
+
+        if ((bool) $system->getConfig('legacy_vc', false) === false) {
+            // Show Visual consoles only if new system is enabled.
+            $items['visualmap'] = [
+                'name'      => __('Visual consoles'),
+                'filename'  => 'visualmaps.php',
+                'menu_item' => true,
+                'icon'      => 'visual_console',
+            ];
+        }
 
         if (!$system->getConfig('metaconsole')) {
             $items['alerts'] = [
diff --git a/pandora_console/mobile/operation/visualmaps.php b/pandora_console/mobile/operation/visualmaps.php
index 632f0ff1a9..1159e14409 100644
--- a/pandora_console/mobile/operation/visualmaps.php
+++ b/pandora_console/mobile/operation/visualmaps.php
@@ -1,56 +1,107 @@
 <?php
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// phpcs:disable Squiz.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+/**
+ * List of visual consoles, for mobile view.
+ *
+ * @category   Common Class
+ * @package    Pandora FMS
+ * @subpackage OpenSource
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
+
+// Begin.
 ob_start();
 require_once '../include/functions_visual_map.php';
 ob_get_clean();
 // Fixed unused javascript code.
+
+/**
+ * Class to generate a list of current visual consoles defined.
+ */
 class Visualmaps
 {
 
-    private $correct_acl = false;
+    /**
+     * ACL allowed.
+     *
+     * @var boolean
+     */
+    private $allowed = false;
 
+    /**
+     * Perms needed to access this feature.
+     *
+     * @var string
+     */
     private $acl = 'VR';
 
-    private $default = true;
-
-    private $default_filters = [];
+    /**
+     * Default filters.
+     *
+     * @var array
+     */
+    private $defaultFilters = [];
 
+    /**
+     * Group.
+     *
+     * @var integer
+     */
     private $group = 0;
 
+    /**
+     * Type. Something about filtering.
+     *
+     * @var boolean
+     */
     private $type = 0;
 
-    private $list_types = null;
 
-
-    function __construct()
+    /**
+     * Builder.
+     */
+    public function __construct()
     {
         $system = System::getInstance();
 
         if ($system->checkACL($this->acl)) {
-            $this->correct_acl = true;
+            $this->allowed = true;
         } else {
-            $this->correct_acl = false;
+            $this->allowed = false;
         }
     }
 
 
+    /**
+     * Prepare filters for current view.
+     *
+     * @return void
+     */
     private function getFilters()
     {
         $system = System::getInstance();
         $user = User::getInstance();
 
-        $this->default_filters['group'] = true;
-        $this->default_filters['type'] = true;
+        $this->defaultFilters['group'] = true;
+        $this->defaultFilters['type'] = true;
 
         $this->group = (int) $system->getRequest('group', __('Group'));
         if (!$user->isInGroup($this->acl, $this->group)) {
@@ -61,7 +112,7 @@ class Visualmaps
             $this->group = 0;
         } else {
             $this->default = false;
-            $this->default_filters['group'] = false;
+            $this->defaultFilters['group'] = false;
         }
 
         $this->type = $system->getRequest('type', __('Type'));
@@ -69,14 +120,19 @@ class Visualmaps
             $this->type = '0';
         } else {
             $this->default = false;
-            $this->default_filters['type'] = false;
+            $this->defaultFilters['type'] = false;
         }
     }
 
 
+    /**
+     * Run view.
+     *
+     * @return void
+     */
     public function show()
     {
-        if (!$this->correct_acl) {
+        if (!$this->allowed) {
             $this->show_fail_acl();
         } else {
             $this->getFilters();
@@ -85,12 +141,19 @@ class Visualmaps
     }
 
 
+    /**
+     * Show a message about failed ACL access.
+     *
+     * @return void
+     */
     private function show_fail_acl()
     {
         $error['type'] = 'onStart';
         $error['title_text'] = __('You don\'t have access to this page');
         $error['content_text'] = System::getDefaultACLFailText();
-        if (class_exists('HomeEnterprise')) {
+
+        // Redirect to main page.
+        if (class_exists('HomeEnterprise') === true) {
             $home = new HomeEnterprise();
         } else {
             $home = new Home();
@@ -100,6 +163,11 @@ class Visualmaps
     }
 
 
+    /**
+     * Show visual console list header.
+     *
+     * @return void
+     */
     private function show_visualmaps()
     {
         $ui = Ui::getInstance();
@@ -124,57 +192,44 @@ class Visualmaps
     }
 
 
+    /**
+     * Show list of visual consoles.
+     *
+     * @return void
+     */
     private function listVisualmapsHtml()
     {
         $system = System::getInstance();
         $ui = Ui::getInstance();
 
-        // Create filter
-        $where = [];
-        // Order by type field
-        $where['order'] = 'type';
+        $visualmaps = visual_map_get_user_layouts();
 
-        if ($this->group != '0') {
-            $where['id_group'] = $this->group;
-        }
-
-        if ($this->type != '0') {
-            $where['type'] = $this->type;
-        }
-
-        // Only display maps of "All" group if user is administrator
-        // or has "RR" privileges, otherwise show only maps of user group
-        $id_user = $system->getConfig('id_user');
-        $own_info = get_user_info($id_user);
-        if ($own_info['is_admin'] || $system->checkACL($this->acl)) {
-            $maps = visual_map_get_user_layouts();
-        } else {
-            $maps = visual_map_get_user_layouts($id_user, false, false, false);
-        }
-
-        if (empty($maps)) {
-            $maps = [];
-        }
-
-        $list = [];
-        foreach ($maps as $map) {
-            $row = [];
-            $row[__('Name')] = '<a class="ui-link" data-ajax="false" href="index.php?page=visualmap&id='.$map['id'].'">'.io_safe_output($map['name']).'</a>';
-            // $row[__('Type')] = $map['type'];
-            $row[__('Group')] = ui_print_group_icon($map['id_group'], true, 'groups_small', '', false);
-            $list[] = $row;
-        }
-
-        if (count($maps) == 0) {
+        if (empty($visualmaps) === true) {
             $ui->contentAddHtml('<p style="color: #ff0000;">'.__('No maps defined').'</p>');
         } else {
             $table = new Table();
+            // Without header jquery.mobile crashes.
+            $table->addHeader(['']);
             $table->id = 'list_visualmaps';
-            $table->importFromHash($list);
-            $ui->contentAddHtml($table->getHTML());
-        }
+            foreach ($visualmaps as $map) {
+                $link = '<a class="ui-link" data-ajax="false" ';
+                $link .= ' href="index.php?page=visualmap&id=';
+                $link .= $map['id'].'">'.io_safe_output($map['name']).'</a>';
 
-        $ui->contentAddLinkListener('list_visualmaps');
+                $row = $link;
+                $row .= ui_print_group_icon(
+                    $map['id_group'],
+                    true,
+                    'groups_small',
+                    '',
+                    false
+                );
+                $table->addRow([ $map['id'].' flex-center' => $row]);
+            }
+
+            $ui->contentAddHtml($table->getHTML());
+            $ui->contentAddLinkListener('list_visualmaps');
+        }
     }
 
 

From bc3616e6c5e28fe0db33f878457da90cba8283bd Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Fri, 18 Dec 2020 13:40:00 +0100
Subject: [PATCH 05/22] visual console mobile wip

---
 pandora_console/mobile/index.php                | 17 ++++++++---------
 pandora_console/mobile/operation/home.php       |  2 +-
 pandora_server/util/recon_scripts/ipmi-recon.pl |  0
 3 files changed, 9 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 pandora_server/util/recon_scripts/ipmi-recon.pl

diff --git a/pandora_console/mobile/index.php b/pandora_console/mobile/index.php
index 6cb2b4a56c..bfeb6fe538 100644
--- a/pandora_console/mobile/index.php
+++ b/pandora_console/mobile/index.php
@@ -350,16 +350,15 @@ switch ($action) {
                 $agent->show();
             break;
 
+            case 'visualmaps':
+                // Show a list ov VC.
+                $vc_list = new Visualmaps();
+                $vc_list->show();
+            break;
+
             case 'visualmap':
-                $id = $system->getRequest('id', null);
-                if ($id !== null) {
-                    $vc = new Visualmap();
-                    $vc->show();
-                } else {
-                    // Show a list ov VC.
-                    $vc_list = new Visualmaps();
-                    $vc_list->show();
-                }
+                $vc = new Visualmap();
+                $vc->show();
             break;
         }
     break;
diff --git a/pandora_console/mobile/operation/home.php b/pandora_console/mobile/operation/home.php
index 1fd8a79a47..59b16683a7 100644
--- a/pandora_console/mobile/operation/home.php
+++ b/pandora_console/mobile/operation/home.php
@@ -62,7 +62,7 @@ class Home
 
         if ((bool) $system->getConfig('legacy_vc', false) === false) {
             // Show Visual consoles only if new system is enabled.
-            $items['visualmap'] = [
+            $items['visualmaps'] = [
                 'name'      => __('Visual consoles'),
                 'filename'  => 'visualmaps.php',
                 'menu_item' => true,
diff --git a/pandora_server/util/recon_scripts/ipmi-recon.pl b/pandora_server/util/recon_scripts/ipmi-recon.pl
old mode 100644
new mode 100755

From f72dabb04c948e9dca1b93b4d98e3000b76ca9f2 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 21 Dec 2020 14:23:50 +0100
Subject: [PATCH 06/22] New VC in mobile view (RC1)

---
 pandora_console/include/styles/dashboards.css |  11 +
 pandora_console/mobile/include/ui.class.php   | 121 +++++
 .../mobile/operation/visualmap.php            | 416 ++++++++++++++----
 3 files changed, 471 insertions(+), 77 deletions(-)

diff --git a/pandora_console/include/styles/dashboards.css b/pandora_console/include/styles/dashboards.css
index bbbf993112..02263d7463 100644
--- a/pandora_console/include/styles/dashboards.css
+++ b/pandora_console/include/styles/dashboards.css
@@ -530,3 +530,14 @@ div#main_pure {
 #select_multiple_modules_filtered > div > div > * {
   flex: auto;
 }
+
+/* Mobile trick */
+.ui-mobile-viewport.ui-overlay-c > #main_page > .ui-content {
+  overflow: visible;
+  overflow-x: visible;
+  margin: 0 !important;
+  padding: 0 !important;
+}
+.ui-mobile-viewport.ui-overlay-c > #main_page > .ui-content div.label > p {
+  margin: 0;
+}
diff --git a/pandora_console/mobile/include/ui.class.php b/pandora_console/mobile/include/ui.class.php
index 1992268990..f87319b66b 100755
--- a/pandora_console/mobile/include/ui.class.php
+++ b/pandora_console/mobile/include/ui.class.php
@@ -1,4 +1,5 @@
 <?php
+// phpcs:disable Squiz.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 // Pandora FMS - http://pandorafms.com
 // ==================================================
 // Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
@@ -48,6 +49,20 @@ class Ui
 
     private $dialog = '';
 
+    /**
+     * List of extra CSS files to be loaded.
+     *
+     * @var array
+     */
+    private $cssList = [];
+
+    /**
+     * List of extra Javascript files to be loaded.
+     *
+     * @var array
+     */
+    private $jsList = [];
+
 
     public function __construct()
     {
@@ -777,6 +792,30 @@ class Ui
         echo "		<script src='../include/javascript/pandora.js'></script>\n";
         echo "		<script src='../include/javascript/pandora_ui.js'></script>\n";
 
+        $loaded = [];
+        foreach ($this->cssList as $filename) {
+            if (in_array($filename, $loaded) === true) {
+                continue;
+            }
+
+            array_push($loaded, $filename);
+
+            $url_css = ui_get_full_url($filename, false, false, false);
+            echo '<link rel="stylesheet" href="'.$url_css.'" type="text/css" />'."\n\t";
+        }
+
+        $js_loaded = [];
+        foreach ($this->jsList as $filename) {
+            if (in_array($filename, $js_loaded) === true) {
+                continue;
+            }
+
+            array_push($js_loaded, $filename);
+
+            $url_css = ui_get_full_url($filename, false, false, false);
+            echo '<script src="'.$url_css.'" rel="text/javascript"></script>'."\n\t";
+        }
+
         echo "	</head>\n";
         echo "	<body>\n";
         echo include_javascript_dependencies_flot_graph(false, false);
@@ -857,6 +896,88 @@ class Ui
     }
 
 
+    /**
+     * Add CSS file to be loaded.
+     *
+     * @param string $name Css file name, as in ui_require_css.
+     * @param string $path Path where search for css file.
+     *
+     * @return boolean True if success, False if not.
+     */
+    public function require_css(
+        string $name,
+        string $path='include/styles/'
+    ):bool {
+        $filename = $path.$name.'.css';
+        $system = System::getInstance();
+
+        if (file_exists($filename) === false
+            && file_exists($system->getConfig('homedir').'/'.$filename) === false
+            && file_exists($system->getConfig('homedir').'/'.ENTERPRISE_DIR.'/'.$filename) === false
+        ) {
+            return false;
+        }
+
+        if (in_array($filename, $this->cssList) === false) {
+            $this->cssList[] = $filename;
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Add JS file to be loaded.
+     *
+     * @param string $name JAvascript file name, as in
+     *                     \ui_require_javascript_file.
+     * @param string $path Path where search for Javascript file.
+     *
+     * @return boolean True if success, False if not.
+     */
+    public function require_javascript(
+        string $name,
+        string $path='include/javascript/'
+    ):bool {
+        $filename = $path.$name.'.js';
+        $system = System::getInstance();
+
+        if (file_exists($filename) === false
+            && file_exists($system->getConfig('homedir').'/'.$filename) === false
+            && file_exists($system->getConfig('homedir').'/'.ENTERPRISE_DIR.'/'.$filename) === false
+        ) {
+            return false;
+        }
+
+        if (in_array($filename, $this->jsList) === false) {
+            $this->jsList[] = $filename;
+        }
+
+        return true;
+    }
+
+
+    /**
+     * Forces reload to retrieve with and height.
+     *
+     * @return void
+     */
+    public function retrieveViewPort()
+    {
+        ?>
+        <script type="text/javascript">
+
+        var dimensions = '&width=' + $(window).width();
+        dimensions +=  '&height=' + $(window).height();
+        window.location.href = window.location.href + dimensions;
+
+        </script>
+
+        <?php
+
+    }
+
+
 }
 
 class Table
diff --git a/pandora_console/mobile/operation/visualmap.php b/pandora_console/mobile/operation/visualmap.php
index c4dbbc877c..1667e8caf0 100644
--- a/pandora_console/mobile/operation/visualmap.php
+++ b/pandora_console/mobile/operation/visualmap.php
@@ -1,59 +1,158 @@
 <?php
-// Pandora FMS - http://pandorafms.com
-// ==================================================
-// Copyright (c) 2005-2010 Artica Soluciones Tecnologicas
-// Please see http://pandorafms.org for full contribution list
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation for version 2.
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-require_once '../include/functions_visual_map.php';
+// phpcs:disable Squiz.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+/**
+ * Visual console mobile viewer class.
+ *
+ * @category   Mix
+ * @package    Pandora FMS
+ * @subpackage OpenSource
+ * @version    1.0.0
+ * @license    See below
+ *
+ *    ______                 ___                    _______ _______ ________
+ *   |   __ \.-----.--.--.--|  |.-----.----.-----. |    ___|   |   |     __|
+ *  |    __/|  _  |     |  _  ||  _  |   _|  _  | |    ___|       |__     |
+ * |___|   |___._|__|__|_____||_____|__| |___._| |___|   |__|_|__|_______|
+ *
+ * ============================================================================
+ * Copyright (c) 2005-2019 Artica Soluciones Tecnologicas
+ * Please see http://pandorafms.org for full contribution list
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation for version 2.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * ============================================================================
+ */
 
+// Begin.
+require_once '../include/functions_visual_map.php';
+use Models\VisualConsole\Container as VisualConsole;
+
+/**
+ * Visual console view handler class.
+ */
 class Visualmap
 {
 
-    private $correct_acl = false;
+    /**
+     * Undocumented variable
+     *
+     * @var boolean
+     */
+    private $validAcl = false;
 
+    /**
+     * Undocumented variable
+     *
+     * @var boolean
+     */
     private $acl = 'VR';
 
+    /**
+     * Undocumented variable
+     *
+     * @var boolean
+     */
     private $id = 0;
 
+    /**
+     * Undocumented variable
+     *
+     * @var boolean
+     */
     private $visualmap = null;
 
+    /**
+     * View widh.
+     *
+     * @var integer
+     */
+    private $width;
 
-    function __construct()
+    /**
+     * View height.
+     *
+     * @var integer
+     */
+    private $height;
+
+    /**
+     * Rotate view.
+     *
+     * @var boolean
+     */
+    private $rotate = false;
+
+
+    /**
+     * Constructor.
+     */
+    public function __construct()
     {
-
     }
 
 
-    private function checkVisualmapACL($groupID=0)
+    /**
+     * Verifies ACL access.
+     *
+     * @param integer $groupID Target group id.
+     *
+     * @return void
+     */
+    private function checkVisualmapACL(int $groupID=0)
     {
         $system = System::getInstance();
 
         if ($system->checkACL($this->acl)) {
-            $this->correct_acl = true;
+            $this->validAcl = true;
         } else {
-            $this->correct_acl = false;
+            $this->validAcl = false;
         }
     }
 
 
+    /**
+     * Retrieve filters.
+     *
+     * @return void
+     */
     private function getFilters()
     {
         $system = System::getInstance();
 
         $this->id = (int) $system->getRequest('id', 0);
+        $this->width = (int) $system->getRequest('width', 0);
+        $this->height = (int) $system->getRequest('height', 0);
+
+        if ($this->width < $this->height) {
+            $w = $this->width;
+            $this->width = $this->height;
+            $this->height = $w;
+            $this->rotate = true;
+        }
     }
 
 
+    /**
+     * Renders the view.
+     *
+     * @return void
+     */
     public function show()
     {
         $this->getFilters();
 
+        if (empty($this->width) === true
+            && empty($this->height) === true
+        ) {
+            // Reload forcing user to send width and height.
+            $ui = Ui::getInstance();
+            $ui->retrieveViewPort();
+        }
+
         $this->visualmap = db_get_row(
             'tlayout',
             'id',
@@ -65,7 +164,7 @@ class Visualmap
         }
 
         $this->checkVisualmapACL($this->visualmap['id_group']);
-        if (!$this->correct_acl) {
+        if (!$this->validAcl) {
             $this->show_fail_acl();
         }
 
@@ -73,12 +172,25 @@ class Visualmap
     }
 
 
-    private function show_fail_acl()
+    /**
+     * Shows an error if ACL fails.
+     *
+     * @param string $msg Optional message.
+     *
+     * @return void
+     */
+    private function show_fail_acl(string $msg='')
     {
         $error['type'] = 'onStart';
-        $error['title_text'] = __('You don\'t have access to this page');
-        $error['content_text'] = System::getDefaultACLFailText();
-        if (class_exists('HomeEnterprise')) {
+        if (empty($msg) === false) {
+            $error['title_text'] = __('Error');
+            $error['content_text'] = $msg;
+        } else {
+            $error['title_text'] = __('You don\'t have access to this page');
+            $error['content_text'] = System::getDefaultACLFailText();
+        }
+
+        if (class_exists('HomeEnterprise') === true) {
             $home = new HomeEnterprise();
         } else {
             $home = new Home();
@@ -88,11 +200,18 @@ class Visualmap
     }
 
 
-    public function ajax($parameter2=false)
+    /**
+     * Ajax call manager.
+     *
+     * @param string $parameter2 Not sure why is doing this stuff.
+     *
+     * @return void
+     */
+    public function ajax(string $parameter2='')
     {
         $system = System::getInstance();
         $this->checkVisualmapACL($this->visualmap['id_group']);
-        if (!$this->correct_acl) {
+        if ((bool) $this->validAcl === false) {
             $this->show_fail_acl();
         } else {
             switch ($parameter2) {
@@ -100,18 +219,55 @@ class Visualmap
                     $map_id = $system->getRequest('map_id', '0');
                     $width = $system->getRequest('width', '400');
                     $height = $system->getRequest('height', '400');
-                    visual_map_print_visual_map($map_id, false, true, $width, $height);
+                    visual_map_print_visual_map(
+                        $map_id,
+                        false,
+                        true,
+                        $width,
+                        $height
+                    );
+                exit;
+
+                default:
                 exit;
             }
         }
     }
 
 
+    /**
+     * Generates HTML code to view target Visual console.
+     *
+     * @return void
+     */
     private function show_visualmap()
     {
         $ui = Ui::getInstance();
         $system = System::getInstance();
 
+        include_once $system->getConfig('homedir').'/vendor/autoload.php';
+
+        // Query parameters.
+        $visualConsoleId = (int) $system->getRequest('id');
+
+        // Refresh interval in seconds.
+        $refr = (int) get_parameter('refr', $system->getConfig('vc_refr'));
+
+        // Check groups can access user.
+        $aclUserGroups = [];
+        if (!users_can_manage_group_all('AR')) {
+            $aclUserGroups = array_keys(users_get_groups(false, 'AR'));
+        }
+
+        // Load Visual Console.
+        $visualConsole = null;
+        try {
+            $visualConsole = VisualConsole::fromDB(['id' => $visualConsoleId]);
+        } catch (Throwable $e) {
+            $this->show_fail_acl($e->getMessage());
+            exit;
+        }
+
         $ui->createPage();
         $ui->createDefaultHeader(
             sprintf(
@@ -127,61 +283,167 @@ class Visualmap
                 ]
             )
         );
+
+        $ui->require_css('visual_maps');
+        $ui->require_css('register');
+        $ui->require_css('dashboards');
+        $ui->require_javascript('pandora_visual_console');
+        $ui->require_javascript('pandora_dashboards');
+        $ui->require_javascript('jquery.cookie');
+        $ui->require_css('modal');
+        $ui->require_css('form');
+
         $ui->showFooter(false);
         $ui->beginContent();
-
-        ob_start();
-        $rendered_map = '<div id="rendered_visual_map">';
-        $rendered_map .= html_print_image('images/spinner.gif', true);
-        $rendered_map .= '</div>';
-        ob_clean();
-
-        $ui->contentAddHtml($rendered_map);
         $ui->contentAddHtml(
-            "<script type=\"text/javascript\">
-				function ajax_load_map() {
-					$('#rendered_visual_map').html('<div style=\"text-align: center\"> ".__('Loading...')."<br /><img src=\"images/ajax-loader.gif\" /></div>');
-					
-					var map_max_width = window.innerWidth * 0.90;
-					var map_max_height = (window.innerHeight - 47) * 0.90;
-					
-					var original_width = ".$this->visualmap['width'].';
-					var original_height = '.$this->visualmap['height'].';
-					
-					var map_width = map_max_width;
-					var map_height = original_height / (original_width / map_width);
-					
-					if(map_height > map_max_height) {
-						map_height = map_max_height;
-						map_width = original_width / (original_height / map_height);
-					}
-					
-					postvars = {};
-					postvars["action"] = "ajax";
-					postvars["parameter1"] = "visualmap";
-					postvars["parameter2"] = "render_map";
-					postvars["map_id"] = "'.$this->id."\";
-					postvars[\"width\"] = map_width;
-					postvars[\"height\"] = map_height;
-					
-					$.post(\"index.php\",
-						postvars,
-						function (data) {
-							$('#rendered_visual_map').html(data);
-						},
-						\"html\");
-				}
-				
-				ajax_load_map();
-				
-				// Detect orientation change to refresh dinamic content
-				$(window).on({
-					orientationchange: function(e) {
-						ajax_load_map();
-					}
-				});
-			</script>"
+            include_javascript_d3(true)
         );
+
+        $size = [
+            'width'  => $this->width,
+            'height' => $this->height,
+        ];
+
+        $visualConsoleData = $visualConsole->toArray();
+        $ratio_visualconsole = ($visualConsoleData['height'] / $visualConsoleData['width']);
+        $ratio_t = ($size['width'] / $visualConsoleData['width']);
+        $radio_h = ($size['height'] / $visualConsoleData['height']);
+
+        $visualConsoleData['width'] = $size['width'];
+        $visualConsoleData['height'] = ($size['width'] * $ratio_visualconsole);
+
+        if ($visualConsoleData['height'] > $size['height']) {
+            $ratio_t = $radio_h;
+
+            $visualConsoleData['height'] = $size['height'];
+            $visualConsoleData['width'] = ($size['height'] / $ratio_visualconsole);
+        }
+
+        $uniq = uniqid();
+
+        $output = '<div class="container-center" style="position:relative;">';
+        // Style.
+        $style = 'width:'.$visualConsoleData['width'].'px;';
+        $style .= 'height:'.$visualConsoleData['height'].'px;';
+        $style .= 'background-size: cover;';
+
+        // Class.
+        $class = 'visual-console-container-dashboard c-'.$uniq;
+        // Id.
+        $id = 'visual-console-container-'.$uniq;
+        $output .= '<div style="'.$style.'" class="'.$class.'" id="'.$id.'">';
+        $output .= '</div>';
+        $output .= '</div>';
+
+        // Check groups can access user.
+        $aclUserGroups = [];
+        if (users_can_manage_group_all('AR') === true) {
+            $aclUserGroups = array_keys(
+                users_get_groups(false, 'AR')
+            );
+        }
+
+        $ignored_params['refr'] = '';
+        \ui_require_javascript_file(
+            'tiny_mce',
+            'include/javascript/tiny_mce/'
+        );
+        \ui_require_javascript_file(
+            'pandora_visual_console',
+            'include/javascript/',
+            true
+        );
+        \include_javascript_d3();
+        \visual_map_load_client_resources();
+
+        // Load Visual Console Items.
+        $visualConsoleItems = VisualConsole::getItemsFromDB(
+            $visualConsoleId,
+            $aclUserGroups,
+            $ratio_t
+        );
+
+        // Horrible trick! due to the use of tinyMCE
+        // it is necessary to modify specific classes of each
+        // of the visual consoles.
+        $output .= '<style type="text/css">';
+        $output .= '.c-'.$uniq.', .c-'.$uniq.' *:not(.parent_graph p table tr td span) { font-size: '.(8 * $ratio_t).'pt; line-height:'.(8 * ($ratio_t) * 1.5).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_4pt, .c-'.$uniq.' .visual_font_size_4pt * { font-size: '.(4 * $ratio_t).'pt; line-height:'.(4 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_6pt, .c-'.$uniq.' .visual_font_size_6pt * { font-size: '.(6 * $ratio_t).'pt; line-height:'.(6 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_8pt, .c-'.$uniq.' .visual_font_size_8pt * { font-size: '.(8 * $ratio_t).'pt; line-height:'.(8 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_10pt, .c-'.$uniq.' .visual_font_size_10pt * { font-size: '.(10 * $ratio_t).'pt; line-height:'.(10 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_12pt, .c-'.$uniq.' .visual_font_size_12pt * { font-size: '.(12 * $ratio_t).'pt; line-height:'.(12 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_14pt, .c-'.$uniq.' .visual_font_size_14pt * { font-size: '.(14 * $ratio_t).'pt; line-height:'.(14 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_18pt, .c-'.$uniq.' .visual_font_size_18pt * { font-size: '.(18 * $ratio_t).'pt; line-height:'.(18 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_24pt, .c-'.$uniq.' .visual_font_size_24pt * { font-size: '.(24 * $ratio_t).'pt; line-height:'.(24 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_28pt, .c-'.$uniq.' .visual_font_size_28pt * { font-size: '.(28 * $ratio_t).'pt; line-height:'.(28 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_36pt, .c-'.$uniq.' .visual_font_size_36pt * { font-size: '.(36 * $ratio_t).'pt; line-height:'.(36 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_48pt, .c-'.$uniq.' .visual_font_size_48pt * { font-size: '.(48 * $ratio_t).'pt; line-height:'.(48 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_60pt, .c-'.$uniq.' .visual_font_size_60pt * { font-size: '.(60 * $ratio_t).'pt; line-height:'.(60 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_72pt, .c-'.$uniq.' .visual_font_size_72pt * { font-size: '.(72 * $ratio_t).'pt; line-height:'.(72 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_84pt, .c-'.$uniq.' .visual_font_size_84pt * { font-size: '.(84 * $ratio_t).'pt; line-height:'.(84 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_96pt, .c-'.$uniq.' .visual_font_size_96pt * { font-size: '.(96 * $ratio_t).'pt; line-height:'.(96 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_116pt, .c-'.$uniq.' .visual_font_size_116pt * { font-size: '.(116 * $ratio_t).'pt; line-height:'.(116 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_128pt, .c-'.$uniq.' .visual_font_size_128pt * { font-size: '.(128 * $ratio_t).'pt; line-height:'.(128 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_140pt, .c-'.$uniq.' .visual_font_size_140pt * { font-size: '.(140 * $ratio_t).'pt; line-height:'.(140 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_154pt, .c-'.$uniq.' .visual_font_size_154pt * { font-size: '.(154 * $ratio_t).'pt; line-height:'.(154 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .visual_font_size_196pt, .c-'.$uniq.' .visual_font_size_196pt * { font-size: '.(196 * $ratio_t).'pt; line-height:'.(196 * ($ratio_t)).'pt; }';
+        $output .= '.c-'.$uniq.' .flot-text, .c-'.$uniq.' .flot-text * { font-size: '.(8 * $ratio_t).'pt !important; line-height:'.(8 * ($ratio_t)).'pt !important; }';
+        $output .= '.c-'.$uniq.' .visual-console-item .digital-clock span.time {font-size: '.(50 * $ratio_t).'px !important; line-height: '.(50 * $ratio_t).'px !important;}';
+        $output .= '.c-'.$uniq.' .visual-console-item .digital-clock span.date {font-size: '.(25 * $ratio_t).'px !important; line-height: '.(25 * $ratio_t).'px !important;}';
+        $output .= '.c-'.$uniq.' .visual-console-item .digital-clock span.timezone {font-size: '.(25 * $ratio_t).'px !important; line-height: '.(25 * $ratio_t).'px !important;}';
+        $output .= '.c-'.$uniq.' .visual-console-item .donut-graph * {font-size: '.(8 * $ratio_t).'px !important; line-height: '.(8 * $ratio_t).'px !important;}';
+        $output .= '.c-'.$uniq.' .visual-console-item .donut-graph g rect {width:'.(25 * $ratio_t).' !important; height: '.(15 * $ratio_t).' !important;}';
+        $output .= '</style>';
+
+        $visualConsoleItems = array_reduce(
+            $visualConsoleItems,
+            function ($carry, $item) use ($ratio_t) {
+                $carry[] = $item->toArray();
+                return $carry;
+            },
+            []
+        );
+
+        $settings = \json_encode(
+            [
+                'props'   => $visualConsoleData,
+                'items'   => $visualConsoleItems,
+                'baseUrl' => ui_get_full_url('/', false, false, false),
+                'ratio'   => $ratio_t,
+                'size'    => $size,
+                'cellId'  => $uniq,
+            ]
+        );
+
+        $output .= '<script type="text/javascript">';
+        $output .= '$(document).ready(function () {';
+        $output .= 'dashboardLoadVC('.$settings.')';
+        $output .= '});';
+        if ($this->rotate === true) {
+            $output .= "$('.container-center').css('transform', 'rotate(90deg)');";
+        }
+
+        $output .= '$( window ).on( "orientationchange", function( event )';
+        $output .= ' { window.location.href = "';
+        $output .= ui_get_full_url(
+            '/mobile/index.php?page=visualmap&id='.$visualConsoleId
+        );
+        $output .= '" });';
+
+        $output .= '</script>';
+
+        $ui->contentAddHtml($output);
+
+        // Load Visual Console Items.
+        $visualConsoleItems = VisualConsole::getItemsFromDB(
+            $visualConsoleId,
+            $aclUserGroups
+        );
+
+        $javascript = ob_get_clean();
+        $ui->contentAddHtml($javascript);
+
         $ui->endContent();
         $ui->showPage();
     }

From 025288d9fe5282b1fe35fc7ab2b058c62541e931 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Mon, 21 Dec 2020 18:10:46 +0100
Subject: [PATCH 07/22] Fixes on VC navigation (mobile)

---
 pandora_console/include/functions.php          |  6 +++++-
 pandora_console/mobile/include/user.class.php  | 17 +++++++++++++++--
 pandora_console/mobile/operation/visualmap.php |  2 ++
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index f79c56b764..c63b928049 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -2249,12 +2249,16 @@ function check_login($output=true)
             return true;
         }
     } else {
+        include_once $config['homedir'].'/mobile/include/db.class.php';
+        include_once $config['homedir'].'/mobile/include/system.class.php';
         include_once $config['homedir'].'/mobile/include/user.class.php';
 
         if (isset($_SESSION['user'])) {
-            $user = $_SESSION['user'];
+            $user = User::getInstance();
             $id_user = $user->getIdUser();
             if (is_user($id_user)) {
+                $_SESSION['id_usuario'] = $id_user;
+                $config['id_user'] = $id_user;
                 return true;
             }
         }
diff --git a/pandora_console/mobile/include/user.class.php b/pandora_console/mobile/include/user.class.php
index 3a46ebac1d..e6ef007206 100644
--- a/pandora_console/mobile/include/user.class.php
+++ b/pandora_console/mobile/include/user.class.php
@@ -38,8 +38,15 @@ class User
             $system = System::getInstance();
             $user = $system->getSession('user', null);
 
+            if (is_object($user) === false) {
+                $user = json_decode($user, true);
+            }
+
             if (!empty($user)) {
-                self::$instance = $user;
+                self::$instance = new self();
+                foreach ($user as $k => $v) {
+                    self::$instance->{$k} = $v;
+                }
             } else {
                 self::$instance = new self();
             }
@@ -49,6 +56,12 @@ class User
     }
 
 
+    public function jsonSerialize()
+    {
+        return get_object_vars($this);
+    }
+
+
     public function saveLogin()
     {
         if ($this->logged) {
@@ -59,7 +72,7 @@ class User
             $config['id_user'] = $this->user;
 
             $system->setSessionBase('id_usuario', $this->user);
-            $system->setSession('user', $this);
+            $system->setSession('user', json_encode($this->jsonSerialize()));
 
             config_user_set_custom_config();
         }
diff --git a/pandora_console/mobile/operation/visualmap.php b/pandora_console/mobile/operation/visualmap.php
index 1667e8caf0..1313fc0f24 100644
--- a/pandora_console/mobile/operation/visualmap.php
+++ b/pandora_console/mobile/operation/visualmap.php
@@ -153,6 +153,8 @@ class Visualmap
             $ui->retrieveViewPort();
         }
 
+        $this->height -= 39;
+
         $this->visualmap = db_get_row(
             'tlayout',
             'id',

From ac8af7ee527df8ec08260ec3fae63e52411b7be6 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 22 Dec 2020 14:40:04 +0100
Subject: [PATCH 08/22] Use mobile navitagion in VC items while using mobile
 view

---
 .../rest-api/models/VisualConsole/Item.php    | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/pandora_console/include/rest-api/models/VisualConsole/Item.php b/pandora_console/include/rest-api/models/VisualConsole/Item.php
index 13ddc6590f..31d17b55c5 100644
--- a/pandora_console/include/rest-api/models/VisualConsole/Item.php
+++ b/pandora_console/include/rest-api/models/VisualConsole/Item.php
@@ -1058,6 +1058,16 @@ class Item extends CachedModel
     {
         global $config;
 
+        $mobile_navigation = false;
+
+        if (isset($_SERVER['PHP_SELF']) === true
+            && (strstr($_SERVER['PHP_SELF'], 'mobile/') !== false
+            || strstr($_SERVER['HTTP_REFERER'], 'mobile/') !== false)
+        ) {
+            $mobile_navigation = true;
+        }
+
+        error_log(obhd($_SERVER['PHP_SELF']));
         // Load side libraries.
         include_once $config['homedir'].'/include/functions_ui.php';
         if (\is_metaconsole()) {
@@ -1070,6 +1080,7 @@ class Item extends CachedModel
         $linkedAgent = static::extractLinkedAgent($data);
 
         $baseUrl = \ui_get_full_url('index.php');
+        $mobileUrl = \ui_get_full_url('mobile/index.php');
 
         // TODO: There's a feature to get the link from the label.
         if (static::$useLinkedVisualConsole === true
@@ -1117,6 +1128,15 @@ class Item extends CachedModel
                  * We are in a regular console.
                  */
 
+                if ($mobile_navigation === true) {
+                    return $mobileUrl.'?'.http_build_query(
+                        [
+                            'page' => 'visualmap',
+                            'id'   => $vcId,
+                        ]
+                    );
+                }
+
                 return $baseUrl.'?'.http_build_query(
                     [
                         'sec'  => 'network',
@@ -1190,6 +1210,15 @@ class Item extends CachedModel
                         ];
                     }
 
+                    if ($mobile_navigation === true) {
+                        return $mobileUrl.'?'.http_build_query(
+                            [
+                                'page' => 'module_graph',
+                                'id'   => $moduleId,
+                            ]
+                        );
+                    }
+
                     return $baseUrl.'?'.http_build_query($queryParams);
                 } else if (\is_metaconsole() && \can_user_access_node()) {
                     /*
@@ -1265,6 +1294,15 @@ class Item extends CachedModel
                      * We are in a regular console.
                      */
 
+                    if ($mobile_navigation === true) {
+                        return $mobileUrl.'?'.http_build_query(
+                            [
+                                'page' => 'agent',
+                                'id'   => $agentId,
+                            ]
+                        );
+                    }
+
                     return $baseUrl.'?'.http_build_query(
                         [
                             'sec'       => 'estado',

From 79ac7f43f7964f1777af94325c1ea6289a3426da Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 22 Dec 2020 17:01:49 +0100
Subject: [PATCH 09/22] Style fixes (minor) event details

---
 pandora_console/mobile/include/style/main.css | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pandora_console/mobile/include/style/main.css b/pandora_console/mobile/include/style/main.css
index 347dce6732..2b29f6025a 100755
--- a/pandora_console/mobile/include/style/main.css
+++ b/pandora_console/mobile/include/style/main.css
@@ -349,6 +349,22 @@ tr.events {
   font-size: 12px !important;
 }
 
+table.event_details {
+  height: 14px;
+  color: #424242;
+}
+
+table.event_details tr th {
+  text-align: left;
+}
+
+table.event_details td:not(:first-child) {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-items: start;
+}
+
 table#list_events th {
   font-size: 12px !important;
   font-weight: bolder !important;

From c429ec59d5a5c36b59709efca640d8f77bc65bde Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 22 Dec 2020 17:04:29 +0100
Subject: [PATCH 10/22] module status ball css fix

---
 pandora_console/mobile/include/style/main.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pandora_console/mobile/include/style/main.css b/pandora_console/mobile/include/style/main.css
index 2b29f6025a..60dd6f625d 100755
--- a/pandora_console/mobile/include/style/main.css
+++ b/pandora_console/mobile/include/style/main.css
@@ -1363,6 +1363,12 @@ span.nobold * {
   display: block !important;
 }
 
+.status_rounded_rectangles.forced_title {
+  width: 1em;
+  height: 1em;
+  border-radius: 50%;
+}
+
 #list_Modules *,
 #list_agent_Modules *,
 #list_agents *,

From 6ada7d46c85ba0210d1b51acbc9ebde37cfe85e5 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 22 Dec 2020 17:09:21 +0100
Subject: [PATCH 11/22] event select list margin issue css

---
 pandora_console/mobile/include/style/main.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pandora_console/mobile/include/style/main.css b/pandora_console/mobile/include/style/main.css
index 60dd6f625d..81d6ce7af1 100755
--- a/pandora_console/mobile/include/style/main.css
+++ b/pandora_console/mobile/include/style/main.css
@@ -1369,6 +1369,11 @@ span.nobold * {
   border-radius: 50%;
 }
 
+.ui-content .ui-listview,
+.ui-panel-inner > .ui-listview {
+  margin: 0 !important;
+}
+
 #list_Modules *,
 #list_agent_Modules *,
 #list_agents *,

From c55bdb6e6d4add120779c85dac2d55ffccfba722 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Tue, 22 Dec 2020 17:16:38 +0100
Subject: [PATCH 12/22] Changed global to agent search because is only
 searching for agents...

---
 pandora_console/mobile/operation/home.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pandora_console/mobile/operation/home.php b/pandora_console/mobile/operation/home.php
index 59b16683a7..c2afb324ed 100644
--- a/pandora_console/mobile/operation/home.php
+++ b/pandora_console/mobile/operation/home.php
@@ -165,7 +165,7 @@ class Home
             $options = [
                 'name'        => 'free_search',
                 'value'       => $this->global_search,
-                'placeholder' => __('Global search'),
+                'placeholder' => __('Agent search'),
             ];
             $ui->formAddInputSearch($options);
             $ui->endForm();

From d4b8916c54b733e4a941e4b3723a7bedcc943ca5 Mon Sep 17 00:00:00 2001
From: Junichi Satoh <junichi@rworks.jp>
Date: Fri, 26 Mar 2021 17:11:10 +0900
Subject: [PATCH 13/22] Fixed following problems. - alert actions cannot be
 copied/removed by any users - alert actions cannot be modified by users with
 'LM' even if alerts belong to the same group of users.

And users with 'LM' can now copy alert actions/templates in All group to the group to which the user belongs.
---
 .../godmode/alerts/alert_actions.php          | 115 +++++++-----------
 .../godmode/alerts/alert_commands.php         |  19 +--
 .../godmode/alerts/alert_templates.php        |  35 +++---
 .../godmode/alerts/configure_alert_action.php |  69 ++++++-----
 .../alerts/configure_alert_template.php       | 109 +++++++++--------
 pandora_console/include/functions_alerts.php  |  14 ++-
 6 files changed, 179 insertions(+), 182 deletions(-)

diff --git a/pandora_console/godmode/alerts/alert_actions.php b/pandora_console/godmode/alerts/alert_actions.php
index cdff3dbe2b..9fa04651dc 100644
--- a/pandora_console/godmode/alerts/alert_actions.php
+++ b/pandora_console/godmode/alerts/alert_actions.php
@@ -61,6 +61,11 @@ if (defined('METACONSOLE')) {
     $sec = 'galertas';
 }
 
+$can_edit_all = false;
+if (check_acl_restricted_all($config['id_user'], 0, 'LM')) {
+    $can_edit_all = true;
+}
+
 // Header.
 if (defined('METACONSOLE')) {
     alerts_meta_print_header();
@@ -79,30 +84,13 @@ if ($copy_action) {
 
     $al_action = alerts_get_alert_action($id);
 
-    if (!check_acl_restricted_all($config['id_user'], $al_action['id_group'], 'LM')) {
-        db_pandora_audit(
-            'ACL Violation',
-            'Trying to access Alert Management'
-        );
-        include 'general/noaccess.php';
-        exit;
-    }
-
     if ($al_action !== false) {
-        // If user tries to copy an action with group=ALL.
-        if ($al_action['id_group'] == 0) {
-            // Then must have "PM" access privileges.
-            if (! check_acl($config['id_user'], 0, 'PM')) {
-                db_pandora_audit(
-                    'ACL Violation',
-                    'Trying to access Alert Management'
-                );
-                include 'general/noaccess.php';
-                exit;
-            }
+        // If user who doesn't have permission to modify group all tries to copy an action with group=ALL.
+        if ($can_edit_all == false && $al_action['id_group'] == 0) {
+            $al_action['id_group'] = users_get_first_group(false, 'LM', false);
         } else {
             $own_info = get_user_info($config['id_user']);
-            if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) {
+            if ($can_edit_all == true || check_acl($config['id_user'], 0, 'PM')) {
                 $own_groups = array_keys(
                     users_get_groups($config['id_user'], 'LM')
                 );
@@ -125,7 +113,7 @@ if ($copy_action) {
         }
     }
 
-    $result = alerts_clone_alert_action($id);
+    $result = alerts_clone_alert_action($id, $al_action['id_group']);
 
     if ($result) {
         db_pandora_audit(
@@ -397,10 +385,9 @@ foreach ($actions as $action) {
 
     $data = [];
 
-    if (check_acl_restricted_all($config['id_user'], $action['id_group'], 'LM')) {
-        $data[0] = '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_action&id='.$action['id'].'&pure='.$pure.'">'.$action['name'].'</a>';
-    } else {
-        $data[0] = $action['name'];
+    $data[0] = '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_action&id='.$action['id'].'&pure='.$pure.'">'.$action['name'].'</a>';
+    if ($action['id_group'] == 0 && $can_edit_all == false) {
+        $data[0] .= ui_print_help_tip(__('You cannot edit this action, You don\'t have the permission to edit All group.'), true);
     }
 
     $data[1] = $action['command_name'];
@@ -420,7 +407,7 @@ foreach ($actions as $action) {
     $data[4] = '';
 
     if (is_central_policies_on_node() === false
-        && check_acl_restricted_all($config['id_user'], $action['id_group'], 'LM')
+        && check_acl($config['id_user'], $action['id_group'], 'LM')
     ) {
         $table->cellclass[] = [
             3 => 'action_buttons',
@@ -430,10 +417,35 @@ foreach ($actions as $action) {
         $id_action = $action['id'];
         $text_confirm = __('Are you sure?');
 
-        $data[3] = '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_actions" 
-        onClick="copy_action('.$id_action.',\''.$text_confirm.'\');">'.html_print_image('images/copy.png', true, ['class' => 'invert_filter']).'</a>';
-        $data[4] = '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_actions"
-        onClick="delete_action('.$id_action.',\''.$text_confirm.'\');">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>';
+        $data[3] = '<form method="post" style="display: inline; float: right" onsubmit="if (!confirm(\''.$text_confirm.'\')) return false;">';
+        $data[3] .= html_print_input_hidden('copy_action', 1, true);
+        $data[3] .= html_print_input_hidden('id', $id_action, true);
+        $data[3] .= html_print_input_image(
+            'dup',
+            'images/copy.png',
+            1,
+            '',
+            true,
+            ['title' => __('Duplicate')]
+        );
+        $data[3] .= '</form> ';
+
+        if ($action['id_group'] != 0 || $can_edit_all == true) {
+            $data[4] = '<form method="post" style="display: inline; float: right" onsubmit="if (!confirm(\''.$text_confirm.'\')) return false;">';
+            $data[4] .= html_print_input_hidden('delete_action', 1, true);
+            $data[4] .= html_print_input_hidden('id', $id_action, true);
+            $data[4] .= html_print_input_image(
+                'del',
+                'images/cross.png',
+                1,
+                '',
+                true,
+                ['title' => __('Delete')]
+            );
+            $data[4] .= '</form> ';
+        } else {
+            $data[4] = '';
+        }
     }
 
     array_push($table->data, $data);
@@ -458,44 +470,3 @@ if (is_central_policies_on_node() === false) {
 
 enterprise_hook('close_meta_frame');
 ?>
-
-<script type="text/javascript">
-
-function copy_action(id_action, text_confirm) {
-    if (!confirm(text_confirm)) {
-        return false;
-    } else {
-        jQuery.post ("ajax.php",
-            {
-            "page" : "godmode/alerts/alert_actions",
-            "copy_action" : 1,
-            "id" : id_action
-            },
-            function (data, status) {
-                // No data.
-            },
-            "json"
-        );
-    }
-}
-
-function delete_action(id_action, text_confirm) {
-    if (!confirm(text_confirm)) {
-        return false;
-    } else {
-        jQuery.post ("ajax.php",
-            {
-            "page" : "godmode/alerts/alert_actions",
-            "delete_action" : 1,
-            "id" : id_action
-            },
-            function (data, status) {
-                // No data.
-            },
-            "json"
-        );
-    }
-}
-
-</script>
-
diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php
index 8407a88f97..3d13557b09 100644
--- a/pandora_console/godmode/alerts/alert_commands.php
+++ b/pandora_console/godmode/alerts/alert_commands.php
@@ -28,12 +28,6 @@ if (! check_acl($config['id_user'], 0, 'LM')) {
     exit;
 }
 
-if (!check_acl($config['id_user'], 0, 'PM') && !is_user_admin($config['id_user'])) {
-    echo "<div id='message_permissions'  title='".__('Permissions warning')."' style='display:none;'>";
-    echo "<p style='text-align: center;font-weight: bold;'>".__('Command management is limited to administrator users or user profiles with permissions over Pandora FMS management').'</p>';
-    echo '</div>';
-}
-
 if (is_metaconsole()) {
     $sec = 'advanced';
 } else {
@@ -465,6 +459,17 @@ if (is_ajax()) {
     return;
 }
 
+// This check should be after ajax. Because, ajax will be called from configure_alert_action.
+if (!check_acl($config['id_user'], 0, 'PM') && !is_user_admin($config['id_user
+'])) {
+    echo "<div id='message_permissions'  title='".__('Permissions warning')."' s
+tyle='display:none;'>";
+    echo "<p style='text-align: center;font-weight: bold;'>".__('Command managem
+ent is limited to administrator users or user profiles with permissions over Pan
+dora FMS management').'</p>';
+    echo '</div>';
+}
+
 enterprise_hook('open_meta_frame');
 
 if ($update_command) {
@@ -716,4 +721,4 @@ enterprise_hook('close_meta_frame');
         });
     }
 
-</script>
\ No newline at end of file
+</script>
diff --git a/pandora_console/godmode/alerts/alert_templates.php b/pandora_console/godmode/alerts/alert_templates.php
index 6763e7f6e5..91a23ce366 100644
--- a/pandora_console/godmode/alerts/alert_templates.php
+++ b/pandora_console/godmode/alerts/alert_templates.php
@@ -401,17 +401,16 @@ foreach ($templates as $template) {
 
     $data = [];
 
-    if (check_acl_restricted_all($config['id_user'], $template['id_group'], 'LM')) {
-        $data[0] = '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_template&id='.$template['id'].'&pure='.$pure.'">'.$template['name'].'</a>';
-    } else {
-        $data[0] = $template['name'];
+    $data[0] = '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_template&id='.$template['id'].'&pure='.$pure.'">'.$template['name'].'</a>';
+    if (!check_acl_restricted_all($config['id_user'], $template['id_group'], 'LM')) {
+        $data[0] .= ui_print_help_tip(__('You cannot edit this alert template, You don\'t have the permission to edit All group.'), true);
     }
 
     $data[1] = ui_print_group_icon($template['id_group'], true);
     $data[3] = alerts_get_alert_templates_type_name($template['type']);
 
     if (is_central_policies_on_node() === false
-        && check_acl_restricted_all($config['id_user'], $template['id_group'], 'LM')
+        && check_acl($config['id_user'], $template['id_group'], 'LM')
     ) {
         $table->cellclass[][4] = 'action_buttons';
         $data[4] = '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_template&pure='.$pure.'" class="float-left inline_line">';
@@ -427,18 +426,20 @@ foreach ($templates as $template) {
         );
         $data[4] .= '</form> ';
 
-        $data[4] .= '<form method="post" class="float-right inline_line" onsubmit="if (!confirm(\''.__('Are you sure?').'\')) return false;">';
-        $data[4] .= html_print_input_hidden('delete_template', 1, true);
-        $data[4] .= html_print_input_hidden('id', $template['id'], true);
-        $data[4] .= html_print_input_image(
-            'del',
-            'images/cross.png',
-            1,
-            '',
-            true,
-            ['title' => __('Delete')]
-        );
-        $data[4] .= '</form> ';
+        if (check_acl_restricted_all($config['id_user'], $template['id_group'], 'LM')) {
+            $data[4] .= '<form method="post" class="float-right inline_line" onsubmit="if (!confirm(\''.__('Are you sure?').'\')) return false;">';
+            $data[4] .= html_print_input_hidden('delete_template', 1, true);
+            $data[4] .= html_print_input_hidden('id', $template['id'], true);
+            $data[4] .= html_print_input_image(
+                'del',
+                'images/cross.png',
+                1,
+                '',
+                true,
+                ['title' => __('Delete')]
+            );
+            $data[4] .= '</form> ';
+        }
     } else {
         $data[4] = '';
     }
diff --git a/pandora_console/godmode/alerts/configure_alert_action.php b/pandora_console/godmode/alerts/configure_alert_action.php
index 7d44ffd25b..bf0dbff521 100644
--- a/pandora_console/godmode/alerts/configure_alert_action.php
+++ b/pandora_console/godmode/alerts/configure_alert_action.php
@@ -58,7 +58,7 @@ if (defined('METACONSOLE')) {
 
 if ($al_action !== false) {
     $own_info = get_user_info($config['id_user']);
-    if ($own_info['is_admin'] || check_acl($config['id_user'], 0, 'PM')) {
+    if ($own_info['is_admin'] || check_acl_restricted_all($config['id_user'], 0, 'LM')) {
         $own_groups = array_keys(users_get_groups($config['id_user'], 'LM'));
     } else {
         $own_groups = array_keys(users_get_groups($config['id_user'], 'LM', false));
@@ -91,8 +91,14 @@ if ($al_action !== false) {
             true
         );
     }
+    $is_in_group = true;
 }
 
+if (!$is_in_group && $al_action['id_group'] != 0) {
+    db_pandora_audit('ACL Violation', 'Trying to access unauthorized alert action configuration');
+    include 'general/noaccess.php';
+    exit;
+}
 
 $is_central_policies_on_node = is_central_policies_on_node();
 
@@ -102,6 +108,11 @@ if ($is_central_policies_on_node === true) {
     );
 }
 
+$disabled = !$is_in_group;
+$disabled_attr = '';
+if ($disabled) {
+    $disabled_attr = 'disabled="disabled"';
+}
 
 $name = '';
 $id_command = '';
@@ -116,15 +127,6 @@ if ($id) {
     $group = $action['id_group'];
     $action_threshold = $action['action_threshold'];
     $create_wu_integria = $action['create_wu_integria'];
-
-    if (!check_acl_restricted_all($config['id_user'], $action['id_group'], 'LM')) {
-        db_pandora_audit(
-            'ACL Violation',
-            'Trying to access Alert Management'
-        );
-        include 'general/noaccess.php';
-        exit;
-    }
 }
 
 // Hidden div with help hint to fill with javascript.
@@ -175,7 +177,7 @@ $table->data[0][1] = html_print_input_text(
     '',
     '',
     '',
-    $is_central_policies_on_node
+    $is_central_policies_on_node | $disabled
 );
 
 if (io_safe_output($name) == 'Monitoring Event') {
@@ -194,7 +196,7 @@ $own_info = get_user_info($config['id_user']);
 
 $return_all_group = false;
 
-if (users_can_manage_group_all('LW') === true) {
+if (users_can_manage_group_all('LW') === true || $disabled) {
     $return_all_group = true;
 }
 
@@ -211,7 +213,7 @@ $table->data[1][1] = '<div class="w250px inline">'.html_print_select_groups(
     false,
     true,
     '',
-    $is_central_policies_on_node
+    $is_central_policies_on_node | $disabled
 ).'</div>';
 $table->colspan[1][1] = 2;
 
@@ -245,11 +247,11 @@ $table->data[2][1] = html_print_select_from_sql(
     true,
     false,
     false,
-    $is_central_policies_on_node
+    $is_central_policies_on_node | $disabled
 );
 $table->data[2][1] .= ' ';
 if ($is_central_policies_on_node === false
-    && check_acl($config['id_user'], 0, 'PM')
+    && check_acl($config['id_user'], 0, 'PM') && !$disabled
 ) {
     $table->data[2][1] .= __('Create Command');
     $table->data[2][1] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/configure_alert_command&pure='.$pure.'">';
@@ -272,7 +274,7 @@ $table->data[3][1] = html_print_extended_select_for_time(
     false,
     true,
     '',
-    $is_central_policies_on_node,
+    $is_central_policies_on_node | $disabled,
     false,
     '',
     false,
@@ -308,7 +310,7 @@ $table->data[6][0] = __('Create workunit on recovery').ui_print_help_tip(
     __('If closed status is set on recovery, a workunit will be added to the ticket in Integria IMS rather that closing the ticket.'),
     true
 );
-$table->data[6][1] = html_print_checkbox_switch_extended('create_wu_integria', 1, $create_wu_integria, false, '', '', true);
+$table->data[6][1] = html_print_checkbox_switch_extended('create_wu_integria', 1, $create_wu_integria, false, '', $disabled_attr, true);
 
 for ($i = 1; $i <= $config['max_macro_fields']; $i++) {
     $table->data['field'.$i][0] = html_print_image(
@@ -328,12 +330,16 @@ for ($i = 1; $i <= $config['max_macro_fields']; $i++) {
     $table->data['field'.$i][1] .= html_print_input_hidden(
         'field'.$i.'_value',
         (!empty($action['field'.$i]) || $action['field'.$i] == 0) ? $action['field'.$i] : '',
-        true
+        true,
+        '',
+        $disabled_attr
     );
     $table->data['field'.$i][2] .= html_print_input_hidden(
         'field'.$i.'_recovery_value',
         (!empty($action['field'.$i.'_recovery']) || $action['field'.$i] == 0) ? $action['field'.$i.'_recovery'] : '',
-        true
+        true,
+        '',
+        $disabled_attr
     );
 }
 
@@ -346,18 +352,7 @@ if ($is_central_policies_on_node === false) {
     echo '<div class="action-buttons" style="width: '.$table->width.'">';
     if ($id) {
         html_print_input_hidden('id', $id);
-        if ($al_action['id_group'] == 0) {
-            // Then must have "PM" access privileges.
-            if (check_acl($config['id_user'], 0, 'PM')) {
-                html_print_input_hidden('update_action', 1);
-                html_print_submit_button(
-                    __('Update'),
-                    'create',
-                    false,
-                    'class="sub upd"'
-                );
-            }
-        } else {
+        if (!$disabled) {
             html_print_input_hidden('update_action', 1);
             html_print_submit_button(
                 __('Update'),
@@ -365,6 +360,12 @@ if ($is_central_policies_on_node === false) {
                 false,
                 'class="sub upd"'
             );
+        } else {
+            echo '<div class="action-buttons" style="width: '.$table->width.'">';
+            echo '<form method="post" action="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_actions">';
+            html_print_submit_button(__('Back'), 'back', false, 'class="sub upd"');
+            echo '</form>';
+            echo '</div>';
         }
     } else {
         html_print_input_hidden('create_action', 1);
@@ -608,6 +609,7 @@ $(document).ready (function () {
                 for (i = 1; i <= max_fields; i++) {
                     var old_value = '';
                     var old_recovery_value = '';
+                    var disabled = '';
                     var field_row = data["fields_rows"][i];
                     var $table_macros_field = $('#table_macros-field' + i);
                     
@@ -623,6 +625,7 @@ $(document).ready (function () {
                         == ("hidden-field" + i + "_value")) {
                         
                         old_value = $("[name=field" + i + "_value]").val();
+                        disabled = $("[name=field" + i + "_value]").attr('disabled');
                     }
                     
                     if (($("[name=field" + i + "_recovery_value]").attr('id'))
@@ -689,6 +692,10 @@ $(document).ready (function () {
                             $('#help_alert_macros_hint').html());
                     }
                     
+                    if (disabled) {
+                        $("[name=field" + i + "_value]").attr('disabled','disabled');
+                        $("[name=field" + i + "_recovery_value]").attr('disabled','disabled');
+                    }
                     $table_macros_field.show();
                 }
 
diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php
index cbfa4f0d8d..7486c97a94 100644
--- a/pandora_console/godmode/alerts/configure_alert_template.php
+++ b/pandora_console/godmode/alerts/configure_alert_template.php
@@ -38,7 +38,6 @@ $step = (int) get_parameter('step', 1);
 // We set here the number of steps.
 define('LAST_STEP', 3);
 
-// If user tries to duplicate/edit a template with group=ALL then must have "PM" access privileges
 if ($duplicate_template) {
     $source_id = (int) get_parameter('source_id');
     $a_template = alerts_get_alert_template($source_id);
@@ -52,19 +51,14 @@ if (defined('METACONSOLE')) {
     $sec = 'galertas';
 }
 
+$can_edit_all = false;
+if (check_acl_restricted_all($config['id_user'], 0, 'LM')) {
+    $can_edit_all = true;
+}
+
 if ($a_template !== false) {
     // If user tries to duplicate/edit a template with group=ALL
     if ($a_template['id_group'] == 0) {
-        if (users_can_manage_group_all('LM') === false) {
-                db_pandora_audit(
-                    'ACL Violation',
-                    'Trying to access Alert Management'
-                );
-            include 'general/noaccess.php';
-            exit;
-        }
-
-        // Header
         if (defined('METACONSOLE')) {
             alerts_meta_print_header();
         } else {
@@ -146,7 +140,12 @@ if ($a_template !== false) {
 if ($duplicate_template) {
     $source_id = (int) get_parameter('source_id');
 
-    $id = alerts_duplicate_alert_template($source_id);
+    // If user doesn't have the permission to access All group and source template is All group, then group is changed to the first group of user.
+    if ($can_edit_all == false && a_template['id_group'] == 0) {
+        $a_template['id_group'] = users_get_first_group(false, 'LM', false);
+    } 
+
+    $id = alerts_duplicate_alert_template($source_id, $a_template['id_group']);
 
     if ($id) {
         db_pandora_audit('Template alert management', 'Duplicate alert template '.$source_id.' clone to '.$id);
@@ -386,6 +385,14 @@ $create_alert = (bool) get_parameter('create_alert');
 $create_template = (bool) get_parameter('create_template');
 $update_template = (bool) get_parameter('update_template');
 
+$disabled = false;
+if (!$create_alert && !$create_template) {
+    // When user edits a template with All group, user must have "LM" access privileges againt All group.
+    if ($a_template['id_group'] == 0 && !$can_edit_all) {
+        $disabled = true;
+    }
+}
+
 $name = '';
 $description = '';
 $type = '';
@@ -602,7 +609,7 @@ if ($step == 2) {
         1,
         $monday,
         true,
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
     $table->data[0][1] .= __('Tue');
     $table->data[0][1] .= html_print_checkbox(
@@ -610,7 +617,7 @@ if ($step == 2) {
         1,
         $tuesday,
         true,
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
     $table->data[0][1] .= __('Wed');
     $table->data[0][1] .= html_print_checkbox(
@@ -618,7 +625,7 @@ if ($step == 2) {
         1,
         $wednesday,
         true,
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
     $table->data[0][1] .= __('Thu');
     $table->data[0][1] .= html_print_checkbox(
@@ -626,7 +633,7 @@ if ($step == 2) {
         1,
         $thursday,
         true,
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
     $table->data[0][1] .= __('Fri');
     $table->data[0][1] .= html_print_checkbox(
@@ -634,7 +641,7 @@ if ($step == 2) {
         1,
         $friday,
         true,
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
     $table->data[0][1] .= __('Sat');
     $table->data[0][1] .= html_print_checkbox(
@@ -642,7 +649,7 @@ if ($step == 2) {
         1,
         $saturday,
         true,
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
     $table->data[0][1] .= __('Sun');
     $table->data[0][1] .= html_print_checkbox(
@@ -650,7 +657,7 @@ if ($step == 2) {
         1,
         $sunday,
         true,
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
 
     $table->data[0][2] = __('Use special days list');
@@ -659,7 +666,7 @@ if ($step == 2) {
         1,
         $special_day,
         true,
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
 
     $table->data[1][0] = __('Time from');
@@ -680,7 +687,7 @@ if ($step == 2) {
         '',
         '',
         '',
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
     $table->data[1][2] = __('Time to');
     $table->data[1][3] = html_print_input_text(
@@ -700,7 +707,7 @@ if ($step == 2) {
         '',
         '',
         '',
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
 
     $table->colspan['threshold'][1] = 3;
@@ -716,7 +723,7 @@ if ($step == 2) {
         false,
         true,
         '',
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
 
     $table->data[3][0] = __('Min. number of alerts');
@@ -737,7 +744,7 @@ if ($step == 2) {
         '',
         '',
         '',
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
 
     $table->data[3][2] = __('Reset counter for non-sustained alerts');
@@ -750,7 +757,7 @@ if ($step == 2) {
         1,
         $min_alerts_reset_counter,
         true,
-        $is_central_policies_on_node,
+        $is_central_policies_on_node | $disabled,
         '',
         false,
         $create_template == 1 ? 'checked=checked' : ''
@@ -774,7 +781,7 @@ if ($step == 2) {
         '',
         '',
         '',
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
 
     $table->data[4][2] = __('Disable event');
@@ -783,7 +790,7 @@ if ($step == 2) {
         1,
         $disable_event,
         true,
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
 
     $table->data[5][0] = __('Default action');
@@ -811,7 +818,7 @@ if ($step == 2) {
         true,
         false,
         false,
-        $is_central_policies_on_node,
+        $is_central_policies_on_node | $disabled,
         false,
         false,
         0
@@ -833,7 +840,7 @@ if ($step == 2) {
         false,
         false,
         '',
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
     $table->data[6][1] .= '<span id="matches_value" '.($show_matches ? '' : 'class="invisible"').'>';
     $table->data[6][1] .= '&nbsp;'.html_print_checkbox('matches_value', 1, $matches, true);
@@ -886,7 +893,8 @@ if ($step == 2) {
         '',
         5,
         255,
-        true
+        true,
+        $disabled
     );
     $table->colspan['min'][1] = 3;
 
@@ -897,7 +905,8 @@ if ($step == 2) {
         '',
         5,
         255,
-        true
+        true,
+        $disabled
     );
     $table->colspan['max'][1] = 3;
 
@@ -940,7 +949,7 @@ if ($step == 2) {
         false,
         false,
         '',
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
     $table->colspan[0][1] = 2;
 
@@ -966,7 +975,7 @@ if ($step == 2) {
             0,
             '',
             false,
-            $is_central_policies_on_node,
+            $is_central_policies_on_node | $disabled,
             "removeTinyMCE('textarea_field".$i."')",
             '',
             true
@@ -979,7 +988,7 @@ if ($step == 2) {
             0,
             '',
             true,
-            $is_central_policies_on_node,
+            $is_central_policies_on_node | $disabled,
             "addTinyMCE('textarea_field".$i."')",
             '',
             true
@@ -995,7 +1004,7 @@ if ($step == 2) {
             'class="fields" min-height-40px',
             true,
             '',
-            $is_central_policies_on_node
+            $is_central_policies_on_node | $disabled
         );
 
         // Recovery.
@@ -1007,7 +1016,7 @@ if ($step == 2) {
             0,
             '',
             false,
-            $is_central_policies_on_node,
+            $is_central_policies_on_node | $disabled,
             "removeTinyMCE('textarea_field".$i."_recovery')",
             '',
             true
@@ -1020,7 +1029,7 @@ if ($step == 2) {
             0,
             '',
             true,
-            $is_central_policies_on_node,
+            $is_central_policies_on_node | $disabled,
             "addTinyMCE('textarea_field".$i."_recovery')",
             '',
             true
@@ -1036,7 +1045,7 @@ if ($step == 2) {
             'class="fields min-height-40px"',
             true,
             '',
-            $is_central_policies_on_node
+            $is_central_policies_on_node | $disabled
         );
     }
 } else {
@@ -1093,7 +1102,7 @@ if ($step == 2) {
         '',
         '',
         '',
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
 
 
@@ -1103,8 +1112,12 @@ if ($step == 2) {
 
     $return_all_group = false;
 
-    if (users_can_manage_group_all('LM') === true) {
+    if (users_can_manage_group_all('LM') === true || $disabled) {
         $return_all_group = true;
+    } else {
+        if ($id_group == 0) {
+            $id_group = users_get_first_group(false, 'LM', false);
+        }
     }
 
     $table->data[0][1] .= '&nbsp;';
@@ -1121,7 +1134,7 @@ if ($step == 2) {
         false,
         true,
         '',
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     ).'</div>';
 
 
@@ -1134,7 +1147,7 @@ if ($step == 2) {
         '',
         true,
         '',
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
 
     $table->data[2][0] = __('Priority');
@@ -1149,7 +1162,7 @@ if ($step == 2) {
         false,
         false,
         '',
-        $is_central_policies_on_node
+        $is_central_policies_on_node | $disabled
     );
 
     if (defined('METACONSOLE')) {
@@ -1186,16 +1199,6 @@ if ($id) {
     html_print_input_hidden('create_template', 1);
 }
 
-$disabled = false;
-if (!$create_alert && !$create_template) {
-    if ($a_template['id_group'] == 0) {
-        // then must have "PM" access privileges
-        if (! check_acl($config['id_user'], 0, 'PM')) {
-            $disabled = true;
-        }
-    }
-}
-
 if (!$disabled) {
     if ($is_central_policies_on_node === false) {
         if ($step >= LAST_STEP) {
diff --git a/pandora_console/include/functions_alerts.php b/pandora_console/include/functions_alerts.php
index 9e27001d15..2baebc6a51 100644
--- a/pandora_console/include/functions_alerts.php
+++ b/pandora_console/include/functions_alerts.php
@@ -439,10 +439,11 @@ function alerts_delete_alert_action($id_alert_action)
  * Clone an alert action.
  *
  * @param int Id of the original alert action
+ * @param int Agent group id if it wants to be changed when clone.
  *
  * @return mixed Id of the cloned action or false in case of fail.
  */
-function alerts_clone_alert_action($id_alert_action)
+function alerts_clone_alert_action($id_alert_action, $id_group)
 {
     $id_alert_action = safe_int($id_alert_action, 1);
     if (empty($id_alert_action)) {
@@ -455,6 +456,10 @@ function alerts_clone_alert_action($id_alert_action)
         return false;
     }
 
+    if ($id_group != '') {
+        $action['id_group'] = $id_group;
+    }
+
     unset($action['id']);
 
     return alerts_create_alert_action($action['name'].' '.__('copy'), $action['id_alert_command'], $action);
@@ -1121,10 +1126,11 @@ function alerts_get_alert_template_field3_recovery($id_alert_template)
  * Duplicates an alert template.
  *
  * @param int Id of an alert template.
+ * @param int Agent group id if it wants to be changed when duplicate.
  *
  * @return mixed Duplicates an alert template or false if something goes wrong.
  */
-function alerts_duplicate_alert_template($id_alert_template)
+function alerts_duplicate_alert_template($id_alert_template, $id_group)
 {
     $template = alerts_get_alert_template($id_alert_template);
 
@@ -1132,6 +1138,10 @@ function alerts_duplicate_alert_template($id_alert_template)
         return false;
     }
 
+    if ($id_group != '') {
+        $template['id_group'] = $id_group;
+    }
+
     $name = io_safe_input(__('Copy of').' ').$template['name'];
     $type = $template['type'];
 

From 201d3194de8156ebc9e5e6fcce940b4ae735dec9 Mon Sep 17 00:00:00 2001
From: fbsanchez <fborja.sanchez@artica.es>
Date: Wed, 7 Apr 2021 18:17:08 +0200
Subject: [PATCH 14/22] Some inclusions in mobile view (MC) and minor fixes

---
 pandora_console/mobile/include/style/main.css |  7 +-
 pandora_console/mobile/index.php              | 11 ++--
 pandora_console/mobile/operation/agent.php    |  9 ++-
 pandora_console/mobile/operation/home.php     | 64 +++++++++----------
 4 files changed, 50 insertions(+), 41 deletions(-)

diff --git a/pandora_console/mobile/include/style/main.css b/pandora_console/mobile/include/style/main.css
index 2f4e8065d8..1feae8b3c9 100755
--- a/pandora_console/mobile/include/style/main.css
+++ b/pandora_console/mobile/include/style/main.css
@@ -1296,6 +1296,11 @@ table.tactical_bars {
   -webkit-border-radius: 15px !important;
 }
 
+.ui-header.ui-bar-a .ui-btn-icon-notext .ui-btn-inner .ui-icon {
+  margin-top: -3px;
+  margin-left: 3.5px;
+}
+
 #login_btn-container .ui-icon {
   background-color: #333 !important;
   border-radius: 15px !important;
@@ -1431,7 +1436,7 @@ div.nodata_container {
 }
 
 .ui-icon-delete {
-  margin-top: -3px !important;
+  margin-top: -3px;
 }
 
 .empty_advice {
diff --git a/pandora_console/mobile/index.php b/pandora_console/mobile/index.php
index a4ed9f7d21..5087661bd7 100644
--- a/pandora_console/mobile/index.php
+++ b/pandora_console/mobile/index.php
@@ -183,7 +183,6 @@ switch ($action) {
         }
     return;
 
-        break;
     case 'login':
         if ($user->login() && $user->isLogged()) {
             if (file_exists('../enterprise/load_enterprise.php')) {
@@ -279,9 +278,6 @@ switch ($action) {
                     $page = 'events';
                 break;
 
-                case 'Group view':
-                break;
-
                 case 'Alert detail':
                     $page = 'alerts';
                 break;
@@ -295,6 +291,11 @@ switch ($action) {
                     $id_map = (int) db_get_value('id', 'tlayout', 'name', $section_data);
                     $_GET['id'] = $id_map;
                 break;
+
+                case 'Group view':
+                default:
+                    // No content.
+                break;
             }
         }
 
@@ -351,7 +352,7 @@ switch ($action) {
             break;
 
             case 'visualmaps':
-                // Show a list ov VC.
+                // Show a list of VC.
                 $vc_list = new Visualmaps();
                 $vc_list->show();
             break;
diff --git a/pandora_console/mobile/operation/agent.php b/pandora_console/mobile/operation/agent.php
index 0d2b327de2..6441a0c21c 100644
--- a/pandora_console/mobile/operation/agent.php
+++ b/pandora_console/mobile/operation/agent.php
@@ -425,7 +425,12 @@ class Agent
                     success: function(r) {
                         $.mobile.hidePageLoadingMsg();
                         var className = $('#list_agent_Modules').attr('class');
-                        $('#list_agent_Modules').parent().html(r);
+                        if (document.getElementById('list_agent_Modules') == null) {
+                            $($('p.empty_advice')[0]).parent().html(r);
+                            className = 'ui-responsive table-stroke ui-table ui-table-reflow';
+                        } else {
+                            $('#list_agent_Modules').parent().html(r);
+                        }
                         $('#list_agent_Modules').addClass(className);
                     },
                     error: function(r, t, e) {
@@ -468,7 +473,7 @@ class Agent
                     'id_agent'    => $this->id,
                     'all_modules' => true,
                     'status'      => -1,
-                    'name'        => $name_filter,
+                    'name'        => '%'.$name_filter.'%',
                 ];
             }
 
diff --git a/pandora_console/mobile/operation/home.php b/pandora_console/mobile/operation/home.php
index 7a89510380..0fa872df7a 100644
--- a/pandora_console/mobile/operation/home.php
+++ b/pandora_console/mobile/operation/home.php
@@ -70,42 +70,40 @@ class Home
             ];
         }
 
-        if (!$system->getConfig('metaconsole')) {
-            $items['alerts'] = [
-                'name'      => __('Alerts'),
-                'filename'  => 'alerts.php',
-                'menu_item' => true,
-                'icon'      => 'alerts',
-            ];
+        $items['alerts'] = [
+            'name'      => __('Alerts'),
+            'filename'  => 'alerts.php',
+            'menu_item' => true,
+            'icon'      => 'alerts',
+        ];
 
-            $items['agents'] = [
-                'name'      => __('Agents'),
-                'filename'  => 'agents.php',
-                'menu_item' => true,
-                'icon'      => 'agents',
-            ];
+        $items['agents'] = [
+            'name'      => __('Agents'),
+            'filename'  => 'agents.php',
+            'menu_item' => true,
+            'icon'      => 'agents',
+        ];
 
-            $items['modules'] = [
-                'name'      => __('Modules'),
-                'filename'  => 'modules.php',
-                'menu_item' => true,
-                'icon'      => 'modules',
-            ];
+        $items['modules'] = [
+            'name'      => __('Modules'),
+            'filename'  => 'modules.php',
+            'menu_item' => true,
+            'icon'      => 'modules',
+        ];
 
-            // Not in home.
-            $items['agent'] = [
-                'name'      => __('Agent'),
-                'filename'  => 'agent.php',
-                'menu_item' => false,
-                'icon'      => '',
-            ];
-            $items['module_graph'] = [
-                'name'      => __('Module graph'),
-                'filename'  => 'module_graph.php',
-                'menu_item' => false,
-                'icon'      => '',
-            ];
-        }
+        // Not in home.
+        $items['agent'] = [
+            'name'      => __('Agent'),
+            'filename'  => 'agent.php',
+            'menu_item' => false,
+            'icon'      => '',
+        ];
+        $items['module_graph'] = [
+            'name'      => __('Module graph'),
+            'filename'  => 'module_graph.php',
+            'menu_item' => false,
+            'icon'      => '',
+        ];
 
         $this->pagesItems = $items;
     }

From 56ff24567562a221d940caa5b757c4dc846cd803 Mon Sep 17 00:00:00 2001
From: Junichi Satoh <junichi@rworks.jp>
Date: Wed, 14 Apr 2021 11:07:13 +0900
Subject: [PATCH 15/22] Fixed the order of arguments in 'create_profile' as the
 same as comment in pandora_manage.pl and documentation, and fixed
 'profile_name' was not encoded.

Plus, added new cli, 'update_profile'.
---
 pandora_server/util/pandora_manage.pl | 45 +++++++++++++++++++++++++--
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 3a9fc1d3ba..38f0656555 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -193,6 +193,7 @@ sub help_screen{
 	help_screen_line('--delete_profile', '<user_name> <profile_name> <group_name>', 'Delete perfil from user');
 	help_screen_line('--add_profile_to_user', '<user_id> <profile_name> [<group_name>]', 'Add a profile in group to a user');
 	help_screen_line('--create_profile', "<profile_name> <incident_view> <incident_edit> <incident_management> <agent_view>\n\t   <agent_edit> <agent_disable> <alert_edit> <alert_management> <user_management> <db_management>\n\t   <event_view> <event_edit> <event_management> <report_view> <report_edit> <report_management>\n\t   <map_view> <map_edit> <map_management> <vconsole_view> <vconsole_edit> <vconsole_management>\n\t   <pandora_management>", 'Create profile');
+	help_screen_line('--update_profile', "<profile_name> <incident_view> <incident_edit> <incident_management> <agent_view>\n\t   <agent_edit> <agent_disable> <alert_edit> <alert_management> <user_management> <db_management>\n\t   <event_view> <event_edit> <event_management> <report_view> <report_edit> <report_management>\n\t   <map_view> <map_edit> <map_management> <vconsole_view> <vconsole_edit> <vconsole_management>\n\t   <pandora_management>", 'Modify profile');
 	help_screen_line('--disable_eacl', '', 'Disable enterprise ACL system');
 	help_screen_line('--enable_eacl', '', 'Enable enterprise ACL system');
 	help_screen_line('--disable_double_auth', '<user_name>', 'Disable the double authentication for the specified user');
@@ -568,13 +569,29 @@ sub pandora_create_profile ($$$$$$$$$$$$$$$$$$$$$$$$$) {
 		$event_view, $event_edit, $event_management, $report_view, $report_edit, $report_management,
 		$map_view, $map_edit, $map_management, $vconsole_view, $vconsole_edit, $vconsole_management, $pandora_management) = @_;
 
-		return db_insert ($dbh, 'id_up', 'INSERT INTO tperfil (name,incident_edit,incident_view,incident_management,agent_view,agent_edit,alert_edit,user_management,db_management,alert_management,pandora_management,report_view,report_edit,report_management,event_view,event_edit,event_management,agent_disable,map_view,map_edit,map_management,vconsole_view,vconsole_edit,vconsole_management) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);',
-		$profile_name, $incident_view,$incident_edit, $incident_management, $agent_view,
+		return db_insert ($dbh, 'id_up', 'INSERT INTO tperfil (name,incident_view,incident_edit,incident_management,agent_view,agent_edit,agent_disable,alert_edit,alert_management,user_management,db_management,event_view,event_edit,event_management,report_view,report_edit,report_management,map_view,map_edit,map_management,vconsole_view,vconsole_edit,vconsole_management,pandora_management) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);',
+		safe_input($profile_name), $incident_view,$incident_edit, $incident_management, $agent_view,
 		$agent_edit, $agent_disable, $alert_edit, $alert_management, $user_management, $db_management,
 		$event_view, $event_edit, $event_management, $report_view, $report_edit, $report_management,
 		$map_view, $map_edit, $map_management, $vconsole_view, $vconsole_edit, $vconsole_management, $pandora_management);
 }
 
+##########################################################################
+#### Update profile.
+###########################################################################
+sub pandora_update_profile ($$$$$$$$$$$$$$$$$$$$$$$$$) {
+	my ($dbh, $profile_name, $incident_view,$incident_edit, $incident_management, $agent_view,
+		$agent_edit, $agent_disable, $alert_edit, $alert_management, $user_management, $db_management,
+		$event_view, $event_edit, $event_management, $report_view, $report_edit, $report_management,
+		$map_view, $map_edit, $map_management, $vconsole_view, $vconsole_edit, $vconsole_management, $pandora_management) = @_;
+
+		return db_update ($dbh, 'UPDATE tperfil SET incident_view = ?, incident_edit = ?, incident_management = ?, agent_view = ?, agent_edit = ?, agent_disable = ?, alert_edit = ?, alert_management = ?, user_management = ?, db_management = ?, event_view = ?, event_edit = ?, event_management = ?, report_view = ?, report_edit = ?, report_management = ?, map_view = ?, map_edit = ?, map_management = ?, vconsole_view = ?, vconsole_edit = ?, vconsole_management = ?, pandora_management = ? WHERE name=?;',
+		$incident_view,$incident_edit, $incident_management, $agent_view,
+		$agent_edit, $agent_disable, $alert_edit, $alert_management, $user_management, $db_management,
+		$event_view, $event_edit, $event_management, $report_view, $report_edit, $report_management,
+		$map_view, $map_edit, $map_management, $vconsole_view, $vconsole_edit, $vconsole_management, $pandora_management, safe_input($profile_name));
+}
+
 ##########################################################################
 ## Delete a profile from the given user/group.
 ##########################################################################
@@ -4005,6 +4022,26 @@ sub cli_create_profile() {
 	$map_view, $map_edit, $map_management, $vconsole_view, $vconsole_edit, $vconsole_management, $pandora_management);
 }
 
+##############################################################################
+## Update profile.
+## Related option: --update_profile
+##############################################################################
+#
+sub cli_update_profile() {
+	my ($profile_name,$incident_view,$incident_edit,$incident_management,$agent_view,
+	$agent_edit,$agent_disable,$alert_edit,$alert_management,$user_management,$db_management,
+	$event_view,$event_edit,$event_management,$report_view,$report_edit,$report_management,
+	$map_view,$map_edit,$map_management,$vconsole_view,$vconsole_edit,$vconsole_management,$pandora_management) = @ARGV[2..25];
+
+	my $id_profile = get_profile_id($dbh,$profile_name);
+	exist_check($id_profile,'profile',$profile_name);
+
+	pandora_update_profile ($dbh, $profile_name, $incident_view, $incident_edit, $incident_management, $agent_view,
+	$agent_edit, $agent_disable, $alert_edit, $alert_management, $user_management, $db_management,
+	$event_view, $event_edit, $event_management, $report_view, $report_edit, $report_management,
+	$map_view, $map_edit, $map_management, $vconsole_view, $vconsole_edit, $vconsole_management, $pandora_management);
+}
+
 ##############################################################################
 # Delete profile.
 # Related option: --delete_profile
@@ -7432,6 +7469,10 @@ sub pandora_manage_main ($$$) {
 			param_check($ltotal, 24);
 			cli_create_profile();
 		}
+		elsif ($param eq '--update_profile') {
+			param_check($ltotal, 24);
+			cli_update_profile();
+		}
 		elsif ($param eq '--delete_profile') {
 			param_check($ltotal, 3);
 			cli_delete_profile();

From b6ea565118a53ab0785c11890bd6531e7de181d8 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Wed, 14 Apr 2021 12:07:38 +0200
Subject: [PATCH 16/22] add black theme to widget dashboard

---
 pandora_console/include/functions_html.php    |   12 +-
 pandora_console/include/functions_ui.php      |    2 +-
 .../include/graphs/flot/jquery.flot.js        | 1034 +++++++++--------
 .../include/graphs/flot/jquery.flot.min.js    |    4 +-
 .../include/graphs/functions_flot.php         |    5 +-
 pandora_console/include/graphs/pandora.d3.js  |    2 +
 .../include/lib/Dashboard/Widget.php          |    6 +
 .../lib/Dashboard/Widgets/events_list.php     |    7 +-
 .../Dashboard/Widgets/system_group_status.php |    2 +-
 .../lib/Dashboard/Widgets/tree_view.php       |    3 +
 .../include/styles/pandora_black.css          |   43 +-
 .../include/styles/select2_dark.min.css       |   10 +-
 pandora_console/views/dashboard/cell.php      |    3 +
 13 files changed, 597 insertions(+), 536 deletions(-)

diff --git a/pandora_console/include/functions_html.php b/pandora_console/include/functions_html.php
index b566d376ec..c5a16434f8 100644
--- a/pandora_console/include/functions_html.php
+++ b/pandora_console/include/functions_html.php
@@ -885,6 +885,11 @@ function html_print_select(
 		";
     }
 
+    $select2 = 'select2.min';
+    if ($config['style'] === 'pandora_black') {
+        $select2 = 'select2_dark.min';
+    }
+
     if ($multiple === false) {
         if (is_ajax()) {
             $output .= '<script src="';
@@ -898,18 +903,13 @@ function html_print_select(
 
             $output .= '<link rel="stylesheet" href="';
             $output .= ui_get_full_url(
-                'include/styles/select2.min.css',
+                'include/styles/'.$select2.'.css',
                 false,
                 false,
                 false
             );
             $output .= '"/>';
         } else {
-            $select2 = 'select2.min';
-            if ($config['style'] === 'pandora_black') {
-                $select2 = 'select2_dark.min';
-            }
-
             ui_require_css_file($select2);
             ui_require_javascript_file('select2.min');
         }
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index 8bd8470e43..2e2e4b5958 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -322,7 +322,7 @@ function ui_print_message($message, $class='', $attributes='', $return=false, $t
 		class="info_box '.$id.' '.$class.' textodialogo" style="'.$force_style.'">
 		<tr>
 			<td class="icon icon_ui" rowspan="2" >'.html_print_image($icon_image, true, false, false, false, false).'</td>
-			<td class="title pandora_upper pdd_t_10px"><b>'.$text_title.'</b></td>
+			<td class="title pandora_upper pdd_t_10px text_left"><b>'.$text_title.'</b></td>
 			<td class="icon right pdd_r_3px">';
     if (!$no_close_bool) {
         // Use the no_meta parameter because this image is only in
diff --git a/pandora_console/include/graphs/flot/jquery.flot.js b/pandora_console/include/graphs/flot/jquery.flot.js
index 39f3e4cf3e..2f4ac4e4a5 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.js
@@ -29,14 +29,14 @@ Licensed under the MIT license.
  * V. 1.1: Fix error handling so e.g. parsing an empty string does
  * produce a color rather than just crashing.
  */
-(function($){$.color={};$.color.make=function(r,g,b,a){var o={};o.r=r||0;o.g=g||0;o.b=b||0;o.a=a!=null?a:1;o.add=function(c,d){for(var i=0;i<c.length;++i)o[c.charAt(i)]+=d;return o.normalize()};o.scale=function(c,f){for(var i=0;i<c.length;++i)o[c.charAt(i)]*=f;return o.normalize()};o.toString=function(){if(o.a>=1){return"rgb("+[o.r,o.g,o.b].join(",")+")"}else{return"rgba("+[o.r,o.g,o.b,o.a].join(",")+")"}};o.normalize=function(){function clamp(min,value,max){return value<min?min:value>max?max:value}o.r=clamp(0,parseInt(o.r),255);o.g=clamp(0,parseInt(o.g),255);o.b=clamp(0,parseInt(o.b),255);o.a=clamp(0,o.a,1);return o};o.clone=function(){return $.color.make(o.r,o.b,o.g,o.a)};return o.normalize()};$.color.extract=function(elem,css){var c;do{c=elem.css(css).toLowerCase();if(c!=""&&c!="transparent")break;elem=elem.parent()}while(elem.length&&!$.nodeName(elem.get(0),"body"));if(c=="rgba(0, 0, 0, 0)")c="transparent";return $.color.parse(c)};$.color.parse=function(str){var res,m=$.color.make;if(res=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(str))return m(parseInt(res[1],10),parseInt(res[2],10),parseInt(res[3],10));if(res=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))return m(parseInt(res[1],10),parseInt(res[2],10),parseInt(res[3],10),parseFloat(res[4]));if(res=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(str))return m(parseFloat(res[1])*2.55,parseFloat(res[2])*2.55,parseFloat(res[3])*2.55);if(res=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str))return m(parseFloat(res[1])*2.55,parseFloat(res[2])*2.55,parseFloat(res[3])*2.55,parseFloat(res[4]));if(res=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(str))return m(parseInt(res[1],16),parseInt(res[2],16),parseInt(res[3],16));if(res=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(str))return m(parseInt(res[1]+res[1],16),parseInt(res[2]+res[2],16),parseInt(res[3]+res[3],16));var name=$.trim(str).toLowerCase();if(name=="transparent")return m(255,255,255,0);else{res=lookupColors[name]||[0,0,0];return m(res[0],res[1],res[2])}};var lookupColors={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery);
+(function ($) { $.color = {}; $.color.make = function (r, g, b, a) { var o = {}; o.r = r || 0; o.g = g || 0; o.b = b || 0; o.a = a != null ? a : 1; o.add = function (c, d) { for (var i = 0; i < c.length; ++i)o[c.charAt(i)] += d; return o.normalize() }; o.scale = function (c, f) { for (var i = 0; i < c.length; ++i)o[c.charAt(i)] *= f; return o.normalize() }; o.toString = function () { if (o.a >= 1) { return "rgb(" + [o.r, o.g, o.b].join(",") + ")" } else { return "rgba(" + [o.r, o.g, o.b, o.a].join(",") + ")" } }; o.normalize = function () { function clamp(min, value, max) { return value < min ? min : value > max ? max : value } o.r = clamp(0, parseInt(o.r), 255); o.g = clamp(0, parseInt(o.g), 255); o.b = clamp(0, parseInt(o.b), 255); o.a = clamp(0, o.a, 1); return o }; o.clone = function () { return $.color.make(o.r, o.b, o.g, o.a) }; return o.normalize() }; $.color.extract = function (elem, css) { var c; do { c = elem.css(css).toLowerCase(); if (c != "" && c != "transparent") break; elem = elem.parent() } while (elem.length && !$.nodeName(elem.get(0), "body")); if (c == "rgba(0, 0, 0, 0)") c = "transparent"; return $.color.parse(c) }; $.color.parse = function (str) { var res, m = $.color.make; if (res = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(str)) return m(parseInt(res[1], 10), parseInt(res[2], 10), parseInt(res[3], 10)); if (res = /rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str)) return m(parseInt(res[1], 10), parseInt(res[2], 10), parseInt(res[3], 10), parseFloat(res[4])); if (res = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(str)) return m(parseFloat(res[1]) * 2.55, parseFloat(res[2]) * 2.55, parseFloat(res[3]) * 2.55); if (res = /rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str)) return m(parseFloat(res[1]) * 2.55, parseFloat(res[2]) * 2.55, parseFloat(res[3]) * 2.55, parseFloat(res[4])); if (res = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(str)) return m(parseInt(res[1], 16), parseInt(res[2], 16), parseInt(res[3], 16)); if (res = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(str)) return m(parseInt(res[1] + res[1], 16), parseInt(res[2] + res[2], 16), parseInt(res[3] + res[3], 16)); var name = $.trim(str).toLowerCase(); if (name == "transparent") return m(255, 255, 255, 0); else { res = lookupColors[name] || [0, 0, 0]; return m(res[0], res[1], res[2]) } }; var lookupColors = { aqua: [0, 255, 255], azure: [240, 255, 255], beige: [245, 245, 220], black: [0, 0, 0], blue: [0, 0, 255], brown: [165, 42, 42], cyan: [0, 255, 255], darkblue: [0, 0, 139], darkcyan: [0, 139, 139], darkgrey: [169, 169, 169], darkgreen: [0, 100, 0], darkkhaki: [189, 183, 107], darkmagenta: [139, 0, 139], darkolivegreen: [85, 107, 47], darkorange: [255, 140, 0], darkorchid: [153, 50, 204], darkred: [139, 0, 0], darksalmon: [233, 150, 122], darkviolet: [148, 0, 211], fuchsia: [255, 0, 255], gold: [255, 215, 0], green: [0, 128, 0], indigo: [75, 0, 130], khaki: [240, 230, 140], lightblue: [173, 216, 230], lightcyan: [224, 255, 255], lightgreen: [144, 238, 144], lightgrey: [211, 211, 211], lightpink: [255, 182, 193], lightyellow: [255, 255, 224], lime: [0, 255, 0], magenta: [255, 0, 255], maroon: [128, 0, 0], navy: [0, 0, 128], olive: [128, 128, 0], orange: [255, 165, 0], pink: [255, 192, 203], purple: [128, 0, 128], violet: [128, 0, 128], red: [255, 0, 0], silver: [192, 192, 192], white: [255, 255, 255], yellow: [255, 255, 0] } })(jQuery);
 
 // the actual Flot code
-(function($) {
+(function ($) {
 
-	// Cache the prototype hasOwnProperty for faster access
+    // Cache the prototype hasOwnProperty for faster access
 
-	var hasOwnProperty = Object.prototype.hasOwnProperty;
+    var hasOwnProperty = Object.prototype.hasOwnProperty;
 
     // A shim to provide 'detach' to jQuery versions prior to 1.4.  Using a DOM
     // operation produces the same effect as detach, i.e. removing the element
@@ -45,465 +45,465 @@ Licensed under the MIT license.
     // Do not merge this into Flot 0.9, since it requires jQuery 1.4.4+.
 
     if (!$.fn.detach) {
-        $.fn.detach = function() {
-            return this.each(function() {
+        $.fn.detach = function () {
+            return this.each(function () {
                 if (this.parentNode) {
-                    this.parentNode.removeChild( this );
+                    this.parentNode.removeChild(this);
                 }
             });
         };
     }
 
-	///////////////////////////////////////////////////////////////////////////
-	// The Canvas object is a wrapper around an HTML5 <canvas> tag.
-	//
-	// @constructor
-	// @param {string} cls List of classes to apply to the canvas.
-	// @param {element} container Element onto which to append the canvas.
-	//
-	// Requiring a container is a little iffy, but unfortunately canvas
-	// operations don't work unless the canvas is attached to the DOM.
+    ///////////////////////////////////////////////////////////////////////////
+    // The Canvas object is a wrapper around an HTML5 <canvas> tag.
+    //
+    // @constructor
+    // @param {string} cls List of classes to apply to the canvas.
+    // @param {element} container Element onto which to append the canvas.
+    //
+    // Requiring a container is a little iffy, but unfortunately canvas
+    // operations don't work unless the canvas is attached to the DOM.
 
-	function Canvas(cls, container) {
+    function Canvas(cls, container) {
 
-		var element = container.children("." + cls)[0];
+        var element = container.children("." + cls)[0];
 
-		if (element == null) {
+        if (element == null) {
 
-			element = document.createElement("canvas");
-			element.className = cls;
+            element = document.createElement("canvas");
+            element.className = cls;
 
-			$(element).css({ direction: "ltr", position: "absolute", left: 0, top: 0 })
-				.appendTo(container);
+            $(element).css({ direction: "ltr", position: "absolute", left: 0, top: 0 })
+                .appendTo(container);
 
-			// If HTML5 Canvas isn't available, fall back to [Ex|Flash]canvas
+            // If HTML5 Canvas isn't available, fall back to [Ex|Flash]canvas
 
-			if (!element.getContext) {
-				if (window.G_vmlCanvasManager) {
-					element = window.G_vmlCanvasManager.initElement(element);
-				} else {
-					throw new Error("Canvas is not available. If you're using IE with a fall-back such as Excanvas, then there's either a mistake in your conditional include, or the page has no DOCTYPE and is rendering in Quirks Mode.");
-				}
-			}
-		}
+            if (!element.getContext) {
+                if (window.G_vmlCanvasManager) {
+                    element = window.G_vmlCanvasManager.initElement(element);
+                } else {
+                    throw new Error("Canvas is not available. If you're using IE with a fall-back such as Excanvas, then there's either a mistake in your conditional include, or the page has no DOCTYPE and is rendering in Quirks Mode.");
+                }
+            }
+        }
 
-		this.element = element;
+        this.element = element;
 
-		var context = this.context = element.getContext("2d");
+        var context = this.context = element.getContext("2d");
 
-		// Determine the screen's ratio of physical to device-independent
-		// pixels.  This is the ratio between the canvas width that the browser
-		// advertises and the number of pixels actually present in that space.
+        // Determine the screen's ratio of physical to device-independent
+        // pixels.  This is the ratio between the canvas width that the browser
+        // advertises and the number of pixels actually present in that space.
 
-		// The iPhone 4, for example, has a device-independent width of 320px,
-		// but its screen is actually 640px wide.  It therefore has a pixel
-		// ratio of 2, while most normal devices have a ratio of 1.
+        // The iPhone 4, for example, has a device-independent width of 320px,
+        // but its screen is actually 640px wide.  It therefore has a pixel
+        // ratio of 2, while most normal devices have a ratio of 1.
 
-		var devicePixelRatio = window.devicePixelRatio || 1,
-			backingStoreRatio =
-				context.webkitBackingStorePixelRatio ||
-				context.mozBackingStorePixelRatio ||
-				context.msBackingStorePixelRatio ||
-				context.oBackingStorePixelRatio ||
-				context.backingStorePixelRatio || 1;
+        var devicePixelRatio = window.devicePixelRatio || 1,
+            backingStoreRatio =
+                context.webkitBackingStorePixelRatio ||
+                context.mozBackingStorePixelRatio ||
+                context.msBackingStorePixelRatio ||
+                context.oBackingStorePixelRatio ||
+                context.backingStorePixelRatio || 1;
 
-		this.pixelRatio = devicePixelRatio / backingStoreRatio;
+        this.pixelRatio = devicePixelRatio / backingStoreRatio;
 
-		// Size the canvas to match the internal dimensions of its container
+        // Size the canvas to match the internal dimensions of its container
 
-		this.resize(container.width(), container.height());
+        this.resize(container.width(), container.height());
 
-		// Collection of HTML div layers for text overlaid onto the canvas
+        // Collection of HTML div layers for text overlaid onto the canvas
 
-		this.textContainer = null;
-		this.text = {};
+        this.textContainer = null;
+        this.text = {};
 
-		// Cache of text fragments and metrics, so we can avoid expensively
-		// re-calculating them when the plot is re-rendered in a loop.
+        // Cache of text fragments and metrics, so we can avoid expensively
+        // re-calculating them when the plot is re-rendered in a loop.
 
-		this._textCache = {};
-	}
+        this._textCache = {};
+    }
 
-	// Resizes the canvas to the given dimensions.
-	//
-	// @param {number} width New width of the canvas, in pixels.
-	// @param {number} width New height of the canvas, in pixels.
+    // Resizes the canvas to the given dimensions.
+    //
+    // @param {number} width New width of the canvas, in pixels.
+    // @param {number} width New height of the canvas, in pixels.
 
-	Canvas.prototype.resize = function(width, height) {
+    Canvas.prototype.resize = function (width, height) {
 
-		if (width <= 0 || height <= 0) {
-			throw new Error("Invalid dimensions for plot, width = " + width + ", height = " + height);
-		}
+        if (width <= 0 || height <= 0) {
+            throw new Error("Invalid dimensions for plot, width = " + width + ", height = " + height);
+        }
 
-		var element = this.element,
-			context = this.context,
-			pixelRatio = this.pixelRatio;
+        var element = this.element,
+            context = this.context,
+            pixelRatio = this.pixelRatio;
 
-		// Resize the canvas, increasing its density based on the display's
-		// pixel ratio; basically giving it more pixels without increasing the
-		// size of its element, to take advantage of the fact that retina
-		// displays have that many more pixels in the same advertised space.
+        // Resize the canvas, increasing its density based on the display's
+        // pixel ratio; basically giving it more pixels without increasing the
+        // size of its element, to take advantage of the fact that retina
+        // displays have that many more pixels in the same advertised space.
 
-		// Resizing should reset the state (excanvas seems to be buggy though)
+        // Resizing should reset the state (excanvas seems to be buggy though)
 
-		if (this.width != width) {
-			element.width = width * pixelRatio;
-			element.style.width = width + "px";
-			this.width = width;
-		}
+        if (this.width != width) {
+            element.width = width * pixelRatio;
+            element.style.width = width + "px";
+            this.width = width;
+        }
 
-		if (this.height != height) {
-			element.height = height * pixelRatio;
-			element.style.height = height + "px";
-			this.height = height;
-		}
+        if (this.height != height) {
+            element.height = height * pixelRatio;
+            element.style.height = height + "px";
+            this.height = height;
+        }
 
-		// Save the context, so we can reset in case we get replotted.  The
-		// restore ensure that we're really back at the initial state, and
-		// should be safe even if we haven't saved the initial state yet.
+        // Save the context, so we can reset in case we get replotted.  The
+        // restore ensure that we're really back at the initial state, and
+        // should be safe even if we haven't saved the initial state yet.
 
-		context.restore();
-		context.save();
+        context.restore();
+        context.save();
 
-		// Scale the coordinate space to match the display density; so even though we
-		// may have twice as many pixels, we still want lines and other drawing to
-		// appear at the same size; the extra pixels will just make them crisper.
+        // Scale the coordinate space to match the display density; so even though we
+        // may have twice as many pixels, we still want lines and other drawing to
+        // appear at the same size; the extra pixels will just make them crisper.
 
-		context.scale(pixelRatio, pixelRatio);
-	};
+        context.scale(pixelRatio, pixelRatio);
+    };
 
-	// Clears the entire canvas area, not including any overlaid HTML text
-
-	Canvas.prototype.clear = function() {
-		this.context.clearRect(0, 0, this.width, this.height);
-	};
-
-	// Finishes rendering the canvas, including managing the text overlay.
-
-	Canvas.prototype.render = function() {
-
-		var cache = this._textCache;
-
-		// For each text layer, add elements marked as active that haven't
-		// already been rendered, and remove those that are no longer active.
-
-		for (var layerKey in cache) {
-			if (hasOwnProperty.call(cache, layerKey)) {
-
-				var layer = this.getTextLayer(layerKey),
-					layerCache = cache[layerKey];
-
-				layer.hide();
-
-				for (var styleKey in layerCache) {
-					if (hasOwnProperty.call(layerCache, styleKey)) {
-						var styleCache = layerCache[styleKey];
-						for (var key in styleCache) {
-							if (hasOwnProperty.call(styleCache, key)) {
-
-								var positions = styleCache[key].positions;
-
-								for (var i = 0, position; position = positions[i]; i++) {
-									if (position.active) {
-										if (!position.rendered) {
-											layer.append(position.element);
-											position.rendered = true;
-										}
-									} else {
-										positions.splice(i--, 1);
-										if (position.rendered) {
-											position.element.detach();
-										}
-									}
-								}
-
-								if (positions.length == 0) {
-									delete styleCache[key];
-								}
-							}
-						}
-					}
-				}
-
-				layer.show();
-			}
-		}
-	};
-
-	// Creates (if necessary) and returns the text overlay container.
-	//
-	// @param {string} classes String of space-separated CSS classes used to
-	//     uniquely identify the text layer.
-	// @return {object} The jQuery-wrapped text-layer div.
-
-	Canvas.prototype.getTextLayer = function(classes) {
-
-		var layer = this.text[classes];
-
-		// Create the text layer if it doesn't exist
-
-		if (layer == null) {
-
-			// Create the text layer container, if it doesn't exist
-
-			if (this.textContainer == null) {
-				this.textContainer = $("<div class='flot-text'></div>")
-					.css({
-						position: "absolute",
-						top: 0,
-						left: 0,
-						bottom: 0,
-						right: 0,
-						'font-size': "smaller",
-						color: "#545454"
-					})
-					.insertAfter(this.element);
-			}
-
-			layer = this.text[classes] = $("<div></div>")
-				.addClass(classes)
-				.css({
-					position: "absolute",
-					top: 0,
-					left: 0,
-					bottom: 0,
-					right: 0
-				})
-				.appendTo(this.textContainer);
-		}
-
-		return layer;
-	};
-
-	// Creates (if necessary) and returns a text info object.
-	//
-	// The object looks like this:
-	//
-	// {
-	//     width: Width of the text's wrapper div.
-	//     height: Height of the text's wrapper div.
-	//     element: The jQuery-wrapped HTML div containing the text.
-	//     positions: Array of positions at which this text is drawn.
-	// }
-	//
-	// The positions array contains objects that look like this:
-	//
-	// {
-	//     active: Flag indicating whether the text should be visible.
-	//     rendered: Flag indicating whether the text is currently visible.
-	//     element: The jQuery-wrapped HTML div containing the text.
-	//     x: X coordinate at which to draw the text.
-	//     y: Y coordinate at which to draw the text.
-	// }
-	//
-	// Each position after the first receives a clone of the original element.
-	//
-	// The idea is that that the width, height, and general 'identity' of the
-	// text is constant no matter where it is placed; the placements are a
-	// secondary property.
-	//
-	// Canvas maintains a cache of recently-used text info objects; getTextInfo
-	// either returns the cached element or creates a new entry.
-	//
-	// @param {string} layer A string of space-separated CSS classes uniquely
-	//     identifying the layer containing this text.
-	// @param {string} text Text string to retrieve info for.
-	// @param {(string|object)=} font Either a string of space-separated CSS
-	//     classes or a font-spec object, defining the text's font and style.
-	// @param {number=} angle Angle at which to rotate the text, in degrees.
-	//     Angle is currently unused, it will be implemented in the future.
-	// @param {number=} width Maximum width of the text before it wraps.
-	// @return {object} a text info object.
-
-	Canvas.prototype.getTextInfo = function(layer, text, font, angle, width) {
-
-		var textStyle, layerCache, styleCache, info;
-
-		// Cast the value to a string, in case we were given a number or such
-
-		text = "" + text;
-
-		// If the font is a font-spec object, generate a CSS font definition
-
-		if (typeof font === "object") {
-			textStyle = font.style + " " + font.variant + " " + font.weight + " " + font.size + "px/" + font.lineHeight + "px " + font.family;
-		} else {
-			textStyle = font;
-		}
-
-		// Retrieve (or create) the cache for the text's layer and styles
-
-		layerCache = this._textCache[layer];
-
-		if (layerCache == null) {
-			layerCache = this._textCache[layer] = {};
-		}
-
-		styleCache = layerCache[textStyle];
-
-		if (styleCache == null) {
-			styleCache = layerCache[textStyle] = {};
-		}
-
-		info = styleCache[text];
-
-		// If we can't find a matching element in our cache, create a new one
-
-		if (info == null) {
-
-			var element = $("<div></div>").html(text)
-				.css({
-					position: "absolute",
-					'max-width': width,
-					top: -9999
-				})
-				.appendTo(this.getTextLayer(layer));
-
-			if (typeof font === "object") {
-				element.css({
-					font: textStyle,
-					color: font.color
-				});
-			} else if (typeof font === "string") {
-				element.addClass(font);
-			}
-
-			info = styleCache[text] = {
-				width: element.outerWidth(true),
-				height: element.outerHeight(true),
-				element: element,
-				positions: []
-			};
-
-			element.detach();
-		}
-
-		return info;
-	};
-
-	// Adds a text string to the canvas text overlay.
-	//
-	// The text isn't drawn immediately; it is marked as rendering, which will
-	// result in its addition to the canvas on the next render pass.
-	//
-	// @param {string} layer A string of space-separated CSS classes uniquely
-	//     identifying the layer containing this text.
-	// @param {number} x X coordinate at which to draw the text.
-	// @param {number} y Y coordinate at which to draw the text.
-	// @param {string} text Text string to draw.
-	// @param {(string|object)=} font Either a string of space-separated CSS
-	//     classes or a font-spec object, defining the text's font and style.
-	// @param {number=} angle Angle at which to rotate the text, in degrees.
-	//     Angle is currently unused, it will be implemented in the future.
-	// @param {number=} width Maximum width of the text before it wraps.
-	// @param {string=} halign Horizontal alignment of the text; either "left",
-	//     "center" or "right".
-	// @param {string=} valign Vertical alignment of the text; either "top",
-	//     "middle" or "bottom".
-
-	Canvas.prototype.addText = function(layer, x, y, text, font, angle, width, halign, valign) {
-
-		var info = this.getTextInfo(layer, text, font, angle, width),
-			positions = info.positions;
-
-		// Tweak the div's position to match the text's alignment
-
-		if (halign == "center") {
-			x -= info.width / 2;
-		} else if (halign == "right") {
-			x -= info.width;
-		}
-
-		if (valign == "middle") {
-			y -= info.height / 2;
-		} else if (valign == "bottom") {
-			y -= info.height;
-		}
-
-		// Determine whether this text already exists at this position.
-		// If so, mark it for inclusion in the next render pass.
-
-		for (var i = 0, position; position = positions[i]; i++) {
-			if (position.x == x && position.y == y) {
-				position.active = true;
-				return;
-			}
-		}
-
-		// If the text doesn't exist at this position, create a new entry
-
-		// For the very first position we'll re-use the original element,
-		// while for subsequent ones we'll clone it.
-
-		position = {
-			active: true,
-			rendered: false,
-			element: positions.length ? info.element.clone() : info.element,
-			x: x,
-			y: y
-		};
-
-		positions.push(position);
-
-		// Move the element to its final position within the container
-
-		position.element.css({
-			top: Math.round(y),
-			left: Math.round(x),
-			'text-align': halign	// In case the text wraps
-		});
-	};
-
-	// Removes one or more text strings from the canvas text overlay.
-	//
-	// If no parameters are given, all text within the layer is removed.
-	//
-	// Note that the text is not immediately removed; it is simply marked as
-	// inactive, which will result in its removal on the next render pass.
-	// This avoids the performance penalty for 'clear and redraw' behavior,
-	// where we potentially get rid of all text on a layer, but will likely
-	// add back most or all of it later, as when redrawing axes, for example.
-	//
-	// @param {string} layer A string of space-separated CSS classes uniquely
-	//     identifying the layer containing this text.
-	// @param {number=} x X coordinate of the text.
-	// @param {number=} y Y coordinate of the text.
-	// @param {string=} text Text string to remove.
-	// @param {(string|object)=} font Either a string of space-separated CSS
-	//     classes or a font-spec object, defining the text's font and style.
-	// @param {number=} angle Angle at which the text is rotated, in degrees.
-	//     Angle is currently unused, it will be implemented in the future.
-
-	Canvas.prototype.removeText = function(layer, x, y, text, font, angle) {
-		if (text == null) {
-			var layerCache = this._textCache[layer];
-			if (layerCache != null) {
-				for (var styleKey in layerCache) {
-					if (hasOwnProperty.call(layerCache, styleKey)) {
-						var styleCache = layerCache[styleKey];
-						for (var key in styleCache) {
-							if (hasOwnProperty.call(styleCache, key)) {
-								var positions = styleCache[key].positions;
-								for (var i = 0, position; position = positions[i]; i++) {
-									position.active = false;
-								}
-							}
-						}
-					}
-				}
-			}
-		} else {
-			var positions = this.getTextInfo(layer, text, font, angle).positions;
-			for (var i = 0, position; position = positions[i]; i++) {
-				if (position.x == x && position.y == y) {
-					position.active = false;
-				}
-			}
-		}
-	};
-
-	///////////////////////////////////////////////////////////////////////////
-	// The top-level container for the entire plot.
+    // Clears the entire canvas area, not including any overlaid HTML text
+
+    Canvas.prototype.clear = function () {
+        this.context.clearRect(0, 0, this.width, this.height);
+    };
+
+    // Finishes rendering the canvas, including managing the text overlay.
+
+    Canvas.prototype.render = function () {
+
+        var cache = this._textCache;
+
+        // For each text layer, add elements marked as active that haven't
+        // already been rendered, and remove those that are no longer active.
+
+        for (var layerKey in cache) {
+            if (hasOwnProperty.call(cache, layerKey)) {
+
+                var layer = this.getTextLayer(layerKey),
+                    layerCache = cache[layerKey];
+
+                layer.hide();
+
+                for (var styleKey in layerCache) {
+                    if (hasOwnProperty.call(layerCache, styleKey)) {
+                        var styleCache = layerCache[styleKey];
+                        for (var key in styleCache) {
+                            if (hasOwnProperty.call(styleCache, key)) {
+
+                                var positions = styleCache[key].positions;
+
+                                for (var i = 0, position; position = positions[i]; i++) {
+                                    if (position.active) {
+                                        if (!position.rendered) {
+                                            layer.append(position.element);
+                                            position.rendered = true;
+                                        }
+                                    } else {
+                                        positions.splice(i--, 1);
+                                        if (position.rendered) {
+                                            position.element.detach();
+                                        }
+                                    }
+                                }
+
+                                if (positions.length == 0) {
+                                    delete styleCache[key];
+                                }
+                            }
+                        }
+                    }
+                }
+
+                layer.show();
+            }
+        }
+    };
+
+    // Creates (if necessary) and returns the text overlay container.
+    //
+    // @param {string} classes String of space-separated CSS classes used to
+    //     uniquely identify the text layer.
+    // @return {object} The jQuery-wrapped text-layer div.
+
+    Canvas.prototype.getTextLayer = function (classes) {
+
+        var layer = this.text[classes];
+
+        // Create the text layer if it doesn't exist
+
+        if (layer == null) {
+
+            // Create the text layer container, if it doesn't exist
+
+            if (this.textContainer == null) {
+                this.textContainer = $("<div class='flot-text'></div>")
+                    .css({
+                        position: "absolute",
+                        top: 0,
+                        left: 0,
+                        bottom: 0,
+                        right: 0,
+                        'font-size': "smaller",
+                        color: "#545454"
+                    })
+                    .insertAfter(this.element);
+            }
+
+            layer = this.text[classes] = $("<div></div>")
+                .addClass(classes)
+                .css({
+                    position: "absolute",
+                    top: 0,
+                    left: 0,
+                    bottom: 0,
+                    right: 0
+                })
+                .appendTo(this.textContainer);
+        }
+
+        return layer;
+    };
+
+    // Creates (if necessary) and returns a text info object.
+    //
+    // The object looks like this:
+    //
+    // {
+    //     width: Width of the text's wrapper div.
+    //     height: Height of the text's wrapper div.
+    //     element: The jQuery-wrapped HTML div containing the text.
+    //     positions: Array of positions at which this text is drawn.
+    // }
+    //
+    // The positions array contains objects that look like this:
+    //
+    // {
+    //     active: Flag indicating whether the text should be visible.
+    //     rendered: Flag indicating whether the text is currently visible.
+    //     element: The jQuery-wrapped HTML div containing the text.
+    //     x: X coordinate at which to draw the text.
+    //     y: Y coordinate at which to draw the text.
+    // }
+    //
+    // Each position after the first receives a clone of the original element.
+    //
+    // The idea is that that the width, height, and general 'identity' of the
+    // text is constant no matter where it is placed; the placements are a
+    // secondary property.
+    //
+    // Canvas maintains a cache of recently-used text info objects; getTextInfo
+    // either returns the cached element or creates a new entry.
+    //
+    // @param {string} layer A string of space-separated CSS classes uniquely
+    //     identifying the layer containing this text.
+    // @param {string} text Text string to retrieve info for.
+    // @param {(string|object)=} font Either a string of space-separated CSS
+    //     classes or a font-spec object, defining the text's font and style.
+    // @param {number=} angle Angle at which to rotate the text, in degrees.
+    //     Angle is currently unused, it will be implemented in the future.
+    // @param {number=} width Maximum width of the text before it wraps.
+    // @return {object} a text info object.
+
+    Canvas.prototype.getTextInfo = function (layer, text, font, angle, width) {
+
+        var textStyle, layerCache, styleCache, info;
+
+        // Cast the value to a string, in case we were given a number or such
+
+        text = "" + text;
+
+        // If the font is a font-spec object, generate a CSS font definition
+
+        if (typeof font === "object") {
+            textStyle = font.style + " " + font.variant + " " + font.weight + " " + font.size + "px/" + font.lineHeight + "px " + font.family;
+        } else {
+            textStyle = font;
+        }
+
+        // Retrieve (or create) the cache for the text's layer and styles
+
+        layerCache = this._textCache[layer];
+
+        if (layerCache == null) {
+            layerCache = this._textCache[layer] = {};
+        }
+
+        styleCache = layerCache[textStyle];
+
+        if (styleCache == null) {
+            styleCache = layerCache[textStyle] = {};
+        }
+
+        info = styleCache[text];
+
+        // If we can't find a matching element in our cache, create a new one
+
+        if (info == null) {
+
+            var element = $("<div></div>").html(text)
+                .css({
+                    position: "absolute",
+                    'max-width': width,
+                    top: -9999
+                })
+                .appendTo(this.getTextLayer(layer));
+
+            if (typeof font === "object") {
+                element.css({
+                    font: textStyle,
+                    color: font.color
+                });
+            } else if (typeof font === "string") {
+                element.addClass(font);
+            }
+
+            info = styleCache[text] = {
+                width: element.outerWidth(true),
+                height: element.outerHeight(true),
+                element: element,
+                positions: []
+            };
+
+            element.detach();
+        }
+
+        return info;
+    };
+
+    // Adds a text string to the canvas text overlay.
+    //
+    // The text isn't drawn immediately; it is marked as rendering, which will
+    // result in its addition to the canvas on the next render pass.
+    //
+    // @param {string} layer A string of space-separated CSS classes uniquely
+    //     identifying the layer containing this text.
+    // @param {number} x X coordinate at which to draw the text.
+    // @param {number} y Y coordinate at which to draw the text.
+    // @param {string} text Text string to draw.
+    // @param {(string|object)=} font Either a string of space-separated CSS
+    //     classes or a font-spec object, defining the text's font and style.
+    // @param {number=} angle Angle at which to rotate the text, in degrees.
+    //     Angle is currently unused, it will be implemented in the future.
+    // @param {number=} width Maximum width of the text before it wraps.
+    // @param {string=} halign Horizontal alignment of the text; either "left",
+    //     "center" or "right".
+    // @param {string=} valign Vertical alignment of the text; either "top",
+    //     "middle" or "bottom".
+
+    Canvas.prototype.addText = function (layer, x, y, text, font, angle, width, halign, valign) {
+
+        var info = this.getTextInfo(layer, text, font, angle, width),
+            positions = info.positions;
+
+        // Tweak the div's position to match the text's alignment
+
+        if (halign == "center") {
+            x -= info.width / 2;
+        } else if (halign == "right") {
+            x -= info.width;
+        }
+
+        if (valign == "middle") {
+            y -= info.height / 2;
+        } else if (valign == "bottom") {
+            y -= info.height;
+        }
+
+        // Determine whether this text already exists at this position.
+        // If so, mark it for inclusion in the next render pass.
+
+        for (var i = 0, position; position = positions[i]; i++) {
+            if (position.x == x && position.y == y) {
+                position.active = true;
+                return;
+            }
+        }
+
+        // If the text doesn't exist at this position, create a new entry
+
+        // For the very first position we'll re-use the original element,
+        // while for subsequent ones we'll clone it.
+
+        position = {
+            active: true,
+            rendered: false,
+            element: positions.length ? info.element.clone() : info.element,
+            x: x,
+            y: y
+        };
+
+        positions.push(position);
+
+        // Move the element to its final position within the container
+
+        position.element.css({
+            top: Math.round(y),
+            left: Math.round(x),
+            'text-align': halign	// In case the text wraps
+        });
+    };
+
+    // Removes one or more text strings from the canvas text overlay.
+    //
+    // If no parameters are given, all text within the layer is removed.
+    //
+    // Note that the text is not immediately removed; it is simply marked as
+    // inactive, which will result in its removal on the next render pass.
+    // This avoids the performance penalty for 'clear and redraw' behavior,
+    // where we potentially get rid of all text on a layer, but will likely
+    // add back most or all of it later, as when redrawing axes, for example.
+    //
+    // @param {string} layer A string of space-separated CSS classes uniquely
+    //     identifying the layer containing this text.
+    // @param {number=} x X coordinate of the text.
+    // @param {number=} y Y coordinate of the text.
+    // @param {string=} text Text string to remove.
+    // @param {(string|object)=} font Either a string of space-separated CSS
+    //     classes or a font-spec object, defining the text's font and style.
+    // @param {number=} angle Angle at which the text is rotated, in degrees.
+    //     Angle is currently unused, it will be implemented in the future.
+
+    Canvas.prototype.removeText = function (layer, x, y, text, font, angle) {
+        if (text == null) {
+            var layerCache = this._textCache[layer];
+            if (layerCache != null) {
+                for (var styleKey in layerCache) {
+                    if (hasOwnProperty.call(layerCache, styleKey)) {
+                        var styleCache = layerCache[styleKey];
+                        for (var key in styleCache) {
+                            if (hasOwnProperty.call(styleCache, key)) {
+                                var positions = styleCache[key].positions;
+                                for (var i = 0, position; position = positions[i]; i++) {
+                                    position.active = false;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            var positions = this.getTextInfo(layer, text, font, angle).positions;
+            for (var i = 0, position; position = positions[i]; i++) {
+                if (position.x == x && position.y == y) {
+                    position.active = false;
+                }
+            }
+        }
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+    // The top-level container for the entire plot.
 
     function Plot(placeholder, data_, options_, plugins) {
         // data is on the form:
@@ -610,38 +610,38 @@ Licensed under the MIT license.
                     mouseActiveRadius: 10 // how far the mouse can be away to activate an item
                 },
                 interaction: {
-                    redrawOverlayInterval: 1000/60 // time between updates, -1 means in same flow
+                    redrawOverlayInterval: 1000 / 60 // time between updates, -1 means in same flow
                 },
                 hooks: {}
             },
-        surface = null,     // the canvas for the plot itself
-        overlay = null,     // canvas for interactive stuff on top of plot
-        eventHolder = null, // jQuery object that events should be bound to
-        ctx = null, octx = null,
-        xaxes = [], yaxes = [],
-        plotOffset = { left: 0, right: 0, top: 0, bottom: 0},
-        plotWidth = 0, plotHeight = 0,
-        hooks = {
-            processOptions: [],
-            processRawData: [],
-            processDatapoints: [],
-            processOffset: [],
-            drawBackground: [],
-            drawSeries: [],
-            draw: [],
-            bindEvents: [],
-            drawOverlay: [],
-            shutdown: []
-        },
-        plot = this;
+            surface = null,     // the canvas for the plot itself
+            overlay = null,     // canvas for interactive stuff on top of plot
+            eventHolder = null, // jQuery object that events should be bound to
+            ctx = null, octx = null,
+            xaxes = [], yaxes = [],
+            plotOffset = { left: 0, right: 0, top: 0, bottom: 0 },
+            plotWidth = 0, plotHeight = 0,
+            hooks = {
+                processOptions: [],
+                processRawData: [],
+                processDatapoints: [],
+                processOffset: [],
+                drawBackground: [],
+                drawSeries: [],
+                draw: [],
+                bindEvents: [],
+                drawOverlay: [],
+                shutdown: []
+            },
+            plot = this;
 
         // public functions
         plot.setData = setData;
         plot.setupGrid = setupGrid;
         plot.draw = draw;
-        plot.getPlaceholder = function() { return placeholder; };
-        plot.getCanvas = function() { return surface.element; };
-        plot.getPlotOffset = function() { return plotOffset; };
+        plot.getPlaceholder = function () { return placeholder; };
+        plot.getCanvas = function () { return surface.element; };
+        plot.getPlotOffset = function () { return plotOffset; };
         plot.width = function () { return plotWidth; };
         plot.height = function () { return plotHeight; };
         plot.offset = function () {
@@ -667,7 +667,7 @@ Licensed under the MIT license.
         plot.highlight = highlight;
         plot.unhighlight = unhighlight;
         plot.triggerRedrawOverlay = triggerRedrawOverlay;
-        plot.pointOffset = function(point) {
+        plot.pointOffset = function (point) {
             return {
                 left: parseInt(xaxes[axisNumber(point, "x") - 1].p2c(+point.x) + plotOffset.left, 10),
                 top: parseInt(yaxes[axisNumber(point, "y") - 1].p2c(+point.y) + plotOffset.top, 10)
@@ -692,8 +692,8 @@ Licensed under the MIT license.
             plot = null;
         };
         plot.resize = function () {
-        	var width = placeholder.width(),
-        		height = placeholder.height();
+            var width = placeholder.width(),
+                height = placeholder.height();
             surface.resize(width, height);
             overlay.resize(width, height);
         };
@@ -743,7 +743,7 @@ Licensed under the MIT license.
             // not expected behavior; avoid it by replacing them here.
 
             if (opts && opts.colors) {
-            	options.colors = opts.colors;
+                options.colors = opts.colors;
             }
 
             if (options.xaxis.color == null)
@@ -1106,7 +1106,7 @@ Licensed under the MIT license.
                 s = series[i];
                 s.datapoints = { points: [] };
 
-                executeHooks(hooks.processRawData, [ s, s.data, s.datapoints ]);
+                executeHooks(hooks.processRawData, [s, s.data, s.datapoints]);
             }
 
             // first pass: clean and copy data
@@ -1222,7 +1222,7 @@ Licensed under the MIT license.
             for (i = 0; i < series.length; ++i) {
                 s = series[i];
 
-                executeHooks(hooks.processDatapoints, [ s, s.datapoints]);
+                executeHooks(hooks.processDatapoints, [s, s.datapoints]);
             }
 
             // second pass: find datamax/datamin for auto-scaling
@@ -1303,7 +1303,7 @@ Licensed under the MIT license.
             // from a previous plot in this container that we'll try to re-use.
 
             placeholder.css("padding", 0) // padding messes up the positioning
-                .children().filter(function(){
+                .children().filter(function () {
                     return !$(this).hasClass("flot-overlay") && !$(this).hasClass('flot-base');
                 }).remove();
 
@@ -1445,7 +1445,7 @@ Licensed under the MIT license.
 
             // Determine the axis's position in its direction and on its side
 
-            $.each(isXAxis ? xaxes : yaxes, function(i, a) {
+            $.each(isXAxis ? xaxes : yaxes, function (i, a) {
                 if (a && (a.show || a.reserveSpace)) {
                     if (a === axis) {
                         found = true;
@@ -1502,7 +1502,7 @@ Licensed under the MIT license.
                 }
             }
 
-             // save for future reference
+            // save for future reference
             axis.position = pos;
             axis.tickLength = tickLength;
             axis.box.padding = padding;
@@ -1535,7 +1535,7 @@ Licensed under the MIT license.
             if (minMargin == null) {
                 minMargin = 0;
                 for (i = 0; i < series.length; ++i)
-                    minMargin = Math.max(minMargin, 2 * (series[i].points.radius + series[i].points.lineWidth/2));
+                    minMargin = Math.max(minMargin, 2 * (series[i].points.radius + series[i].points.lineWidth / 2));
             }
 
             var margins = {
@@ -1581,7 +1581,7 @@ Licensed under the MIT license.
             // If the grid is visible, add its border width to the offset
 
             for (var a in plotOffset) {
-                if(typeof(options.grid.borderWidth) == "object") {
+                if (typeof (options.grid.borderWidth) == "object") {
                     plotOffset[a] += showGrid ? options.grid.borderWidth[a] : 0;
                 }
                 else {
@@ -1758,21 +1758,21 @@ Licensed under the MIT license.
                     return ticks;
                 };
 
-				axis.tickFormatter = function (value, axis) {
+                axis.tickFormatter = function (value, axis) {
 
-					var factor = axis.tickDecimals ? Math.pow(10, axis.tickDecimals) : 1;
-					var formatted = "" + Math.round(value * factor) / factor;
+                    var factor = axis.tickDecimals ? Math.pow(10, axis.tickDecimals) : 1;
+                    var formatted = "" + Math.round(value * factor) / factor;
 
-					// If tickDecimals was specified, ensure that we have exactly that
-					// much precision; otherwise default to the value's own precision.
+                    // If tickDecimals was specified, ensure that we have exactly that
+                    // much precision; otherwise default to the value's own precision.
 
-					if (axis.tickDecimals != null) {
-						var decimal = formatted.indexOf(".");
-						var precision = decimal == -1 ? 0 : formatted.length - decimal - 1;
-						if (precision < axis.tickDecimals) {
-							return (precision ? formatted : formatted + ".") + ("" + factor).substr(1, axis.tickDecimals - precision);
-						}
-					}
+                    if (axis.tickDecimals != null) {
+                        var decimal = formatted.indexOf(".");
+                        var precision = decimal == -1 ? 0 : formatted.length - decimal - 1;
+                        if (precision < axis.tickDecimals) {
+                            return (precision ? formatted : formatted + ".") + ("" + factor).substr(1, axis.tickDecimals - precision);
+                        }
+                    }
 
                     return formatted;
                 };
@@ -2010,14 +2010,14 @@ Licensed under the MIT license.
                             ctx.lineTo(xrange.to + subPixel, yrange.to);
                         } else {
                             ctx.moveTo(xrange.from, yrange.to + subPixel);
-                            ctx.lineTo(xrange.to, yrange.to + subPixel);                            
+                            ctx.lineTo(xrange.to, yrange.to + subPixel);
                         }
                         ctx.stroke();
                     } else {
                         ctx.fillStyle = m.color || options.grid.markingsColor;
                         ctx.fillRect(xrange.from, yrange.to,
-                                     xrange.to - xrange.from,
-                                     yrange.from - yrange.to);
+                            xrange.to - xrange.from,
+                            yrange.from - yrange.to);
                     }
                 }
             }
@@ -2125,20 +2125,20 @@ Licensed under the MIT license.
                 // If either borderWidth or borderColor is an object, then draw the border
                 // line by line instead of as one rectangle
                 bc = options.grid.borderColor;
-                if(typeof bw == "object" || typeof bc == "object") {
+                if (typeof bw == "object" || typeof bc == "object") {
                     if (typeof bw !== "object") {
-                        bw = {top: bw, right: bw, bottom: bw, left: bw};
+                        bw = { top: bw, right: bw, bottom: bw, left: bw };
                     }
                     if (typeof bc !== "object") {
-                        bc = {top: bc, right: bc, bottom: bc, left: bc};
+                        bc = { top: bc, right: bc, bottom: bc, left: bc };
                     }
 
                     if (bw.top > 0) {
                         ctx.strokeStyle = bc.top;
                         ctx.lineWidth = bw.top;
                         ctx.beginPath();
-                        ctx.moveTo(0 - bw.left, 0 - bw.top/2);
-                        ctx.lineTo(plotWidth, 0 - bw.top/2);
+                        ctx.moveTo(0 - bw.left, 0 - bw.top / 2);
+                        ctx.lineTo(plotWidth, 0 - bw.top / 2);
                         ctx.stroke();
                     }
 
@@ -2164,15 +2164,15 @@ Licensed under the MIT license.
                         ctx.strokeStyle = bc.left;
                         ctx.lineWidth = bw.left;
                         ctx.beginPath();
-                        ctx.moveTo(0 - bw.left/2, plotHeight + bw.bottom);
-                        ctx.lineTo(0- bw.left/2, 0);
+                        ctx.moveTo(0 - bw.left / 2, plotHeight + bw.bottom);
+                        ctx.lineTo(0 - bw.left / 2, 0);
                         ctx.stroke();
                     }
                 }
                 else {
                     ctx.lineWidth = bw;
                     ctx.strokeStyle = options.grid.borderColor;
-                    ctx.strokeRect(-bw/2, -bw/2, plotWidth + bw, plotHeight + bw);
+                    ctx.strokeRect(-bw / 2, -bw / 2, plotWidth + bw, plotHeight + bw);
                 }
             }
 
@@ -2472,10 +2472,10 @@ Licensed under the MIT license.
                 ctx.lineWidth = sw;
                 ctx.strokeStyle = "rgba(0,0,0,0.1)";
                 // position shadow at angle from the mid of line
-                var angle = Math.PI/18;
-                plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/2), Math.cos(angle) * (lw/2 + sw/2), series.xaxis, series.yaxis);
-                ctx.lineWidth = sw/2;
-                plotLine(series.datapoints, Math.sin(angle) * (lw/2 + sw/4), Math.cos(angle) * (lw/2 + sw/4), series.xaxis, series.yaxis);
+                var angle = Math.PI / 18;
+                plotLine(series.datapoints, Math.sin(angle) * (lw / 2 + sw / 2), Math.cos(angle) * (lw / 2 + sw / 2), series.xaxis, series.yaxis);
+                ctx.lineWidth = sw / 2;
+                plotLine(series.datapoints, Math.sin(angle) * (lw / 2 + sw / 4), Math.cos(angle) * (lw / 2 + sw / 4), series.xaxis, series.yaxis);
             }
 
             ctx.lineWidth = lw;
@@ -2530,7 +2530,7 @@ Licensed under the MIT license.
             // Doing the conditional here allows the shadow setting to still be 
             // optional even with a lineWidth of 0.
 
-            if( lw == 0 )
+            if (lw == 0)
                 lw = 0.0001;
 
             if (lw > 0 && sw > 0) {
@@ -2538,19 +2538,19 @@ Licensed under the MIT license.
                 var w = sw / 2;
                 ctx.lineWidth = w;
                 ctx.strokeStyle = "rgba(0,0,0,0.1)";
-                plotPoints(series.datapoints, radius, null, w + w/2, true,
-                           series.xaxis, series.yaxis, symbol);
+                plotPoints(series.datapoints, radius, null, w + w / 2, true,
+                    series.xaxis, series.yaxis, symbol);
 
                 ctx.strokeStyle = "rgba(0,0,0,0.2)";
-                plotPoints(series.datapoints, radius, null, w/2, true,
-                           series.xaxis, series.yaxis, symbol);
+                plotPoints(series.datapoints, radius, null, w / 2, true,
+                    series.xaxis, series.yaxis, symbol);
             }
 
             ctx.lineWidth = lw;
             ctx.strokeStyle = series.color;
             plotPoints(series.datapoints, radius,
-                       getFillStyle(series.points, series.color), 0, false,
-                       series.xaxis, series.yaxis, symbol);
+                getFillStyle(series.points, series.color), 0, false,
+                series.xaxis, series.yaxis, symbol);
             ctx.restore();
         }
 
@@ -2745,10 +2745,10 @@ Licensed under the MIT license.
                 if ($.isFunction(options.legend.sorted)) {
                     entries.sort(options.legend.sorted);
                 } else if (options.legend.sorted == "reverse") {
-                	entries.reverse();
+                    entries.reverse();
                 } else {
                     var ascending = options.legend.sorted != "descending";
-                    entries.sort(function(a, b) {
+                    entries.sort(function (a, b) {
                         return a.label == b.label ? 0 : (
                             (a.label < b.label) != ascending ? 1 : -1   // Logical XOR
                         );
@@ -2798,7 +2798,7 @@ Licensed under the MIT license.
                     pos += 'right:' + (m[0] + plotOffset.right) + 'px;';
                 else if (p.charAt(1) == "w")
                     pos += 'left:' + (m[0] + plotOffset.left) + 'px;';
-                var legend = $('<div class="legend">' + table.replace('style="', 'style="position:absolute;' + pos +';') + '</div>').appendTo(placeholder);
+                var legend = $('<div class="bg_222_important">' + table.replace('style="', 'style="position:absolute;' + pos + ';') + '</div>').appendTo(placeholder);
                 if (options.legend.backgroundOpacity != 0.0) {
                     // put in the transparent background
                     // separately to avoid blended labels and
@@ -2814,7 +2814,7 @@ Licensed under the MIT license.
                         c = c.toString();
                     }
                     var div = legend.children();
-                    $('<div style="position:absolute;width:' + div.width() + 'px;height:' + div.height() + 'px;' + pos +'background-color:' + c + ';"> </div>').prependTo(legend).css('opacity', options.legend.backgroundOpacity);
+                    $('<div class="" style="position:absolute;width:' + div.width() + 'px;height:' + div.height() + 'px;' + pos + 'background-color:' + c + ';"> </div>').prependTo(legend).css('opacity', options.legend.backgroundOpacity);
                 }
             }
         }
@@ -2904,10 +2904,10 @@ Licensed under the MIT license.
                         // for a bar graph, the cursor must be inside the bar
                         if (series[i].bars.horizontal ?
                             (mx <= Math.max(b, x) && mx >= Math.min(b, x) &&
-                             my >= y + barLeft && my <= y + barRight) :
+                                my >= y + barLeft && my <= y + barRight) :
                             (mx >= x + barLeft && mx <= x + barRight &&
-                             my >= Math.min(b, y) && my <= Math.max(b, y)))
-                                item = [i, j / ps];
+                                my >= Math.min(b, y) && my <= Math.max(b, y)))
+                            item = [i, j / ps];
                     }
                 }
             }
@@ -2917,10 +2917,12 @@ Licensed under the MIT license.
                 j = item[1];
                 ps = series[i].datapoints.pointsize;
 
-                return { datapoint: series[i].datapoints.points.slice(j * ps, (j + 1) * ps),
-                         dataIndex: j,
-                         series: series[i],
-                         seriesIndex: i };
+                return {
+                    datapoint: series[i].datapoints.points.slice(j * ps, (j + 1) * ps),
+                    dataIndex: j,
+                    series: series[i],
+                    seriesIndex: i
+                };
             }
 
             return null;
@@ -2929,18 +2931,18 @@ Licensed under the MIT license.
         function onMouseMove(e) {
             if (options.grid.hoverable)
                 triggerClickHoverEvent("plothover", e,
-                                       function (s) { return s["hoverable"] != false; });
+                    function (s) { return s["hoverable"] != false; });
         }
 
         function onMouseLeave(e) {
             if (options.grid.hoverable)
                 triggerClickHoverEvent("plothover", e,
-                                       function (s) { return false; });
+                    function (s) { return false; });
         }
 
         function onClick(e) {
             triggerClickHoverEvent("plotclick", e,
-                                   function (s) { return s["clickable"] != false; });
+                function (s) { return s["clickable"] != false; });
         }
 
         // trigger click or hover event (they send the same parameters
@@ -2949,7 +2951,7 @@ Licensed under the MIT license.
             var offset = eventHolder.offset(),
                 canvasX = event.pageX - offset.left - plotOffset.left,
                 canvasY = event.pageY - offset.top - plotOffset.top,
-            pos = canvasToAxisCoords({ left: canvasX, top: canvasY });
+                pos = canvasToAxisCoords({ left: canvasX, top: canvasY });
 
             pos.pageX = event.pageX;
             pos.pageY = event.pageY;
@@ -2968,8 +2970,8 @@ Licensed under the MIT license.
                     var h = highlights[i];
                     if (h.auto == eventname &&
                         !(item && h.series == item.series &&
-                          h.point[0] == item.datapoint[0] &&
-                          h.point[1] == item.datapoint[1]))
+                            h.point[0] == item.datapoint[0] &&
+                            h.point[1] == item.datapoint[1]))
                         unhighlight(h.series, h.point);
                 }
 
@@ -2977,7 +2979,7 @@ Licensed under the MIT license.
                     highlight(item.series, item.datapoint, eventname);
             }
 
-            placeholder.trigger(eventname, [ pos, item ]);
+            placeholder.trigger(eventname, [pos, item]);
         }
 
         function triggerRedrawOverlay() {
@@ -3109,7 +3111,7 @@ Licensed under the MIT license.
             octx.strokeStyle = highlightColor;
 
             drawBar(point[0], point[1], point[2] || 0, barLeft, barLeft + series.bars.barWidth,
-                    function () { return fillStyle; }, series.xaxis, series.yaxis, octx, series.bars.horizontal, series.bars.lineWidth);
+                function () { return fillStyle; }, series.xaxis, series.yaxis, octx, series.bars.horizontal, series.bars.lineWidth);
         }
 
         function getColorOrGradient(spec, bottom, top, defaultColor) {
@@ -3141,7 +3143,7 @@ Licensed under the MIT license.
 
     // Add the plot function to the top level of the jQuery object
 
-    $.plot = function(placeholder, data, options) {
+    $.plot = function (placeholder, data, options) {
         //var t0 = new Date();
         var plot = new Plot($(placeholder), data, options, $.plot.plugins);
         //(window.console ? console.log : alert)("time used (msecs): " + ((new Date()).getTime() - t0.getTime()));
@@ -3154,8 +3156,8 @@ Licensed under the MIT license.
 
     // Also add the plot function as a chainable property
 
-    $.fn.plot = function(data, options) {
-        return this.each(function() {
+    $.fn.plot = function (data, options) {
+        return this.each(function () {
             $.plot(this, data, options);
         });
     };
diff --git a/pandora_console/include/graphs/flot/jquery.flot.min.js b/pandora_console/include/graphs/flot/jquery.flot.min.js
index 34366d01d7..dcf7fd3baf 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.min.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.min.js
@@ -5,7 +5,7 @@ Licensed under the MIT license.
 
 */
 (function ($) { $.color = {}; $.color.make = function (r, g, b, a) { var o = {}; o.r = r || 0; o.g = g || 0; o.b = b || 0; o.a = a != null ? a : 1; o.add = function (c, d) { for (var i = 0; i < c.length; ++i)o[c.charAt(i)] += d; return o.normalize() }; o.scale = function (c, f) { for (var i = 0; i < c.length; ++i)o[c.charAt(i)] *= f; return o.normalize() }; o.toString = function () { if (o.a >= 1) { return "rgb(" + [o.r, o.g, o.b].join(",") + ")" } else { return "rgba(" + [o.r, o.g, o.b, o.a].join(",") + ")" } }; o.normalize = function () { function clamp(min, value, max) { return value < min ? min : value > max ? max : value } o.r = clamp(0, parseInt(o.r), 255); o.g = clamp(0, parseInt(o.g), 255); o.b = clamp(0, parseInt(o.b), 255); o.a = clamp(0, o.a, 1); return o }; o.clone = function () { return $.color.make(o.r, o.b, o.g, o.a) }; return o.normalize() }; $.color.extract = function (elem, css) { var c; do { c = elem.css(css).toLowerCase(); if (c != "" && c != "transparent") break; elem = elem.parent() } while (elem.length && !$.nodeName(elem.get(0), "body")); if (c == "rgba(0, 0, 0, 0)") c = "transparent"; return $.color.parse(c) }; $.color.parse = function (str) { var res, m = $.color.make; if (res = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(str)) return m(parseInt(res[1], 10), parseInt(res[2], 10), parseInt(res[3], 10)); if (res = /rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str)) return m(parseInt(res[1], 10), parseInt(res[2], 10), parseInt(res[3], 10), parseFloat(res[4])); if (res = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(str)) return m(parseFloat(res[1]) * 2.55, parseFloat(res[2]) * 2.55, parseFloat(res[3]) * 2.55); if (res = /rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(str)) return m(parseFloat(res[1]) * 2.55, parseFloat(res[2]) * 2.55, parseFloat(res[3]) * 2.55, parseFloat(res[4])); if (res = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(str)) return m(parseInt(res[1], 16), parseInt(res[2], 16), parseInt(res[3], 16)); if (res = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(str)) return m(parseInt(res[1] + res[1], 16), parseInt(res[2] + res[2], 16), parseInt(res[3] + res[3], 16)); var name = $.trim(str).toLowerCase(); if (name == "transparent") return m(255, 255, 255, 0); else { res = lookupColors[name] || [0, 0, 0]; return m(res[0], res[1], res[2]) } }; var lookupColors = { aqua: [0, 255, 255], azure: [240, 255, 255], beige: [245, 245, 220], black: [0, 0, 0], blue: [0, 0, 255], brown: [165, 42, 42], cyan: [0, 255, 255], darkblue: [0, 0, 139], darkcyan: [0, 139, 139], darkgrey: [169, 169, 169], darkgreen: [0, 100, 0], darkkhaki: [189, 183, 107], darkmagenta: [139, 0, 139], darkolivegreen: [85, 107, 47], darkorange: [255, 140, 0], darkorchid: [153, 50, 204], darkred: [139, 0, 0], darksalmon: [233, 150, 122], darkviolet: [148, 0, 211], fuchsia: [255, 0, 255], gold: [255, 215, 0], green: [0, 128, 0], indigo: [75, 0, 130], khaki: [240, 230, 140], lightblue: [173, 216, 230], lightcyan: [224, 255, 255], lightgreen: [144, 238, 144], lightgrey: [211, 211, 211], lightpink: [255, 182, 193], lightyellow: [255, 255, 224], lime: [0, 255, 0], magenta: [255, 0, 255], maroon: [128, 0, 0], navy: [0, 0, 128], olive: [128, 128, 0], orange: [255, 165, 0], pink: [255, 192, 203], purple: [128, 0, 128], violet: [128, 0, 128], red: [255, 0, 0], silver: [192, 192, 192], white: [255, 255, 255], yellow: [255, 255, 0] } })(jQuery); (function ($) {
-    var hasOwnProperty = Object.prototype.hasOwnProperty; if (!$.fn.detach) { $.fn.detach = function () { return this.each(function () { if (this.parentNode) { this.parentNode.removeChild(this) } }) } } function Canvas(cls, container) { var element = container.children("." + cls)[0]; if (element == null) { element = document.createElement("canvas"); element.className = cls; $(element).css({ direction: "ltr", position: "absolute", left: 0, top: 0 }).appendTo(container); if (!element.getContext) { if (window.G_vmlCanvasManager) { element = window.G_vmlCanvasManager.initElement(element) } else { throw new Error("Canvas is not available. If you're using IE with a fall-back such as Excanvas, then there's either a mistake in your conditional include, or the page has no DOCTYPE and is rendering in Quirks Mode.") } } } this.element = element; var context = this.context = element.getContext("2d"); var devicePixelRatio = window.devicePixelRatio || 1, backingStoreRatio = context.webkitBackingStorePixelRatio || context.mozBackingStorePixelRatio || context.msBackingStorePixelRatio || context.oBackingStorePixelRatio || context.backingStorePixelRatio || 1; this.pixelRatio = devicePixelRatio / backingStoreRatio; this.resize(container.width(), container.height()); this.textContainer = null; this.text = {}; this._textCache = {} } Canvas.prototype.resize = function (width, height) { if (width <= 0 || height <= 0) { throw new Error("Invalid dimensions for plot, width = " + width + ", height = " + height) } var element = this.element, context = this.context, pixelRatio = this.pixelRatio; if (this.width != width) { element.width = width * pixelRatio; element.style.width = width + "px"; this.width = width } if (this.height != height) { element.height = height * pixelRatio; element.style.height = height + "px"; this.height = height } context.restore(); context.save(); context.scale(pixelRatio, pixelRatio) }; Canvas.prototype.clear = function () { this.context.clearRect(0, 0, this.width, this.height) }; Canvas.prototype.render = function () { var cache = this._textCache; for (var layerKey in cache) { if (hasOwnProperty.call(cache, layerKey)) { var layer = this.getTextLayer(layerKey), layerCache = cache[layerKey]; layer.hide(); for (var styleKey in layerCache) { if (hasOwnProperty.call(layerCache, styleKey)) { var styleCache = layerCache[styleKey]; for (var key in styleCache) { if (hasOwnProperty.call(styleCache, key)) { var positions = styleCache[key].positions; for (var i = 0, position; position = positions[i]; i++) { if (position.active) { if (!position.rendered) { layer.append(position.element); position.rendered = true } } else { positions.splice(i--, 1); if (position.rendered) { position.element.detach() } } } if (positions.length == 0) { delete styleCache[key] } } } } } layer.show() } } }; Canvas.prototype.getTextLayer = function (classes) { var layer = this.text[classes]; if (layer == null) { if (this.textContainer == null) { this.textContainer = $("<div class='flot-text invert_filter'></div>").css({ position: "absolute", top: 0, left: 0, bottom: 0, right: 0, "font-size": "smaller", color: "#545454" }).insertAfter(this.element) } layer = this.text[classes] = $("<div></div>").addClass(classes).css({ position: "absolute", top: 0, left: 0, bottom: 0, right: 0 }).appendTo(this.textContainer) } return layer }; Canvas.prototype.getTextInfo = function (layer, text, font, angle, width) { var textStyle, layerCache, styleCache, info; text = "" + text; if (typeof font === "object") { textStyle = font.style + " " + font.variant + " " + font.weight + " " + font.size + "px/" + font.lineHeight + "px " + font.family } else { textStyle = font } layerCache = this._textCache[layer]; if (layerCache == null) { layerCache = this._textCache[layer] = {} } styleCache = layerCache[textStyle]; if (styleCache == null) { styleCache = layerCache[textStyle] = {} } info = styleCache[text]; if (info == null) { var element = $("<div></div>").html(text).css({ position: "absolute", "max-width": width, top: -9999 }).appendTo(this.getTextLayer(layer)); if (typeof font === "object") { element.css({ font: textStyle, color: font.color }) } else if (typeof font === "string") { element.addClass(font) } info = styleCache[text] = { width: element.outerWidth(true), height: element.outerHeight(true), element: element, positions: [] }; element.detach() } return info }; Canvas.prototype.addText = function (layer, x, y, text, font, angle, width, halign, valign) { var info = this.getTextInfo(layer, text, font, angle, width), positions = info.positions; if (halign == "center") { x -= info.width / 2 } else if (halign == "right") { x -= info.width } if (valign == "middle") { y -= info.height / 2 } else if (valign == "bottom") { y -= info.height } for (var i = 0, position; position = positions[i]; i++) { if (position.x == x && position.y == y) { position.active = true; return } } position = { active: true, rendered: false, element: positions.length ? info.element.clone() : info.element, x: x, y: y }; positions.push(position); position.element.css({ top: Math.round(y), left: Math.round(x), "text-align": halign }) }; Canvas.prototype.removeText = function (layer, x, y, text, font, angle) { if (text == null) { var layerCache = this._textCache[layer]; if (layerCache != null) { for (var styleKey in layerCache) { if (hasOwnProperty.call(layerCache, styleKey)) { var styleCache = layerCache[styleKey]; for (var key in styleCache) { if (hasOwnProperty.call(styleCache, key)) { var positions = styleCache[key].positions; for (var i = 0, position; position = positions[i]; i++) { position.active = false } } } } } } } else { var positions = this.getTextInfo(layer, text, font, angle).positions; for (var i = 0, position; position = positions[i]; i++) { if (position.x == x && position.y == y) { position.active = false } } } }; function Plot(placeholder, data_, options_, plugins) {
+    var hasOwnProperty = Object.prototype.hasOwnProperty; if (!$.fn.detach) { $.fn.detach = function () { return this.each(function () { if (this.parentNode) { this.parentNode.removeChild(this) } }) } } function Canvas(cls, container) { var element = container.children("." + cls)[0]; if (element == null) { element = document.createElement("canvas"); element.className = cls; $(element).css({ direction: "ltr", position: "absolute", left: 0, top: 0 }).appendTo(container); if (!element.getContext) { if (window.G_vmlCanvasManager) { element = window.G_vmlCanvasManager.initElement(element) } else { throw new Error("Canvas is not available. If you're using IE with a fall-back such as Excanvas, then there's either a mistake in your conditional include, or the page has no DOCTYPE and is rendering in Quirks Mode.") } } } this.element = element; var context = this.context = element.getContext("2d"); var devicePixelRatio = window.devicePixelRatio || 1, backingStoreRatio = context.webkitBackingStorePixelRatio || context.mozBackingStorePixelRatio || context.msBackingStorePixelRatio || context.oBackingStorePixelRatio || context.backingStorePixelRatio || 1; this.pixelRatio = devicePixelRatio / backingStoreRatio; this.resize(container.width(), container.height()); this.textContainer = null; this.text = {}; this._textCache = {} } Canvas.prototype.resize = function (width, height) { if (width <= 0 || height <= 0) { throw new Error("Invalid dimensions for plot, width = " + width + ", height = " + height) } var element = this.element, context = this.context, pixelRatio = this.pixelRatio; if (this.width != width) { element.width = width * pixelRatio; element.style.width = width + "px"; this.width = width } if (this.height != height) { element.height = height * pixelRatio; element.style.height = height + "px"; this.height = height } context.restore(); context.save(); context.scale(pixelRatio, pixelRatio) }; Canvas.prototype.clear = function () { this.context.clearRect(0, 0, this.width, this.height) }; Canvas.prototype.render = function () { var cache = this._textCache; for (var layerKey in cache) { if (hasOwnProperty.call(cache, layerKey)) { var layer = this.getTextLayer(layerKey), layerCache = cache[layerKey]; layer.hide(); for (var styleKey in layerCache) { if (hasOwnProperty.call(layerCache, styleKey)) { var styleCache = layerCache[styleKey]; for (var key in styleCache) { if (hasOwnProperty.call(styleCache, key)) { var positions = styleCache[key].positions; for (var i = 0, position; position = positions[i]; i++) { if (position.active) { if (!position.rendered) { layer.append(position.element); position.rendered = true } } else { positions.splice(i--, 1); if (position.rendered) { position.element.detach() } } } if (positions.length == 0) { delete styleCache[key] } } } } } layer.show() } } }; Canvas.prototype.getTextLayer = function (classes) { var layer = this.text[classes]; if (layer == null) { if (this.textContainer == null) { this.textContainer = $("<div class='flot-text'></div>").css({ position: "absolute", top: 0, left: 0, bottom: 0, right: 0, "font-size": "smaller", color: "#545454" }).insertAfter(this.element) } layer = this.text[classes] = $("<div></div>").addClass(classes).css({ position: "absolute", top: 0, left: 0, bottom: 0, right: 0 }).appendTo(this.textContainer) } return layer }; Canvas.prototype.getTextInfo = function (layer, text, font, angle, width) { var textStyle, layerCache, styleCache, info; text = "" + text; if (typeof font === "object") { textStyle = font.style + " " + font.variant + " " + font.weight + " " + font.size + "px/" + font.lineHeight + "px " + font.family } else { textStyle = font } layerCache = this._textCache[layer]; if (layerCache == null) { layerCache = this._textCache[layer] = {} } styleCache = layerCache[textStyle]; if (styleCache == null) { styleCache = layerCache[textStyle] = {} } info = styleCache[text]; if (info == null) { var element = $("<div></div>").html(text).css({ position: "absolute", "max-width": width, top: -9999 }).appendTo(this.getTextLayer(layer)); if (typeof font === "object") { element.css({ font: textStyle, color: font.color }) } else if (typeof font === "string") { element.addClass(font) } info = styleCache[text] = { width: element.outerWidth(true), height: element.outerHeight(true), element: element, positions: [] }; element.detach() } return info }; Canvas.prototype.addText = function (layer, x, y, text, font, angle, width, halign, valign) { var info = this.getTextInfo(layer, text, font, angle, width), positions = info.positions; if (halign == "center") { x -= info.width / 2 } else if (halign == "right") { x -= info.width } if (valign == "middle") { y -= info.height / 2 } else if (valign == "bottom") { y -= info.height } for (var i = 0, position; position = positions[i]; i++) { if (position.x == x && position.y == y) { position.active = true; return } } position = { active: true, rendered: false, element: positions.length ? info.element.clone() : info.element, x: x, y: y }; positions.push(position); position.element.css({ top: Math.round(y), left: Math.round(x), "text-align": halign }) }; Canvas.prototype.removeText = function (layer, x, y, text, font, angle) { if (text == null) { var layerCache = this._textCache[layer]; if (layerCache != null) { for (var styleKey in layerCache) { if (hasOwnProperty.call(layerCache, styleKey)) { var styleCache = layerCache[styleKey]; for (var key in styleCache) { if (hasOwnProperty.call(styleCache, key)) { var positions = styleCache[key].positions; for (var i = 0, position; position = positions[i]; i++) { position.active = false } } } } } } } else { var positions = this.getTextInfo(layer, text, font, angle).positions; for (var i = 0, position; position = positions[i]; i++) { if (position.x == x && position.y == y) { position.active = false } } } }; function Plot(placeholder, data_, options_, plugins) {
         var series = [], options = { colors: ["#edc240", "#afd8f8", "#cb4b4b", "#4da74d", "#9440ed"], legend: { show: true, noColumns: 1, labelFormatter: null, labelBoxBorderColor: "#ccc", container: null, position: "ne", margin: 5, backgroundColor: null, backgroundOpacity: .85, sorted: null }, xaxis: { show: null, position: "bottom", mode: null, font: null, color: null, tickColor: null, transform: null, inverseTransform: null, min: null, max: null, autoscaleMargin: null, ticks: null, tickFormatter: null, labelWidth: null, labelHeight: null, reserveSpace: null, tickLength: null, alignTicksWithAxis: null, tickDecimals: null, tickSize: null, minTickSize: null }, yaxis: { autoscaleMargin: .02, position: "left" }, xaxes: [], yaxes: [], series: { points: { show: false, radius: 3, lineWidth: 2, fill: true, fillColor: "#ffffff", symbol: "circle" }, lines: { lineWidth: 2, fill: false, fillColor: null, steps: false }, bars: { show: false, lineWidth: 2, barWidth: 1, fill: true, fillColor: null, align: "left", horizontal: false, zero: true }, shadowSize: 3, highlightColor: null }, grid: { show: true, aboveData: false, color: "#545454", backgroundColor: null, borderColor: null, tickColor: null, margin: 0, labelMargin: 5, axisMargin: 8, borderWidth: 2, minBorderMargin: null, markings: null, markingsColor: "#f4f4f4", markingsLineWidth: 2, clickable: false, hoverable: false, autoHighlight: true, mouseActiveRadius: 10 }, interaction: { redrawOverlayInterval: 1e3 / 60 }, hooks: {} }, surface = null, overlay = null, eventHolder = null, ctx = null, octx = null, xaxes = [], yaxes = [], plotOffset = { left: 0, right: 0, top: 0, bottom: 0 }, plotWidth = 0, plotHeight = 0, hooks = { processOptions: [], processRawData: [], processDatapoints: [], processOffset: [], drawBackground: [], drawSeries: [], draw: [], bindEvents: [], drawOverlay: [], shutdown: [] }, plot = this; plot.setData = setData; plot.setupGrid = setupGrid; plot.draw = draw; plot.getPlaceholder = function () { return placeholder }; plot.getCanvas = function () { return surface.element }; plot.getPlotOffset = function () { return plotOffset }; plot.width = function () { return plotWidth }; plot.height = function () { return plotHeight }; plot.offset = function () { var o = eventHolder.offset(); o.left += plotOffset.left; o.top += plotOffset.top; return o }; plot.getData = function () { return series }; plot.getAxes = function () { var res = {}, i; $.each(xaxes.concat(yaxes), function (_, axis) { if (axis) res[axis.direction + (axis.n != 1 ? axis.n : "") + "axis"] = axis }); return res }; plot.getXAxes = function () { return xaxes }; plot.getYAxes = function () { return yaxes }; plot.c2p = canvasToAxisCoords; plot.p2c = axisToCanvasCoords; plot.getOptions = function () { return options }; plot.highlight = highlight; plot.unhighlight = unhighlight; plot.triggerRedrawOverlay = triggerRedrawOverlay; plot.pointOffset = function (point) { return { left: parseInt(xaxes[axisNumber(point, "x") - 1].p2c(+point.x) + plotOffset.left, 10), top: parseInt(yaxes[axisNumber(point, "y") - 1].p2c(+point.y) + plotOffset.top, 10) } }; plot.shutdown = shutdown; plot.destroy = function () { shutdown(); placeholder.removeData("plot").empty(); series = []; options = null; surface = null; overlay = null; eventHolder = null; ctx = null; octx = null; xaxes = []; yaxes = []; hooks = null; highlights = []; plot = null }; plot.resize = function () { var width = placeholder.width(), height = placeholder.height(); surface.resize(width, height); overlay.resize(width, height) }; plot.hooks = hooks; initPlugins(plot); parseOptions(options_); setupCanvases(); setData(data_); setupGrid(); draw(); bindEvents(); function executeHooks(hook, args) { args = [plot].concat(args); for (var i = 0; i < hook.length; ++i)hook[i].apply(this, args) } function initPlugins() { var classes = { Canvas: Canvas }; for (var i = 0; i < plugins.length; ++i) { var p = plugins[i]; p.init(plot, classes); if (p.options) $.extend(true, options, p.options) } } function parseOptions(opts) { $.extend(true, options, opts); if (opts && opts.colors) { options.colors = opts.colors } if (options.xaxis.color == null) options.xaxis.color = $.color.parse(options.grid.color).scale("a", .22).toString(); if (options.yaxis.color == null) options.yaxis.color = $.color.parse(options.grid.color).scale("a", .22).toString(); if (options.xaxis.tickColor == null) options.xaxis.tickColor = options.grid.tickColor || options.xaxis.color; if (options.yaxis.tickColor == null) options.yaxis.tickColor = options.grid.tickColor || options.yaxis.color; if (options.grid.borderColor == null) options.grid.borderColor = options.grid.color; if (options.grid.tickColor == null) options.grid.tickColor = $.color.parse(options.grid.color).scale("a", .22).toString(); var i, axisOptions, axisCount, fontSize = placeholder.css("font-size"), fontSizeDefault = fontSize ? +fontSize.replace("px", "") : 13, fontDefaults = { style: placeholder.css("font-style"), size: Math.round(.8 * fontSizeDefault), variant: placeholder.css("font-variant"), weight: placeholder.css("font-weight"), family: placeholder.css("font-family") }; axisCount = options.xaxes.length || 1; for (i = 0; i < axisCount; ++i) { axisOptions = options.xaxes[i]; if (axisOptions && !axisOptions.tickColor) { axisOptions.tickColor = axisOptions.color } axisOptions = $.extend(true, {}, options.xaxis, axisOptions); options.xaxes[i] = axisOptions; if (axisOptions.font) { axisOptions.font = $.extend({}, fontDefaults, axisOptions.font); if (!axisOptions.font.color) { axisOptions.font.color = axisOptions.color } if (!axisOptions.font.lineHeight) { axisOptions.font.lineHeight = Math.round(axisOptions.font.size * 1.15) } } } axisCount = options.yaxes.length || 1; for (i = 0; i < axisCount; ++i) { axisOptions = options.yaxes[i]; if (axisOptions && !axisOptions.tickColor) { axisOptions.tickColor = axisOptions.color } axisOptions = $.extend(true, {}, options.yaxis, axisOptions); options.yaxes[i] = axisOptions; if (axisOptions.font) { axisOptions.font = $.extend({}, fontDefaults, axisOptions.font); if (!axisOptions.font.color) { axisOptions.font.color = axisOptions.color } if (!axisOptions.font.lineHeight) { axisOptions.font.lineHeight = Math.round(axisOptions.font.size * 1.15) } } } if (options.xaxis.noTicks && options.xaxis.ticks == null) options.xaxis.ticks = options.xaxis.noTicks; if (options.yaxis.noTicks && options.yaxis.ticks == null) options.yaxis.ticks = options.yaxis.noTicks; if (options.x2axis) { options.xaxes[1] = $.extend(true, {}, options.xaxis, options.x2axis); options.xaxes[1].position = "top"; if (options.x2axis.min == null) { options.xaxes[1].min = null } if (options.x2axis.max == null) { options.xaxes[1].max = null } } if (options.y2axis) { options.yaxes[1] = $.extend(true, {}, options.yaxis, options.y2axis); options.yaxes[1].position = "right"; if (options.y2axis.min == null) { options.yaxes[1].min = null } if (options.y2axis.max == null) { options.yaxes[1].max = null } } if (options.grid.coloredAreas) options.grid.markings = options.grid.coloredAreas; if (options.grid.coloredAreasColor) options.grid.markingsColor = options.grid.coloredAreasColor; if (options.lines) $.extend(true, options.series.lines, options.lines); if (options.points) $.extend(true, options.series.points, options.points); if (options.bars) $.extend(true, options.series.bars, options.bars); if (options.shadowSize != null) options.series.shadowSize = options.shadowSize; if (options.highlightColor != null) options.series.highlightColor = options.highlightColor; for (i = 0; i < options.xaxes.length; ++i)getOrCreateAxis(xaxes, i + 1).options = options.xaxes[i]; for (i = 0; i < options.yaxes.length; ++i)getOrCreateAxis(yaxes, i + 1).options = options.yaxes[i]; for (var n in hooks) if (options.hooks[n] && options.hooks[n].length) hooks[n] = hooks[n].concat(options.hooks[n]); executeHooks(hooks.processOptions, [options]) } function setData(d) { series = parseData(d); fillInSeriesOptions(); processData() } function parseData(d) { var res = []; for (var i = 0; i < d.length; ++i) { var s = $.extend(true, {}, options.series); if (d[i].data != null) { s.data = d[i].data; delete d[i].data; $.extend(true, s, d[i]); d[i].data = s.data } else s.data = d[i]; res.push(s) } return res } function axisNumber(obj, coord) { var a = obj[coord + "axis"]; if (typeof a == "object") a = a.n; if (typeof a != "number") a = 1; return a } function allAxes() { return $.grep(xaxes.concat(yaxes), function (a) { return a }) } function canvasToAxisCoords(pos) { var res = {}, i, axis; for (i = 0; i < xaxes.length; ++i) { axis = xaxes[i]; if (axis && axis.used) res["x" + axis.n] = axis.c2p(pos.left) } for (i = 0; i < yaxes.length; ++i) { axis = yaxes[i]; if (axis && axis.used) res["y" + axis.n] = axis.c2p(pos.top) } if (res.x1 !== undefined) res.x = res.x1; if (res.y1 !== undefined) res.y = res.y1; return res } function axisToCanvasCoords(pos) { var res = {}, i, axis, key; for (i = 0; i < xaxes.length; ++i) { axis = xaxes[i]; if (axis && axis.used) { key = "x" + axis.n; if (pos[key] == null && axis.n == 1) key = "x"; if (pos[key] != null) { res.left = axis.p2c(pos[key]); break } } } for (i = 0; i < yaxes.length; ++i) { axis = yaxes[i]; if (axis && axis.used) { key = "y" + axis.n; if (pos[key] == null && axis.n == 1) key = "y"; if (pos[key] != null) { res.top = axis.p2c(pos[key]); break } } } return res } function getOrCreateAxis(axes, number) { if (!axes[number - 1]) axes[number - 1] = { n: number, direction: axes == xaxes ? "x" : "y", options: $.extend(true, {}, axes == xaxes ? options.xaxis : options.yaxis) }; return axes[number - 1] } function fillInSeriesOptions() { var neededColors = series.length, maxIndex = -1, i; for (i = 0; i < series.length; ++i) { var sc = series[i].color; if (sc != null) { neededColors--; if (typeof sc == "number" && sc > maxIndex) { maxIndex = sc } } } if (neededColors <= maxIndex) { neededColors = maxIndex + 1 } var c, colors = [], colorPool = options.colors, colorPoolSize = colorPool.length, variation = 0; for (i = 0; i < neededColors; i++) { c = $.color.parse(colorPool[i % colorPoolSize] || "#666"); if (i % colorPoolSize == 0 && i) { if (variation >= 0) { if (variation < .5) { variation = -variation - .2 } else variation = 0 } else variation = -variation } colors[i] = c.scale("rgb", 1 + variation) } var colori = 0, s; for (i = 0; i < series.length; ++i) { s = series[i]; if (s.color == null) { s.color = colors[colori].toString(); ++colori } else if (typeof s.color == "number") s.color = colors[s.color].toString(); if (s.lines.show == null) { var v, show = true; for (v in s) if (s[v] && s[v].show) { show = false; break } if (show) s.lines.show = true } if (s.lines.zero == null) { s.lines.zero = !!s.lines.fill } s.xaxis = getOrCreateAxis(xaxes, axisNumber(s, "x")); s.yaxis = getOrCreateAxis(yaxes, axisNumber(s, "y")) } } function processData() { var topSentry = Number.POSITIVE_INFINITY, bottomSentry = Number.NEGATIVE_INFINITY, fakeInfinity = Number.MAX_VALUE, i, j, k, m, length, s, points, ps, x, y, axis, val, f, p, data, format; function updateAxis(axis, min, max) { if (min < axis.datamin && min != -fakeInfinity) axis.datamin = min; if (max > axis.datamax && max != fakeInfinity) axis.datamax = max } $.each(allAxes(), function (_, axis) { axis.datamin = topSentry; axis.datamax = bottomSentry; axis.used = false }); for (i = 0; i < series.length; ++i) { s = series[i]; s.datapoints = { points: [] }; executeHooks(hooks.processRawData, [s, s.data, s.datapoints]) } for (i = 0; i < series.length; ++i) { s = series[i]; data = s.data; format = s.datapoints.format; if (!format) { format = []; format.push({ x: true, number: true, required: true }); format.push({ y: true, number: true, required: true }); if (s.bars.show || s.lines.show && s.lines.fill) { var autoscale = !!(s.bars.show && s.bars.zero || s.lines.show && s.lines.zero); format.push({ y: true, number: true, required: false, defaultValue: 0, autoscale: autoscale }); if (s.bars.horizontal) { delete format[format.length - 1].y; format[format.length - 1].x = true } } s.datapoints.format = format } if (s.datapoints.pointsize != null) continue; s.datapoints.pointsize = format.length; ps = s.datapoints.pointsize; points = s.datapoints.points; var insertSteps = s.lines.show && s.lines.steps; s.xaxis.used = s.yaxis.used = true; for (j = k = 0; j < data.length; ++j, k += ps) { p = data[j]; var nullify = p == null; if (!nullify) { for (m = 0; m < ps; ++m) { val = p[m]; f = format[m]; if (f) { if (f.number && val != null) { val = +val; if (isNaN(val)) val = null; else if (val == Infinity) val = fakeInfinity; else if (val == -Infinity) val = -fakeInfinity } if (val == null) { if (f.required) nullify = true; if (f.defaultValue != null) val = f.defaultValue } } points[k + m] = val } } if (nullify) { for (m = 0; m < ps; ++m) { val = points[k + m]; if (val != null) { f = format[m]; if (f.autoscale !== false) { if (f.x) { updateAxis(s.xaxis, val, val) } if (f.y) { updateAxis(s.yaxis, val, val) } } } points[k + m] = null } } else { if (insertSteps && k > 0 && points[k - ps] != null && points[k - ps] != points[k] && points[k - ps + 1] != points[k + 1]) { for (m = 0; m < ps; ++m)points[k + ps + m] = points[k + m]; points[k + 1] = points[k - ps + 1]; k += ps } } } } for (i = 0; i < series.length; ++i) { s = series[i]; executeHooks(hooks.processDatapoints, [s, s.datapoints]) } for (i = 0; i < series.length; ++i) { s = series[i]; points = s.datapoints.points; ps = s.datapoints.pointsize; format = s.datapoints.format; var xmin = topSentry, ymin = topSentry, xmax = bottomSentry, ymax = bottomSentry; for (j = 0; j < points.length; j += ps) { if (points[j] == null) continue; for (m = 0; m < ps; ++m) { val = points[j + m]; f = format[m]; if (!f || f.autoscale === false || val == fakeInfinity || val == -fakeInfinity) continue; if (f.x) { if (val < xmin) xmin = val; if (val > xmax) xmax = val } if (f.y) { if (val < ymin) ymin = val; if (val > ymax) ymax = val } } } if (s.bars.show) { var delta; switch (s.bars.align) { case "left": delta = 0; break; case "right": delta = -s.bars.barWidth; break; default: delta = -s.bars.barWidth / 2 }if (s.bars.horizontal) { ymin += delta; ymax += delta + s.bars.barWidth } else { xmin += delta; xmax += delta + s.bars.barWidth } } updateAxis(s.xaxis, xmin, xmax); updateAxis(s.yaxis, ymin, ymax) } $.each(allAxes(), function (_, axis) { if (axis.datamin == topSentry) axis.datamin = null; if (axis.datamax == bottomSentry) axis.datamax = null }) } function setupCanvases() { placeholder.css("padding", 0).children().filter(function () { return !$(this).hasClass("flot-overlay") && !$(this).hasClass("flot-base") }).remove(); if (placeholder.css("position") == "static") placeholder.css("position", "relative"); surface = new Canvas("flot-base", placeholder); overlay = new Canvas("flot-overlay", placeholder); ctx = surface.context; octx = overlay.context; eventHolder = $(overlay.element).unbind(); var existing = placeholder.data("plot"); if (existing) { existing.shutdown(); overlay.clear() } placeholder.data("plot", plot) } function bindEvents() { if (options.grid.hoverable) { eventHolder.mousemove(onMouseMove); eventHolder.bind("mouseleave", onMouseLeave) } if (options.grid.clickable) eventHolder.click(onClick); executeHooks(hooks.bindEvents, [eventHolder]) } function shutdown() { if (redrawTimeout) clearTimeout(redrawTimeout); eventHolder.unbind("mousemove", onMouseMove); eventHolder.unbind("mouseleave", onMouseLeave); eventHolder.unbind("click", onClick); executeHooks(hooks.shutdown, [eventHolder]) } function setTransformationHelpers(axis) { function identity(x) { return x } var s, m, t = axis.options.transform || identity, it = axis.options.inverseTransform; if (axis.direction == "x") { s = axis.scale = plotWidth / Math.abs(t(axis.max) - t(axis.min)); m = Math.min(t(axis.max), t(axis.min)) } else { s = axis.scale = plotHeight / Math.abs(t(axis.max) - t(axis.min)); s = -s; m = Math.max(t(axis.max), t(axis.min)) } if (t == identity) axis.p2c = function (p) { return (p - m) * s }; else axis.p2c = function (p) { return (t(p) - m) * s }; if (!it) axis.c2p = function (c) { return m + c / s }; else axis.c2p = function (c) { return it(m + c / s) } } function measureTickLabels(axis) { var opts = axis.options, ticks = axis.ticks || [], labelWidth = opts.labelWidth || 0, labelHeight = opts.labelHeight || 0, maxWidth = labelWidth || (axis.direction == "x" ? Math.floor(surface.width / (ticks.length || 1)) : null), legacyStyles = axis.direction + "Axis " + axis.direction + axis.n + "Axis", layer = "flot-" + axis.direction + "-axis flot-" + axis.direction + axis.n + "-axis " + legacyStyles, font = opts.font || "flot-tick-label tickLabel"; for (var i = 0; i < ticks.length; ++i) { var t = ticks[i]; if (!t.label) continue; var info = surface.getTextInfo(layer, t.label, font, null, maxWidth); labelWidth = Math.max(labelWidth, info.width); labelHeight = Math.max(labelHeight, info.height) } axis.labelWidth = opts.labelWidth || labelWidth; axis.labelHeight = opts.labelHeight || labelHeight } function allocateAxisBoxFirstPhase(axis) { var lw = axis.labelWidth, lh = axis.labelHeight, pos = axis.options.position, isXAxis = axis.direction === "x", tickLength = axis.options.tickLength, axisMargin = options.grid.axisMargin, padding = options.grid.labelMargin, innermost = true, outermost = true, first = true, found = false; $.each(isXAxis ? xaxes : yaxes, function (i, a) { if (a && (a.show || a.reserveSpace)) { if (a === axis) { found = true } else if (a.options.position === pos) { if (found) { outermost = false } else { innermost = false } } if (!found) { first = false } } }); if (outermost) { axisMargin = 0 } if (tickLength == null) { tickLength = first ? "full" : 5 } if (!isNaN(+tickLength)) padding += +tickLength; if (isXAxis) { lh += padding; if (pos == "bottom") { plotOffset.bottom += lh + axisMargin; axis.box = { top: surface.height - plotOffset.bottom, height: lh } } else { axis.box = { top: plotOffset.top + axisMargin, height: lh }; plotOffset.top += lh + axisMargin } } else { lw += padding; if (pos == "left") { axis.box = { left: plotOffset.left + axisMargin, width: lw }; plotOffset.left += lw + axisMargin } else { plotOffset.right += lw + axisMargin; axis.box = { left: surface.width - plotOffset.right, width: lw } } } axis.position = pos; axis.tickLength = tickLength; axis.box.padding = padding; axis.innermost = innermost } function allocateAxisBoxSecondPhase(axis) { if (axis.direction == "x") { axis.box.left = plotOffset.left - axis.labelWidth / 2; axis.box.width = surface.width - plotOffset.left - plotOffset.right + axis.labelWidth } else { axis.box.top = plotOffset.top - axis.labelHeight / 2; axis.box.height = surface.height - plotOffset.bottom - plotOffset.top + axis.labelHeight } } function adjustLayoutForThingsStickingOut() { var minMargin = options.grid.minBorderMargin, axis, i; if (minMargin == null) { minMargin = 0; for (i = 0; i < series.length; ++i)minMargin = Math.max(minMargin, 2 * (series[i].points.radius + series[i].points.lineWidth / 2)) } var margins = { left: minMargin, right: minMargin, top: minMargin, bottom: minMargin }; $.each(allAxes(), function (_, axis) { if (axis.reserveSpace && axis.ticks && axis.ticks.length) { if (axis.direction === "x") { margins.left = Math.max(margins.left, axis.labelWidth / 2); margins.right = Math.max(margins.right, axis.labelWidth / 2) } else { margins.bottom = Math.max(margins.bottom, axis.labelHeight / 2); margins.top = Math.max(margins.top, axis.labelHeight / 2) } } }); plotOffset.left = Math.ceil(Math.max(margins.left, plotOffset.left)); plotOffset.right = Math.ceil(Math.max(margins.right, plotOffset.right)); plotOffset.top = Math.ceil(Math.max(margins.top, plotOffset.top)); plotOffset.bottom = Math.ceil(Math.max(margins.bottom, plotOffset.bottom)) } function setupGrid() { var i, axes = allAxes(), showGrid = options.grid.show; for (var a in plotOffset) { var margin = options.grid.margin || 0; plotOffset[a] = typeof margin == "number" ? margin : margin[a] || 0 } executeHooks(hooks.processOffset, [plotOffset]); for (var a in plotOffset) { if (typeof options.grid.borderWidth == "object") { plotOffset[a] += showGrid ? options.grid.borderWidth[a] : 0 } else { plotOffset[a] += showGrid ? options.grid.borderWidth : 0 } } $.each(axes, function (_, axis) { var axisOpts = axis.options; axis.show = axisOpts.show == null ? axis.used : axisOpts.show; axis.reserveSpace = axisOpts.reserveSpace == null ? axis.show : axisOpts.reserveSpace; setRange(axis) }); if (showGrid) { var allocatedAxes = $.grep(axes, function (axis) { return axis.show || axis.reserveSpace }); $.each(allocatedAxes, function (_, axis) { setupTickGeneration(axis); setTicks(axis); snapRangeToTicks(axis, axis.ticks); measureTickLabels(axis) }); for (i = allocatedAxes.length - 1; i >= 0; --i)allocateAxisBoxFirstPhase(allocatedAxes[i]); adjustLayoutForThingsStickingOut(); $.each(allocatedAxes, function (_, axis) { allocateAxisBoxSecondPhase(axis) }) } plotWidth = surface.width - plotOffset.left - plotOffset.right; plotHeight = surface.height - plotOffset.bottom - plotOffset.top; $.each(axes, function (_, axis) { setTransformationHelpers(axis) }); if (showGrid) { drawAxisLabels() } insertLegend() } function setRange(axis) { var opts = axis.options, min = +(opts.min != null ? opts.min : axis.datamin), max = +(opts.max != null ? opts.max : axis.datamax), delta = max - min; if (delta == 0) { var widen = max == 0 ? 1 : .01; if (opts.min == null) min -= widen; if (opts.max == null || opts.min != null) max += widen } else { var margin = opts.autoscaleMargin; if (margin != null) { if (opts.min == null) { min -= delta * margin; if (min < 0 && axis.datamin != null && axis.datamin >= 0) min = 0 } if (opts.max == null) { max += delta * margin; if (max > 0 && axis.datamax != null && axis.datamax <= 0) max = 0 } } } axis.min = min; axis.max = max } function setupTickGeneration(axis) { var opts = axis.options; var noTicks; if (typeof opts.ticks == "number" && opts.ticks > 0) noTicks = opts.ticks; else noTicks = .3 * Math.sqrt(axis.direction == "x" ? surface.width : surface.height); var delta = (axis.max - axis.min) / noTicks, dec = -Math.floor(Math.log(delta) / Math.LN10), maxDec = opts.tickDecimals; if (maxDec != null && dec > maxDec) { dec = maxDec } var magn = Math.pow(10, -dec), norm = delta / magn, size; if (norm < 1.5) { size = 1 } else if (norm < 3) { size = 2; if (norm > 2.25 && (maxDec == null || dec + 1 <= maxDec)) { size = 2.5; ++dec } } else if (norm < 7.5) { size = 5 } else { size = 10 } size *= magn; if (opts.minTickSize != null && size < opts.minTickSize) { size = opts.minTickSize } axis.delta = delta; axis.tickDecimals = Math.max(0, maxDec != null ? maxDec : dec); axis.tickSize = opts.tickSize || size; if (opts.mode == "time" && !axis.tickGenerator) { throw new Error("Time mode requires the flot.time plugin.") } if (!axis.tickGenerator) { axis.tickGenerator = function (axis) { var ticks = [], start = floorInBase(axis.min, axis.tickSize), i = 0, v = Number.NaN, prev; do { prev = v; v = start + i * axis.tickSize; ticks.push(v); ++i } while (v < axis.max && v != prev); return ticks }; axis.tickFormatter = function (value, axis) { var factor = axis.tickDecimals ? Math.pow(10, axis.tickDecimals) : 1; var formatted = "" + Math.round(value * factor) / factor; if (axis.tickDecimals != null) { var decimal = formatted.indexOf("."); var precision = decimal == -1 ? 0 : formatted.length - decimal - 1; if (precision < axis.tickDecimals) { return (precision ? formatted : formatted + ".") + ("" + factor).substr(1, axis.tickDecimals - precision) } } return formatted } } if ($.isFunction(opts.tickFormatter)) axis.tickFormatter = function (v, axis) { return "" + opts.tickFormatter(v, axis) }; if (opts.alignTicksWithAxis != null) { var otherAxis = (axis.direction == "x" ? xaxes : yaxes)[opts.alignTicksWithAxis - 1]; if (otherAxis && otherAxis.used && otherAxis != axis) { var niceTicks = axis.tickGenerator(axis); if (niceTicks.length > 0) { if (opts.min == null) axis.min = Math.min(axis.min, niceTicks[0]); if (opts.max == null && niceTicks.length > 1) axis.max = Math.max(axis.max, niceTicks[niceTicks.length - 1]) } axis.tickGenerator = function (axis) { var ticks = [], v, i; for (i = 0; i < otherAxis.ticks.length; ++i) { v = (otherAxis.ticks[i].v - otherAxis.min) / (otherAxis.max - otherAxis.min); v = axis.min + v * (axis.max - axis.min); ticks.push(v) } return ticks }; if (!axis.mode && opts.tickDecimals == null) { var extraDec = Math.max(0, -Math.floor(Math.log(axis.delta) / Math.LN10) + 1), ts = axis.tickGenerator(axis); if (!(ts.length > 1 && /\..*0$/.test((ts[1] - ts[0]).toFixed(extraDec)))) axis.tickDecimals = extraDec } } } } function setTicks(axis) { var oticks = axis.options.ticks, ticks = []; if (oticks == null || typeof oticks == "number" && oticks > 0) ticks = axis.tickGenerator(axis); else if (oticks) { if ($.isFunction(oticks)) ticks = oticks(axis); else ticks = oticks } var i, v; axis.ticks = []; for (i = 0; i < ticks.length; ++i) { var label = null; var t = ticks[i]; if (typeof t == "object") { v = +t[0]; if (t.length > 1) label = t[1] } else v = +t; if (label == null) label = axis.tickFormatter(v, axis); if (!isNaN(v)) axis.ticks.push({ v: v, label: label }) } } function snapRangeToTicks(axis, ticks) { if (axis.options.autoscaleMargin && ticks.length > 0) { if (axis.options.min == null) axis.min = Math.min(axis.min, ticks[0].v); if (axis.options.max == null && ticks.length > 1) axis.max = Math.max(axis.max, ticks[ticks.length - 1].v) } } function draw() { surface.clear(); executeHooks(hooks.drawBackground, [ctx]); var grid = options.grid; if (grid.show && grid.backgroundColor) drawBackground(); if (grid.show && !grid.aboveData) { drawGrid() } for (var i = 0; i < series.length; ++i) { executeHooks(hooks.drawSeries, [ctx, series[i]]); drawSeries(series[i]) } executeHooks(hooks.draw, [ctx]); if (grid.show && grid.aboveData) { drawGrid() } surface.render(); triggerRedrawOverlay() } function extractRange(ranges, coord) { var axis, from, to, key, axes = allAxes(); for (var i = 0; i < axes.length; ++i) { axis = axes[i]; if (axis.direction == coord) { key = coord + axis.n + "axis"; if (!ranges[key] && axis.n == 1) key = coord + "axis"; if (ranges[key]) { from = ranges[key].from; to = ranges[key].to; break } } } if (!ranges[key]) { axis = coord == "x" ? xaxes[0] : yaxes[0]; from = ranges[coord + "1"]; to = ranges[coord + "2"] } if (from != null && to != null && from > to) { var tmp = from; from = to; to = tmp } return { from: from, to: to, axis: axis } } function drawBackground() { ctx.save(); ctx.translate(plotOffset.left, plotOffset.top); ctx.fillStyle = getColorOrGradient(options.grid.backgroundColor, plotHeight, 0, "rgba(255, 255, 255, 0)"); ctx.fillRect(0, 0, plotWidth, plotHeight); ctx.restore() } function drawGrid() {
             var i, axes, bw, bc; ctx.save(); ctx.translate(plotOffset.left, plotOffset.top); var markings = options.grid.markings; if (markings) {
                 if ($.isFunction(markings)) { axes = plot.getAxes(); axes.xmin = axes.xaxis.min; axes.xmax = axes.xaxis.max; axes.ymin = axes.yaxis.min; axes.ymax = axes.yaxis.max; markings = markings(axes) } for (i = 0; i < markings.length; ++i) {
@@ -13,6 +13,6 @@ Licensed under the MIT license.
                     if (yrange.from == null) yrange.from = yrange.axis.min; if (yrange.to == null) yrange.to = yrange.axis.max; if (xrange.to < xrange.axis.min || xrange.from > xrange.axis.max || yrange.to < yrange.axis.min || yrange.from > yrange.axis.max) continue; xrange.from = Math.max(xrange.from, xrange.axis.min); xrange.to = Math.min(xrange.to, xrange.axis.max); yrange.from = Math.max(yrange.from, yrange.axis.min); yrange.to = Math.min(yrange.to, yrange.axis.max); var xequal = xrange.from === xrange.to, yequal = yrange.from === yrange.to; if (xequal && yequal) { continue } xrange.from = Math.floor(xrange.axis.p2c(xrange.from)); xrange.to = Math.floor(xrange.axis.p2c(xrange.to)); yrange.from = Math.floor(yrange.axis.p2c(yrange.from)); yrange.to = Math.floor(yrange.axis.p2c(yrange.to)); if (xequal || yequal) { var lineWidth = m.lineWidth || options.grid.markingsLineWidth, subPixel = lineWidth % 2 ? .5 : 0; ctx.beginPath(); ctx.strokeStyle = m.color || options.grid.markingsColor; ctx.lineWidth = lineWidth; if (xequal) { ctx.moveTo(xrange.to + subPixel, yrange.from); ctx.lineTo(xrange.to + subPixel, yrange.to) } else { ctx.moveTo(xrange.from, yrange.to + subPixel); ctx.lineTo(xrange.to, yrange.to + subPixel) } ctx.stroke() } else { ctx.fillStyle = m.color || options.grid.markingsColor; ctx.fillRect(xrange.from, yrange.to, xrange.to - xrange.from, yrange.from - yrange.to) }
                 }
             } axes = allAxes(); bw = options.grid.borderWidth; for (var j = 0; j < axes.length; ++j) { var axis = axes[j], box = axis.box, t = axis.tickLength, x, y, xoff, yoff; if (!axis.show || axis.ticks.length == 0) continue; ctx.lineWidth = 1; if (axis.direction == "x") { x = 0; if (t == "full") y = axis.position == "top" ? 0 : plotHeight; else y = box.top - plotOffset.top + (axis.position == "top" ? box.height : 0) } else { y = 0; if (t == "full") x = axis.position == "left" ? 0 : plotWidth; else x = box.left - plotOffset.left + (axis.position == "left" ? box.width : 0) } if (!axis.innermost) { ctx.strokeStyle = axis.options.color; ctx.beginPath(); xoff = yoff = 0; if (axis.direction == "x") xoff = plotWidth + 1; else yoff = plotHeight + 1; if (ctx.lineWidth == 1) { if (axis.direction == "x") { y = Math.floor(y) + .5 } else { x = Math.floor(x) + .5 } } ctx.moveTo(x, y); ctx.lineTo(x + xoff, y + yoff); ctx.stroke() } ctx.strokeStyle = axis.options.tickColor; ctx.beginPath(); for (i = 0; i < axis.ticks.length; ++i) { var v = axis.ticks[i].v; xoff = yoff = 0; if (isNaN(v) || v < axis.min || v > axis.max || t == "full" && (typeof bw == "object" && bw[axis.position] > 0 || bw > 0) && (v == axis.min || v == axis.max)) continue; if (axis.direction == "x") { x = axis.p2c(v); yoff = t == "full" ? -plotHeight : t; if (axis.position == "top") yoff = -yoff } else { y = axis.p2c(v); xoff = t == "full" ? -plotWidth : t; if (axis.position == "left") xoff = -xoff } if (ctx.lineWidth == 1) { if (axis.direction == "x") x = Math.floor(x) + .5; else y = Math.floor(y) + .5 } ctx.moveTo(x, y); ctx.lineTo(x + xoff, y + yoff) } ctx.stroke() } if (bw) { bc = options.grid.borderColor; if (typeof bw == "object" || typeof bc == "object") { if (typeof bw !== "object") { bw = { top: bw, right: bw, bottom: bw, left: bw } } if (typeof bc !== "object") { bc = { top: bc, right: bc, bottom: bc, left: bc } } if (bw.top > 0) { ctx.strokeStyle = bc.top; ctx.lineWidth = bw.top; ctx.beginPath(); ctx.moveTo(0 - bw.left, 0 - bw.top / 2); ctx.lineTo(plotWidth, 0 - bw.top / 2); ctx.stroke() } if (bw.right > 0) { ctx.strokeStyle = bc.right; ctx.lineWidth = bw.right; ctx.beginPath(); ctx.moveTo(plotWidth + bw.right / 2, 0 - bw.top); ctx.lineTo(plotWidth + bw.right / 2, plotHeight); ctx.stroke() } if (bw.bottom > 0) { ctx.strokeStyle = bc.bottom; ctx.lineWidth = bw.bottom; ctx.beginPath(); ctx.moveTo(plotWidth + bw.right, plotHeight + bw.bottom / 2); ctx.lineTo(0, plotHeight + bw.bottom / 2); ctx.stroke() } if (bw.left > 0) { ctx.strokeStyle = bc.left; ctx.lineWidth = bw.left; ctx.beginPath(); ctx.moveTo(0 - bw.left / 2, plotHeight + bw.bottom); ctx.lineTo(0 - bw.left / 2, 0); ctx.stroke() } } else { ctx.lineWidth = bw; ctx.strokeStyle = options.grid.borderColor; ctx.strokeRect(-bw / 2, -bw / 2, plotWidth + bw, plotHeight + bw) } } ctx.restore()
-        } function drawAxisLabels() { $.each(allAxes(), function (_, axis) { var box = axis.box, legacyStyles = axis.direction + "Axis " + axis.direction + axis.n + "Axis", layer = "flot-" + axis.direction + "-axis flot-" + axis.direction + axis.n + "-axis " + legacyStyles, font = axis.options.font || "flot-tick-label tickLabel", tick, x, y, halign, valign; surface.removeText(layer); if (!axis.show || axis.ticks.length == 0) return; for (var i = 0; i < axis.ticks.length; ++i) { tick = axis.ticks[i]; if (!tick.label || tick.v < axis.min || tick.v > axis.max) continue; if (axis.direction == "x") { halign = "center"; x = plotOffset.left + axis.p2c(tick.v); if (axis.position == "bottom") { y = box.top + box.padding } else { y = box.top + box.height - box.padding; valign = "bottom" } } else { valign = "middle"; y = plotOffset.top + axis.p2c(tick.v); if (axis.position == "left") { x = box.left + box.width - box.padding; halign = "right" } else { x = box.left + box.padding } } surface.addText(layer, x, y, tick.label, font, null, null, halign, valign) } }) } function drawSeries(series) { if (series.lines.show) drawSeriesLines(series); if (series.bars.show) drawSeriesBars(series); if (series.points.show) drawSeriesPoints(series) } function drawSeriesLines(series) { function plotLine(datapoints, xoffset, yoffset, axisx, axisy) { var points = datapoints.points, ps = datapoints.pointsize, prevx = null, prevy = null; ctx.beginPath(); for (var i = ps; i < points.length; i += ps) { var x1 = points[i - ps], y1 = points[i - ps + 1], x2 = points[i], y2 = points[i + 1]; if (x1 == null || x2 == null) continue; if (y1 <= y2 && y1 < axisy.min) { if (y2 < axisy.min) continue; x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; y1 = axisy.min } else if (y2 <= y1 && y2 < axisy.min) { if (y1 < axisy.min) continue; x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; y2 = axisy.min } if (y1 >= y2 && y1 > axisy.max) { if (y2 > axisy.max) continue; x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; y1 = axisy.max } else if (y2 >= y1 && y2 > axisy.max) { if (y1 > axisy.max) continue; x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; y2 = axisy.max } if (x1 <= x2 && x1 < axisx.min) { if (x2 < axisx.min) continue; y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; x1 = axisx.min } else if (x2 <= x1 && x2 < axisx.min) { if (x1 < axisx.min) continue; y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; x2 = axisx.min } if (x1 >= x2 && x1 > axisx.max) { if (x2 > axisx.max) continue; y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; x1 = axisx.max } else if (x2 >= x1 && x2 > axisx.max) { if (x1 > axisx.max) continue; y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; x2 = axisx.max } if (x1 != prevx || y1 != prevy) ctx.moveTo(axisx.p2c(x1) + xoffset, axisy.p2c(y1) + yoffset); prevx = x2; prevy = y2; ctx.lineTo(axisx.p2c(x2) + xoffset, axisy.p2c(y2) + yoffset) } ctx.stroke() } function plotLineArea(datapoints, axisx, axisy) { var points = datapoints.points, ps = datapoints.pointsize, bottom = Math.min(Math.max(0, axisy.min), axisy.max), i = 0, top, areaOpen = false, ypos = 1, segmentStart = 0, segmentEnd = 0; while (true) { if (ps > 0 && i > points.length + ps) break; i += ps; var x1 = points[i - ps], y1 = points[i - ps + ypos], x2 = points[i], y2 = points[i + ypos]; if (areaOpen) { if (ps > 0 && x1 != null && x2 == null) { segmentEnd = i; ps = -ps; ypos = 2; continue } if (ps < 0 && i == segmentStart + ps) { ctx.fill(); areaOpen = false; ps = -ps; ypos = 1; i = segmentStart = segmentEnd + ps; continue } } if (x1 == null || x2 == null) continue; if (x1 <= x2 && x1 < axisx.min) { if (x2 < axisx.min) continue; y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; x1 = axisx.min } else if (x2 <= x1 && x2 < axisx.min) { if (x1 < axisx.min) continue; y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; x2 = axisx.min } if (x1 >= x2 && x1 > axisx.max) { if (x2 > axisx.max) continue; y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; x1 = axisx.max } else if (x2 >= x1 && x2 > axisx.max) { if (x1 > axisx.max) continue; y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; x2 = axisx.max } if (!areaOpen) { ctx.beginPath(); ctx.moveTo(axisx.p2c(x1), axisy.p2c(bottom)); areaOpen = true } if (y1 >= axisy.max && y2 >= axisy.max) { ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.max)); ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.max)); continue } else if (y1 <= axisy.min && y2 <= axisy.min) { ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.min)); ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.min)); continue } var x1old = x1, x2old = x2; if (y1 <= y2 && y1 < axisy.min && y2 >= axisy.min) { x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; y1 = axisy.min } else if (y2 <= y1 && y2 < axisy.min && y1 >= axisy.min) { x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; y2 = axisy.min } if (y1 >= y2 && y1 > axisy.max && y2 <= axisy.max) { x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; y1 = axisy.max } else if (y2 >= y1 && y2 > axisy.max && y1 <= axisy.max) { x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; y2 = axisy.max } if (x1 != x1old) { ctx.lineTo(axisx.p2c(x1old), axisy.p2c(y1)) } ctx.lineTo(axisx.p2c(x1), axisy.p2c(y1)); ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2)); if (x2 != x2old) { ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2)); ctx.lineTo(axisx.p2c(x2old), axisy.p2c(y2)) } } } ctx.save(); ctx.translate(plotOffset.left, plotOffset.top); ctx.lineJoin = "round"; var lw = series.lines.lineWidth, sw = series.shadowSize; if (lw > 0 && sw > 0) { ctx.lineWidth = sw; ctx.strokeStyle = "rgba(0,0,0,0.1)"; var angle = Math.PI / 18; plotLine(series.datapoints, Math.sin(angle) * (lw / 2 + sw / 2), Math.cos(angle) * (lw / 2 + sw / 2), series.xaxis, series.yaxis); ctx.lineWidth = sw / 2; plotLine(series.datapoints, Math.sin(angle) * (lw / 2 + sw / 4), Math.cos(angle) * (lw / 2 + sw / 4), series.xaxis, series.yaxis) } ctx.lineWidth = lw; ctx.strokeStyle = series.color; var fillStyle = getFillStyle(series.lines, series.color, 0, plotHeight); if (fillStyle) { ctx.fillStyle = fillStyle; plotLineArea(series.datapoints, series.xaxis, series.yaxis) } if (lw > 0) plotLine(series.datapoints, 0, 0, series.xaxis, series.yaxis); ctx.restore() } function drawSeriesPoints(series) { function plotPoints(datapoints, radius, fillStyle, offset, shadow, axisx, axisy, symbol) { var points = datapoints.points, ps = datapoints.pointsize; for (var i = 0; i < points.length; i += ps) { var x = points[i], y = points[i + 1]; if (x == null || x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max) continue; ctx.beginPath(); x = axisx.p2c(x); y = axisy.p2c(y) + offset; if (symbol == "circle") ctx.arc(x, y, radius, 0, shadow ? Math.PI : Math.PI * 2, false); else symbol(ctx, x, y, radius, shadow); ctx.closePath(); if (fillStyle) { ctx.fillStyle = fillStyle; ctx.fill() } ctx.stroke() } } ctx.save(); ctx.translate(plotOffset.left, plotOffset.top); var lw = series.points.lineWidth, sw = series.shadowSize, radius = series.points.radius, symbol = series.points.symbol; if (lw == 0) lw = 1e-4; if (lw > 0 && sw > 0) { var w = sw / 2; ctx.lineWidth = w; ctx.strokeStyle = "rgba(0,0,0,0.1)"; plotPoints(series.datapoints, radius, null, w + w / 2, true, series.xaxis, series.yaxis, symbol); ctx.strokeStyle = "rgba(0,0,0,0.2)"; plotPoints(series.datapoints, radius, null, w / 2, true, series.xaxis, series.yaxis, symbol) } ctx.lineWidth = lw; ctx.strokeStyle = series.color; plotPoints(series.datapoints, radius, getFillStyle(series.points, series.color), 0, false, series.xaxis, series.yaxis, symbol); ctx.restore() } function drawBar(x, y, b, barLeft, barRight, fillStyleCallback, axisx, axisy, c, horizontal, lineWidth) { var left, right, bottom, top, drawLeft, drawRight, drawTop, drawBottom, tmp; if (horizontal) { drawBottom = drawRight = drawTop = true; drawLeft = false; left = b; right = x; top = y + barLeft; bottom = y + barRight; if (right < left) { tmp = right; right = left; left = tmp; drawLeft = true; drawRight = false } } else { drawLeft = drawRight = drawTop = true; drawBottom = false; left = x + barLeft; right = x + barRight; bottom = b; top = y; if (top < bottom) { tmp = top; top = bottom; bottom = tmp; drawBottom = true; drawTop = false } } if (right < axisx.min || left > axisx.max || top < axisy.min || bottom > axisy.max) return; if (left < axisx.min) { left = axisx.min; drawLeft = false } if (right > axisx.max) { right = axisx.max; drawRight = false } if (bottom < axisy.min) { bottom = axisy.min; drawBottom = false } if (top > axisy.max) { top = axisy.max; drawTop = false } left = axisx.p2c(left); bottom = axisy.p2c(bottom); right = axisx.p2c(right); top = axisy.p2c(top); if (fillStyleCallback) { c.fillStyle = fillStyleCallback(bottom, top); c.fillRect(left, top, right - left, bottom - top) } if (lineWidth > 0 && (drawLeft || drawRight || drawTop || drawBottom)) { c.beginPath(); c.moveTo(left, bottom); if (drawLeft) c.lineTo(left, top); else c.moveTo(left, top); if (drawTop) c.lineTo(right, top); else c.moveTo(right, top); if (drawRight) c.lineTo(right, bottom); else c.moveTo(right, bottom); if (drawBottom) c.lineTo(left, bottom); else c.moveTo(left, bottom); c.stroke() } } function drawSeriesBars(series) { function plotBars(datapoints, barLeft, barRight, fillStyleCallback, axisx, axisy) { var points = datapoints.points, ps = datapoints.pointsize; for (var i = 0; i < points.length; i += ps) { if (points[i] == null) continue; drawBar(points[i], points[i + 1], points[i + 2], barLeft, barRight, fillStyleCallback, axisx, axisy, ctx, series.bars.horizontal, series.bars.lineWidth) } } ctx.save(); ctx.translate(plotOffset.left, plotOffset.top); ctx.lineWidth = series.bars.lineWidth; ctx.strokeStyle = series.color; var barLeft; switch (series.bars.align) { case "left": barLeft = 0; break; case "right": barLeft = -series.bars.barWidth; break; default: barLeft = -series.bars.barWidth / 2 }var fillStyleCallback = series.bars.fill ? function (bottom, top) { return getFillStyle(series.bars, series.color, bottom, top) } : null; plotBars(series.datapoints, barLeft, barLeft + series.bars.barWidth, fillStyleCallback, series.xaxis, series.yaxis); ctx.restore() } function getFillStyle(filloptions, seriesColor, bottom, top) { var fill = filloptions.fill; if (!fill) return null; if (filloptions.fillColor) return getColorOrGradient(filloptions.fillColor, bottom, top, seriesColor); var c = $.color.parse(seriesColor); c.a = typeof fill == "number" ? fill : .4; c.normalize(); return c.toString() } function insertLegend() { if (options.legend.container != null) { $(options.legend.container).html("") } else { placeholder.find(".legend").remove() } if (!options.legend.show) { return } var fragments = [], entries = [], rowStarted = false, lf = options.legend.labelFormatter, s, label; for (var i = 0; i < series.length; ++i) { s = series[i]; if (s.label) { label = lf ? lf(s.label, s) : s.label; if (label) { entries.push({ label: label, color: s.color }) } } } if (options.legend.sorted) { if ($.isFunction(options.legend.sorted)) { entries.sort(options.legend.sorted) } else if (options.legend.sorted == "reverse") { entries.reverse() } else { var ascending = options.legend.sorted != "descending"; entries.sort(function (a, b) { return a.label == b.label ? 0 : a.label < b.label != ascending ? 1 : -1 }) } } for (var i = 0; i < entries.length; ++i) { var entry = entries[i]; if (i % options.legend.noColumns == 0) { if (rowStarted) fragments.push("</tr>"); fragments.push("<tr>"); rowStarted = true } fragments.push('<td class="legendColorBox"><div style="border:1px solid ' + options.legend.labelBoxBorderColor + ';padding:1px"><div style="width:4px;height:0;border:5px solid ' + entry.color + ';overflow:hidden"></div></div></td>' + '<td class="legendLabel">' + entry.label + "</td>") } if (rowStarted) fragments.push("</tr>"); if (fragments.length == 0) return; var table = '<table style="font-size:smaller;color:' + options.grid.color + '">' + fragments.join("") + "</table>"; if (options.legend.container != null) $(options.legend.container).html(table); else { var pos = "", p = options.legend.position, m = options.legend.margin; if (m[0] == null) m = [m, m]; if (p.charAt(0) == "n") pos += "top:" + (m[1] + plotOffset.top) + "px;"; else if (p.charAt(0) == "s") pos += "bottom:" + (m[1] + plotOffset.bottom) + "px;"; if (p.charAt(1) == "e") pos += "right:" + (m[0] + plotOffset.right) + "px;"; else if (p.charAt(1) == "w") pos += "left:" + (m[0] + plotOffset.left) + "px;"; var legend = $('<div class="legend">' + table.replace('style="', 'style="position:absolute;' + pos + ";") + "</div>").appendTo(placeholder); if (options.legend.backgroundOpacity != 0) { var c = options.legend.backgroundColor; if (c == null) { c = options.grid.backgroundColor; if (c && typeof c == "string") c = $.color.parse(c); else c = $.color.extract(legend, "background-color"); c.a = 1; c = c.toString() } var div = legend.children(); $('<div style="position:absolute;width:' + div.width() + "px;height:" + div.height() + "px;" + pos + "background-color:" + c + ';"> </div>').prependTo(legend).css("opacity", options.legend.backgroundOpacity) } } } var highlights = [], redrawTimeout = null; function findNearbyItem(mouseX, mouseY, seriesFilter) { var maxDistance = options.grid.mouseActiveRadius, smallestDistance = maxDistance * maxDistance + 1, item = null, foundPoint = false, i, j, ps; for (i = series.length - 1; i >= 0; --i) { if (!seriesFilter(series[i])) continue; var s = series[i], axisx = s.xaxis, axisy = s.yaxis, points = s.datapoints.points, mx = axisx.c2p(mouseX), my = axisy.c2p(mouseY), maxx = maxDistance / axisx.scale, maxy = maxDistance / axisy.scale; ps = s.datapoints.pointsize; if (axisx.options.inverseTransform) maxx = Number.MAX_VALUE; if (axisy.options.inverseTransform) maxy = Number.MAX_VALUE; if (s.lines.show || s.points.show) { for (j = 0; j < points.length; j += ps) { var x = points[j], y = points[j + 1]; if (x == null) continue; if (x - mx > maxx || x - mx < -maxx || y - my > maxy || y - my < -maxy) continue; var dx = Math.abs(axisx.p2c(x) - mouseX), dy = Math.abs(axisy.p2c(y) - mouseY), dist = dx * dx + dy * dy; if (dist < smallestDistance) { smallestDistance = dist; item = [i, j / ps] } } } if (s.bars.show && !item) { var barLeft, barRight; switch (s.bars.align) { case "left": barLeft = 0; break; case "right": barLeft = -s.bars.barWidth; break; default: barLeft = -s.bars.barWidth / 2 }barRight = barLeft + s.bars.barWidth; for (j = 0; j < points.length; j += ps) { var x = points[j], y = points[j + 1], b = points[j + 2]; if (x == null) continue; if (series[i].bars.horizontal ? mx <= Math.max(b, x) && mx >= Math.min(b, x) && my >= y + barLeft && my <= y + barRight : mx >= x + barLeft && mx <= x + barRight && my >= Math.min(b, y) && my <= Math.max(b, y)) item = [i, j / ps] } } } if (item) { i = item[0]; j = item[1]; ps = series[i].datapoints.pointsize; return { datapoint: series[i].datapoints.points.slice(j * ps, (j + 1) * ps), dataIndex: j, series: series[i], seriesIndex: i } } return null } function onMouseMove(e) { if (options.grid.hoverable) triggerClickHoverEvent("plothover", e, function (s) { return s["hoverable"] != false }) } function onMouseLeave(e) { if (options.grid.hoverable) triggerClickHoverEvent("plothover", e, function (s) { return false }) } function onClick(e) { triggerClickHoverEvent("plotclick", e, function (s) { return s["clickable"] != false }) } function triggerClickHoverEvent(eventname, event, seriesFilter) { var offset = eventHolder.offset(), canvasX = event.pageX - offset.left - plotOffset.left, canvasY = event.pageY - offset.top - plotOffset.top, pos = canvasToAxisCoords({ left: canvasX, top: canvasY }); pos.pageX = event.pageX; pos.pageY = event.pageY; var item = findNearbyItem(canvasX, canvasY, seriesFilter); if (item) { item.pageX = parseInt(item.series.xaxis.p2c(item.datapoint[0]) + offset.left + plotOffset.left, 10); item.pageY = parseInt(item.series.yaxis.p2c(item.datapoint[1]) + offset.top + plotOffset.top, 10) } if (options.grid.autoHighlight) { for (var i = 0; i < highlights.length; ++i) { var h = highlights[i]; if (h.auto == eventname && !(item && h.series == item.series && h.point[0] == item.datapoint[0] && h.point[1] == item.datapoint[1])) unhighlight(h.series, h.point) } if (item) highlight(item.series, item.datapoint, eventname) } placeholder.trigger(eventname, [pos, item]) } function triggerRedrawOverlay() { var t = options.interaction.redrawOverlayInterval; if (t == -1) { drawOverlay(); return } if (!redrawTimeout) redrawTimeout = setTimeout(drawOverlay, t) } function drawOverlay() { redrawTimeout = null; octx.save(); overlay.clear(); octx.translate(plotOffset.left, plotOffset.top); var i, hi; for (i = 0; i < highlights.length; ++i) { hi = highlights[i]; if (hi.series.bars.show) drawBarHighlight(hi.series, hi.point); else drawPointHighlight(hi.series, hi.point) } octx.restore(); executeHooks(hooks.drawOverlay, [octx]) } function highlight(s, point, auto) { if (typeof s == "number") s = series[s]; if (typeof point == "number") { var ps = s.datapoints.pointsize; point = s.datapoints.points.slice(ps * point, ps * (point + 1)) } var i = indexOfHighlight(s, point); if (i == -1) { highlights.push({ series: s, point: point, auto: auto }); triggerRedrawOverlay() } else if (!auto) highlights[i].auto = false } function unhighlight(s, point) { if (s == null && point == null) { highlights = []; triggerRedrawOverlay(); return } if (typeof s == "number") s = series[s]; if (typeof point == "number") { var ps = s.datapoints.pointsize; point = s.datapoints.points.slice(ps * point, ps * (point + 1)) } var i = indexOfHighlight(s, point); if (i != -1) { highlights.splice(i, 1); triggerRedrawOverlay() } } function indexOfHighlight(s, p) { for (var i = 0; i < highlights.length; ++i) { var h = highlights[i]; if (h.series == s && h.point[0] == p[0] && h.point[1] == p[1]) return i } return -1 } function drawPointHighlight(series, point) { var x = point[0], y = point[1], axisx = series.xaxis, axisy = series.yaxis, highlightColor = typeof series.highlightColor === "string" ? series.highlightColor : $.color.parse(series.color).scale("a", .5).toString(); if (x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max) return; var pointRadius = series.points.radius + series.points.lineWidth / 2; octx.lineWidth = pointRadius; octx.strokeStyle = highlightColor; var radius = 1.5 * pointRadius; x = axisx.p2c(x); y = axisy.p2c(y); octx.beginPath(); if (series.points.symbol == "circle") octx.arc(x, y, radius, 0, 2 * Math.PI, false); else series.points.symbol(octx, x, y, radius, false); octx.closePath(); octx.stroke() } function drawBarHighlight(series, point) { var highlightColor = typeof series.highlightColor === "string" ? series.highlightColor : $.color.parse(series.color).scale("a", .5).toString(), fillStyle = highlightColor, barLeft; switch (series.bars.align) { case "left": barLeft = 0; break; case "right": barLeft = -series.bars.barWidth; break; default: barLeft = -series.bars.barWidth / 2 }octx.lineWidth = series.bars.lineWidth; octx.strokeStyle = highlightColor; drawBar(point[0], point[1], point[2] || 0, barLeft, barLeft + series.bars.barWidth, function () { return fillStyle }, series.xaxis, series.yaxis, octx, series.bars.horizontal, series.bars.lineWidth) } function getColorOrGradient(spec, bottom, top, defaultColor) { if (typeof spec == "string") return spec; else { var gradient = ctx.createLinearGradient(0, top, 0, bottom); for (var i = 0, l = spec.colors.length; i < l; ++i) { var c = spec.colors[i]; if (typeof c != "string") { var co = $.color.parse(defaultColor); if (c.brightness != null) co = co.scale("rgb", c.brightness); if (c.opacity != null) co.a *= c.opacity; c = co.toString() } gradient.addColorStop(i / (l - 1), c) } return gradient } }
+        } function drawAxisLabels() { $.each(allAxes(), function (_, axis) { var box = axis.box, legacyStyles = axis.direction + "Axis " + axis.direction + axis.n + "Axis", layer = "flot-" + axis.direction + "-axis flot-" + axis.direction + axis.n + "-axis " + legacyStyles, font = axis.options.font || "flot-tick-label tickLabel", tick, x, y, halign, valign; surface.removeText(layer); if (!axis.show || axis.ticks.length == 0) return; for (var i = 0; i < axis.ticks.length; ++i) { tick = axis.ticks[i]; if (!tick.label || tick.v < axis.min || tick.v > axis.max) continue; if (axis.direction == "x") { halign = "center"; x = plotOffset.left + axis.p2c(tick.v); if (axis.position == "bottom") { y = box.top + box.padding } else { y = box.top + box.height - box.padding; valign = "bottom" } } else { valign = "middle"; y = plotOffset.top + axis.p2c(tick.v); if (axis.position == "left") { x = box.left + box.width - box.padding; halign = "right" } else { x = box.left + box.padding } } surface.addText(layer, x, y, tick.label, font, null, null, halign, valign) } }) } function drawSeries(series) { if (series.lines.show) drawSeriesLines(series); if (series.bars.show) drawSeriesBars(series); if (series.points.show) drawSeriesPoints(series) } function drawSeriesLines(series) { function plotLine(datapoints, xoffset, yoffset, axisx, axisy) { var points = datapoints.points, ps = datapoints.pointsize, prevx = null, prevy = null; ctx.beginPath(); for (var i = ps; i < points.length; i += ps) { var x1 = points[i - ps], y1 = points[i - ps + 1], x2 = points[i], y2 = points[i + 1]; if (x1 == null || x2 == null) continue; if (y1 <= y2 && y1 < axisy.min) { if (y2 < axisy.min) continue; x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; y1 = axisy.min } else if (y2 <= y1 && y2 < axisy.min) { if (y1 < axisy.min) continue; x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; y2 = axisy.min } if (y1 >= y2 && y1 > axisy.max) { if (y2 > axisy.max) continue; x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; y1 = axisy.max } else if (y2 >= y1 && y2 > axisy.max) { if (y1 > axisy.max) continue; x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; y2 = axisy.max } if (x1 <= x2 && x1 < axisx.min) { if (x2 < axisx.min) continue; y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; x1 = axisx.min } else if (x2 <= x1 && x2 < axisx.min) { if (x1 < axisx.min) continue; y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; x2 = axisx.min } if (x1 >= x2 && x1 > axisx.max) { if (x2 > axisx.max) continue; y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; x1 = axisx.max } else if (x2 >= x1 && x2 > axisx.max) { if (x1 > axisx.max) continue; y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; x2 = axisx.max } if (x1 != prevx || y1 != prevy) ctx.moveTo(axisx.p2c(x1) + xoffset, axisy.p2c(y1) + yoffset); prevx = x2; prevy = y2; ctx.lineTo(axisx.p2c(x2) + xoffset, axisy.p2c(y2) + yoffset) } ctx.stroke() } function plotLineArea(datapoints, axisx, axisy) { var points = datapoints.points, ps = datapoints.pointsize, bottom = Math.min(Math.max(0, axisy.min), axisy.max), i = 0, top, areaOpen = false, ypos = 1, segmentStart = 0, segmentEnd = 0; while (true) { if (ps > 0 && i > points.length + ps) break; i += ps; var x1 = points[i - ps], y1 = points[i - ps + ypos], x2 = points[i], y2 = points[i + ypos]; if (areaOpen) { if (ps > 0 && x1 != null && x2 == null) { segmentEnd = i; ps = -ps; ypos = 2; continue } if (ps < 0 && i == segmentStart + ps) { ctx.fill(); areaOpen = false; ps = -ps; ypos = 1; i = segmentStart = segmentEnd + ps; continue } } if (x1 == null || x2 == null) continue; if (x1 <= x2 && x1 < axisx.min) { if (x2 < axisx.min) continue; y1 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; x1 = axisx.min } else if (x2 <= x1 && x2 < axisx.min) { if (x1 < axisx.min) continue; y2 = (axisx.min - x1) / (x2 - x1) * (y2 - y1) + y1; x2 = axisx.min } if (x1 >= x2 && x1 > axisx.max) { if (x2 > axisx.max) continue; y1 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; x1 = axisx.max } else if (x2 >= x1 && x2 > axisx.max) { if (x1 > axisx.max) continue; y2 = (axisx.max - x1) / (x2 - x1) * (y2 - y1) + y1; x2 = axisx.max } if (!areaOpen) { ctx.beginPath(); ctx.moveTo(axisx.p2c(x1), axisy.p2c(bottom)); areaOpen = true } if (y1 >= axisy.max && y2 >= axisy.max) { ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.max)); ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.max)); continue } else if (y1 <= axisy.min && y2 <= axisy.min) { ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.min)); ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.min)); continue } var x1old = x1, x2old = x2; if (y1 <= y2 && y1 < axisy.min && y2 >= axisy.min) { x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; y1 = axisy.min } else if (y2 <= y1 && y2 < axisy.min && y1 >= axisy.min) { x2 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; y2 = axisy.min } if (y1 >= y2 && y1 > axisy.max && y2 <= axisy.max) { x1 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; y1 = axisy.max } else if (y2 >= y1 && y2 > axisy.max && y1 <= axisy.max) { x2 = (axisy.max - y1) / (y2 - y1) * (x2 - x1) + x1; y2 = axisy.max } if (x1 != x1old) { ctx.lineTo(axisx.p2c(x1old), axisy.p2c(y1)) } ctx.lineTo(axisx.p2c(x1), axisy.p2c(y1)); ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2)); if (x2 != x2old) { ctx.lineTo(axisx.p2c(x2), axisy.p2c(y2)); ctx.lineTo(axisx.p2c(x2old), axisy.p2c(y2)) } } } ctx.save(); ctx.translate(plotOffset.left, plotOffset.top); ctx.lineJoin = "round"; var lw = series.lines.lineWidth, sw = series.shadowSize; if (lw > 0 && sw > 0) { ctx.lineWidth = sw; ctx.strokeStyle = "rgba(0,0,0,0.1)"; var angle = Math.PI / 18; plotLine(series.datapoints, Math.sin(angle) * (lw / 2 + sw / 2), Math.cos(angle) * (lw / 2 + sw / 2), series.xaxis, series.yaxis); ctx.lineWidth = sw / 2; plotLine(series.datapoints, Math.sin(angle) * (lw / 2 + sw / 4), Math.cos(angle) * (lw / 2 + sw / 4), series.xaxis, series.yaxis) } ctx.lineWidth = lw; ctx.strokeStyle = series.color; var fillStyle = getFillStyle(series.lines, series.color, 0, plotHeight); if (fillStyle) { ctx.fillStyle = fillStyle; plotLineArea(series.datapoints, series.xaxis, series.yaxis) } if (lw > 0) plotLine(series.datapoints, 0, 0, series.xaxis, series.yaxis); ctx.restore() } function drawSeriesPoints(series) { function plotPoints(datapoints, radius, fillStyle, offset, shadow, axisx, axisy, symbol) { var points = datapoints.points, ps = datapoints.pointsize; for (var i = 0; i < points.length; i += ps) { var x = points[i], y = points[i + 1]; if (x == null || x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max) continue; ctx.beginPath(); x = axisx.p2c(x); y = axisy.p2c(y) + offset; if (symbol == "circle") ctx.arc(x, y, radius, 0, shadow ? Math.PI : Math.PI * 2, false); else symbol(ctx, x, y, radius, shadow); ctx.closePath(); if (fillStyle) { ctx.fillStyle = fillStyle; ctx.fill() } ctx.stroke() } } ctx.save(); ctx.translate(plotOffset.left, plotOffset.top); var lw = series.points.lineWidth, sw = series.shadowSize, radius = series.points.radius, symbol = series.points.symbol; if (lw == 0) lw = 1e-4; if (lw > 0 && sw > 0) { var w = sw / 2; ctx.lineWidth = w; ctx.strokeStyle = "rgba(0,0,0,0.1)"; plotPoints(series.datapoints, radius, null, w + w / 2, true, series.xaxis, series.yaxis, symbol); ctx.strokeStyle = "rgba(0,0,0,0.2)"; plotPoints(series.datapoints, radius, null, w / 2, true, series.xaxis, series.yaxis, symbol) } ctx.lineWidth = lw; ctx.strokeStyle = series.color; plotPoints(series.datapoints, radius, getFillStyle(series.points, series.color), 0, false, series.xaxis, series.yaxis, symbol); ctx.restore() } function drawBar(x, y, b, barLeft, barRight, fillStyleCallback, axisx, axisy, c, horizontal, lineWidth) { var left, right, bottom, top, drawLeft, drawRight, drawTop, drawBottom, tmp; if (horizontal) { drawBottom = drawRight = drawTop = true; drawLeft = false; left = b; right = x; top = y + barLeft; bottom = y + barRight; if (right < left) { tmp = right; right = left; left = tmp; drawLeft = true; drawRight = false } } else { drawLeft = drawRight = drawTop = true; drawBottom = false; left = x + barLeft; right = x + barRight; bottom = b; top = y; if (top < bottom) { tmp = top; top = bottom; bottom = tmp; drawBottom = true; drawTop = false } } if (right < axisx.min || left > axisx.max || top < axisy.min || bottom > axisy.max) return; if (left < axisx.min) { left = axisx.min; drawLeft = false } if (right > axisx.max) { right = axisx.max; drawRight = false } if (bottom < axisy.min) { bottom = axisy.min; drawBottom = false } if (top > axisy.max) { top = axisy.max; drawTop = false } left = axisx.p2c(left); bottom = axisy.p2c(bottom); right = axisx.p2c(right); top = axisy.p2c(top); if (fillStyleCallback) { c.fillStyle = fillStyleCallback(bottom, top); c.fillRect(left, top, right - left, bottom - top) } if (lineWidth > 0 && (drawLeft || drawRight || drawTop || drawBottom)) { c.beginPath(); c.moveTo(left, bottom); if (drawLeft) c.lineTo(left, top); else c.moveTo(left, top); if (drawTop) c.lineTo(right, top); else c.moveTo(right, top); if (drawRight) c.lineTo(right, bottom); else c.moveTo(right, bottom); if (drawBottom) c.lineTo(left, bottom); else c.moveTo(left, bottom); c.stroke() } } function drawSeriesBars(series) { function plotBars(datapoints, barLeft, barRight, fillStyleCallback, axisx, axisy) { var points = datapoints.points, ps = datapoints.pointsize; for (var i = 0; i < points.length; i += ps) { if (points[i] == null) continue; drawBar(points[i], points[i + 1], points[i + 2], barLeft, barRight, fillStyleCallback, axisx, axisy, ctx, series.bars.horizontal, series.bars.lineWidth) } } ctx.save(); ctx.translate(plotOffset.left, plotOffset.top); ctx.lineWidth = series.bars.lineWidth; ctx.strokeStyle = series.color; var barLeft; switch (series.bars.align) { case "left": barLeft = 0; break; case "right": barLeft = -series.bars.barWidth; break; default: barLeft = -series.bars.barWidth / 2 }var fillStyleCallback = series.bars.fill ? function (bottom, top) { return getFillStyle(series.bars, series.color, bottom, top) } : null; plotBars(series.datapoints, barLeft, barLeft + series.bars.barWidth, fillStyleCallback, series.xaxis, series.yaxis); ctx.restore() } function getFillStyle(filloptions, seriesColor, bottom, top) { var fill = filloptions.fill; if (!fill) return null; if (filloptions.fillColor) return getColorOrGradient(filloptions.fillColor, bottom, top, seriesColor); var c = $.color.parse(seriesColor); c.a = typeof fill == "number" ? fill : .4; c.normalize(); return c.toString() } function insertLegend() { if (options.legend.container != null) { $(options.legend.container).html("") } else { placeholder.find(".legend").remove() } if (!options.legend.show) { return } var fragments = [], entries = [], rowStarted = false, lf = options.legend.labelFormatter, s, label; for (var i = 0; i < series.length; ++i) { s = series[i]; if (s.label) { label = lf ? lf(s.label, s) : s.label; if (label) { entries.push({ label: label, color: s.color }) } } } if (options.legend.sorted) { if ($.isFunction(options.legend.sorted)) { entries.sort(options.legend.sorted) } else if (options.legend.sorted == "reverse") { entries.reverse() } else { var ascending = options.legend.sorted != "descending"; entries.sort(function (a, b) { return a.label == b.label ? 0 : a.label < b.label != ascending ? 1 : -1 }) } } for (var i = 0; i < entries.length; ++i) { var entry = entries[i]; if (i % options.legend.noColumns == 0) { if (rowStarted) fragments.push("</tr>"); fragments.push("<tr>"); rowStarted = true } fragments.push('<td class="legendColorBox"><div style="border:1px solid ' + options.legend.labelBoxBorderColor + ';padding:1px"><div style="width:4px;height:0;border:5px solid ' + entry.color + ';overflow:hidden"></div></div></td>' + '<td class="legendLabel">' + entry.label + "</td>") } if (rowStarted) fragments.push("</tr>"); if (fragments.length == 0) return; var table = '<table style="font-size:smaller;color:' + options.grid.color + '">' + fragments.join("") + "</table>"; if (options.legend.container != null) $(options.legend.container).html(table); else { var pos = "", p = options.legend.position, m = options.legend.margin; if (m[0] == null) m = [m, m]; if (p.charAt(0) == "n") pos += "top:" + (m[1] + plotOffset.top) + "px;"; else if (p.charAt(0) == "s") pos += "bottom:" + (m[1] + plotOffset.bottom) + "px;"; if (p.charAt(1) == "e") pos += "right:" + (m[0] + plotOffset.right) + "px;"; else if (p.charAt(1) == "w") pos += "left:" + (m[0] + plotOffset.left) + "px;"; var legend = $('<div class="legend">' + table.replace('style="', 'style="position:absolute;' + pos + ";") + "</div>").appendTo(placeholder); if (options.legend.backgroundOpacity != 0) { var c = options.legend.backgroundColor; if (c == null) { c = options.grid.backgroundColor; if (c && typeof c == "string") c = $.color.parse(c); else c = $.color.extract(legend, "background-color"); c.a = 1; c = c.toString() } var div = legend.children(); $('<div class="bg_222_important" style="position:absolute;width:' + div.width() + "px;height:" + div.height() + "px;" + pos + "background-color:" + c + ';"> </div>').prependTo(legend).css("opacity", options.legend.backgroundOpacity) } } } var highlights = [], redrawTimeout = null; function findNearbyItem(mouseX, mouseY, seriesFilter) { var maxDistance = options.grid.mouseActiveRadius, smallestDistance = maxDistance * maxDistance + 1, item = null, foundPoint = false, i, j, ps; for (i = series.length - 1; i >= 0; --i) { if (!seriesFilter(series[i])) continue; var s = series[i], axisx = s.xaxis, axisy = s.yaxis, points = s.datapoints.points, mx = axisx.c2p(mouseX), my = axisy.c2p(mouseY), maxx = maxDistance / axisx.scale, maxy = maxDistance / axisy.scale; ps = s.datapoints.pointsize; if (axisx.options.inverseTransform) maxx = Number.MAX_VALUE; if (axisy.options.inverseTransform) maxy = Number.MAX_VALUE; if (s.lines.show || s.points.show) { for (j = 0; j < points.length; j += ps) { var x = points[j], y = points[j + 1]; if (x == null) continue; if (x - mx > maxx || x - mx < -maxx || y - my > maxy || y - my < -maxy) continue; var dx = Math.abs(axisx.p2c(x) - mouseX), dy = Math.abs(axisy.p2c(y) - mouseY), dist = dx * dx + dy * dy; if (dist < smallestDistance) { smallestDistance = dist; item = [i, j / ps] } } } if (s.bars.show && !item) { var barLeft, barRight; switch (s.bars.align) { case "left": barLeft = 0; break; case "right": barLeft = -s.bars.barWidth; break; default: barLeft = -s.bars.barWidth / 2 }barRight = barLeft + s.bars.barWidth; for (j = 0; j < points.length; j += ps) { var x = points[j], y = points[j + 1], b = points[j + 2]; if (x == null) continue; if (series[i].bars.horizontal ? mx <= Math.max(b, x) && mx >= Math.min(b, x) && my >= y + barLeft && my <= y + barRight : mx >= x + barLeft && mx <= x + barRight && my >= Math.min(b, y) && my <= Math.max(b, y)) item = [i, j / ps] } } } if (item) { i = item[0]; j = item[1]; ps = series[i].datapoints.pointsize; return { datapoint: series[i].datapoints.points.slice(j * ps, (j + 1) * ps), dataIndex: j, series: series[i], seriesIndex: i } } return null } function onMouseMove(e) { if (options.grid.hoverable) triggerClickHoverEvent("plothover", e, function (s) { return s["hoverable"] != false }) } function onMouseLeave(e) { if (options.grid.hoverable) triggerClickHoverEvent("plothover", e, function (s) { return false }) } function onClick(e) { triggerClickHoverEvent("plotclick", e, function (s) { return s["clickable"] != false }) } function triggerClickHoverEvent(eventname, event, seriesFilter) { var offset = eventHolder.offset(), canvasX = event.pageX - offset.left - plotOffset.left, canvasY = event.pageY - offset.top - plotOffset.top, pos = canvasToAxisCoords({ left: canvasX, top: canvasY }); pos.pageX = event.pageX; pos.pageY = event.pageY; var item = findNearbyItem(canvasX, canvasY, seriesFilter); if (item) { item.pageX = parseInt(item.series.xaxis.p2c(item.datapoint[0]) + offset.left + plotOffset.left, 10); item.pageY = parseInt(item.series.yaxis.p2c(item.datapoint[1]) + offset.top + plotOffset.top, 10) } if (options.grid.autoHighlight) { for (var i = 0; i < highlights.length; ++i) { var h = highlights[i]; if (h.auto == eventname && !(item && h.series == item.series && h.point[0] == item.datapoint[0] && h.point[1] == item.datapoint[1])) unhighlight(h.series, h.point) } if (item) highlight(item.series, item.datapoint, eventname) } placeholder.trigger(eventname, [pos, item]) } function triggerRedrawOverlay() { var t = options.interaction.redrawOverlayInterval; if (t == -1) { drawOverlay(); return } if (!redrawTimeout) redrawTimeout = setTimeout(drawOverlay, t) } function drawOverlay() { redrawTimeout = null; octx.save(); overlay.clear(); octx.translate(plotOffset.left, plotOffset.top); var i, hi; for (i = 0; i < highlights.length; ++i) { hi = highlights[i]; if (hi.series.bars.show) drawBarHighlight(hi.series, hi.point); else drawPointHighlight(hi.series, hi.point) } octx.restore(); executeHooks(hooks.drawOverlay, [octx]) } function highlight(s, point, auto) { if (typeof s == "number") s = series[s]; if (typeof point == "number") { var ps = s.datapoints.pointsize; point = s.datapoints.points.slice(ps * point, ps * (point + 1)) } var i = indexOfHighlight(s, point); if (i == -1) { highlights.push({ series: s, point: point, auto: auto }); triggerRedrawOverlay() } else if (!auto) highlights[i].auto = false } function unhighlight(s, point) { if (s == null && point == null) { highlights = []; triggerRedrawOverlay(); return } if (typeof s == "number") s = series[s]; if (typeof point == "number") { var ps = s.datapoints.pointsize; point = s.datapoints.points.slice(ps * point, ps * (point + 1)) } var i = indexOfHighlight(s, point); if (i != -1) { highlights.splice(i, 1); triggerRedrawOverlay() } } function indexOfHighlight(s, p) { for (var i = 0; i < highlights.length; ++i) { var h = highlights[i]; if (h.series == s && h.point[0] == p[0] && h.point[1] == p[1]) return i } return -1 } function drawPointHighlight(series, point) { var x = point[0], y = point[1], axisx = series.xaxis, axisy = series.yaxis, highlightColor = typeof series.highlightColor === "string" ? series.highlightColor : $.color.parse(series.color).scale("a", .5).toString(); if (x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max) return; var pointRadius = series.points.radius + series.points.lineWidth / 2; octx.lineWidth = pointRadius; octx.strokeStyle = highlightColor; var radius = 1.5 * pointRadius; x = axisx.p2c(x); y = axisy.p2c(y); octx.beginPath(); if (series.points.symbol == "circle") octx.arc(x, y, radius, 0, 2 * Math.PI, false); else series.points.symbol(octx, x, y, radius, false); octx.closePath(); octx.stroke() } function drawBarHighlight(series, point) { var highlightColor = typeof series.highlightColor === "string" ? series.highlightColor : $.color.parse(series.color).scale("a", .5).toString(), fillStyle = highlightColor, barLeft; switch (series.bars.align) { case "left": barLeft = 0; break; case "right": barLeft = -series.bars.barWidth; break; default: barLeft = -series.bars.barWidth / 2 }octx.lineWidth = series.bars.lineWidth; octx.strokeStyle = highlightColor; drawBar(point[0], point[1], point[2] || 0, barLeft, barLeft + series.bars.barWidth, function () { return fillStyle }, series.xaxis, series.yaxis, octx, series.bars.horizontal, series.bars.lineWidth) } function getColorOrGradient(spec, bottom, top, defaultColor) { if (typeof spec == "string") return spec; else { var gradient = ctx.createLinearGradient(0, top, 0, bottom); for (var i = 0, l = spec.colors.length; i < l; ++i) { var c = spec.colors[i]; if (typeof c != "string") { var co = $.color.parse(defaultColor); if (c.brightness != null) co = co.scale("rgb", c.brightness); if (c.opacity != null) co.a *= c.opacity; c = co.toString() } gradient.addColorStop(i / (l - 1), c) } return gradient } }
     } $.plot = function (placeholder, data, options) { var plot = new Plot($(placeholder), data, options, $.plot.plugins); return plot }; $.plot.version = "0.8.3"; $.plot.plugins = []; $.fn.plot = function (data, options) { return this.each(function () { $.plot(this, data, options) }) }; function floorInBase(n, base) { return base * Math.floor(n / base) }
 })(jQuery);
\ No newline at end of file
diff --git a/pandora_console/include/graphs/functions_flot.php b/pandora_console/include/graphs/functions_flot.php
index aff51b5f7b..419e631995 100644
--- a/pandora_console/include/graphs/functions_flot.php
+++ b/pandora_console/include/graphs/functions_flot.php
@@ -683,12 +683,13 @@ function flot_vcolumn_chart(array $options)
     $options['graphId'] = $graphId;
 
     // If pandora_black theme its enabled then change grid colors.
-    if ($config['style'] === 'pandora_black') {
+    /*
+        if ($config['style'] === 'pandora_black') {
         $options['grid']['backgroundColor']['colors'][0] = 'transparent';
         $options['grid']['backgroundColor']['colors'][1] = 'transparent';
         $options['y']['color'] = 'transparent';
         $options['x']['color'] = 'transparent';
-    }
+    }*/
 
     $settings = base64_encode(json_encode($options));
 
diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js
index f46e457fd9..0c2e364994 100644
--- a/pandora_console/include/graphs/pandora.d3.js
+++ b/pandora_console/include/graphs/pandora.d3.js
@@ -2646,6 +2646,8 @@ function printClockDigital1(
     svg = d3.selectAll("#clock_" + id_element + " svg");
 
   svgUnderlay.attr("id", "underlay_" + id_element);
+  svgUnderlay.attr("class", "invert_filter");
+
   svgOverlay.attr("id", "overlay_" + id_element);
 
   var digit = svg.selectAll(".digit"),
diff --git a/pandora_console/include/lib/Dashboard/Widget.php b/pandora_console/include/lib/Dashboard/Widget.php
index 2100428b6e..fa6c0a7711 100644
--- a/pandora_console/include/lib/Dashboard/Widget.php
+++ b/pandora_console/include/lib/Dashboard/Widget.php
@@ -490,6 +490,8 @@ class Widget
      */
     public function getFormInputs(): array
     {
+        global $config;
+
         $inputs = [];
 
         $values = $this->values;
@@ -501,6 +503,10 @@ class Widget
 
         if (empty($values['background']) === true) {
             $values['background'] = '#ffffff';
+
+            if ($config['style'] === 'pandora_black') {
+                $values['background'] = '#222222';
+            }
         }
 
         $inputs[] = [
diff --git a/pandora_console/include/lib/Dashboard/Widgets/events_list.php b/pandora_console/include/lib/Dashboard/Widgets/events_list.php
index 77f1cb34e5..388c8e34c9 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/events_list.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/events_list.php
@@ -732,7 +732,12 @@ class EventsListWidget extends Widget
 
                 $table->data[$i] = $data;
 
-                $table->cellstyle[$i][0] = 'background: #E8E8E8;';
+                $bg_color = 'background: #E8E8E8;';
+                if ($config['style'] === 'pandora_black') {
+                    $bg_color = 'background: #222;';
+                }
+
+                $table->cellstyle[$i][0] = $bg_color;
                 $rowclass = \events_get_criticity_class($event['criticity']);
                 $table->cellclass[$i][1] = $rowclass;
                 $table->cellclass[$i][2] = $rowclass;
diff --git a/pandora_console/include/lib/Dashboard/Widgets/system_group_status.php b/pandora_console/include/lib/Dashboard/Widgets/system_group_status.php
index 9c3391f8ff..e43ac4659c 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/system_group_status.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/system_group_status.php
@@ -510,7 +510,7 @@ class SystemGroupStatusWidget extends Widget
             $show_link = array_key_exists($group['g'], $user_groups);
 
             if ((in_array($group['g'], $this->values['groupId'])) === true) {
-                $table->data[$i][] = '<span>'.$group['name'].'</span>';
+                $table->data[$i][] = '<span class="legendLabel">'.$group['name'].'</span>';
 
                 $url = $config['homeurl'].'index.php';
                 $url .= '?sec=estado&sec2=operation/agentes/status_monitor';
diff --git a/pandora_console/include/lib/Dashboard/Widgets/tree_view.php b/pandora_console/include/lib/Dashboard/Widgets/tree_view.php
index 9cc265ef9d..27445a24c3 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/tree_view.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/tree_view.php
@@ -536,6 +536,9 @@ class TreeViewWidget extends Widget
 
         // Css Files.
         \ui_require_css_file('tree', 'include/styles/', true);
+        if ($config['style'] == 'pandora_black') {
+            \ui_require_css_file('pandora_black', 'include/styles/', true);
+        }
 
         // Javascript Files.
         \ui_include_time_picker();
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index e0cf8840bc..68dbb08746 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -665,6 +665,9 @@ form ul.form_flex {
   border-radius: 4px;
 }
 
+text {
+  color: #fff !important;
+}
 .legendLabel {
   color: #fff;
 }
@@ -720,8 +723,9 @@ form ul.form_flex {
   color: #900;
 }
 
-.cluetip-default ul {
-  text-align: left;
+.cluetip-default ul,
+.text_left {
+  text-align: left !important;
 }
 .card {
   border: 1px solid #e2e2e2;
@@ -892,3 +896,38 @@ div.integria_details_description textarea {
   color: #fff;
   resize: vertical;
 }
+
+.grid-stack-item-content {
+  color: #fff !important;
+}
+.widget-groups-status h1 a {
+  font-size: 1.1em;
+  font-weight: bold;
+  line-height: 20px;
+  color: #fff;
+  font-family: "lato-lighter", "Open Sans", sans-serif;
+  letter-spacing: 0.03pt;
+  text-decoration: none;
+  text-transform: capitalize;
+}
+
+.widget_groups_status {
+  background-color: #222;
+}
+.flot-text {
+  color: #fff !important;
+}
+
+.table.group_modules_status_box tr td {
+  font-family: "lato-lighter", "Open Sans", sans-serif;
+  letter-spacing: 0.03pt;
+  font-size: 11pt;
+  text-decoration: none;
+  color: #fff !important;
+  font-weight: bolder;
+  text-align: justify;
+  border-bottom: 0px;
+}
+.bg_222_important {
+  background-color: #222 !important;
+}
diff --git a/pandora_console/include/styles/select2_dark.min.css b/pandora_console/include/styles/select2_dark.min.css
index f649915772..5a368aeff8 100644
--- a/pandora_console/include/styles/select2_dark.min.css
+++ b/pandora_console/include/styles/select2_dark.min.css
@@ -255,7 +255,7 @@
 .select2-container--default
   .select2-selection--multiple
   .select2-selection__choice {
-  background-color: #e4e4e4;
+  background-color: #222;
   border: 1px solid #aaa;
   border-radius: 4px;
   cursor: default;
@@ -263,7 +263,7 @@
   margin-right: 5px;
   margin-top: 5px;
   padding: 0 5px;
-  color: #111;
+  color: #fff;
 }
 .select2-container--default
   .select2-selection--multiple
@@ -277,7 +277,7 @@
 .select2-container--default
   .select2-selection--multiple
   .select2-selection__choice__remove:hover {
-  color: #333;
+  color: #82b92e;
 }
 .select2-container--default[dir="rtl"]
   .select2-selection--multiple
@@ -301,7 +301,7 @@
 }
 .select2-container--default.select2-container--focus
   .select2-selection--multiple {
-  border: solid black 1px;
+  border: solid #fff 1px;
   outline: 0;
 }
 .select2-container--default.select2-container--disabled
@@ -331,7 +331,7 @@
   border: 1px solid #aaa;
 }
 .select2-container--default .select2-search--inline .select2-search__field {
-  background: transparent;
+  background: #222;
   border: none;
   outline: 0;
   box-shadow: none;
diff --git a/pandora_console/views/dashboard/cell.php b/pandora_console/views/dashboard/cell.php
index ba9c9e546b..cbc3463acc 100644
--- a/pandora_console/views/dashboard/cell.php
+++ b/pandora_console/views/dashboard/cell.php
@@ -73,6 +73,9 @@ if ($manageDashboards !== 0) {
 
 $output .= '</div>';
 $output .= '</div>';
+if ($options['background'] === null && $config['style'] === 'pandora_black') {
+    $options['background'] = '#222';
+}
 
 if ((int) $cellData['id_widget'] !== 0) {
     $style = 'style="background-color:'.$options['background'].';"';

From 48cc1283cc062c0c0507190f8cc7ee276f4ad6e9 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Wed, 14 Apr 2021 15:09:19 +0200
Subject: [PATCH 17/22] add black theme to widget dashboard

---
 .../include/functions_treeview.php            |  4 +-
 .../include/graphs/flot/jquery.flot.js        |  2 +-
 pandora_console/include/graphs/pandora.d3.js  |  1 +
 .../functions_pandora_networkmap.js           | 83 ++++++++++---------
 .../include/javascript/pandora_dashboards.js  |  1 +
 .../lib/Dashboard/Widgets/tree_view.php       |  2 +-
 .../include/styles/pandora_black.css          | 15 ++++
 pandora_console/operation/tree.php            |  2 +-
 8 files changed, 64 insertions(+), 46 deletions(-)

diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php
index 4a09a20dd9..d72abf3c33 100755
--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@@ -290,7 +290,7 @@ function treeview_printModuleTable($id_module, $server_data=false, $no_head=fals
         }
 
         $last_data_str .= '&nbsp;';
-        $last_data_str .= html_print_image('images/clock2.png', true, ['title' => $last_data['timestamp'], 'width' => '18px']);
+        $last_data_str .= html_print_image('images/clock2.png', true, ['title' => $last_data['timestamp'], 'width' => '18px', 'class' => 'invert_filter']);
 
         $is_snapshot = is_snapshot_data($last_data['datos']);
         $is_large_image = is_text_to_black_string($last_data['datos']);
@@ -307,7 +307,7 @@ function treeview_printModuleTable($id_module, $server_data=false, $no_head=fals
         }
 
         if ($salida !== null) {
-            $last_data_str = html_print_image('images/clock2.png', true, ['title' => $last_data['timestamp'], 'width' => '18px']);
+            $last_data_str = html_print_image('images/clock2.png', true, ['title' => $last_data['timestamp'], 'width' => '18px', 'class' => 'invert_filter']);
         }
 
         $last_data_str .= $salida;
diff --git a/pandora_console/include/graphs/flot/jquery.flot.js b/pandora_console/include/graphs/flot/jquery.flot.js
index 2f4ac4e4a5..009b9adc96 100644
--- a/pandora_console/include/graphs/flot/jquery.flot.js
+++ b/pandora_console/include/graphs/flot/jquery.flot.js
@@ -247,7 +247,7 @@ Licensed under the MIT license.
             // Create the text layer container, if it doesn't exist
 
             if (this.textContainer == null) {
-                this.textContainer = $("<div class='flot-text'></div>")
+                this.textContainer = $("<div class='flot-text white_important'></div>")
                     .css({
                         position: "absolute",
                         top: 0,
diff --git a/pandora_console/include/graphs/pandora.d3.js b/pandora_console/include/graphs/pandora.d3.js
index 0c2e364994..4f5ce6735f 100644
--- a/pandora_console/include/graphs/pandora.d3.js
+++ b/pandora_console/include/graphs/pandora.d3.js
@@ -2486,6 +2486,7 @@ function printClockAnalogic1(
     var face = svg
       .append("g")
       .attr("id", "clock-face")
+      .attr("class", "invert_filter")
       .attr(
         "transform",
         "translate(" +
diff --git a/pandora_console/include/javascript/functions_pandora_networkmap.js b/pandora_console/include/javascript/functions_pandora_networkmap.js
index 3450caa518..aba931fb22 100644
--- a/pandora_console/include/javascript/functions_pandora_networkmap.js
+++ b/pandora_console/include/javascript/functions_pandora_networkmap.js
@@ -1211,43 +1211,43 @@ function add_agent_node(agents) {
             graph.nodes.push(temp_node);
 
             /*jQuery.each(data['rel'], function(i, relation) {
-							var temp_link = {};
-							if (i == 0) {
-								var found = 0;
-								temp_link['source'] = graph.nodes[temp_node['id']];
-								jQuery.each(graph.nodes, function(j, element) {
-									if (element.id_agent == relation['id_agent_end']) {
-										found = j;
-									}
-								});
-								temp_link['target'] = graph.nodes[found];
-							}
-							else {
-								var found = 0;
-								temp_link['target'] = graph.nodes[temp_node['id']];
-								jQuery.each(graph.nodes, function(j, element) {
-									if (element.id_agent == relation['id_agent_start']) {
-										found = j;
-									}
-								});
-								temp_link['source'] = graph.nodes[found];
-							}
-							temp_link['id_db'] = String(relation['id_db']);
-							temp_link['id_agent_end'] = String(relation['id_agent_end']);
-							temp_link['id_agent_start'] = String(relation['id_agent_start']);
-							temp_link['id_module_end'] = relation['id_module_end'];
-							temp_link['id_module_start'] = relation['id_module_start'];
-							temp_link['source_in_db'] = String(relation['source_in_db']);
-							temp_link['target_in_db'] = String(relation['target_in_db']);
-							temp_link['arrow_end'] = relation['arrow_end'];
-							temp_link['arrow_start'] = relation['arrow_start'];
-							temp_link['status_end'] = relation['status_end'];
-							temp_link['status_start'] = relation['status_start'];
-							temp_link['text_end'] = relation['text_end'];
-							temp_link['text_start'] = relation['text_start'];
-							
-							graph.links.push(temp_link);
-						});*/
+              var temp_link = {};
+              if (i == 0) {
+                var found = 0;
+                temp_link['source'] = graph.nodes[temp_node['id']];
+                jQuery.each(graph.nodes, function(j, element) {
+                  if (element.id_agent == relation['id_agent_end']) {
+                    found = j;
+                  }
+                });
+                temp_link['target'] = graph.nodes[found];
+              }
+              else {
+                var found = 0;
+                temp_link['target'] = graph.nodes[temp_node['id']];
+                jQuery.each(graph.nodes, function(j, element) {
+                  if (element.id_agent == relation['id_agent_start']) {
+                    found = j;
+                  }
+                });
+                temp_link['source'] = graph.nodes[found];
+              }
+              temp_link['id_db'] = String(relation['id_db']);
+              temp_link['id_agent_end'] = String(relation['id_agent_end']);
+              temp_link['id_agent_start'] = String(relation['id_agent_start']);
+              temp_link['id_module_end'] = relation['id_module_end'];
+              temp_link['id_module_start'] = relation['id_module_start'];
+              temp_link['source_in_db'] = String(relation['source_in_db']);
+              temp_link['target_in_db'] = String(relation['target_in_db']);
+              temp_link['arrow_end'] = relation['arrow_end'];
+              temp_link['arrow_start'] = relation['arrow_start'];
+              temp_link['status_end'] = relation['status_end'];
+              temp_link['status_start'] = relation['status_start'];
+              temp_link['text_end'] = relation['text_end'];
+              temp_link['text_start'] = relation['text_start'];
+            	
+              graph.links.push(temp_link);
+            });*/
 
             draw_elements_graph();
             init_drag_and_drop();
@@ -3385,8 +3385,8 @@ function init_graph(parameter_object) {
           "stroke-opacity: 0.75; " +
           "stroke-dasharray: none; " +
           "stroke-dashoffset: 0"
-      );
-
+      )
+      .attr("class", "fill_222");
     window.layer_graph
       .append("text")
       .append("tspan")
@@ -3406,6 +3406,7 @@ function init_graph(parameter_object) {
           "stroke: none; " +
           "font-family: Verdana"
       )
+      .attr("class", "fill_fff")
       .attr(
         "x",
         networkmap_dimensions[0] + node_radius - holding_area_dimensions[0]
@@ -4072,7 +4073,7 @@ function draw_elements_graph() {
 
   node_temp
     .append("text")
-    .attr("class", "node_text")
+    .attr("class", "node_text fill_fff")
     .attr("id", "node_text_" + networkmap_id)
     .attr(
       "style",
@@ -4094,7 +4095,7 @@ function draw_elements_graph() {
     .text(function(d) {
       return ellipsize(get_node_name_ov(d), 30);
     })
-    .classed("dragable_node", true) //own dragable
+    .classed("dragable_node fill_fff", true) //own dragable
     .on("click", selected_node)
     .on("contextmenu", function(d) {
       show_menu("node", d);
diff --git a/pandora_console/include/javascript/pandora_dashboards.js b/pandora_console/include/javascript/pandora_dashboards.js
index a322dbe4d7..710e2de2ba 100644
--- a/pandora_console/include/javascript/pandora_dashboards.js
+++ b/pandora_console/include/javascript/pandora_dashboards.js
@@ -952,6 +952,7 @@ function show_module_detail_dialog(
   period,
   module_name
 ) {
+  console.log("empezamos");
   var params = {};
   var f = new Date();
   period = $("#period").val();
diff --git a/pandora_console/include/lib/Dashboard/Widgets/tree_view.php b/pandora_console/include/lib/Dashboard/Widgets/tree_view.php
index 27445a24c3..edb843bda0 100644
--- a/pandora_console/include/lib/Dashboard/Widgets/tree_view.php
+++ b/pandora_console/include/lib/Dashboard/Widgets/tree_view.php
@@ -686,7 +686,7 @@ class TreeViewWidget extends Widget
         ];
 
         // Show the modal window of an module.
-        $output .= '<div id="module_details_window" class="invisible">';
+        $output .= '<div id="module_details_window" class="">';
         $output .= '</div>';
 
         // Script.
diff --git a/pandora_console/include/styles/pandora_black.css b/pandora_console/include/styles/pandora_black.css
index 68dbb08746..5c4bfe3e88 100644
--- a/pandora_console/include/styles/pandora_black.css
+++ b/pandora_console/include/styles/pandora_black.css
@@ -931,3 +931,18 @@ div.integria_details_description textarea {
 .bg_222_important {
   background-color: #222 !important;
 }
+
+.networkconsole {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  overflow: hidden;
+  background-color: #111;
+}
+
+.fill_222 {
+  fill: #222 !important;
+}
+.fill_fff {
+  fill: #fff !important;
+}
diff --git a/pandora_console/operation/tree.php b/pandora_console/operation/tree.php
index 4597a25beb..676e0085c6 100755
--- a/pandora_console/operation/tree.php
+++ b/pandora_console/operation/tree.php
@@ -438,7 +438,7 @@ enterprise_hook('close_meta_frame');
         .hide()
         .prop("id", "module_details_window")
         .appendTo('body');
-    
+    console.log("vamos a ver");
     function show_module_detail_dialog(module_id, id_agent, server_name, offset, period, module_name) {
         var params = {};
         var f = new Date();

From fe9109e5854652fa15c92b52873bd5253a93aebe Mon Sep 17 00:00:00 2001
From: artica <artica.devel@gmail.com>
Date: Thu, 15 Apr 2021 01:00:43 +0200
Subject: [PATCH 18/22] Auto-updated build strings.

---
 pandora_agents/unix/DEBIAN/control             | 2 +-
 pandora_agents/unix/DEBIAN/make_deb_package.sh | 2 +-
 pandora_agents/unix/pandora_agent              | 2 +-
 pandora_agents/unix/pandora_agent.redhat.spec  | 2 +-
 pandora_agents/unix/pandora_agent.spec         | 2 +-
 pandora_agents/unix/pandora_agent_installer    | 2 +-
 pandora_agents/win32/installer/pandora.mpi     | 2 +-
 pandora_agents/win32/pandora.cc                | 2 +-
 pandora_agents/win32/versioninfo.rc            | 2 +-
 pandora_console/DEBIAN/control                 | 2 +-
 pandora_console/DEBIAN/make_deb_package.sh     | 2 +-
 pandora_console/include/config_process.php     | 2 +-
 pandora_console/install.php                    | 2 +-
 pandora_console/pandora_console.redhat.spec    | 2 +-
 pandora_console/pandora_console.rhel7.spec     | 2 +-
 pandora_console/pandora_console.spec           | 2 +-
 pandora_server/DEBIAN/control                  | 2 +-
 pandora_server/DEBIAN/make_deb_package.sh      | 2 +-
 pandora_server/lib/PandoraFMS/Config.pm        | 2 +-
 pandora_server/lib/PandoraFMS/PluginTools.pm   | 2 +-
 pandora_server/pandora_server.redhat.spec      | 2 +-
 pandora_server/pandora_server.spec             | 2 +-
 pandora_server/pandora_server_installer        | 2 +-
 pandora_server/util/pandora_db.pl              | 2 +-
 pandora_server/util/pandora_manage.pl          | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/pandora_agents/unix/DEBIAN/control b/pandora_agents/unix/DEBIAN/control
index 79dd7ebbd2..092348f5cb 100644
--- a/pandora_agents/unix/DEBIAN/control
+++ b/pandora_agents/unix/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-agent-unix
-Version: 7.0NG.753-210414
+Version: 7.0NG.753-210415
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_agents/unix/DEBIAN/make_deb_package.sh b/pandora_agents/unix/DEBIAN/make_deb_package.sh
index 4bad64cd46..f85da39764 100644
--- a/pandora_agents/unix/DEBIAN/make_deb_package.sh
+++ b/pandora_agents/unix/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.753-210414"
+pandora_version="7.0NG.753-210415"
 
 echo "Test if you has the tools for to make the packages."
 whereis dpkg-deb | cut -d":" -f2 | grep dpkg-deb > /dev/null
diff --git a/pandora_agents/unix/pandora_agent b/pandora_agents/unix/pandora_agent
index f07627ae02..8ba4c19f8a 100755
--- a/pandora_agents/unix/pandora_agent
+++ b/pandora_agents/unix/pandora_agent
@@ -1015,7 +1015,7 @@ my $Sem = undef;
 my $ThreadSem = undef;
 
 use constant AGENT_VERSION => '7.0NG.753';
-use constant AGENT_BUILD => '210414';
+use constant AGENT_BUILD => '210415';
 
 # Agent log default file size maximum and instances
 use constant DEFAULT_MAX_LOG_SIZE => 600000;
diff --git a/pandora_agents/unix/pandora_agent.redhat.spec b/pandora_agents/unix/pandora_agent.redhat.spec
index 138c0dc01b..5bb5168e74 100644
--- a/pandora_agents/unix/pandora_agent.redhat.spec
+++ b/pandora_agents/unix/pandora_agent.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.753
-%define release     210414
+%define release     210415
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent.spec b/pandora_agents/unix/pandora_agent.spec
index a6016c7fa0..1bc2e0a0a1 100644
--- a/pandora_agents/unix/pandora_agent.spec
+++ b/pandora_agents/unix/pandora_agent.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_agent_unix
 %define version     7.0NG.753
-%define release     210414
+%define release     210415
 
 Summary:            Pandora FMS Linux agent, PERL version
 Name:               %{name}
diff --git a/pandora_agents/unix/pandora_agent_installer b/pandora_agents/unix/pandora_agent_installer
index b16bc68c8e..240a646ac6 100755
--- a/pandora_agents/unix/pandora_agent_installer
+++ b/pandora_agents/unix/pandora_agent_installer
@@ -10,7 +10,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.753"
-PI_BUILD="210414"
+PI_BUILD="210415"
 OS_NAME=`uname -s`
 
 FORCE=0
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index c73ac3f92e..43b3793fb3 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -186,7 +186,7 @@ UpgradeApplicationID
 {}
 
 Version
-{210414}
+{210415}
 
 ViewReadme
 {Yes}
diff --git a/pandora_agents/win32/pandora.cc b/pandora_agents/win32/pandora.cc
index 1037a8feac..ef49d178ca 100644
--- a/pandora_agents/win32/pandora.cc
+++ b/pandora_agents/win32/pandora.cc
@@ -30,7 +30,7 @@ using namespace Pandora;
 using namespace Pandora_Strutils;
 
 #define PATH_SIZE    _MAX_PATH+1
-#define PANDORA_VERSION ("7.0NG.753(Build 210414)")
+#define PANDORA_VERSION ("7.0NG.753(Build 210415)")
 
 string pandora_path;
 string pandora_dir;
diff --git a/pandora_agents/win32/versioninfo.rc b/pandora_agents/win32/versioninfo.rc
index 2624d730d0..7cac310f11 100644
--- a/pandora_agents/win32/versioninfo.rc
+++ b/pandora_agents/win32/versioninfo.rc
@@ -11,7 +11,7 @@ BEGIN
       VALUE "LegalCopyright", "Artica ST"
       VALUE "OriginalFilename", "PandoraAgent.exe"
       VALUE "ProductName", "Pandora FMS Windows Agent"
-      VALUE "ProductVersion", "(7.0NG.753(Build 210414))"
+      VALUE "ProductVersion", "(7.0NG.753(Build 210415))"
       VALUE "FileVersion", "1.0.0.0"
     END
   END
diff --git a/pandora_console/DEBIAN/control b/pandora_console/DEBIAN/control
index 74c3407a7c..533ccc5147 100644
--- a/pandora_console/DEBIAN/control
+++ b/pandora_console/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-console
-Version: 7.0NG.753-210414
+Version: 7.0NG.753-210415
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_console/DEBIAN/make_deb_package.sh b/pandora_console/DEBIAN/make_deb_package.sh
index 00649207db..4d11da420a 100644
--- a/pandora_console/DEBIAN/make_deb_package.sh
+++ b/pandora_console/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.753-210414"
+pandora_version="7.0NG.753-210415"
 
 package_pear=0
 package_pandora=1
diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php
index 92d360fa6f..f3ac229799 100644
--- a/pandora_console/include/config_process.php
+++ b/pandora_console/include/config_process.php
@@ -20,7 +20,7 @@
 /**
  * Pandora build version and version
  */
-$build_version = 'PC210414';
+$build_version = 'PC210415';
 $pandora_version = 'v7.0NG.753';
 
 // Do not overwrite default timezone set if defined.
diff --git a/pandora_console/install.php b/pandora_console/install.php
index c5f188732d..eb331b781f 100644
--- a/pandora_console/install.php
+++ b/pandora_console/install.php
@@ -129,7 +129,7 @@
         <div style='height: 10px'>
             <?php
             $version = '7.0NG.753';
-            $build = '210414';
+            $build = '210415';
             $banner = "v$version Build $build";
 
             error_reporting(0);
diff --git a/pandora_console/pandora_console.redhat.spec b/pandora_console/pandora_console.redhat.spec
index a93fc526e8..0cd6d5a4f2 100644
--- a/pandora_console/pandora_console.redhat.spec
+++ b/pandora_console/pandora_console.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.753
-%define release     210414
+%define release     210415
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.rhel7.spec b/pandora_console/pandora_console.rhel7.spec
index 7b5ad07818..2e3a08f9d1 100644
--- a/pandora_console/pandora_console.rhel7.spec
+++ b/pandora_console/pandora_console.rhel7.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.753
-%define release     210414
+%define release     210415
 
 # User and Group under which Apache is running
 %define httpd_name  httpd
diff --git a/pandora_console/pandora_console.spec b/pandora_console/pandora_console.spec
index a055e8d820..c0df69a0e1 100644
--- a/pandora_console/pandora_console.spec
+++ b/pandora_console/pandora_console.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_console
 %define version     7.0NG.753
-%define release     210414
+%define release     210415
 %define httpd_name      httpd
 # User and Group under which Apache is running
 %define httpd_name  apache2
diff --git a/pandora_server/DEBIAN/control b/pandora_server/DEBIAN/control
index 51da18be12..6cff9ca95c 100644
--- a/pandora_server/DEBIAN/control
+++ b/pandora_server/DEBIAN/control
@@ -1,5 +1,5 @@
 package: pandorafms-server
-Version: 7.0NG.753-210414
+Version: 7.0NG.753-210415
 Architecture: all
 Priority: optional
 Section: admin
diff --git a/pandora_server/DEBIAN/make_deb_package.sh b/pandora_server/DEBIAN/make_deb_package.sh
index 8ef71038a5..2bcc2f474e 100644
--- a/pandora_server/DEBIAN/make_deb_package.sh
+++ b/pandora_server/DEBIAN/make_deb_package.sh
@@ -14,7 +14,7 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-pandora_version="7.0NG.753-210414"
+pandora_version="7.0NG.753-210415"
 
 package_cpan=0
 package_pandora=1
diff --git a/pandora_server/lib/PandoraFMS/Config.pm b/pandora_server/lib/PandoraFMS/Config.pm
index 7788686d08..134305f8ab 100644
--- a/pandora_server/lib/PandoraFMS/Config.pm
+++ b/pandora_server/lib/PandoraFMS/Config.pm
@@ -45,7 +45,7 @@ our @EXPORT = qw(
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.753";
-my $pandora_build = "210414";
+my $pandora_build = "210415";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 # Setup hash
diff --git a/pandora_server/lib/PandoraFMS/PluginTools.pm b/pandora_server/lib/PandoraFMS/PluginTools.pm
index 61718a93a4..5fd5c293c5 100644
--- a/pandora_server/lib/PandoraFMS/PluginTools.pm
+++ b/pandora_server/lib/PandoraFMS/PluginTools.pm
@@ -34,7 +34,7 @@ our @ISA = qw(Exporter);
 
 # version: Defines actual version of Pandora Server for this module only
 my $pandora_version = "7.0NG.753";
-my $pandora_build = "210414";
+my $pandora_build = "210415";
 our $VERSION = $pandora_version." ".$pandora_build;
 
 our %EXPORT_TAGS = ( 'all' => [ qw() ] );
diff --git a/pandora_server/pandora_server.redhat.spec b/pandora_server/pandora_server.redhat.spec
index 4967ad6bf8..045e69b862 100644
--- a/pandora_server/pandora_server.redhat.spec
+++ b/pandora_server/pandora_server.redhat.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.753
-%define release     210414
+%define release     210415
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server.spec b/pandora_server/pandora_server.spec
index c923e517a8..dad510161b 100644
--- a/pandora_server/pandora_server.spec
+++ b/pandora_server/pandora_server.spec
@@ -3,7 +3,7 @@
 #
 %define name        pandorafms_server
 %define version     7.0NG.753
-%define release     210414
+%define release     210415
 
 Summary:            Pandora FMS Server
 Name:               %{name}
diff --git a/pandora_server/pandora_server_installer b/pandora_server/pandora_server_installer
index 62e3f669de..230bc58247 100755
--- a/pandora_server/pandora_server_installer
+++ b/pandora_server/pandora_server_installer
@@ -9,7 +9,7 @@
 # **********************************************************************
 
 PI_VERSION="7.0NG.753"
-PI_BUILD="210414"
+PI_BUILD="210415"
 
 MODE=$1
 if [ $# -gt 1 ]; then
diff --git a/pandora_server/util/pandora_db.pl b/pandora_server/util/pandora_db.pl
index 8486ae06f9..678e493a0e 100755
--- a/pandora_server/util/pandora_db.pl
+++ b/pandora_server/util/pandora_db.pl
@@ -35,7 +35,7 @@ use PandoraFMS::Config;
 use PandoraFMS::DB;
 
 # version: define current version
-my $version = "7.0NG.753 PS210414";
+my $version = "7.0NG.753 PS210415";
 
 # Pandora server configuration
 my %conf;
diff --git a/pandora_server/util/pandora_manage.pl b/pandora_server/util/pandora_manage.pl
index 38f0656555..1070976276 100755
--- a/pandora_server/util/pandora_manage.pl
+++ b/pandora_server/util/pandora_manage.pl
@@ -36,7 +36,7 @@ use Encode::Locale;
 Encode::Locale::decode_argv;
 
 # version: define current version
-my $version = "7.0NG.753 PS210414";
+my $version = "7.0NG.753 PS210415";
 
 # save program name for logging
 my $progname = basename($0);

From 24099644be8226a07fbebec6eb6b973197b01671 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Thu, 15 Apr 2021 11:22:24 +0200
Subject: [PATCH 19/22] remove log

---
 pandora_console/include/javascript/pandora_dashboards.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pandora_console/include/javascript/pandora_dashboards.js b/pandora_console/include/javascript/pandora_dashboards.js
index 710e2de2ba..a322dbe4d7 100644
--- a/pandora_console/include/javascript/pandora_dashboards.js
+++ b/pandora_console/include/javascript/pandora_dashboards.js
@@ -952,7 +952,6 @@ function show_module_detail_dialog(
   period,
   module_name
 ) {
-  console.log("empezamos");
   var params = {};
   var f = new Date();
   period = $("#period").val();

From 317bf0da3d4e904395455d21db7b8b8e3011845b Mon Sep 17 00:00:00 2001
From: Marcos Alconada <marcos.alconada@artica.es>
Date: Thu, 15 Apr 2021 10:33:31 +0000
Subject: [PATCH 20/22] minnor error fixed

---
 .../godmode/alerts/alert_commands.php         | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/pandora_console/godmode/alerts/alert_commands.php b/pandora_console/godmode/alerts/alert_commands.php
index da7bfee2e2..7fe93ebbdf 100644
--- a/pandora_console/godmode/alerts/alert_commands.php
+++ b/pandora_console/godmode/alerts/alert_commands.php
@@ -462,13 +462,16 @@ if (is_ajax()) {
 }
 
 // This check should be after ajax. Because, ajax will be called from configure_alert_action.
-if (!check_acl($config['id_user'], 0, 'PM') && !is_user_admin($config['id_user
-'])) {
+if (!check_acl($config['id_user'], 0, 'PM') && !is_user_admin(
+    $config['id_user
+']
+)
+) {
     echo "<div id='message_permissions'  title='".__('Permissions warning')."' s
 tyle='display:none;'>";
-    echo "<p style='text-align: center;font-weight: bold;'>".__('Command managem
-ent is limited to administrator users or user profiles with permissions over Pan
-dora FMS management').'</p>';
+    echo "<p style='text-align: center;font-weight: bold; margin: 15px'>".__(
+        'Command management is limited to administrator users or user profiles with permissions PM'
+    ).'</p>';
     echo '</div>';
 }
 
@@ -680,12 +683,19 @@ foreach ($commands as $command) {
 
     // (IMPORTANT, DO NOT CHANGE!) only users with permissions over "All" group have access to edition of commands belonging to "All" group.
     if ($is_central_policies_on_node === false && !$command['internal'] && check_acl_restricted_all($config['id_user'], $command['id_group'], 'LM')) {
-        $data['action'] = '<span class="inline_flex">';
-        $data['action'] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_commands&amp;copy_command=1&id='.$command['id'].'&pure='.$pure.'"
-			onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/copy.png', true, ['class' => 'invert_filter']).'</a>';
-        $data['action'] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_commands&delete_command=1&id='.$command['id'].'&pure='.$pure.'"
+        if (check_acl($config['id_user'], 0, 'PM') || is_user_admin(
+            $config['id_user
+            ']
+        )
+        ) {
+                    $data['action'] = '<span class="inline_flex">';
+            $data['action'] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_commands&amp;copy_command=1&id='.$command['id'].'&pure='.$pure.'"
+            onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/copy.png', true, ['class' => 'invert_filter']).'</a>';
+
+            $data['action'] .= '<a href="index.php?sec='.$sec.'&sec2=godmode/alerts/alert_commands&delete_command=1&id='.$command['id'].'&pure='.$pure.'"
 			onClick="if (!confirm(\''.__('Are you sure?').'\')) return false;">'.html_print_image('images/cross.png', true, ['class' => 'invert_filter']).'</a>';
-        $data['action'] .= '</span>';
+            $data['action'] .= '</span>';
+        }
     }
 
     array_push($table->data, $data);

From e506523fffe5fb6ac7b61082c3e289278adbf671 Mon Sep 17 00:00:00 2001
From: marcos <marcos.alconada@artica.es>
Date: Thu, 15 Apr 2021 13:55:14 +0200
Subject: [PATCH 21/22] fixed minnor error

---
 pandora_console/include/graphs/flot/pandora.flot.js | 4 ++--
 pandora_console/views/dashboard/cell.php            | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pandora_console/include/graphs/flot/pandora.flot.js b/pandora_console/include/graphs/flot/pandora.flot.js
index 6a145e3e6f..ba93380bc1 100644
--- a/pandora_console/include/graphs/flot/pandora.flot.js
+++ b/pandora_console/include/graphs/flot/pandora.flot.js
@@ -114,7 +114,8 @@ function pandoraFlotPie(
 
   // Reset styles
   function resetInteractivity() {
-    legends.css("color", "#fff");
+    legends.css("color", "#3F3F3D");
+    legends.attr("class", "invert_filter");
   }
 
   if (water_mark) {
@@ -293,7 +294,6 @@ function pandoraFlotPieCustom(
   function resetInteractivity() {
     legends.each(function() {
       // fix the widths so they don't jump around
-      console.log($(this));
       $(this).css("color", "#3F3F3D");
     });
   }
diff --git a/pandora_console/views/dashboard/cell.php b/pandora_console/views/dashboard/cell.php
index cbc3463acc..2b16a73316 100644
--- a/pandora_console/views/dashboard/cell.php
+++ b/pandora_console/views/dashboard/cell.php
@@ -73,7 +73,11 @@ if ($manageDashboards !== 0) {
 
 $output .= '</div>';
 $output .= '</div>';
-if ($options['background'] === null && $config['style'] === 'pandora_black') {
+if ($config['style'] === 'pandora') {
+    $options['background'] = '#fff';
+}
+
+if ($config['style'] === 'pandora_black') {
     $options['background'] = '#222';
 }
 

From 798c1d060f718c078cc932c968e659f295a5dc7d Mon Sep 17 00:00:00 2001
From: Marcos Alconada <marcos.alconada@artica.es>
Date: Thu, 15 Apr 2021 12:37:38 +0000
Subject: [PATCH 22/22] fixed error with weeckly days sla

---
 pandora_console/include/functions_reporting_html.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pandora_console/include/functions_reporting_html.php b/pandora_console/include/functions_reporting_html.php
index 9877842e0a..1445f2e84e 100644
--- a/pandora_console/include/functions_reporting_html.php
+++ b/pandora_console/include/functions_reporting_html.php
@@ -130,17 +130,24 @@ function html_do_report_info($report)
 
     $date_today = date($config['date_format']);
 
+    $date_today = preg_split('/[\s,]+/', io_safe_output($date_today));
+
+    $date_today = __($date_today[0]).' '.$date_today[1].' '.$date_today[2].' '.$date_today[3].' '.$date_today[4];
     $html = '<div class="report_info" style="background: '.$background_color.'"><table>
             <tr>
                 <td><b>'.__('Generated').': </b></td><td>'.$date_today.'</td>
             </tr>
             <tr>
                 <td><b>'.__('Report date').': </b></td>';
+
+    $date_before = date($config['date_format'], $report['datetime']);
+    $date_before = preg_split('/[\s,]+/', io_safe_output($date_before));
+    $date_before = __($date_before[0]).' '.$date_before[1].' '.$date_before[2].' '.$date_before[3].' '.$date_before[4];
     if (is_numeric($report['datetime']) && is_numeric($report['period']) && ($report['period'] != 0)) {
         $html .= '<td>'.__('From').' <b>'.date($config['date_format'], ($report['datetime'] - $report['period'])).'</b></td>';
         $html .= '<td>'.__('to').' <b>'.date($config['date_format'], $report['datetime']).'</b></td>';
     } else {
-        $html .= '<td>'.__('Items period before').' <b>'.date($config['date_format'], $report['datetime']).'</b></td>';
+        $html .= '<td>'.__('Items period before').' <b>'.$date_before.'</b></td>';
     }
 
     $html .= '</tr>