From 069b875274620d8eca0955839903918d5b590fbc Mon Sep 17 00:00:00 2001 From: slerena Date: Mon, 7 Feb 2011 14:01:35 +0000 Subject: [PATCH] 2011-02-11 Sancho Lerena * pandoradb_data.sql: Added new OS: android. * operation/agentes/estado_generalagente.php: Show description in GIS data when it's available. * images/os_icons/android.png, images/networkmap/15.png: New icons for Android OStype. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@3807 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 10 ++++++++++ pandora_console/images/networkmap/15.png | Bin 0 -> 1141 bytes pandora_console/images/os_icons/android.png | Bin 0 -> 894 bytes .../operation/agentes/estado_generalagente.php | 11 +++++++++-- pandora_console/pandoradb_data.sql | 5 +++-- 5 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 pandora_console/images/networkmap/15.png create mode 100644 pandora_console/images/os_icons/android.png diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 4c6688186e..acc39f4f55 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2011-02-11 Sancho Lerena + + * pandoradb_data.sql: Added new OS: android. + + * operation/agentes/estado_generalagente.php: Show description in GIS + data when it's available. + + * images/os_icons/android.png, + images/networkmap/15.png: New icons for Android OStype. + 2011-02-07 Miguel de Dios * pandoradb.sql: cleaned source code. diff --git a/pandora_console/images/networkmap/15.png b/pandora_console/images/networkmap/15.png new file mode 100644 index 0000000000000000000000000000000000000000..6121f04c804f8a52752536808c958e69bc6ba559 GIT binary patch literal 1141 zcmV-*1d98KP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipP% z4IC}_O26&^00Z?&L_t(o!|j({h?G?r$AAAbv+GK$ZLD@DtVCV~S&8$p_D$XuNrC0= zq(mD?by0K`K^Z|&2;D_NSnfwR1$`iN(}k(CGxl+jh!S2HNoi?>nxr#x{$0#F>=!UWVm?#N_#%spI1$BTP@V4x8}Y++K%1y zVjEsE><~yURjAzyd^+{bt;=ecdWTFLkn|_wr$V;;n|m*A#7I&+YqZ| ztrQxNH7K#lL7O3Lu2#b<;|JDX->To02PUSojOI#AeYLJXrqkn~2f=_awop^o*s_G0 z>xV*&4~%R$c)Ve!s}M|-^C_yeU7!NujO}MYW0LNkz1R4d%~%j`*}7T8ADq@Lg-q$f zLiw;@2pp?<&_hVrAn6aJYTXkvkH>OKoVKaeeG_h^<`-e%WSn=&hTZ$KN(J7v^hD!$ zV+0skExHB^l63*Lkz^mi@t)BQ2TyjCgc7X0_FOP*RC9*JxX>)%jdwMtr8-bnIcTV@ zDi|;3W-OdN-@g%0moojT=}F<$hFyi>@^=%(%uv&-ol3nR zuyn$XD}(hk$T9HtW4Y3aIh|0E*9A{m0q~=fdv9N1R}LeV0~4- z+yxBJ34zVpMrjKMNABDQP_4&bsqO|?u_Cz1jZ`wX&6@+Ep6Utk=2w`j5n%};#D-nX zvKczQ7_JIWhmGjpkpBVvcK~?K!@RE@^`XXtS|+>zfK;>eE^n5)L?GAoEx_t&l(c8j zz{`CAeQq}a9~s}56DHktZPp7v5VZu@V~`EOd^`uhWHHBRzVuou74Hwk=VSWf1_cL+ za5XWIkmTis;nJqyI2J;DJk?X(GTCzRHNS7FlwnJ@e3^(AGbzvopoHLb!}PR>+s%8~=9gAb<6p zR&vV-e=?dcZMu@3wj0rGC8Om{!iA8v3_utA29?xq!WWl(P|WpR$xip3(0IPKoP z-UHf|blYVuEBPIZE&x4qDsKNlR5SP5}^g4s*7JDxdBfJah3M z2N10iA00000NkvXX Hu0mjf1m_h2 literal 0 HcmV?d00001 diff --git a/pandora_console/images/os_icons/android.png b/pandora_console/images/os_icons/android.png new file mode 100644 index 0000000000000000000000000000000000000000..da95c5d4e08acb7860f002b598d186c26126e989 GIT binary patch literal 894 zcmV-^1A+XBP)MqCMI@G0S>uGEKKZQ z|3lSE@S89I1P}{|!N(=Xz|PFaz{tqN@a4y|U-#bZG=KW>WY^!n-xV1c7+HaaJrd?t z-zOxS-pzx9~ zP-Z4JVW1i*AT3}hn_dpm^Y!;@27WFD27mx!0&%|oddu+T=Szm?A5N>>eZ8%Xm6_)g zC!5GaMn*;k5M*WMdc(;k_~h2hjb*o9ZSZ*i?HN9jgFt8hV!#6a{`<+n!7A|P!MnY6AHF|i1q#&y1Q6JOCvOjBeE#Q+8#cBy}FzudI>{qGydl3IWO0viAfWhN#jR@06PB%3p2+DVAOsAi2wu;I1Kcp6O*5OIL7t!_j`voz<^?AVh6`R zFfl=_WMqN{;x7gc7Qwf&(g|K4zTM#li2(!<*Z_7G{+seb_MiY{{P6w$WnijP`v3nA zH!CyeYoO+zzyE%h0Yxo0yZCc%R*{`-Oq@5kfJqtz00M{!nt_1!F*6ABXq=N1ve#o{ z=2;A~O;N=z<_0E6#&})?Z?0We}LX#`76Mw^c@^VOiT=%jDNuf00a=&fPepf zGf40nf?|R}lHZi!*@qJsAHF;AoQFf|2GBLn+20FX7vxep&BrOv05%LMSOEeI0Qg-a U5e6X>?EnA(07*qoM6N<$g7A2g(*OVf literal 0 HcmV?d00001 diff --git a/pandora_console/operation/agentes/estado_generalagente.php b/pandora_console/operation/agentes/estado_generalagente.php index e20c8e80c7..1c91af5627 100644 --- a/pandora_console/operation/agentes/estado_generalagente.php +++ b/pandora_console/operation/agentes/estado_generalagente.php @@ -142,12 +142,19 @@ if ($config['activate_gis']) { echo ''.__('Position (Long, Lat)'). ''; echo ''; + if ($dataPositionAgent === false) { - echo __('There is no GIS data.'); + echo __('There is no GIS data.'); } else { - echo ''.$dataPositionAgent['stored_longitude'].', '.$dataPositionAgent['stored_latitude'].''; + echo ''; + if ($dataPositionAgent['description'] != "") + echo $dataPositionAgent['description']; + else + echo $dataPositionAgent['stored_longitude'].', '.$dataPositionAgent['stored_latitude']; + echo ""; } + echo ''; } // Last contact diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index 9aa826dc41..b89a881cae 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -97,7 +97,8 @@ INSERT INTO `tconfig_os` VALUES (11,'Network','Pandora FMS Network Agent','network.png'), (12,'Web Server','Web Server/Application','network.png'), (13,'Octopods','Octopods Pandora FMS Hardware Agent','network.png'), -(14,'Embedded','Embedded device running a Pandora FMS agent','embedded.png'); +(14,'Embedded','Embedded device running a Pandora FMS agent','embedded.png'), +(15,'Android','Android agent','android.png'); UNLOCK TABLES; @@ -260,7 +261,7 @@ INSERT INTO `tusuario_perfil` VALUES (1,'admin',5,0,'admin'); INSERT INTO `tperfil` VALUES (1,'Operator (Read)',0,1,0,1,0,0,0,0,0,0),(2,'Operator (Write)',1,1,0,1,0,0,0,0,0,0),(3,'Chief Operator',1,1,1,1,0,0,0,0,0,0),(4,'Group coordinator',1,1,1,1,1,1,1,0,0,0),(5,'Pandora Administrator',1,1,1,1,1,1,1,1,1,1); -INSERT INTO `tnews` VALUES (1,'admin','Welcome to Pandora FMS 3.2!','This is the new Pandora FMS Console. A lot of new features have been added since last version. Please read the documentation about it, and feel free to test any option.\r\n\r\nThe Pandora FMS Team.',NOW()), +INSERT INTO `tnews` VALUES (1,'admin','Welcome to Pandora FMS 3.2!','This is the new Pandora FMS Console. A l/ot of new features have been added since last version. Please read the documentation about it, and feel free to test any option.\r\n\r\nThe Pandora FMS Team.',NOW()), (2,'admin','New GIS Feature','Try our new GIS representation, activate GIS in Setup to see new available options.',NOW()); INSERT INTO tmodule VALUES (1,'Agent module');