From d6a56769a22523ca3e986cc712572049dbe15ce2 Mon Sep 17 00:00:00 2001 From: nertyog Date: Mon, 28 Sep 2026 16:52:10 +0300 Subject: [PATCH] Protect install.xml with is_file and try-catch against abrupt uninstall --- install.xml | 100 ++++++++++++++----------- poll_widget_nat_OC_20_22_1_1.ocmod.zip | Bin 195848 -> 195925 bytes 2 files changed, 55 insertions(+), 45 deletions(-) diff --git a/install.xml b/install.xml index 2f67e46..ac5ac98 100644 --- a/install.xml +++ b/install.xml @@ -11,42 +11,47 @@ user->hasPermission('access', 'catalog/product')) {]]> load->model('setting/setting'); - $nat_status = $this->config->get('module_poll_widget_nat_status'); - if ($nat_status === null || $nat_status) { - $nat_pos = $this->config->get('module_poll_widget_nat_menu_position'); - if (empty($nat_pos)) { $nat_pos = 'both'; } - if ($nat_pos == 'sidebar' || $nat_pos == 'both') { - if ($this->user->hasPermission('access', 'module/poll_widget_nat')) { - $nat_item = array( - 'name' => 'Poll Widget', - 'href' => $this->url->link('module/poll_widget_nat', 'token=' . $this->session->data['token'], true), - 'children' => array() - ); - - $nat_menu_index = -1; - if (isset($data['menus'])) { - foreach ($data['menus'] as $k => $menu) { - if (isset($menu['id']) && $menu['id'] == 'menu-nat') { - $nat_menu_index = $k; - break; + try { + if (is_file(DIR_APPLICATION . 'controller/module/poll_widget_nat.php')) { + $this->load->model('setting/setting'); + $nat_status = $this->config->get('module_poll_widget_nat_status'); + if ($nat_status === null || $nat_status) { + $nat_pos = $this->config->get('module_poll_widget_nat_menu_position'); + if (empty($nat_pos)) { $nat_pos = 'both'; } + if ($nat_pos == 'sidebar' || $nat_pos == 'both') { + if ($this->user->hasPermission('access', 'module/poll_widget_nat')) { + $nat_item = array( + 'name' => 'Poll Widget', + 'href' => $this->url->link('module/poll_widget_nat', 'token=' . $this->session->data['token'], true), + 'children' => array() + ); + + $nat_menu_index = -1; + if (isset($data['menus'])) { + foreach ($data['menus'] as $k => $menu) { + if (isset($menu['id']) && $menu['id'] == 'menu-nat') { + $nat_menu_index = $k; + break; + } + } + } + + if ($nat_menu_index > -1) { + $data['menus'][$nat_menu_index]['children'][] = $nat_item; + } else { + $data['menus'][] = array( + 'id' => 'menu-nat', + 'icon' => 'fa-rocket fw', + 'name' => '[NAT] Modules', + 'href' => '', + 'children' => array($nat_item) + ); } } } - - if ($nat_menu_index > -1) { - $data['menus'][$nat_menu_index]['children'][] = $nat_item; - } else { - $data['menus'][] = array( - 'id' => 'menu-nat', - 'icon' => 'fa-rocket fw', - 'name' => '[NAT] Modules', - 'href' => '', - 'children' => array($nat_item) - ); - } } } + } catch (\Throwable $e) { } ]]> @@ -56,22 +61,27 @@ url->link('common/logout']]> load->model('setting/setting'); - $nat_status = $this->config->get('module_poll_widget_nat_status'); - if ($nat_status === null || $nat_status) { - $nat_pos = $this->config->get('module_poll_widget_nat_menu_position'); - if (empty($nat_pos)) { $nat_pos = 'both'; } - if ($nat_pos == 'header' || $nat_pos == 'both') { - if ($this->user->hasPermission('access', 'module/poll_widget_nat')) { - $data['nat_menus'][] = array( - 'name' => 'Poll Widget', - 'href' => $this->url->link('module/poll_widget_nat', 'token=' . $this->session->data['token'], true) - ); + try { + if (!isset($data['nat_menus'])) { + $data['nat_menus'] = array(); + } + if (is_file(DIR_APPLICATION . 'controller/module/poll_widget_nat.php')) { + $this->load->model('setting/setting'); + $nat_status = $this->config->get('module_poll_widget_nat_status'); + if ($nat_status === null || $nat_status) { + $nat_pos = $this->config->get('module_poll_widget_nat_menu_position'); + if (empty($nat_pos)) { $nat_pos = 'both'; } + if ($nat_pos == 'header' || $nat_pos == 'both') { + if ($this->user->hasPermission('access', 'module/poll_widget_nat')) { + $data['nat_menus'][] = array( + 'name' => 'Poll Widget', + 'href' => $this->url->link('module/poll_widget_nat', 'token=' . $this->session->data['token'], true) + ); + } + } } } + } catch (\Throwable $e) { } ]]> diff --git a/poll_widget_nat_OC_20_22_1_1.ocmod.zip b/poll_widget_nat_OC_20_22_1_1.ocmod.zip index 95aef084b19af8cf952dac510f09fddc9db13ba2..45dc41bf8c14a721fd815549ffbf0bb222b23451 100644 GIT binary patch delta 1972 zcmZ8idpwi-AKxC73@0+TF3bH=Ozw_LD`GC^w4zcjbNMNR$#rEsb4dJJfG|p1bYRci1U<^R)Kx~ zQnMTa3Kb2c*R7q=x}}UJsuiYghkQ59AlqxQZfS6Mpga_HSW%ynqp%esX`mYAf`SsI zbHnjj6>pHwsvuq6PcDkeSOoq(qGTj5Wf@G{Mm1*T~oyj!{S+JB@`3xnaTr)j6UAAuce5(-a-Wb(g z-}0dCUOrm2ySZSA$D8^v`B6)4a+`PQGi}iegVB_1WKI>sw<9pDk81!5m49-vtFCg; z+SD<-O$ zLlwOOc1V8oG70E96l`B(;~r-ItJ#hn7oW$sXc6l>?B4zUq=|tYW5JvX6GGbGj<}mp z-r??J-40MX7T6=>`Mj#fqt2;4;#rZAnsUe0B4g1)QL@a< zE2mxbG%g2zH`>xlZz=t#lJBO^`?jt4v~iopOB=5-e?MlIle_Yr1~7{xYoipWbj_pB zc;BZfqZNl6?+l}M+px5*Rve9t@z)pn8YAZinK8247qguR)tq1xkar;_)I1GbTm9>g z@$pyu6Bw5aay!seIE_3P>N(ueH4i3ri&0k);9O~nPnMC91ZZmP=VHz%LwzRn8 zKJ(Tmnyb&6{O5ecE+!~AV9j{zy=EU_E(RPObL)@86rLM3>paCj8j7*~Wr7jVzSCti zxM*4*i>`fhZ->9GMdgvR-g!j!iFM&KBh%e#5X%c{AT7fOX>*q)2A)T(aeuOxQP9 zE^tsW~!4khI?Q_ss3YNLS_0u9lr9# zoBGl3rQCXTxPnP$I!f}sjmts!{~FkuBJ6+Td{NK!|M}MssmB<$8g$I zk85KMVzqKH6D;YS77p#Rubt)u=L|Ru_t8T7gKb(|$;nJQ@wP6`{N%yV;t^EF{gXg| zcUD?_m?uh#c0_h9)N=EG2aTgw?^1Ve_PICls5vE>_;V}$(Z|ekHCo~n>$O*RO5ElE zUUoEvA;ByXK;I$GibDj#~M`dnuvaNbNDHV zH#pDkx?5Qz&1!L4skobBkGYjrBqk8W+Y|_?XFm15Un2H~+nyh>TI|c8js#d}}G2bJQz4q)VIb7&Kn)S3LP=SSZ>0 zbo%?;9{Ens*yv3>EA_eZ@%xv+2>7sACcWf;yG_}AbgLC%`UHL-;qh{o`3T3%Yxz|C zDQe?&oiucC6*-6I;yI;%pVpe~94p8CG||&ZGp{V=n*VaOB|}L4e13!U1^| z*#FN76)pg5*8ibY2LWIQq4NUZAcR^400u%*Gk_z6TxNiq5ZXEmXi`7T0DB=iwwT+6^e5d0h&z-vj87h=S`vW01^&Kqy@kQLLCbmBgriS`yt*V}Rgm=5q*ko}#t@Y#n$+nP c0J>;R+N(e%T=Ab5gxdcXfZpUJ03>(hZyscO@c;k- delta 1903 zcmZ9Ndmz(m7{|BYA(t^0qUqRnl15B!p^{rCt0|&GqL53exkN5)hatIS5yM=Tq+>X_ zjb<*Vj%&3@$+e3{%G_^-vgF7w)#>-o^L?Ms^SsaZ_x|y|U5l{TMHt+g@QaWvtGR)j;rr?)E4Mb^Ea$PM7p|qZ)*);RW5-OM^_L;Dxsj+lyZ%H_ zZYxddukvV42@pGZV80xh z)Dk0c_ge^=XRB@VGp!K&lcJi_xZt*dbS>MfTrtlOwjW{Bv=Nc z@0zDvY&+?6@E{drP|O$Q$nocN3-=vmskxMn6r)>1wHC2 z7<2ARa3F@<#xT3FlaM;cjXWWR2F^4ze*@7-(yLMDQosoXvwK=qc@9oP016|}y~m2p`zN*OZ7(*&GhkF;P5(UeTvd6N`gR>yIJSi@VS zbehdgEp3Lvh_?HN>IFspB8V*|*5=KHb5}cYyba}3N^aCorg?&%`x^tA%d=S(7Ge+d z3;t=w^wq0v<`hvwZ;w~$2Be9ko2eFMl8vkP?duvJmD702fc+i*>P&ktIq<5R3aTdX z<#k+f$o^+CA$nDY5^ip=b5Rm^h*TEixm7}RE6(x0@}u@BDZ~{Vr>$|G@o=<9*{p`!e@Tbxr7cX_pa6|a7_|v0GmU6DfcDEZX zPv@uTsH8Cv4?D9Ywt4&1%l>wDaBHpoWX^St&8|%Sjn+iTyNc|Vl1wC%VGy$GCPIN7%&6FFV4-j#n?=fIp}t>TfSTRTI9Bbuo- zq?$&u>FK(K5zH>{bl+1Kge(ft$L=frQJy=?dM};N62U?Vd12lCAL?FT5WMVOR3*E- z@!XsqLu9hEpauz~2+Bs&i^0ZXP4~>7?{@V6z*Fyv@$Hr3<@545b+Y~v=WgMjY4I60 zcI&K=Y^$2#Z1K^7d2;02^zF>OT5gEGU)_g_9N4`TEsKyVK@qRBUbcQD_<4IS>5a|g za6P1!pF_{{%+XqWQ>TL9jwPJ$xVv-7i^4G6>tgsjF`i#Z<{l=ks)+|vP{rgHk9fOy zN;{PXh;}!ZI?QU9ddYU5R5`U!2M=eoU&!@)pE{~(O@IQjknb-6{m=xUzk2J@<0b$@ zP$A|3B)xwEz=BJONx%eD){}q{sFEfD2B@^AfPJ7sOs}-1P64=Y07)O10@S}z{0|^_ zdJSBj2auflX?e(jzE%s^#72N;7Ya}LP)O214#I=?n~Wk>LZ zp|4t+{ShGPdlmrjg##&dVXX}%STWMO00=-M^q$4F=_|x?brQ!{0NjMa|9|Jx(My2l Lx|wlc<>vnn*T8#9