From dfed664d20b216d7c5005fe792d6bff7de551c6c Mon Sep 17 00:00:00 2001 From: nertyog Date: Tue, 20 Oct 2026 04:51:34 +0300 Subject: [PATCH] Fix admin menu/header license gating, AJAX save response handling, and dark theme compatibility --- admin/controller/module/promo_top_bar_nat.php | 95 +++++++++-------- .../template/module/promo_top_bar_nat.twig | 97 +++++++----------- .../controller/module/promo_top_bar_nat.php | 32 +++--- promo_top_bar_nat.ocmod.zip | Bin 103154 -> 103859 bytes 4 files changed, 106 insertions(+), 118 deletions(-) diff --git a/admin/controller/module/promo_top_bar_nat.php b/admin/controller/module/promo_top_bar_nat.php index 652d467..145b928 100644 --- a/admin/controller/module/promo_top_bar_nat.php +++ b/admin/controller/module/promo_top_bar_nat.php @@ -538,7 +538,8 @@ class PromoTopBarNat extends \Opencart\System\Engine\Controller { // Blocks images if (isset($slide['blocks']) && is_array($slide['blocks'])) { foreach ($slide['blocks'] as $j => $block) { - if ($block['type'] === 'image') { + if (!is_array($block) || empty($block['type'])) continue; +if ($block['type'] === 'image') { $slides[$i]['blocks'][$j]['thumb'] = []; foreach ($data['languages'] as $lang) { $img_val = isset($block['image'][$lang['language_id']]) ? $block['image'][$lang['language_id']] : ''; @@ -585,7 +586,9 @@ class PromoTopBarNat extends \Opencart\System\Engine\Controller { $this->load->language('extension/promo_top_bar_nat/module/promo_top_bar_nat'); $json = []; - if (!$this->user->hasPermission('modify', 'extension/promo_top_bar_nat/module/promo_top_bar_nat')) { + + try { +if (!$this->user->hasPermission('modify', 'extension/promo_top_bar_nat/module/promo_top_bar_nat')) { $json['error'] = $this->language->get('error_permission'); } @@ -610,6 +613,8 @@ class PromoTopBarNat extends \Opencart\System\Engine\Controller { $existing_settings = $this->model_setting_setting->getSetting('module_promo_top_bar_nat'); unset($this->request->post['module_promo_top_bar_nat_slides_json']); unset($this->request->post['module_promo_top_bar_nat_slides']); + if (!is_array($existing_settings)) { $existing_settings = []; } + if (!is_array($this->request->post)) { $this->request->post = []; } $this->request->post = array_merge($existing_settings, $this->request->post); } @@ -627,6 +632,14 @@ class PromoTopBarNat extends \Opencart\System\Engine\Controller { $json['success'] = $this->language->get('text_success'); } + + } catch (\Throwable $e) { + $json['error'] = $e->getMessage(); + } + + if (ob_get_length()) { + ob_clean(); + } $this->response->addHeader('Content-Type: application/json'); $this->response->setOutput(json_encode($json)); } @@ -683,93 +696,94 @@ class PromoTopBarNat extends \Opencart\System\Engine\Controller { foreach ($slides as $i => $slide) { if (isset($slide['blocks']) && is_array($slide['blocks'])) { foreach ($slide['blocks'] as $j => $block) { - if ($block['type'] === 'text') { + if (!is_array($block) || empty($block['type'])) continue; +if ($block['type'] === 'text') { if (isset($block['text']) && is_array($block['text'])) { foreach ($block['text'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['text'][$lang_id] = base64_encode($val); + $slides[$i]['blocks'][$j]['text'][$lang_id] = base64_encode((string)$val); } } if (isset($block['mobile_text']) && is_array($block['mobile_text'])) { foreach ($block['mobile_text'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['mobile_text'][$lang_id] = base64_encode($val); + $slides[$i]['blocks'][$j]['mobile_text'][$lang_id] = base64_encode((string)$val); } } } elseif ($block['type'] === 'image') { if (isset($block['alt']) && is_array($block['alt'])) { foreach ($block['alt'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['alt'][$lang_id] = base64_encode($val); + $slides[$i]['blocks'][$j]['alt'][$lang_id] = base64_encode((string)$val); } } } elseif ($block['type'] === 'button') { if (isset($block['text']) && is_array($block['text'])) { foreach ($block['text'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['text'][$lang_id] = base64_encode($val); + $slides[$i]['blocks'][$j]['text'][$lang_id] = base64_encode((string)$val); } } if (isset($block['badge_text']) && is_array($block['badge_text'])) { foreach ($block['badge_text'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['badge_text'][$lang_id] = base64_encode($val); + $slides[$i]['blocks'][$j]['badge_text'][$lang_id] = base64_encode((string)$val); } } } elseif ($block['type'] === 'timer') { if (isset($block['timer_fallback_text']) && is_array($block['timer_fallback_text'])) { foreach ($block['timer_fallback_text'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['timer_fallback_text'][$lang_id] = base64_encode($val); + $slides[$i]['blocks'][$j]['timer_fallback_text'][$lang_id] = base64_encode((string)$val); } } } elseif ($block['type'] === 'shipping') { if (isset($block['shipping_text_before']) && is_array($block['shipping_text_before'])) { foreach ($block['shipping_text_before'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['shipping_text_before'][$lang_id] = base64_encode($val); + $slides[$i]['blocks'][$j]['shipping_text_before'][$lang_id] = base64_encode((string)$val); } } if (isset($block['shipping_text_after']) && is_array($block['shipping_text_after'])) { foreach ($block['shipping_text_after'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['shipping_text_after'][$lang_id] = base64_encode($val); + $slides[$i]['blocks'][$j]['shipping_text_after'][$lang_id] = base64_encode((string)$val); } } } elseif ($block['type'] === 'subscribe') { if (isset($block['subscribe_placeholder']) && is_array($block['subscribe_placeholder'])) { foreach ($block['subscribe_placeholder'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['subscribe_placeholder'][$lang_id] = base64_encode($val); + $slides[$i]['blocks'][$j]['subscribe_placeholder'][$lang_id] = base64_encode((string)$val); } } if (isset($block['subscribe_button_text']) && is_array($block['subscribe_button_text'])) { foreach ($block['subscribe_button_text'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['subscribe_button_text'][$lang_id] = base64_encode($val); + $slides[$i]['blocks'][$j]['subscribe_button_text'][$lang_id] = base64_encode((string)$val); } } if (isset($block['subscribe_success_msg']) && is_array($block['subscribe_success_msg'])) { foreach ($block['subscribe_success_msg'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['subscribe_success_msg'][$lang_id] = base64_encode($val); + $slides[$i]['blocks'][$j]['subscribe_success_msg'][$lang_id] = base64_encode((string)$val); } } } elseif ($block['type'] === 'coupon') { if (isset($block['coupon_text']) && is_array($block['coupon_text'])) { foreach ($block['coupon_text'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['coupon_text'][$lang_id] = base64_encode($val); + $slides[$i]['blocks'][$j]['coupon_text'][$lang_id] = base64_encode((string)$val); } } if (isset($block['coupon_code']) && is_array($block['coupon_code'])) { foreach ($block['coupon_code'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['coupon_code'][$lang_id] = base64_encode($val); + $slides[$i]['blocks'][$j]['coupon_code'][$lang_id] = base64_encode((string)$val); } } if (isset($block['coupon_tooltip']) && is_array($block['coupon_tooltip'])) { foreach ($block['coupon_tooltip'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['coupon_tooltip'][$lang_id] = base64_encode($val); + $slides[$i]['blocks'][$j]['coupon_tooltip'][$lang_id] = base64_encode((string)$val); } } } elseif ($block['type'] === 'activity') { if (isset($block['activity_text']) && is_array($block['activity_text'])) { foreach ($block['activity_text'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['activity_text'][$lang_id] = base64_encode($val); + $slides[$i]['blocks'][$j]['activity_text'][$lang_id] = base64_encode((string)$val); } } } elseif ($block['type'] === 'product') { if (isset($block['product_button_text']) && is_array($block['product_button_text'])) { foreach ($block['product_button_text'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['product_button_text'][$lang_id] = base64_encode($val); + $slides[$i]['blocks'][$j]['product_button_text'][$lang_id] = base64_encode((string)$val); } } } @@ -789,93 +803,94 @@ class PromoTopBarNat extends \Opencart\System\Engine\Controller { foreach ($slides as $i => $slide) { if (isset($slide['blocks']) && is_array($slide['blocks'])) { foreach ($slide['blocks'] as $j => $block) { - if ($block['type'] === 'text') { + if (!is_array($block) || empty($block['type'])) continue; +if ($block['type'] === 'text') { if (isset($block['text']) && is_array($block['text'])) { foreach ($block['text'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['text'][$lang_id] = base64_decode($val); + $slides[$i]['blocks'][$j]['text'][$lang_id] = base64_decode((string)$val); } } if (isset($block['mobile_text']) && is_array($block['mobile_text'])) { foreach ($block['mobile_text'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['mobile_text'][$lang_id] = base64_decode($val); + $slides[$i]['blocks'][$j]['mobile_text'][$lang_id] = base64_decode((string)$val); } } } elseif ($block['type'] === 'image') { if (isset($block['alt']) && is_array($block['alt'])) { foreach ($block['alt'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['alt'][$lang_id] = base64_decode($val); + $slides[$i]['blocks'][$j]['alt'][$lang_id] = base64_decode((string)$val); } } } elseif ($block['type'] === 'button') { if (isset($block['text']) && is_array($block['text'])) { foreach ($block['text'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['text'][$lang_id] = base64_decode($val); + $slides[$i]['blocks'][$j]['text'][$lang_id] = base64_decode((string)$val); } } if (isset($block['badge_text']) && is_array($block['badge_text'])) { foreach ($block['badge_text'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['badge_text'][$lang_id] = base64_decode($val); + $slides[$i]['blocks'][$j]['badge_text'][$lang_id] = base64_decode((string)$val); } } } elseif ($block['type'] === 'timer') { if (isset($block['timer_fallback_text']) && is_array($block['timer_fallback_text'])) { foreach ($block['timer_fallback_text'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['timer_fallback_text'][$lang_id] = base64_decode($val); + $slides[$i]['blocks'][$j]['timer_fallback_text'][$lang_id] = base64_decode((string)$val); } } } elseif ($block['type'] === 'shipping') { if (isset($block['shipping_text_before']) && is_array($block['shipping_text_before'])) { foreach ($block['shipping_text_before'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['shipping_text_before'][$lang_id] = base64_decode($val); + $slides[$i]['blocks'][$j]['shipping_text_before'][$lang_id] = base64_decode((string)$val); } } if (isset($block['shipping_text_after']) && is_array($block['shipping_text_after'])) { foreach ($block['shipping_text_after'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['shipping_text_after'][$lang_id] = base64_decode($val); + $slides[$i]['blocks'][$j]['shipping_text_after'][$lang_id] = base64_decode((string)$val); } } } elseif ($block['type'] === 'subscribe') { if (isset($block['subscribe_placeholder']) && is_array($block['subscribe_placeholder'])) { foreach ($block['subscribe_placeholder'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['subscribe_placeholder'][$lang_id] = base64_decode($val); + $slides[$i]['blocks'][$j]['subscribe_placeholder'][$lang_id] = base64_decode((string)$val); } } if (isset($block['subscribe_button_text']) && is_array($block['subscribe_button_text'])) { foreach ($block['subscribe_button_text'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['subscribe_button_text'][$lang_id] = base64_decode($val); + $slides[$i]['blocks'][$j]['subscribe_button_text'][$lang_id] = base64_decode((string)$val); } } if (isset($block['subscribe_success_msg']) && is_array($block['subscribe_success_msg'])) { foreach ($block['subscribe_success_msg'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['subscribe_success_msg'][$lang_id] = base64_decode($val); + $slides[$i]['blocks'][$j]['subscribe_success_msg'][$lang_id] = base64_decode((string)$val); } } } elseif ($block['type'] === 'coupon') { if (isset($block['coupon_text']) && is_array($block['coupon_text'])) { foreach ($block['coupon_text'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['coupon_text'][$lang_id] = base64_decode($val); + $slides[$i]['blocks'][$j]['coupon_text'][$lang_id] = base64_decode((string)$val); } } if (isset($block['coupon_code']) && is_array($block['coupon_code'])) { foreach ($block['coupon_code'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['coupon_code'][$lang_id] = base64_decode($val); + $slides[$i]['blocks'][$j]['coupon_code'][$lang_id] = base64_decode((string)$val); } } if (isset($block['coupon_tooltip']) && is_array($block['coupon_tooltip'])) { foreach ($block['coupon_tooltip'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['coupon_tooltip'][$lang_id] = base64_decode($val); + $slides[$i]['blocks'][$j]['coupon_tooltip'][$lang_id] = base64_decode((string)$val); } } } elseif ($block['type'] === 'activity') { if (isset($block['activity_text']) && is_array($block['activity_text'])) { foreach ($block['activity_text'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['activity_text'][$lang_id] = base64_decode($val); + $slides[$i]['blocks'][$j]['activity_text'][$lang_id] = base64_decode((string)$val); } } } elseif ($block['type'] === 'product') { if (isset($block['product_button_text']) && is_array($block['product_button_text'])) { foreach ($block['product_button_text'] as $lang_id => $val) { - $slides[$i]['blocks'][$j]['product_button_text'][$lang_id] = base64_decode($val); + $slides[$i]['blocks'][$j]['product_button_text'][$lang_id] = base64_decode((string)$val); } } } @@ -1106,8 +1121,8 @@ class PromoTopBarNat extends \Opencart\System\Engine\Controller { try { $is_installed = is_file(DIR_EXTENSION . 'promo_top_bar_nat/admin/controller/module/promo_top_bar_nat.php') || is_file(DIR_APPLICATION . 'controller/extension/module/promo_top_bar_nat.php'); if ($is_installed) { - $nat_status = $this->config->get('module_promo_top_bar_nat_status'); - if ($nat_status === null || $nat_status) { + $1$nat_license = (string)$this->config->get('module_promo_top_bar_nat_license'); + if (!empty($nat_status) && $this->checkLicense($nat_license)) { $nat_pos = $this->config->get('module_promo_top_bar_nat_menu_position'); if (empty($nat_pos)) { $nat_pos = 'both'; } if ($nat_pos == 'sidebar' || $nat_pos == 'both') { @@ -1164,8 +1179,8 @@ class PromoTopBarNat extends \Opencart\System\Engine\Controller { $output = $style . $output; } - $nat_status = $this->config->get('module_promo_top_bar_nat_status'); - if ($nat_status === null || $nat_status) { + $1$nat_license = (string)$this->config->get('module_promo_top_bar_nat_license'); + if (!empty($nat_status) && $this->checkLicense($nat_license)) { $nat_pos = $this->config->get('module_promo_top_bar_nat_menu_position'); if (empty($nat_pos)) { $nat_pos = 'both'; } if ($nat_pos == 'header' || $nat_pos == 'both') { diff --git a/admin/view/template/module/promo_top_bar_nat.twig b/admin/view/template/module/promo_top_bar_nat.twig index e7ba5e6..23e1216 100644 --- a/admin/view/template/module/promo_top_bar_nat.twig +++ b/admin/view/template/module/promo_top_bar_nat.twig @@ -1,4 +1,9 @@