diff --git a/admin-dev/tabs/AdminImages.php b/admin-dev/tabs/AdminImages.php
deleted file mode 100644
index e3dff8b50..000000000
--- a/admin-dev/tabs/AdminImages.php
+++ /dev/null
@@ -1,533 +0,0 @@
-
-* @copyright 2007-2011 PrestaShop SA
-* @version Release: $Revision: 7310 $
-* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
-* International Registered Trademark & Property of PrestaShop SA
-*/
-
-class AdminImages extends AdminTab
-{
- private $start_time = 0;
- private $max_execution_time = 7200;
-
- public function __construct()
- {
- $this->table = 'image_type';
- $this->className = 'ImageType';
- $this->lang = false;
- $this->edit = true;
- $this->delete = true;
-
- $this->fieldsDisplay = array(
- 'id_image_type' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
- 'name' => array('title' => $this->l('Name'), 'width' => 140, 'size' => 16),
- 'width' => array('title' => $this->l('Width'), 'align' => 'right', 'suffix' => ' px', 'width' => 50, 'size' => 5),
- 'height' => array('title' => $this->l('Height'), 'align' => 'right', 'suffix' => ' px', 'width' => 50, 'size' => 5)
- );
- parent::__construct();
- }
-
- public function displayList()
- {
- parent::displayList();
- $this->displayImagePreferences();
- $this->displayRegenerate();
- $this->displayMoveImages();
- }
-
- public function postProcess()
- {
- if (Tools::getValue('submitRegenerate'.$this->table))
- {
- if ($this->tabAccess['edit'] === '1')
- {
- if ($this->_regenerateThumbnails(Tools::getValue('type'), Tools::getValue('erase')))
- Tools::redirectAdmin(self::$currentIndex.'&conf=9'.'&token='.$this->token);
- }
- else
- $this->_errors[] = Tools::displayError('You do not have permission to edit here.');
- }elseif (Tools::getValue('submitMoveImages'.$this->table))
- {
- if ($this->tabAccess['edit'] === '1')
- {
- if($this->_moveImagesToNewFileSystem())
- Tools::redirectAdmin(self::$currentIndex.'&conf=25'.'&token='.$this->token);
- }
- else
- $this->_errors[] = Tools::displayError('You do not have permission to edit here.');
- }elseif (Tools::getValue('submitImagePreferences'))
- {
- if ($this->tabAccess['edit'] === '1')
- {
- if ((int)Tools::getValue('PS_JPEG_QUALITY') < 0
- || (int)Tools::getValue('PS_JPEG_QUALITY') > 100)
- $this->_errors[] = Tools::displayError('Incorrect value for JPEG image quality.');
- elseif ((int)Tools::getValue('PS_PNG_QUALITY') < 0
- || (int)Tools::getValue('PS_PNG_QUALITY') > 9)
- $this->_errors[] = Tools::displayError('Incorrect value for PNG image quality.');
- elseif (!Configuration::updateValue('PS_IMAGE_QUALITY', Tools::getValue('PS_IMAGE_QUALITY'))
- || !Configuration::updateValue('PS_JPEG_QUALITY', Tools::getValue('PS_JPEG_QUALITY'))
- || !Configuration::updateValue('PS_PNG_QUALITY', Tools::getValue('PS_PNG_QUALITY')))
- $this->_errors[] = Tools::displayError('Unknown error.');
- else
- Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=4');
- }
- else
- $this->_errors[] = Tools::displayError('You do not have permission to edit here.');
- }
- else
- parent::postProcess();
- }
-
- protected function _childValidation()
- {
- if (!Tools::getValue('id_image_type') AND Validate::isImageTypeName($typeName = Tools::getValue('name')) AND ImageType::typeAlreadyExists($typeName))
- $this->_errors[] = Tools::displayError('This name already exists.');
- }
-
- public function displayForm($isMainTab = true)
- {
- parent::displayForm();
-
- if (!($obj = $this->loadObject(true)))
- return;
-
- echo $obj->id ? $this->displayWarning($this->l('After modification, do not forget to regenerate thumbnails')) : '';
-
- echo '
- ';
- }
-
- /**
- * Display form for thumbnails regeneration
- */
- public function displayRegenerate()
- {
- $types = array(
- 'categories' => $this->l('Categories'),
- 'manufacturers' => $this->l('Manufacturers'),
- 'suppliers' => $this->l('Suppliers'),
- 'scenes' => $this->l('Scenes'),
- 'products' => $this->l('Products'),
- 'stores' => $this->l('Stores')
- );
- echo '
-
'.$this->l('Regenerate thumbnails').'
- '.$this->l('Regenerates thumbnails for all existing product images').'.
';
- $this->displayWarning($this->l('Please be patient, as this can take several minutes').' '.$this->l('Be careful! Manually generated thumbnails will be erased by automatically generated thumbnails.'));
- echo '
-
- ';
- }
-
- /**
- * Delete resized image then regenerate new one with updated settings
- */
- private function _deleteOldImages($dir, $type, $product = false)
- {
- if (!is_dir($dir))
- return false;
- $toDel = scandir($dir);
- foreach ($toDel AS $d)
- foreach ($type AS $imageType)
- if (preg_match('/^[0-9]+\-'.($product ? '[0-9]+\-' : '').$imageType['name'].'\.jpg$/', $d) OR preg_match('/^([[:lower:]]{2})\-default\-(.*)\.jpg$/', $d))
- if (file_exists($dir.$d))
- unlink($dir.$d);
-
- // delete product images using new filesystem.
- if ($product)
- {
- $productsImages = Image::getAllImages();
- foreach ($productsImages AS $k => $image)
- {
- $imageObj = new Image($image['id_image']);
- $imageObj->id_product = $image['id_product'];
- if (file_exists($dir.$imageObj->getImgFolder()))
- {
- $toDel = scandir($dir.$imageObj->getImgFolder());
- foreach ($toDel AS $d)
- foreach ($type AS $imageType)
- if (preg_match('/^[0-9]+\-'.$imageType['name'].'\.jpg$/', $d))
- if (file_exists($dir.$imageObj->getImgFolder().$d))
- unlink($dir.$imageObj->getImgFolder().$d);
- }
- }
- }
- }
-
- // Regenerate images
- private function _regenerateNewImages($dir, $type, $productsImages = false)
- {
- if (!is_dir($dir))
- return false;
- $errors = false;
- $toRegen = scandir($dir);
- if (!$productsImages)
- {
- foreach ($toRegen AS $image)
- if (preg_match('/^[0-9]*\.jpg$/', $image))
- foreach ($type AS $k => $imageType)
- {
- // Customizable writing dir
- $newDir = $dir;
- if ($imageType['name'] == 'thumb_scene')
- $newDir .= 'thumbs/';
- if (!file_exists($newDir))
- continue;
- if (!file_exists($newDir.substr($image, 0, -4).'-'.stripslashes($imageType['name']).'.jpg'))
- if (!imageResize($dir.$image, $newDir.substr($image, 0, -4).'-'.stripslashes($imageType['name']).'.jpg', (int)($imageType['width']), (int)($imageType['height'])))
- $errors = true;
- if (time() - $this->start_time > $this->max_execution_time - 4) // stop 4 seconds before the tiemout, just enough time to process the end of the page on a slow server
- return 'timeout';
- }
- }
- else
- {
- $productsImages = Image::getAllImages();
- foreach ($productsImages AS $k => $image)
- {
- $imageObj = new Image($image['id_image']);
- if (file_exists($dir.$imageObj->getExistingImgPath().'.jpg'))
- foreach ($type AS $k => $imageType)
- {
- if (!file_exists($dir.$imageObj->getExistingImgPath().'-'.stripslashes($imageType['name']).'.jpg'))
- if (!imageResize($dir.$imageObj->getExistingImgPath().'.jpg', $dir.$imageObj->getExistingImgPath().'-'.stripslashes($imageType['name']).'.jpg', (int)($imageType['width']), (int)($imageType['height'])))
- $errors = true;
- if (time() - $this->start_time > $this->max_execution_time - 4) // stop 4 seconds before the tiemout, just enough time to process the end of the page on a slow server
- return 'timeout';
- }
- }
- }
- return $errors;
- }
-
- // Regenerate no-pictures images
- private function _regenerateNoPictureImages($dir, $type, $languages)
- {
- $errors = false;
- foreach ($type AS $k => $imageType)
- foreach ($languages AS $language)
- {
- $file = $dir.$language['iso_code'].'.jpg';
- if (!file_exists($file))
- $file = _PS_PROD_IMG_DIR_.Language::getIsoById((int)(Configuration::get('PS_LANG_DEFAULT'))).'.jpg';
- if (!file_exists($dir.$language['iso_code'].'-default-'.stripslashes($imageType['name']).'.jpg'))
- if (!imageResize($file, $dir.$language['iso_code'].'-default-'.stripslashes($imageType['name']).'.jpg', (int)($imageType['width']), (int)($imageType['height'])))
- $errors = true;
- }
- return $errors;
- }
-
- // Hook watermark optimization
- private function _regenerateWatermark($dir)
- {
- $result = Db::getInstance()->executeS('
- SELECT m.`name` FROM `'._DB_PREFIX_.'module` m
- LEFT JOIN `'._DB_PREFIX_.'hook_module` hm ON hm.`id_module` = m.`id_module`
- LEFT JOIN `'._DB_PREFIX_.'hook` h ON hm.`id_hook` = h.`id_hook`
- WHERE h.`name` = \'watermark\' AND m.`active` = 1');
-
- if ($result AND sizeof($result))
- {
- $productsImages = Image::getAllImages();
- foreach ($productsImages AS $k => $image)
- {
- $imageObj = new Image($image['id_image']);
- if (file_exists($dir.$imageObj->getExistingImgPath().'.jpg'))
- foreach ($result AS $k => $module)
- {
- if ($moduleInstance = Module::getInstanceByName($module['name']) AND is_callable(array($moduleInstance, 'hookwatermark')))
- call_user_func(array($moduleInstance, 'hookwatermark'), array('id_image' => $imageObj->id, 'id_product' => $imageObj->id_product));
- if (time() - $this->start_time > $this->max_execution_time - 4) // stop 4 seconds before the tiemout, just enough time to process the end of the page on a slow server
- return 'timeout';
- }
- }
- }
- }
-
- private function _regenerateThumbnails($type = 'all', $deleteOldImages = false)
- {
- $this->start_time = time();
- ini_set('max_execution_time', $this->max_execution_time); // ini_set may be disabled, we need the real value
- $this->max_execution_time = (int)ini_get('max_execution_time');
- $languages = Language::getLanguages(false);
-
- $process =
- array(
- array('type' => 'categories', 'dir' => _PS_CAT_IMG_DIR_),
- array('type' => 'manufacturers', 'dir' => _PS_MANU_IMG_DIR_),
- array('type' => 'suppliers', 'dir' => _PS_SUPP_IMG_DIR_),
- array('type' => 'scenes', 'dir' => _PS_SCENE_IMG_DIR_),
- array('type' => 'products', 'dir' => _PS_PROD_IMG_DIR_),
- array('type' => 'stores', 'dir' => _PS_STORE_IMG_DIR_)
- );
-
- // Launching generation process
- foreach ($process AS $k => $proc)
- {
- if ($type != 'all' && $type != $proc['type'])
- continue ;
-
- // Getting format generation
- $formats = ImageType::getImagesTypes($proc['type']);
- if ($type != 'all')
- {
- $format = strval(Tools::getValue('format_'.$type));
- if ($format != 'all')
- foreach ($formats AS $k => $form)
- if ($form['id_image_type'] != $format)
- unset($formats[$k]);
- }
-
- if ($deleteOldImages)
- $this->_deleteOldImages($proc['dir'], $formats, ($proc['type'] == 'products' ? true : false));
- if (($return = $this->_regenerateNewImages($proc['dir'], $formats, ($proc['type'] == 'products' ? true : false))) === true)
- $this->_errors[] = Tools::displayError('Cannot write ').$proc['type'].Tools::displayError(' images. Please check the folder\'s writing permissions.');
- elseif ($return == 'timeout')
- $this->_errors[] = Tools::displayError('Only part of the images have been regenerated, server timed out before finishing.');
- else
- {
- if ($proc['type'] == 'products')
- if ($this->_regenerateWatermark($proc['dir']) == 'timeout')
- $this->_errors[] = Tools::displayError('Server timed out, the watermark may not have been applied on all your images.');
- if (!count($this->_errors))
- if ($this->_regenerateNoPictureImages($proc['dir'], $formats, $languages))
- $this->_errors[] = Tools::displayError('Cannot write no-picture image to').' ('.$proc['type'].') '.Tools::displayError('images folder. Please check the folder\'s writing permissions.');
- }
- }
- return (sizeof($this->_errors) > 0 ? false : true);
- }
-
- /**
- * Display the block for moving images
- */
- public function displayMoveImages()
- {
- $safe_mode = ini_get('safe_mode');
-
- echo '
-
'.$this->l('Move images').'
'.
- $this->l('A new storage system for product images is now used by PrestaShop. It offers better performance if your shop has a very large number of products.').' '.
- ' ';
- if (file_exists(_PS_PROD_IMG_DIR_.'duplicates/'))
- {
- echo '
';
- $this->displayWarning($this->l('Duplicate images were found when moving the product images. It is probably caused by unused demonstration images. Please make sure that the folder ').
- _PS_PROD_IMG_DIR_.'duplicates/'.
- $this->l(' only contains demonstration images then delete this folder.'));
- echo '
';
- }
- if($safe_mode)
- $this->displayWarning($this->l('PrestaShop has detected that your server configuration is not compatible with the new storage system (directive "safe_mode" is activated). You should continue to use the actual system.'));
- else
- echo '
- ';
-}
-
- /**
- * Move product images to the new filesystem
- */
- private function _moveImagesToNewFileSystem()
- {
- if (!Image::testFileSystem())
- $this->_errors[] = Tools::displayError('Error: your server configuration is not compatible with the new image system. No images were moved');
- else
- {
- ini_set('max_execution_time', $this->max_execution_time); // ini_set may be disabled, we need the real value
- $this->max_execution_time = (int)ini_get('max_execution_time');
- $result = Image::moveToNewFileSystem($this->max_execution_time);
- if ($result === 'timeout')
- $this->_errors[] = Tools::displayError('Not all images have been moved, server timed out before finishing. Click on \"Move images\" again to resume moving images');
- else if ($result === false)
- $this->_errors[] = Tools::displayError('Error: some or all images could not be moved.');
- }
- return (sizeof($this->_errors) > 0 ? false : true);
- }
-
- /**
- * Display the block for moving images
- */
- public function displayImagePreferences()
- {
- echo '
- ';
-}
-}