From 725b42e32b12cbc3fa36d619f97ab877e7d572a2 Mon Sep 17 00:00:00 2001 From: slerena Date: Wed, 28 Apr 2010 18:59:11 +0000 Subject: [PATCH] 2010-04-28 Sancho Lerena * pandoradb_data.sql: Updated version to 3.1 * pandoradb_migrate_v3.0_to_v3.1.sql: Fix, set log4x correct type id. * include/functions_gis.php: Fixed a notice by undefined value. * images/gis_maps/icons: Deleted several non-useful icons. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2629 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 10 ++++++++++ .../extras/pandoradb_migrate_v3.0_to_v3.1.sql | 2 +- .../images/gis_map/icons/circle.pink.png | Bin 439 -> 0 bytes .../images/gis_map/icons/cross.pink.png | Bin 351 -> 0 bytes pandora_console/images/gis_map/icons/dot.bad.png | Bin 526 -> 0 bytes .../images/gis_map/icons/dot.default.png | Bin 502 -> 0 bytes pandora_console/images/gis_map/icons/dot.ok.png | Bin 554 -> 0 bytes pandora_console/images/gis_map/icons/dot.png | Bin 502 -> 0 bytes .../images/gis_map/icons/dot.warning.png | Bin 515 -> 0 bytes pandora_console/images/gis_map/icons/icon.bad.png | Bin 849 -> 0 bytes .../images/gis_map/icons/icon.default.png | Bin 824 -> 0 bytes pandora_console/images/gis_map/icons/icon.ok.png | Bin 859 -> 0 bytes pandora_console/images/gis_map/icons/icon.png | Bin 824 -> 0 bytes .../images/gis_map/icons/icon.warning.png | Bin 779 -> 0 bytes pandora_console/include/functions_gis.php | 3 +-- pandora_console/pandoradb_data.sql | 2 +- 16 files changed, 13 insertions(+), 4 deletions(-) delete mode 100755 pandora_console/images/gis_map/icons/circle.pink.png delete mode 100755 pandora_console/images/gis_map/icons/cross.pink.png delete mode 100755 pandora_console/images/gis_map/icons/dot.bad.png delete mode 100755 pandora_console/images/gis_map/icons/dot.default.png delete mode 100755 pandora_console/images/gis_map/icons/dot.ok.png delete mode 100755 pandora_console/images/gis_map/icons/dot.png delete mode 100755 pandora_console/images/gis_map/icons/dot.warning.png delete mode 100755 pandora_console/images/gis_map/icons/icon.bad.png delete mode 100755 pandora_console/images/gis_map/icons/icon.default.png delete mode 100755 pandora_console/images/gis_map/icons/icon.ok.png delete mode 100755 pandora_console/images/gis_map/icons/icon.png delete mode 100755 pandora_console/images/gis_map/icons/icon.warning.png diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index c7fd3541ef..565e9b9960 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,13 @@ +2010-04-28 Sancho Lerena + + * pandoradb_data.sql: Updated version to 3.1 + + * pandoradb_migrate_v3.0_to_v3.1.sql: Fix, set log4x correct type id. + + * include/functions_gis.php: Fixed a notice by undefined value. + + * images/gis_maps/icons: Deleted several non-useful icons. + 2010-04-28 Miguel de Dios * include/functions_agents.php, godmode/gis_maps/configure_gis_map.php, diff --git a/pandora_console/extras/pandoradb_migrate_v3.0_to_v3.1.sql b/pandora_console/extras/pandoradb_migrate_v3.0_to_v3.1.sql index 0916e18365..739e69c926 100644 --- a/pandora_console/extras/pandoradb_migrate_v3.0_to_v3.1.sql +++ b/pandora_console/extras/pandoradb_migrate_v3.0_to_v3.1.sql @@ -69,7 +69,7 @@ INSERT INTO tconfig (`token`, `value`) VALUES ('stats_interval', '300'); -- Log4x Module -INSERT INTO ttipo_modulo (`id_tipo`, `nombre`, `categoria`, `descripcion`, `icon`) VALUES (30, 'log4x', 0, 'Log4x', 'mod_log4x.png'); +INSERT INTO ttipo_modulo (`id_tipo`, `nombre`, `categoria`, `descripcion`, `icon`) VALUES (24, 'log4x', 0, 'Log4x', 'mod_log4x.png'); -- GIS extension Tables and DATA diff --git a/pandora_console/images/gis_map/icons/circle.pink.png b/pandora_console/images/gis_map/icons/circle.pink.png deleted file mode 100755 index 454b990532d68709270779523f8a95a34705d738..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 439 zcmV;o0Z9IdP)b%78FWQhbW?9;ba!ELWdL_~cP?peYja~^ zaAhuUa%Y?FJQ@H10W?WOK~y-6wbe~(!!Qtr;aAgug!jHf7g;$b;M|~#fVRDfPvjn< zH;AD)-K2}2!6$H{#?y^c5}W=cc0ZVv(1Q@8kx^CpF~-b*2Vm)NtCn^FAjr0%*#IxV zv#Nd!_Vz(z%-rFg6unPKjv1LvNdc&+C@J@^yxtkidqeZ6s&5y7s?wnXfhS zGOU_fJw6B$fE9An}^`}{RAF$u{LSc=1~GBSI!)+Hme4!4q) zc5&*nF-b{jX%{kD>O}2wsT+Ipr}r+v#{D{i$v?ev5>XHnL=6RP5UF^d~B%Vwsg zm%n(qzHvk4A10njKU@+%{7@CxHt(O8LXP%op_Nf@-W3=ZR0+?K$=i0rcH*m3s~m0s zRZLtp!6DG-%99|)tj}1Xh=!ESAM)VAnvQrw4?71 zG^ohr^&RgTe~DWM4fm`#iA diff --git a/pandora_console/images/gis_map/icons/dot.bad.png b/pandora_console/images/gis_map/icons/dot.bad.png deleted file mode 100755 index 5e9ed081e57abcf76a3c8c6c2c080194f313ec19..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 526 zcmV+p0`dKcP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXM@ z4JIPhbEdEW00E9kL_t&-(@l}jN*iGm#n1g_CTS;a69z<(7(y3y>B?^07#J57p~VO2 zlSEvYeV?H(APTyX!S39M4^WpwaKyqS)0vFs`*Uv>BhmwhvpI{y?+{*e-0!cni6$OV zteFQbrBWx7EJenL)9D`opqJt(RO;kg9Cv#A`+*-tuz8O8`MEhwl10sYa5$a*qT_yl zB~I!*EO=xF}T{K@;$?fy8}-TnM-d)woxf*1p_7F^eG zMFBsGFf2>&cbZ1ZBZ_-_djZ!qxT@gF60R)4RRyjp*vCh_AB_S9#Qrn$!0UElvJ9+s zGr?Mjb6~9j0B<)oU_=J~8>Lc{Wgl5i{#jt^uXc+1!N9bDZ7WEG#g7<=iGZ z`MR~$`LMGSwAR+3@9**V>dKtm-Y%9R4d?$K^nnQx#ZF}45v3xMSm5=+f376uxjdNF Qvj6}907*qoM6N<$g2MIXSO5S3 diff --git a/pandora_console/images/gis_map/icons/dot.default.png b/pandora_console/images/gis_map/icons/dot.default.png deleted file mode 100755 index d36c05f1e3c0d8e62b8fca4505c534e22fe9c57d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 502 zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXM@ z4JQ?J)iVA700DMML_t&-(@l}Fsv1!gMfbTg>ZmxR@PVR;WFQ|PQ`iRVAHGkS+R}PH zCHMhC3JW2KR%s%N+NKGU8Rrhyb55G~B)i$of>kWS`;sJiF~%&3XeJ^fW6Vue*CMh= z)ATn0&^!3m^Sp0y9Jiw=sx_NUlx2z2>Ew31UBS$6X_|hgBuQR8&-*o>&p(A>2vvoM zfQUdu$g&Kp)#?v3e=)|GWgN%tPNxHAhI0{4+Dd zTKj}PzFw~*&vOvb&8X`7d_KEIqw!Q*Yf+XZ%CbZlhPYfV4#3)|>SDj&7x()e-EJ4g z7&zzP`#y%lA)IqK91ex5F1+n_d!J6HKaR)aYY+rpuh;Vig8_Ws$Mt%3o6Y90h`gm~ s`jh@INJL8jGgTcC(G9>_Ri6d_0WhB7x1h55HUIzs07*qoM6N<$f*eNF6#xJL diff --git a/pandora_console/images/gis_map/icons/dot.ok.png b/pandora_console/images/gis_map/icons/dot.ok.png deleted file mode 100755 index 92578043c42f0eb9d2a6d1ee0ee9c717bd27646f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 554 zcmV+_0@eMAP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXM@ z4J8)e>H)?800F8=L_t&-(@oL8YZGA{$MMheJa^%|7)^sc2Qgr^g@}~Up@ljLnG~w_ zU+5p;>JSj5n}dUMR!7kaig2Kd3YBU^DnSR~rb>!;m)w)wJ>TbtOF`fBdwVgQ)ZM|N z@Yyco=oxZt;j_e9#D-jdIKUVH*vWXquZd?{H}BNfu5S8g>I<026bIiw(92iPB`LE# z9N;bM?qJcci68gxJ!qb5MX&@IW5F2*^MLW6-+1)oVMb(D#Dxv^cmX3{vHosSJ`br1A)>%NsrzdY)0P zeL7gcagl&b39H4P{lq zV*xtRby?wub{8 svi}9SV7rW=XN_xf!4l^XTk}uwFZ8D27hKW{I{*Lx07*qoM6N<$f-xoVA^-pY diff --git a/pandora_console/images/gis_map/icons/dot.png b/pandora_console/images/gis_map/icons/dot.png deleted file mode 100755 index d36c05f1e3c0d8e62b8fca4505c534e22fe9c57d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 502 zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXM@ z4JQ?J)iVA700DMML_t&-(@l}Fsv1!gMfbTg>ZmxR@PVR;WFQ|PQ`iRVAHGkS+R}PH zCHMhC3JW2KR%s%N+NKGU8Rrhyb55G~B)i$of>kWS`;sJiF~%&3XeJ^fW6Vue*CMh= z)ATn0&^!3m^Sp0y9Jiw=sx_NUlx2z2>Ew31UBS$6X_|hgBuQR8&-*o>&p(A>2vvoM zfQUdu$g&Kp)#?v3e=)|GWgN%tPNxHAhI0{4+Dd zTKj}PzFw~*&vOvb&8X`7d_KEIqw!Q*Yf+XZ%CbZlhPYfV4#3)|>SDj&7x()e-EJ4g z7&zzP`#y%lA)IqK91ex5F1+n_d!J6HKaR)aYY+rpuh;Vig8_Ws$Mt%3o6Y90h`gm~ s`jh@INJL8jGgTcC(G9>_Ri6d_0WhB7x1h55HUIzs07*qoM6N<$f*eNF6#xJL diff --git a/pandora_console/images/gis_map/icons/dot.warning.png b/pandora_console/images/gis_map/icons/dot.warning.png deleted file mode 100755 index 03c1173de676aab637b11e69d1c0c99b8d325c0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 515 zcmV+e0{s1nP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXM@ z4JaC8@-v_S00DzZL_t&-(@l}VY7=1;g}?jHOwyR74J{RdG8!$e^dW@og@OpBl)i?T zWyF^d2|-**#eKk?1y>5T6gR=FgkscWCd14>bFT}7dNyZs_|D=J);T_E@78JzMWkO< z76*aM%xqE=3`XPSC4j7l_v>{zIXq}Jd%YWxbDO9xm`=a?m#>mE&uxD+UcQs#qxNpS zE?=HJzTFAKtC)F=3PFI7s=DOqv+2(~w>z#@V|aMbY6ig$sw>QLumaT;s&ky%B?9pMv^E|)aLwr?tzIb zO9rn`l2ofX8;uSCS!MuqyIZIxym_0ZWyv7;_^DXkyIcS8{&e+VXWIwYuU!eYI$atY z1)tA;`R6Yd%c5X^G+v&`{|3X5A<$PPc8(b^Da(Hbe*;2J&}a(|{)_+s002ovPDHLk FV1hrx+kOB5 diff --git a/pandora_console/images/gis_map/icons/icon.bad.png b/pandora_console/images/gis_map/icons/icon.bad.png deleted file mode 100755 index 452e757d757abbf729a9d020d7b7f8de4f981ef0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 849 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 diff --git a/pandora_console/include/functions_gis.php b/pandora_console/include/functions_gis.php index e83d008409..c4cbc53f29 100644 --- a/pandora_console/include/functions_gis.php +++ b/pandora_console/include/functions_gis.php @@ -688,8 +688,7 @@ function saveMap($map_name, $map_initial_longitude, $map_initial_latitude, 'tgrupo_id_grupo' => $layer['layer_group'] ) ); - - if (count($layer['layer_agent_list']) > 0) { + if ((isset($layer['layer_agent_list'])) AND (count($layer['layer_agent_list']) > 0)) { foreach ($layer['layer_agent_list'] as $agent_name) { process_sql_insert('tgis_map_layer_has_tagente', array( diff --git a/pandora_console/pandoradb_data.sql b/pandora_console/pandoradb_data.sql index f6b9262a65..ef9e752a2d 100644 --- a/pandora_console/pandoradb_data.sql +++ b/pandora_console/pandoradb_data.sql @@ -14,7 +14,7 @@ -- along with this program; if not, write to the Free Software -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. --- Database Data for Pandora FMS 3.0 +-- Database Data for Pandora FMS 3.1 -- PLEASE NO NOT USE MULTILINE COMMENTS -- Because Pandora Installer don't understand them