From 5eea63e2fd2f218a4f9fdc37de76a1d9234d4c57 Mon Sep 17 00:00:00 2001 From: nertyog Date: Sat, 5 Sep 2026 17:27:19 +0300 Subject: [PATCH] fix(oc20-22): resolve tpl parse errors, view loader, token auth, catalog fake jpg guard and install.xml --- install.xml | 78 +++++++-- upload/admin/controller/module/img_opti.php | 28 +-- upload/admin/model/module/img_opti.php | 28 +-- .../admin/view/template/module/img_opti.tpl | 53 +++--- .../model/extension/module/img_opti.php | 162 +++++++++++++++++- upload/catalog/model/module/img_opti.php | 160 +++++++++++++++++ 6 files changed, 441 insertions(+), 68 deletions(-) diff --git a/install.xml b/install.xml index 87696fa..2e113d5 100644 --- a/install.xml +++ b/install.xml @@ -16,9 +16,7 @@ $nat_pos = $this->config->get('module_img_opti_menu_position'); if ($nat_pos == 'sidebar' || $nat_pos == 'both') { if ($this->user->hasPermission('access', 'module/img_opti')) { - $nat_item = array( - 'name' => 'Image Optimizer', - $nat_token_str = isset($this->session->data['user_token']) ? ('user_token=' . $this->session->data['user_token']) : ('token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : '')); + $nat_token_str = 'token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : ''); $nat_item = array( 'name' => 'Image Optimizer', 'href' => $this->url->link('module/img_opti', $nat_token_str, true), @@ -87,7 +85,7 @@ if (!$exists) { $data['nat_menus'][] = array( 'name' => 'Image Optimizer', - 'href' => $this->url->link('module/img_opti', (isset($this->session->data['user_token']) ? ('user_token=' . $this->session->data['user_token']) : ('token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : ''))), true) + 'href' => $this->url->link('module/img_opti', 'token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : ''), true) ); } } @@ -97,7 +95,7 @@ - + ]]> - + + - {% endif %} + ]]> @@ -189,7 +187,10 @@ a.img-thumbnail img, a.thumbnail img { if ($this->config->get('module_img_opti_status') && $this->config->get('module_img_opti_auto_fake_jpg_guard') && !empty($filename)) { $this->load->model('module/img_opti'); try { - $filename = $this->model_extension_module_img_opti->checkAndFixFakeJpgOnTheFly($filename); + $opti_model = isset($this->model_module_img_opti) ? $this->model_module_img_opti : (isset($this->model_extension_module_img_opti) ? $this->model_extension_module_img_opti : null); + if ($opti_model) { + $filename = $opti_model->checkAndFixFakeJpgOnTheFly($filename); + } } catch (\Exception $e) {} } if (empty($filename) || ($filename !== 'no_image.png' && $filename !== 'placeholder.png' && !is_file(DIR_IMAGE . $filename))) { @@ -226,7 +227,10 @@ a.img-thumbnail img, a.thumbnail img { if ($this->config->get('module_img_opti_status') && $this->config->get('module_img_opti_wm_status')) { $this->load->model('module/img_opti'); try { - $this->model_extension_module_img_opti->applyDynamicWatermark(DIR_IMAGE . $image_new, $filename); + $opti_model = isset($this->model_module_img_opti) ? $this->model_module_img_opti : (isset($this->model_extension_module_img_opti) ? $this->model_extension_module_img_opti : null); + if ($opti_model) { + $opti_model->applyDynamicWatermark(DIR_IMAGE . $image_new, $filename); + } } catch (\Exception $e) {} } ]]> @@ -240,7 +244,10 @@ a.img-thumbnail img, a.thumbnail img { if ($this->config->get('module_img_opti_status') && $this->config->get('module_img_opti_wm_status')) { $this->load->model('module/img_opti'); try { - $this->model_extension_module_img_opti->applyDynamicWatermark(DIR_IMAGE . $image_new, $filename); + $opti_model = isset($this->model_module_img_opti) ? $this->model_module_img_opti : (isset($this->model_extension_module_img_opti) ? $this->model_extension_module_img_opti : null); + if ($opti_model) { + $opti_model->applyDynamicWatermark(DIR_IMAGE . $image_new, $filename); + } } catch (\Exception $e) {} } }]]> @@ -255,7 +262,10 @@ a.img-thumbnail img, a.thumbnail img { if ($this->config->get('module_img_opti_status') && $this->config->get('module_img_opti_auto_fake_jpg_guard') && !empty($filename)) { $this->load->model('module/img_opti'); try { - $filename = $this->model_extension_module_img_opti->checkAndFixFakeJpgOnTheFly($filename); + $opti_model = isset($this->model_module_img_opti) ? $this->model_module_img_opti : (isset($this->model_extension_module_img_opti) ? $this->model_extension_module_img_opti : null); + if ($opti_model) { + $filename = $opti_model->checkAndFixFakeJpgOnTheFly($filename); + } } catch (\Exception $e) {} } if (empty($filename) || ($filename !== 'no_image.png' && $filename !== 'placeholder.png' && !is_file(DIR_IMAGE . $filename))) { @@ -690,6 +700,20 @@ document.addEventListener("DOMContentLoaded", function() { } ]]> + + model_tool_image->resize($product_info['image'], $this->config->get('config_image_popup_width'), $this->config->get('config_image_popup_height')); + } else { + $data['popup'] = ''; + }]]> + config->get('module_img_opti_status') && $this->config->get('module_img_opti_broken_fallback') && $this->config->get('module_img_opti_fallback_image'))) { + $data['popup'] = $this->model_tool_image->resize($product_info['image'], $this->config->get('config_image_popup_width'), $this->config->get('config_image_popup_height')); + } else { + $data['popup'] = ''; + } + ]]> + model_tool_image->resize($product_info['image'], $this->config->get('theme_' . $this->config->get('config_theme') . '_image_thumb_width'), $this->config->get('theme_' . $this->config->get('config_theme') . '_image_thumb_height')); @@ -704,8 +728,30 @@ document.addEventListener("DOMContentLoaded", function() { } ]]> + + model_tool_image->resize($product_info['image'], $this->config->get('config_image_thumb_width'), $this->config->get('config_image_thumb_height')); + } else { + $data['thumb'] = ''; + }]]> + config->get('module_img_opti_status') && $this->config->get('module_img_opti_broken_fallback') && $this->config->get('module_img_opti_fallback_image'))) { + $data['thumb'] = $this->model_tool_image->resize($product_info['image'], $this->config->get('config_image_thumb_width'), $this->config->get('config_image_thumb_height')); + } else { + $data['thumb'] = ''; + } + ]]> + + + + + + + diff --git a/upload/admin/controller/module/img_opti.php b/upload/admin/controller/module/img_opti.php index 85b45b9..4363ea6 100644 --- a/upload/admin/controller/module/img_opti.php +++ b/upload/admin/controller/module/img_opti.php @@ -77,7 +77,9 @@ class ControllerModuleImgOpti extends Controller { break; } } + $this->request->post['img_opti_status'] = $this->request->post['module_img_opti_status']; $this->model_setting_setting->editSetting('module_img_opti', $this->request->post); + $this->model_setting_setting->editSetting('img_opti', array('img_opti_status' => $this->request->post['module_img_opti_status'])); $this->cache->delete('img_opti_disk_stats'); if ($quality_changed) { $cache_file = DIR_CACHE . 'img_opti_optimized.json'; @@ -86,7 +88,7 @@ class ControllerModuleImgOpti extends Controller { } } $this->session->data['success'] = $this->language->get('text_success'); - $this->response->redirect($this->url->link('module/img_opti', 'user_token=' . $this->session->data['user_token'], true)); + $this->response->redirect($this->url->link('module/img_opti', 'token=' . $this->session->data['token'], true)); } if (isset($this->session->data['success'])) { @@ -106,16 +108,16 @@ class ControllerModuleImgOpti extends Controller { $data['webp_enabled'] = function_exists('imagewebp'); $data['imagick_enabled'] = extension_loaded('imagick'); - $data['breadcrumbs'] = array(); - $data['breadcrumbs'][] = array('text' => $this->language->get('text_home'), 'href' => $this->url->link('common/dashboard', 'user_token=' . $this->session->data['user_token'], true)); - $data['breadcrumbs'][] = array('text' => $this->language->get('text_extension'), 'href' => $this->url->link('marketplace/extension', 'user_token=' . $this->session->data['user_token'] . '&type=module', true)); - $data['breadcrumbs'][] = array('text' => $this->language->get('heading_title_raw'), 'href' => $this->url->link('module/img_opti', 'user_token=' . $this->session->data['user_token'], true)); + $data['token'] = isset($this->session->data['token']) ? $this->session->data['token'] : ''; + $token_param = 'token=' . $data['token']; - $data['action'] = $this->url->link('module/img_opti', 'user_token=' . $this->session->data['user_token'], true); - $ext_route = (version_compare(VERSION, '3.0.0.0', '>=')) ? 'marketplace/extension' : (version_compare(VERSION, '2.3.0.0', '>=') ? 'extension/extension' : 'extension/module'); - $token_param = isset($this->session->data['user_token']) ? ('user_token=' . $this->session->data['user_token']) : ('token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : '')); + $data['breadcrumbs'] = array(); + $data['breadcrumbs'][] = array('text' => $this->language->get('text_home'), 'href' => $this->url->link('common/dashboard', $token_param, true)); + $data['breadcrumbs'][] = array('text' => $this->language->get('text_extension'), 'href' => $this->url->link('extension/module', $token_param, true)); + $data['breadcrumbs'][] = array('text' => $this->language->get('heading_title_raw'), 'href' => $this->url->link('module/img_opti', $token_param, true)); + + $data['action'] = $this->url->link('module/img_opti', $token_param, true); $data['cancel'] = $this->url->link('extension/module', $token_param, true); - $data['token'] = isset($this->session->data['token']) ? $this->session->data['token'] : (isset($this->session->data['user_token']) ? $this->session->data['user_token'] : ''); $fields = array( 'module_img_opti_status' => 1, @@ -517,7 +519,7 @@ class ControllerModuleImgOpti extends Controller { $data['column_left'] = $this->load->controller('common/column_left'); $data['footer'] = $this->load->controller('common/footer'); - $this->response->setOutput($this->load->view('module/img_opti', $data)); + $this->response->setOutput($this->load->view('module/img_opti.tpl', $data)); } private function getModuleModel() { @@ -2464,6 +2466,8 @@ class ControllerModuleImgOpti extends Controller { } $en_paths = array( + DIR_LANGUAGE . 'en-gb/module/img_opti.php', + DIR_LANGUAGE . 'english/module/img_opti.php', DIR_LANGUAGE . 'en-gb/extension/module/img_opti.php', DIR_LANGUAGE . 'english/extension/module/img_opti.php' ); @@ -2492,6 +2496,8 @@ class ControllerModuleImgOpti extends Controller { $paths = array(); if ($lang && $lang !== 'en-gb' && $lang !== 'english') { + $paths[] = DIR_LANGUAGE . $lang . '/module/img_opti.php'; + $paths[] = DIR_LANGUAGE . strtolower($lang) . '/module/img_opti.php'; $paths[] = DIR_LANGUAGE . $lang . '/extension/module/img_opti.php'; $paths[] = DIR_LANGUAGE . strtolower($lang) . '/extension/module/img_opti.php'; } @@ -2508,6 +2514,8 @@ class ControllerModuleImgOpti extends Controller { if ($query_lang && $query_lang->num_rows) { if (!empty($query_lang->row['directory'])) { $db_dir = $query_lang->row['directory']; + $paths[] = DIR_LANGUAGE . $db_dir . '/module/img_opti.php'; + $paths[] = DIR_LANGUAGE . strtolower($db_dir) . '/module/img_opti.php'; $paths[] = DIR_LANGUAGE . $db_dir . '/extension/module/img_opti.php'; $paths[] = DIR_LANGUAGE . strtolower($db_dir) . '/extension/module/img_opti.php'; } diff --git a/upload/admin/model/module/img_opti.php b/upload/admin/model/module/img_opti.php index 06d0d75..deac027 100644 --- a/upload/admin/model/module/img_opti.php +++ b/upload/admin/model/module/img_opti.php @@ -164,7 +164,7 @@ class ModelModuleImgOpti extends Model { $catalog_url = (defined('HTTPS_CATALOG') && HTTPS_CATALOG) ? HTTPS_CATALOG : (defined('HTTP_CATALOG') ? HTTP_CATALOG : ''); $query = $this->db->query("SELECT p.product_id, p.model, p.status, p.date_available, (SELECT p2s.store_id FROM `" . DB_PREFIX . "product_to_store` p2s WHERE p2s.product_id = p.product_id AND p2s.store_id = '" . (int)$this->config->get('config_store_id') . "' LIMIT 1) AS store_id, (SELECT name FROM `" . DB_PREFIX . "product_description` pd WHERE pd.product_id = p.product_id AND pd.language_id = '" . (int)$this->config->get('config_language_id') . "' LIMIT 1) AS name FROM `" . DB_PREFIX . "product` p WHERE p.image = '" . $escaped . "'"); foreach ($query->rows as $row) { - $admin_link = $this->url->link('catalog/product/edit', 'user_token=' . $this->session->data['user_token'] . '&product_id=' . (int)$row['product_id'], true); + $admin_link = $this->url->link('catalog/product/edit', 'token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : '') . '&product_id=' . (int)$row['product_id'], true); $catalog_link_html = ''; if (isset($row['status']) && (int)$row['status'] === 1 && (empty($row['date_available']) || strtotime($row['date_available']) <= time()) && (isset($row['store_id']) && $row['store_id'] !== null)) { $catalog_link = $catalog_url . 'index.php?route=product/product&product_id=' . (int)$row['product_id']; @@ -175,7 +175,7 @@ class ModelModuleImgOpti extends Model { } $query = $this->db->query("SELECT pi.product_id, p.model, p.status, p.date_available, (SELECT p2s.store_id FROM `" . DB_PREFIX . "product_to_store` p2s WHERE p2s.product_id = pi.product_id AND p2s.store_id = '" . (int)$this->config->get('config_store_id') . "' LIMIT 1) AS store_id, (SELECT name FROM `" . DB_PREFIX . "product_description` pd WHERE pd.product_id = pi.product_id AND pd.language_id = '" . (int)$this->config->get('config_language_id') . "' LIMIT 1) AS name FROM `" . DB_PREFIX . "product_image` pi LEFT JOIN `" . DB_PREFIX . "product` p ON (pi.product_id = p.product_id) WHERE pi.image = '" . $escaped . "'"); foreach ($query->rows as $row) { - $admin_link = $this->url->link('catalog/product/edit', 'user_token=' . $this->session->data['user_token'] . '&product_id=' . (int)$row['product_id'], true); + $admin_link = $this->url->link('catalog/product/edit', 'token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : '') . '&product_id=' . (int)$row['product_id'], true); $catalog_link_html = ''; if (isset($row['status']) && (int)$row['status'] === 1 && (empty($row['date_available']) || strtotime($row['date_available']) <= time()) && (isset($row['store_id']) && $row['store_id'] !== null)) { $catalog_link = $catalog_url . 'index.php?route=product/product&product_id=' . (int)$row['product_id']; @@ -186,7 +186,7 @@ class ModelModuleImgOpti extends Model { } $query = $this->db->query("SELECT c.category_id, c.status, (SELECT c2s.store_id FROM `" . DB_PREFIX . "category_to_store` c2s WHERE c2s.category_id = c.category_id AND c2s.store_id = '" . (int)$this->config->get('config_store_id') . "' LIMIT 1) AS store_id, (SELECT name FROM `" . DB_PREFIX . "category_description` cd WHERE cd.category_id = c.category_id AND cd.language_id = '" . (int)$this->config->get('config_language_id') . "' LIMIT 1) AS name FROM `" . DB_PREFIX . "category` c WHERE image = '" . $escaped . "'"); foreach ($query->rows as $row) { - $admin_link = $this->url->link('catalog/category/edit', 'user_token=' . $this->session->data['user_token'] . '&category_id=' . (int)$row['category_id'], true); + $admin_link = $this->url->link('catalog/category/edit', 'token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : '') . '&category_id=' . (int)$row['category_id'], true); $catalog_link_html = ''; if (isset($row['status']) && (int)$row['status'] === 1 && (isset($row['store_id']) && $row['store_id'] !== null)) { $catalog_link = $catalog_url . 'index.php?route=product/category&path=' . (int)$row['category_id']; @@ -197,7 +197,7 @@ class ModelModuleImgOpti extends Model { } $query = $this->db->query("SELECT m.manufacturer_id, m.name, (SELECT m2s.store_id FROM `" . DB_PREFIX . "manufacturer_to_store` m2s WHERE m2s.manufacturer_id = m.manufacturer_id AND m2s.store_id = '" . (int)$this->config->get('config_store_id') . "' LIMIT 1) AS store_id FROM `" . DB_PREFIX . "manufacturer` m WHERE image = '" . $escaped . "'"); foreach ($query->rows as $row) { - $admin_link = $this->url->link('catalog/manufacturer/edit', 'user_token=' . $this->session->data['user_token'] . '&manufacturer_id=' . (int)$row['manufacturer_id'], true); + $admin_link = $this->url->link('catalog/manufacturer/edit', 'token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : '') . '&manufacturer_id=' . (int)$row['manufacturer_id'], true); $catalog_link_html = ''; if ((isset($row['store_id']) && $row['store_id'] !== null)) { $catalog_link = $catalog_url . 'index.php?route=product/manufacturer/info&manufacturer_id=' . (int)$row['manufacturer_id']; @@ -210,7 +210,7 @@ class ModelModuleImgOpti extends Model { if ($table_query->num_rows) { $query_banner = $this->db->query("SELECT bi.banner_id, b.name FROM `" . DB_PREFIX . "banner_image` bi LEFT JOIN `" . DB_PREFIX . "banner` b ON (bi.banner_id = b.banner_id) WHERE bi.image = '" . $escaped . "'"); foreach ($query_banner->rows as $row) { - $admin_link = $this->url->link('design/banner/edit', 'user_token=' . $this->session->data['user_token'] . '&banner_id=' . (int)$row['banner_id'], true); + $admin_link = $this->url->link('design/banner/edit', 'token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : '') . '&banner_id=' . (int)$row['banner_id'], true); $search_links = $this->getSearchLinks($row['name']); $entities[] = 'Banner ' . htmlspecialchars($row['name'] ? $row['name'] : 'Banner ID ' . $row['banner_id'], ENT_QUOTES, 'UTF-8') . '' . $search_links; } @@ -236,7 +236,7 @@ class ModelModuleImgOpti extends Model { try { $query_blog = $this->db->query($sql); foreach ($query_blog->rows as $row) { - $admin_link = $this->url->link($cfg['route'], 'user_token=' . $this->session->data['user_token'] . '&' . $cfg['id'] . '=' . (int)$row[$cfg['id']], true); + $admin_link = $this->url->link($cfg['route'], 'token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : '') . '&' . $cfg['id'] . '=' . (int)$row[$cfg['id']], true); $search_links = $this->getSearchLinks($row['name']); $entities[] = '' . $cfg['type'] . ' ' . htmlspecialchars($row['name'] ? $row['name'] : $cfg['type'] . ' ID ' . $row[$cfg['id']], ENT_QUOTES, 'UTF-8') . '' . $search_links; } @@ -410,7 +410,7 @@ class ModelModuleImgOpti extends Model { $fullPath = DIR_IMAGE . $image_path; $realPath = realpath($fullPath); if (!$realPath || strpos(str_replace('\\', '/', $realPath), $realImageDir) !== 0 || !is_file($realPath)) { - $admin_link = $this->url->link('catalog/product/edit', 'user_token=' . $this->session->data['user_token'] . '&product_id=' . (int)$row['id'], true); + $admin_link = $this->url->link('catalog/product/edit', 'token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : '') . '&product_id=' . (int)$row['id'], true); $catalog_link_html = ''; if (isset($row['status']) && (int)$row['status'] === 1 && (empty($row['date_available']) || strtotime($row['date_available']) <= time()) && (isset($row['store_id']) && $row['store_id'] !== null)) { $catalog_link = $catalog_url . 'index.php?route=product/product&product_id=' . (int)$row['id']; @@ -441,7 +441,7 @@ class ModelModuleImgOpti extends Model { $fullPath = DIR_IMAGE . $image_path; $realPath = realpath($fullPath); if (!$realPath || strpos(str_replace('\\', '/', $realPath), $realImageDir) !== 0 || !is_file($realPath)) { - $admin_link = $this->url->link('catalog/product/edit', 'user_token=' . $this->session->data['user_token'] . '&product_id=' . (int)$row['product_id'], true); + $admin_link = $this->url->link('catalog/product/edit', 'token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : '') . '&product_id=' . (int)$row['product_id'], true); $catalog_link_html = ''; if (isset($row['status']) && (int)$row['status'] === 1 && (empty($row['date_available']) || strtotime($row['date_available']) <= time()) && (isset($row['store_id']) && $row['store_id'] !== null)) { $catalog_link = $catalog_url . 'index.php?route=product/product&product_id=' . (int)$row['product_id']; @@ -470,7 +470,7 @@ class ModelModuleImgOpti extends Model { $fullPath = DIR_IMAGE . $image_path; $realPath = realpath($fullPath); if (!$realPath || strpos(str_replace('\\', '/', $realPath), $realImageDir) !== 0 || !is_file($realPath)) { - $admin_link = $this->url->link('catalog/category/edit', 'user_token=' . $this->session->data['user_token'] . '&category_id=' . (int)$row['id'], true); + $admin_link = $this->url->link('catalog/category/edit', 'token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : '') . '&category_id=' . (int)$row['id'], true); $catalog_link_html = ''; if (isset($row['status']) && (int)$row['status'] === 1 && (isset($row['store_id']) && $row['store_id'] !== null)) { $catalog_link = $catalog_url . 'index.php?route=product/category&path=' . (int)$row['id']; @@ -500,7 +500,7 @@ class ModelModuleImgOpti extends Model { $fullPath = DIR_IMAGE . $image_path; $realPath = realpath($fullPath); if (!$realPath || strpos(str_replace('\\', '/', $realPath), $realImageDir) !== 0 || !is_file($realPath)) { - $admin_link = $this->url->link('catalog/manufacturer/edit', 'user_token=' . $this->session->data['user_token'] . '&manufacturer_id=' . (int)$row['id'], true); + $admin_link = $this->url->link('catalog/manufacturer/edit', 'token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : '') . '&manufacturer_id=' . (int)$row['id'], true); $catalog_link_html = ''; if ((isset($row['store_id']) && $row['store_id'] !== null)) { $catalog_link = $catalog_url . 'index.php?route=product/manufacturer/info&manufacturer_id=' . (int)$row['id']; @@ -1717,7 +1717,7 @@ class ModelModuleImgOpti extends Model { if (!$matched_image) continue; - $admin_link = $this->url->link('catalog/product/edit', 'user_token=' . $this->session->data['user_token'] . '&product_id=' . (int)$row['id'], true); + $admin_link = $this->url->link('catalog/product/edit', 'token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : '') . '&product_id=' . (int)$row['id'], true); $catalog_link_html = ''; if (isset($row['status']) && (int)$row['status'] === 1 && (empty($row['date_available']) || strtotime($row['date_available']) <= time()) && (isset($row['store_id']) && $row['store_id'] !== null)) { $catalog_link = $catalog_url . 'index.php?route=product/product&product_id=' . (int)$row['id']; @@ -1773,7 +1773,7 @@ class ModelModuleImgOpti extends Model { if (!$matched_image) continue; - $admin_link = $this->url->link('catalog/category/edit', 'user_token=' . $this->session->data['user_token'] . '&category_id=' . (int)$row['id'], true); + $admin_link = $this->url->link('catalog/category/edit', 'token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : '') . '&category_id=' . (int)$row['id'], true); $catalog_link_html = ''; if (isset($row['status']) && (int)$row['status'] === 1 && (isset($row['store_id']) && $row['store_id'] !== null)) { $catalog_link = $catalog_url . 'index.php?route=product/category&path=' . (int)$row['id']; @@ -1829,7 +1829,7 @@ class ModelModuleImgOpti extends Model { if (!$matched_image) continue; - $admin_link = $this->url->link('catalog/manufacturer/edit', 'user_token=' . $this->session->data['user_token'] . '&manufacturer_id=' . (int)$row['id'], true); + $admin_link = $this->url->link('catalog/manufacturer/edit', 'token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : '') . '&manufacturer_id=' . (int)$row['id'], true); $catalog_link_html = ''; if ((isset($row['store_id']) && $row['store_id'] !== null)) { $catalog_link = $catalog_url . 'index.php?route=product/manufacturer/info&manufacturer_id=' . (int)$row['id']; @@ -2751,7 +2751,7 @@ private function roundCornersGD($im, $radius) { } } if (!$fullPath || strpos(str_replace('\\', '/', $fullPath), str_replace('\\', '/', $realImageDir)) !== 0 || !is_file($fullPath)) { - $admin_link = $this->url->link($cfg['route'], 'user_token=' . $this->session->data['user_token'] . '&' . $cfg['param'] . '=' . (int)$row[$cfg['id']], true); + $admin_link = $this->url->link($cfg['route'], 'token=' . (isset($this->session->data['token']) ? $this->session->data['token'] : '') . '&' . $cfg['param'] . '=' . (int)$row[$cfg['id']], true); $search_links = $this->getSearchLinks($row[$cfg['name_field']], ($table === 'product_description' ? $row['model'] : '')); $rows[] = array( 'id' => 'html_broken-' . $table . '-' . (int)$row[$cfg['id']] . '-' . md5($cleanRelPath), diff --git a/upload/admin/view/template/module/img_opti.tpl b/upload/admin/view/template/module/img_opti.tpl index 1eb0baa..6810d23 100644 --- a/upload/admin/view/template/module/img_opti.tpl +++ b/upload/admin/view/template/module/img_opti.tpl @@ -9,7 +9,7 @@

@@ -62,10 +62,10 @@
@@ -73,8 +73,8 @@
@@ -136,19 +136,19 @@ - + - + - + - + - + @@ -273,9 +273,9 @@
@@ -347,8 +347,8 @@
@@ -477,9 +477,9 @@
@@ -909,7 +909,7 @@

- wget -q -O - "index.php?route=module/img_opti_cron&key=" >/dev/null 2>&1 + wget -q -O - "index.php?route=module/img_opti_cron&key=" >/dev/null 2>&1
@@ -1050,8 +1050,7 @@