From 1804f7def436e4ba0f3f3bf1754a349eb9b368e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Proch=C3=A1zka?= Date: Tue, 3 Dec 2024 14:36:48 +0100 Subject: [PATCH] UCRM 6365 - KMZ plugin - deprecated fix --- plugins.json | 2 +- plugins/kmz-map/kmz-map.zip | Bin 5245 -> 5230 bytes plugins/kmz-map/src/includes/config.class.php | 9 +++------ plugins/kmz-map/src/manifest.json | 2 +- plugins_2.1.x.json | 2 +- plugins_2.2.x.json | 2 +- plugins_2.3.x.json | 2 +- plugins_2.4.x.json | 2 +- plugins_2.5.x.json | 2 +- plugins_3.0.x.json | 2 +- 10 files changed, 11 insertions(+), 14 deletions(-) diff --git a/plugins.json b/plugins.json index 23805097..b83992ea 100644 --- a/plugins.json +++ b/plugins.json @@ -70,7 +70,7 @@ "displayName": "KMZ Map", "description": "A UISP CRM plugin that provides a frontend Google Map for clients to view tower coverage.", "url": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/tree\/master\/plugins\/kmz-map", - "version": "1.2.0", + "version": "1.2.1", "unmsVersionCompliancy": { "min": "1.0.0", "max": "2.1.0" diff --git a/plugins/kmz-map/kmz-map.zip b/plugins/kmz-map/kmz-map.zip index 9351d2a9b78333cad5bf3669a8d38b0f500c519c..f42afc14e58cfb2521bd3c7ee237ff5901a79280 100644 GIT binary patch delta 1501 zcmY+EX)xOf7>EA}QdiIxeqWyV*+(s-pjaCoUIYLJ_yH@c{wk;w z7)-UVA%Gu%c^_Ync4Y|gRlr)q;#_aP4QJbd0bmsZ07!u04wt5s-wHZEp&=I2%ypK@ zgB8R#8>oNy-kZm5F)l1>T-N;FaDwBI_dW4Yf z!**4)cDy~(X7Tfdp+op>8X6-lX`$wKc+{e0g zwI#Y!(^>`Z(T_B2D0}Cihw-@r()2!Y+~n&l)l9C}qE#;}f(*WXokV|(#Yzri6D6{u zDlvia4LY6j4wYK&z`;))kxozi^=vH?UWS;|jMC;Q`R_XL5~}**@5q8U+qIL%>28Wi zBLrsa*4~BMBoUP!E`Gdj+yr`U8noqAkiL5IsjE+TvT-};AY)5KU%$3%lpWBjcR^JCev z#N~&HI5k-%{V6o3Xe8`}NY6S6?!K<16@1&%dCVoU53eSg8o6nO4p~-hBdd&7Q}+$C zo7YO~g$mkP7bck%+2Ar?2gUsRn=%2Qu`KnH2lbG^tRlC;T1RHKktM~wn^-LS;(AFW zzU9=m(03LO*{i|wSAzbfu!dJKhVLtvj0DjPfkPTCU&WK~3u8(vK?9X0$%z zd-!S6g+_NQVP#51oAYBZefmur(Zsp2vMUij(gF&uoZQ9f#uoCkH9LUK-3zxjFV z=0qbK{;a7qD4Hq3I$CAy;g&#S<*?2KbKeu}*J6rL29!r>T%5K;R=MMy>1mkLv81M0 zjU~f!c)P1jdUcs2w|lQ-?{#-tWxg&4zB_#vvm}~fk4QE%`S^-TSem}bE6-qvm%GJ7 zM^}@Vx*Mbr@)8}Ag)NOzUPEk@uG0W?_N}jKh<_{8Dgm?5T+~s~mo_tbH*`CJw|4xT zevd;e<%-on`#!6}|1p1FfVyp~KSIelK)v3K+5NjVbWtug*tGwM_xubv7V(_kLvl{H zEqJ>xe`K>v!c+rgxORCwP_8I38XlA^XPWw zodH35l@npyp#6(0et)uPE#dAac^`YxM>Tz`;(qJj5}(^~x!vLES74-q&_9&m!rGllS_RsD?}o=CQfS)!B5W0L z*TlMwyD}Q~Ne*iR0-Nys=S4;iO#6_(A(+-TEegUlMgFfvhBe$k{t(-F;Z0cz2msh$ zZ7BhKA9k!JKf{9`$!LHJe+zjDmooSu005*bUc>-zHIhH+$6BhrBd%V-tDX2Yg8p>{ fzefS=*vkw#1oDSpz#zoI2cirYgdBtdJG}e{S~jP3 delta 1547 zcmaE-@mGU4z?+#xgn@~HgF!QQ)<)h?CMKDH%_&R^nOLsGvV>3OWL+l&Vu&@pWsGBD zV9;P^V31^(>?~m-TK;|S@zA@UA5F>Ty*|_D z$dTEV4&I{nL4wU@cP^~H)U_zgJSDu@>~+ic3k;Dk@7)!som77K zo#*1&88?#87L?fL@aNqQ{BM%9`+j1eea+n$-=a%SX=tY8xTraLB(nG)&6n9Z*>Rrc znO=vt;YrIygYWn-w;O6N)YE(LN5(CKi?#KbjMrhM=X^nn4W0Z-cwLy%y7U{)J4rv! z5`X)v(_`Y!w{tBR&xEzTj?gu!Pl#?6aBIw7>O$X^5Q0>tpIGY(8!|kf3?TYT<{-#2kmq z!73sA+5WcKCxx#F8>*>pPqJLJZEbFu&DDte_I;b3W<7o$R^jE6x`d5&jbo`q-QN0a z{=;gk*$S>jSiGB-U~c8OK_=8|`|0}*3KqX2A1tUlB42N)&e1sK)Ent@jGc$%mG26TXAojV?&MVOgCPAz%Y5|&H9wN-iuiJ`cLhV`LbE@+^ORFxiJMg zJ+Y}rwTzGF4#MUr>*yH{uf@So3*g$;}PC>XJ7R0^M1Kg#;tqe zo|aRYa?dBFt@V2QWYxcozMB%`oB6xzW>y!!*GHsHP!fE~^HsKSLgBma{nJ^sv(*l2=Xo70d%U;Q;uq&)VeMH(drq$vWK0#bdN~iR;d$#-N=J;@loQI;`%Qyb-L@ebH6<69Zfy zMfSaQ-siCWQQ?^F+dubjcMw?yE0vxbNDWCK~Y za(BifA~}tvt5+Ok+qaQ-_O)iFM~5aHnp1GTts?7^hws%LN`HQBnPzTsv2Dp;1FpD` z$Jdsh&wTe;rOKHp@~+yOkfjHA)~7tV^l#3(3M1~vh3a05D+HFOXZG(>n!38&CB65l ziqn4VOR|#hJ{9$9O;J0mV?x?(gS(!m;HjDw)NZRMgM0A@MdJPXNH%Wllz2B zK*{fjkTImt{4Hd}hgxV(widQjz>n36USsf4#~-Dg?Yek|Tr0sxqEpV|Nb diff --git a/plugins/kmz-map/src/includes/config.class.php b/plugins/kmz-map/src/includes/config.class.php index 964a3b69..ece5210e 100644 --- a/plugins/kmz-map/src/includes/config.class.php +++ b/plugins/kmz-map/src/includes/config.class.php @@ -16,7 +16,7 @@ class Config public static $LINK_TWO = null; - public static function initializeStaticProperties($config_path) + public static function initializeStaticProperties($config_path): void { // ## Setup user configuration settings, if they exist @@ -26,16 +26,13 @@ public static function initializeStaticProperties($config_path) $config_json = json_decode($config_string); foreach ($config_json as $key => $value) { - - // ## Expect specific key naming convention $name = false; - $count = false; if (strpos($key, 'REQUIRED_') !== false) { $name = str_replace('REQUIRED_', '', $key); $new_value = $value; } elseif (strpos($key, 'HYPER_LINK_') !== false) { $name = str_replace('HYPER_LINK_', '', $key); - $new_value = self::parseLink($value); + $new_value = self::parseLink((string) $value); } elseif (strpos($key, 'OPTIONAL_') !== false) { $name = str_replace('OPTIONAL_', '', $key); $new_value = $value; @@ -54,7 +51,7 @@ public static function initializeStaticProperties($config_path) } } - private static function parseLink($link_string) + private static function parseLink(string $link_string): array { return explode('|', $link_string, 2); } diff --git a/plugins/kmz-map/src/manifest.json b/plugins/kmz-map/src/manifest.json index 8f224ec2..21d4b813 100644 --- a/plugins/kmz-map/src/manifest.json +++ b/plugins/kmz-map/src/manifest.json @@ -5,7 +5,7 @@ "displayName": "KMZ Map", "description": "A UISP CRM plugin that provides a frontend Google Map for clients to view tower coverage.", "url": "https://github.com/Ubiquiti-App/UCRM-plugins/tree/master/plugins/kmz-map", - "version": "1.2.0", + "version": "1.2.1", "unmsVersionCompliancy": { "min": "1.0.0", "max": null diff --git a/plugins_2.1.x.json b/plugins_2.1.x.json index 3fbc77eb..4f51159e 100644 --- a/plugins_2.1.x.json +++ b/plugins_2.1.x.json @@ -70,7 +70,7 @@ "displayName": "KMZ Map", "description": "A UISP CRM plugin that provides a frontend Google Map for clients to view tower coverage.", "url": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/tree\/master\/plugins\/kmz-map", - "version": "1.2.0", + "version": "1.2.1", "unmsVersionCompliancy": { "min": "1.0.0", "max": null diff --git a/plugins_2.2.x.json b/plugins_2.2.x.json index b6bb48ca..2118f1de 100644 --- a/plugins_2.2.x.json +++ b/plugins_2.2.x.json @@ -70,7 +70,7 @@ "displayName": "KMZ Map", "description": "A UISP CRM plugin that provides a frontend Google Map for clients to view tower coverage.", "url": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/tree\/master\/plugins\/kmz-map", - "version": "1.2.0", + "version": "1.2.1", "unmsVersionCompliancy": { "min": "1.0.0", "max": null diff --git a/plugins_2.3.x.json b/plugins_2.3.x.json index efd26b23..c94b5022 100644 --- a/plugins_2.3.x.json +++ b/plugins_2.3.x.json @@ -70,7 +70,7 @@ "displayName": "KMZ Map", "description": "A UISP CRM plugin that provides a frontend Google Map for clients to view tower coverage.", "url": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/tree\/master\/plugins\/kmz-map", - "version": "1.2.0", + "version": "1.2.1", "unmsVersionCompliancy": { "min": "1.0.0", "max": null diff --git a/plugins_2.4.x.json b/plugins_2.4.x.json index efd26b23..c94b5022 100644 --- a/plugins_2.4.x.json +++ b/plugins_2.4.x.json @@ -70,7 +70,7 @@ "displayName": "KMZ Map", "description": "A UISP CRM plugin that provides a frontend Google Map for clients to view tower coverage.", "url": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/tree\/master\/plugins\/kmz-map", - "version": "1.2.0", + "version": "1.2.1", "unmsVersionCompliancy": { "min": "1.0.0", "max": null diff --git a/plugins_2.5.x.json b/plugins_2.5.x.json index efd26b23..c94b5022 100644 --- a/plugins_2.5.x.json +++ b/plugins_2.5.x.json @@ -70,7 +70,7 @@ "displayName": "KMZ Map", "description": "A UISP CRM plugin that provides a frontend Google Map for clients to view tower coverage.", "url": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/tree\/master\/plugins\/kmz-map", - "version": "1.2.0", + "version": "1.2.1", "unmsVersionCompliancy": { "min": "1.0.0", "max": null diff --git a/plugins_3.0.x.json b/plugins_3.0.x.json index efd26b23..c94b5022 100644 --- a/plugins_3.0.x.json +++ b/plugins_3.0.x.json @@ -70,7 +70,7 @@ "displayName": "KMZ Map", "description": "A UISP CRM plugin that provides a frontend Google Map for clients to view tower coverage.", "url": "https:\/\/github.com\/Ubiquiti-App\/UCRM-plugins\/tree\/master\/plugins\/kmz-map", - "version": "1.2.0", + "version": "1.2.1", "unmsVersionCompliancy": { "min": "1.0.0", "max": null