Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions ps_imageslider.php
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,9 @@ protected function _postValidation()
if (Tools::getValue('image_old_' . $language['id_lang']) != null && !Validate::isFileName(Tools::getValue('image_old_' . $language['id_lang']))) {
$errors[] = $this->trans('Invalid filename.', [], 'Modules.Imageslider.Admin');
}
if (!Tools::isSubmit('has_picture') && (!isset($_FILES['image_' . $language['id_lang']]) || empty($_FILES['image_' . $language['id_lang']]['tmp_name']))) {
$errors[] = $this->trans('The image is not set.', [], 'Modules.Imageslider.Admin');
}
}

/* Checks title/legend/description for default lang */
Expand Down Expand Up @@ -613,10 +616,12 @@ public function hookActionShopDataDuplication($params)

public function headerHTML()
{
if ('AdminModules' !== Tools::getValue('controller') ||
if (
'AdminModules' !== Tools::getValue('controller') ||
Tools::getValue('configure') !== $this->name ||
Tools::getIsset('id_slide') ||
Tools::getIsset('addSlide')) {
Tools::getIsset('addSlide')
) {
return;
}

Expand Down Expand Up @@ -677,8 +682,8 @@ public function getSlides($active = null, $forceShowAll = false)
LEFT JOIN ' . _DB_PREFIX_ . 'homeslider_slides_lang hssl ON (hss.id_homeslider_slides = hssl.id_homeslider_slides)
WHERE id_shop = ' . (int) $id_shop . '
AND hssl.id_lang = ' . (int) $id_lang .
($forceShowAll ? '' : ' AND hssl.`image` <> ""') .
($active ? ' AND hss.`active` = 1' : ' ') . '
($forceShowAll ? '' : ' AND hssl.`image` <> ""') .
($active ? ' AND hss.`active` = 1' : ' ') . '
ORDER BY hss.position'
);

Expand All @@ -705,7 +710,7 @@ public function getAllImagesBySlidesId($id_slides, $active = null, $id_shop = nu
LEFT JOIN ' . _DB_PREFIX_ . 'homeslider_slides hss ON (hs.id_homeslider_slides = hss.id_homeslider_slides)
LEFT JOIN ' . _DB_PREFIX_ . 'homeslider_slides_lang hssl ON (hss.id_homeslider_slides = hssl.id_homeslider_slides)
WHERE hs.`id_homeslider_slides` = ' . (int) $id_slides . ' AND hs.`id_shop` = ' . (int) $id_shop .
($active ? ' AND hss.`active` = 1' : ' ')
($active ? ' AND hss.`active` = 1' : ' ')
);

foreach ($results as $result) {
Expand Down