// ImageType is now applied to a them

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11700 b9a71923-0436-4b27-9f14-aed3839534dd

classes/FileUploader.php

@@ -154,8 +154,11 @@ class qqUploadedFileXhr
 		{
 			$imagesTypes = ImageType::getImagesTypes('products');
 			foreach ($imagesTypes AS $k => $imageType)
-				if (!imageResize($tmpName, $new_path.'-'.stripslashes($imageType['name']).'.'.$image->image_format, $imageType['width'], $imageType['height'], $image->image_format))
+			{
+				$theme = (Shop::isFeatureActive() ? '-'.$imageType['id_theme'] : '');
+				if (!imageResize($tmpName, $new_path.'-'.stripslashes($imageType['name']).$theme.'.'.$image->image_format, $imageType['width'], $imageType['height'], $image->image_format))
 					return array('error' => Tools::displayError('An error occurred while copying image:').' '.stripslashes($imageType['name']));
+			}
 		}
 		unlink($tmpName);
 		Hook::exec('watermark', array('id_image' => $id_image, 'id_product' => $id_product));

classes/Image.php

@@ -238,12 +238,13 @@ class ImageCore extends ObjectModel
 				$new_path = $image_new->getPathForCreation();
 				foreach ($images_types as $image_type)
 				{
-					if (file_exists(_PS_PROD_IMG_DIR_.$image_old->getExistingImgPath().'-'.$image_type['name'].'.jpg'))
+					$theme = (Shop::isFeatureActive() ? '-'.$image_type['id_theme'] : '');
+					if (file_exists(_PS_PROD_IMG_DIR_.$image_old->getExistingImgPath().'-'.$image_type['name'].$theme.'.jpg'))
 					{
 						if (!Configuration::get('PS_LEGACY_IMAGES'))
 						$image_new->createImgFolder();
-						copy(_PS_PROD_IMG_DIR_.$image_old->getExistingImgPath().'-'.$image_type['name'].'.jpg',
+						copy(_PS_PROD_IMG_DIR_.$image_old->getExistingImgPath().'-'.$image_type['name'].$theme.'.jpg',
-						$new_path.'-'.$image_type['name'].'.jpg');
+						$new_path.'-'.$image_type['name'].$theme.'.jpg');
 					}
 				}
 			if (file_exists(_PS_PROD_IMG_DIR_.$image_old->getExistingImgPath().'.jpg'))
@@ -401,8 +402,10 @@ class ImageCore extends ObjectModel
 		// Delete auto-generated images
 		$image_types = ImageType::getImagesTypes();
 		foreach ($image_types as $image_type)
-			$files_to_delete[] = $this->image_dir.$this->getExistingImgPath().'-'.$image_type['name'].'.'.$this->image_format;
+		{
-
+			$theme = (Shop::isFeatureActive() ? '-'.$image_type['id_theme'] : '');
+			$files_to_delete[] = $this->image_dir.$this->getExistingImgPath().'-'.$image_type['name'].$theme.'.'.$this->image_format;
+		}
 		// Delete watermark image
 		$files_to_delete[] = $this->image_dir.$this->getExistingImgPath().'-watermark.'.$this->image_format;
 		// delete index.php

classes/ImageType.php

@@ -29,6 +29,9 @@ class ImageTypeCore extends ObjectModel
 {
 	public		$id;
 
+	/** @var string id_theme */
+	public		$id_theme;
+	
 	/** @var string Name */
 	public		$name;
 
@@ -63,6 +66,7 @@ class ImageTypeCore extends ObjectModel
 		'table' => 'image_type',
 		'primary' => 'id_image_type',
 		'fields' => array(
+			'id_theme' => 			array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId', 'required' => true),
 			'name' => 			array('type' => self::TYPE_STRING, 'validate' => 'isImageTypeName', 'required' => true, 'size' => 16),
 			'width' => 			array('type' => self::TYPE_INT, 'validate' => 'isImageSize', 'required' => true),
 			'height' => 		array('type' => self::TYPE_INT, 'validate' => 'isImageSize', 'required' => true),
@@ -88,16 +92,17 @@ class ImageTypeCore extends ObjectModel
 	* @param string|null Image type
 	* @return array Image type definitions
 	*/
-	public static function getImagesTypes($type = NULL)
+	public static function getImagesTypes($type = NULL, $id_theme = false)
 	{
-		if (!isset(self::$images_types_cache[$type]))
+		if (!isset(self::$images_types_cache[$type.($id_theme ? '-'.$id_theme : '')]))
 		{
+			$where = 'WHERE 1';
+			if ($id_theme)
+				$where .= ' AND id_theme='.(int)$id_theme;
 			if (!empty($type))
-				$where = 'WHERE ' . pSQL($type) . ' = 1 ';
+				$where .= ' AND ' . pSQL($type) . ' = 1 ';
-			else
-				$where = '';
 
-			$query = 'SELECT * FROM `'._DB_PREFIX_.'image_type`'.$where.'ORDER BY `name` ASC';
+			$query = 'SELECT * FROM `'._DB_PREFIX_.'image_type`'.$where.' ORDER BY `name` ASC';
 			self::$images_types_cache[$type] = Db::getInstance()->executeS($query);
 		}
 

classes/Link.php

@@ -306,24 +306,26 @@ class LinkCore
 	public function getImageLink($name, $ids, $type = null)
 	{
 		// legacy mode or default image
+		$theme = ((Shop::isFeatureActive() && file_exists(_PS_PROD_IMG_DIR_.$ids.($type ? '-'.$type : '').'-'.(int)Context::getContext()->shop->id_theme.'.jpg')) ? '-'.Context::getContext()->shop->id_theme : '');
 		if ((Configuration::get('PS_LEGACY_IMAGES')
-			&& (file_exists(_PS_PROD_IMG_DIR_.$ids.($type ? '-'.$type : '').'.jpg')))
+			&& (file_exists(_PS_PROD_IMG_DIR_.$ids.($type ? '-'.$type : '').$theme.'.jpg')))
 			|| strpos($ids, 'default') !== false)
 		{
-		if ($this->allow == 1)
+			if ($this->allow == 1)
-			$uri_path = __PS_BASE_URI__.$ids.($type ? '-'.$type : '').'/'.$name.'.jpg';
+				$uri_path = __PS_BASE_URI__.$ids.($type ? '-'.$type : '').$theme.'/'.$name.'.jpg';
+			else
+				$uri_path = _THEME_PROD_DIR_.$ids.($type ? '-'.$type : '').$theme.'.jpg';
+		}
 		else
-			$uri_path = _THEME_PROD_DIR_.$ids.($type ? '-'.$type : '').'.jpg';
-		}else
 		{
 			// if ids if of the form id_product-id_image, we want to extract the id_image part
 			$split_ids = explode('-', $ids);
 			$id_image = (isset($split_ids[1]) ? $split_ids[1] : $split_ids[0]);
-
+			$theme = ((Shop::isFeatureActive() && file_exists(_PS_PROD_IMG_DIR_.Image::getImgFolderStatic($id_image).$id_image.($type ? '-'.$type : '').'-'.(int)Context::getContext()->shop->id_theme.'.jpg')) ? '-'.Context::getContext()->shop->id_theme : '');
 			if ($this->allow == 1)
-				$uri_path = __PS_BASE_URI__.$id_image.($type ? '-'.$type : '').'/'.$name.'.jpg';
+				$uri_path = __PS_BASE_URI__.$id_image.($type ? '-'.$type : '').$theme.'/'.$name.'.jpg';
 			else
-				$uri_path = _THEME_PROD_DIR_.Image::getImgFolderStatic($id_image).$id_image.($type ? '-'.$type : '').'.jpg';
+				$uri_path = _THEME_PROD_DIR_.Image::getImgFolderStatic($id_image).$id_image.($type ? '-'.$type : '').$theme.'.jpg';
 		}
 
 		return $this->protocol_content.Tools::getMediaServer($uri_path).$uri_path;

classes/Tools.php

@@ -1566,8 +1566,8 @@ class ToolsCore
 			fwrite($write_fd, "# Images\n");
 			if (Configuration::get('PS_LEGACY_IMAGES'))
 			{
-				fwrite($write_fd, 'RewriteRule ^([a-z0-9]+)\-([a-z0-9]+)(\-[_a-zA-Z0-9-]*)/[_a-zA-Z0-9-\pL]*\.jpg$ '._PS_PROD_IMG_.'$1-$2$3.jpg [L]'."\n");
+				fwrite($write_fd, 'RewriteRule (*UTF8)^([a-z0-9]+)\-([a-z0-9]+)(\-[_a-zA-Z0-9-]*)(-[0-9]+)?/[_a-zA-Z0-9-\pL]*\.jpg$ '._PS_PROD_IMG_.'$1-$2$3$4.jpg [L]'."\n");
-				fwrite($write_fd, 'RewriteRule ^([0-9]+)\-([0-9]+)/[_a-zA-Z0-9-\pL]*\.jpg$ '._PS_PROD_IMG_.'$1-$2.jpg [L]'."\n");
+				fwrite($write_fd, 'RewriteRule (*UTF8)^([0-9]+)\-([0-9]+)(-[0-9]+)?/[_a-zA-Z0-9-\pL]*\.jpg$ '._PS_PROD_IMG_.'$1-$2$3.jpg [L]'."\n");
 			}
 
 			// Rewrite product images < 100 millions
@@ -1580,10 +1580,10 @@ class ToolsCore
 					$img_name .= '$'.$j;
 				}
 				$img_name .= '$'.$j;
-				fwrite($write_fd, 'RewriteRule ^'.str_repeat('([0-9])', $i).'(\-[_a-zA-Z0-9-]*)?/[_a-zA-Z0-9-\pL]*\.jpg$ '._PS_PROD_IMG_.$img_path.$img_name.".jpg [L]\n");
+				fwrite($write_fd, 'RewriteRule (*UTF8)^'.str_repeat('([0-9])', $i).'(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/[_a-zA-Z0-9-\pL]*\.jpg$ '._PS_PROD_IMG_.$img_path.$img_name.'$'.($j+1).".jpg [L]\n");
 			}
-			fwrite($write_fd, 'RewriteRule ^c/([0-9]+)(\-[_a-zA-Z0-9-\pL]*)/[_a-zA-Z0-9-]*\.jpg$ img/c/$1$2.jpg [L]'."\n");
+			fwrite($write_fd, 'RewriteRule (*UTF8)^c/([0-9]+)(\-[_a-zA-Z0-9-\pL]*)(-[0-9]+)?/[_a-zA-Z0-9-]*\.jpg$ img/c/$1$2$3.jpg [L]'."\n");
-			fwrite($write_fd, 'RewriteRule ^c/([a-zA-Z-]+)/[a-zA-Z0-9-\pL]+\.jpg$ img/c/$1.jpg [L]'."\n");
+			fwrite($write_fd, 'RewriteRule (*UTF8)^c/([a-zA-Z-]+)(-[0-9]+)?/[a-zA-Z0-9-\pL]+\.jpg$ img/c/$1$2.jpg [L]'."\n");
 		}
 
 		// Redirections to dispatcher

classes/webservice/WebserviceSpecificManagementImages.php

@@ -982,8 +982,11 @@ class WebserviceSpecificManagementImagesCore implements WebserviceSpecificManage
 						{
 							$imagesTypes = ImageType::getImagesTypes('products');
 							foreach ($imagesTypes AS $imageType)
-								if (!imageResize($tmpName, _PS_PROD_IMG_DIR_.$image->getExistingImgPath().'-'.stripslashes($imageType['name']).'.'.$image->image_format, $imageType['width'], $imageType['height'], $image->image_format))
+							{
+								$theme = (Shop::isFeatureActive() ? '-'.$image_type['id_theme'] : '');
+								if (!imageResize($tmpName, _PS_PROD_IMG_DIR_.$image->getExistingImgPath().'-'.stripslashes($imageType['name']).$theme.'.'.$image->image_format, $imageType['width'], $imageType['height'], $image->image_format))
 									$this->_errors[] = Tools::displayError('An error occurred while copying image:').' '.stripslashes($imageType['name']);
+							}
 						}
 						@unlink($tmpName);
 						$this->imgToDisplay = _PS_PROD_IMG_DIR_.$image->getExistingImgPath().'.'.$image->image_format;

controllers/admin/AdminCategoriesController.php

@@ -425,11 +425,14 @@ class AdminCategoriesControllerCore extends AdminController
 		{
 			$images_types = ImageType::getImagesTypes('categories');
 			foreach ($images_types as $k => $image_type)
+			{
+				$theme = (Shop::isFeatureActive() ? '-'.$image_type['id_theme'] : '');
 				imageResize(
 					_PS_CAT_IMG_DIR_.$id_category.'.jpg',
-					_PS_CAT_IMG_DIR_.$id_category.'-'.stripslashes($image_type['name']).'.jpg',
+					_PS_CAT_IMG_DIR_.$id_category.'-'.stripslashes($image_type['name']).$theme.'.jpg',
 					(int)$image_type['width'], (int)$image_type['height']
 				);
+			}
 		}
 		return $ret;
 	}

controllers/admin/AdminImagesController.php

@@ -69,6 +69,13 @@ class AdminImagesControllerCore extends AdminController
 				'title' => $this->l('Images'),
 				'image' => '../img/admin/picture.gif'
 			),
+			'input' => array(
+				array(
+					'type' => 'text',
+					'label' => $this->l('Theme:'),
+					'name' => 'theme',
+					
+				),
 			'input' => array(
 				array(
 					'type' => 'text',
@@ -363,6 +370,8 @@ class AdminImagesControllerCore extends AdminController
 				if (preg_match('/^[0-9]*\.jpg$/', $image))
 					foreach ($type AS $k => $imageType)
 					{
+
+						$theme = (Shop::isFeatureActive() ? '-'.$imageType['id_theme'] : '');
 						// Customizable writing dir
 						$newDir = $dir;
 						if ($imageType['name'] == 'thumb_scene')
@@ -370,7 +379,7 @@ class AdminImagesControllerCore extends AdminController
 						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'])))
+							if (!imageResize($dir.$image, $newDir.substr($image, 0, -4).'-'.stripslashes($imageType['name']).$theme.'.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';
@@ -385,14 +394,16 @@ class AdminImagesControllerCore extends AdminController
 				if (file_exists($dir.$imageObj->getExistingImgPath().'.jpg'))
 					foreach ($type AS $k => $imageType)
 					{
+						$theme = (Shop::isFeatureActive() ? '-'.$imageType['id_theme'] : '');
 						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'])))
+							if (!imageResize($dir.$imageObj->getExistingImgPath().'.jpg', $dir.$imageObj->getExistingImgPath().'-'.stripslashes($imageType['name']).$theme.'.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;
 	}
 
@@ -401,15 +412,18 @@ class AdminImagesControllerCore extends AdminController
 	{
 		$errors = false;
 		foreach ($type AS $k => $imageType)
+		{
+			$theme = (Shop::isFeatureActive() ? '-'.$imageType['id_theme'] : '');
 			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'])))
+					if (!imageResize($file, $dir.$language['iso_code'].'-default-'.stripslashes($imageType['name']).$theme.'.jpg', (int)($imageType['width']), (int)($imageType['height'])))
 						$errors = true;
 			}
+		}
 		return $errors;
 	}
 

controllers/admin/AdminImportController.php

@@ -700,7 +700,10 @@ class AdminImportControllerCore extends AdminController
 			imageResize($tmpfile, $path.'.jpg');
 			$images_types = ImageType::getImagesTypes($entity);
 			foreach ($images_types as $k => $image_type)
-				imageResize($tmpfile, $path.'-'.stripslashes($image_type['name']).'.jpg', $image_type['width'], $image_type['height']);
+			{
+				$theme = (Shop::isFeatureActive() ? '-'.$image_type['id_theme'] : '');
+				imageResize($tmpfile, $path.'-'.stripslashes($image_type['name']).$theme.'.jpg', $image_type['width'], $image_type['height']);
+			}
 			if (in_array($image_type['id_image_type'], $watermark_types))
 				Hook::exec('watermark', array('id_image' => $id_image, 'id_product' => $id_entity));
 		}

controllers/admin/AdminLanguagesController.php

@@ -433,11 +433,12 @@ class AdminLanguagesControllerCore extends AdminController
 					$images_types = ImageType::getImagesTypes('products');
 					foreach ($images_types as $k => $image_type)
 					{
-						if (!imageResize($tmp_name, _PS_IMG_DIR_.'p/'.$language.'-default-'.stripslashes($image_type['name']).'.jpg', $image_type['width'], $image_type['height']))
+						$theme = (Shop::isFeatureActive() ? '-'.$image_type['id_theme'] : '');
+						if (!imageResize($tmp_name, _PS_IMG_DIR_.'p/'.$language.'-default-'.stripslashes($image_type['name']).$theme.'.jpg', $image_type['width'], $image_type['height']))
 							$this->_errors[] = Tools::displayError('An error occurred while resizing no-picture image to your product directory.');
-						if (!imageResize($tmp_name, _PS_IMG_DIR_.'c/'.$language.'-default-'.stripslashes($image_type['name']).'.jpg', $image_type['width'], $image_type['height']))
+						if (!imageResize($tmp_name, _PS_IMG_DIR_.'c/'.$language.'-default-'.stripslashes($image_type['name']).$theme.'.jpg', $image_type['width'], $image_type['height']))
 							$this->_errors[] = Tools::displayError('An error occurred while resizing no-picture image to your category directory.');
-						if (!imageResize($tmp_name, _PS_IMG_DIR_.'m/'.$language.'-default-'.stripslashes($image_type['name']).'.jpg', $image_type['width'], $image_type['height']))
+						if (!imageResize($tmp_name, _PS_IMG_DIR_.'m/'.$language.'-default-'.stripslashes($image_type['name']).$theme.'.jpg', $image_type['width'], $image_type['height']))
 							$this->_errors[] = Tools::displayError('An error occurred while resizing no-picture image to your manufacturer directory.');
 					}
 				}

controllers/admin/AdminManufacturersController.php

@@ -683,12 +683,15 @@ class AdminManufacturersControllerCore extends AdminController
 		{
 			$images_types = ImageType::getImagesTypes('manufacturers');
 			foreach ($images_types as $k => $image_type)
+			{
+				$theme = (Shop::isFeatureActive() ? '-'.$image_type['id_theme'] : '');
 				imageResize(
 					_PS_MANU_IMG_DIR_.$id_manufacturer.'.jpg',
-					_PS_MANU_IMG_DIR_.$id_manufacturer.'-'.stripslashes($image_type['name']).'.jpg',
+					_PS_MANU_IMG_DIR_.$id_manufacturer.'-'.stripslashes($image_type['name']).$theme.'.jpg',
 					(int)$image_type['width'],
 					(int)$image_type['height']
 				);
+			}
 		}
 	}
 }

controllers/admin/AdminProductsController.php

@@ -1370,8 +1370,11 @@ class AdminProductsControllerCore extends AdminController
 			{
 				$imagesTypes = ImageType::getImagesTypes('products');
 				foreach ($imagesTypes as $k => $image_type)
-					if (!imageResize($tmpName, $new_path.'-'.stripslashes($image_type['name']).'.'.$image->image_format, $image_type['width'], $image_type['height'], $image->image_format))
+				{
+					$theme = (Shop::isFeatureActive() ? '-'.$image_type['id_theme'] : '');
+					if (!imageResize($tmpName, $new_path.'-'.stripslashes($image_type['name']).$theme.'.'.$image->image_format, $image_type['width'], $image_type['height'], $image->image_format))
 						$this->_errors[] = Tools::displayError('An error occurred while copying image:').' '.stripslashes($image_type['name']);
+				}
 			}
 
 			@unlink($tmpName);

controllers/admin/AdminScenesController.php

@@ -74,10 +74,11 @@ class AdminScenesControllerCore extends AdminController
 			$images_types = ImageType::getImagesTypes('scenes');
 			foreach ($images_types as $k => $image_type)
 			{
+				$theme = (Shop::isFeatureActive() ? '-'.$image_type['id_theme'] : '');
 				if ($image_type['name'] == 'large_scene' && isset($_FILES['image']))
 					imageResize(
 						$_FILES['image']['tmp_name'],
-						_PS_SCENE_IMG_DIR_.$obj->id.'-'.stripslashes($image_type['name']).'.jpg',
+						_PS_SCENE_IMG_DIR_.$obj->id.'-'.stripslashes($image_type['name']).$theme.'.jpg',
 						(int)$image_type['width'],
 						(int)$image_type['height']
 					);
@@ -89,7 +90,7 @@ class AdminScenesControllerCore extends AdminController
 						$tmp_name = $_FILES['image']['tmp_name'];
 					imageResize(
 						$tmp_name,
-						_PS_SCENE_THUMB_IMG_DIR_.$obj->id.'-'.stripslashes($image_type['name']).'.jpg',
+						_PS_SCENE_THUMB_IMG_DIR_.$obj->id.'-'.stripslashes($image_type['name']).$theme.'.jpg',
 						(int)$image_type['width'],
 						(int)$image_type['height']
 					);

controllers/admin/AdminStoresController.php

@@ -373,10 +373,13 @@ class AdminStoresControllerCore extends AdminController
 		{
 			$images_types = ImageType::getImagesTypes('stores');
 			foreach ($images_types as $k => $image_type)
+			{
+				$theme = (Shop::isFeatureActive() ? '-'.$image_type['id_theme'] : '');
 				imageResize(_PS_STORE_IMG_DIR_.$id_store.'.jpg',
-							_PS_STORE_IMG_DIR_.$id_store.'-'.stripslashes($image_type['name']).'.jpg',
+							_PS_STORE_IMG_DIR_.$id_store.'-'.stripslashes($image_type['name']).$theme.'.jpg',
 							(int)$image_type['width'], (int)$image_type['height']
 				);
+			}
 		}
 		return $ret;
 	}

controllers/admin/AdminSuppliersController.php

@@ -306,7 +306,8 @@ class AdminSuppliersControllerCore extends AdminController
 			foreach ($images_types as $k => $image_type)
 			{
 				$file = _PS_SUPP_IMG_DIR_.$id_supplier.'.jpg';
-				imageResize($file, _PS_SUPP_IMG_DIR_.$id_supplier.'-'.stripslashes($image_type['name']).'.jpg', (int)$image_type['width'], (int)$image_type['height']);
+				$theme = (Shop::isFeatureActive() ? '-'.$image_type['id_theme'] : '');
+				imageResize($file, _PS_SUPP_IMG_DIR_.$id_supplier.'-'.stripslashes($image_type['name']).$theme.'.jpg', (int)$image_type['width'], (int)$image_type['height']);
 			}
 		}
 	}

install-dev/sql/db.sql

@@ -867,6 +867,7 @@ CREATE TABLE `PREFIX_image_lang` (
 
 CREATE TABLE `PREFIX_image_type` (
   `id_image_type` int(10) unsigned NOT NULL auto_increment,
+  `id_theme` INT(11) unsigned NOT NULL,
   `name` varchar(16) NOT NULL,
   `width` int(10) unsigned NOT NULL,
   `height` int(10) unsigned NOT NULL,
@@ -877,7 +878,7 @@ CREATE TABLE `PREFIX_image_type` (
   `scenes` tinyint(1) NOT NULL default '1',
   `stores` tinyint(1) NOT NULL default '1',
   PRIMARY KEY  (`id_image_type`),
-  KEY `image_type_name` (`name`)
+  UNIQUE KEY `image_type_name` (`id_theme`, `name`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;
 
 CREATE TABLE `PREFIX_lang` (

install-dev/sql/db_settings_lite.sql

@@ -339,11 +339,7 @@ INSERT INTO `PREFIX_configuration` (`id_configuration`, `name`, `value`, `date_a
 (162, 'PS_UNIDENTIFIED_GROUP', '1', NOW(), NOW()),
 (163, 'PS_GUEST_GROUP', '2', NOW(), NOW()),
 (164, 'PS_CUSTOMER_GROUP', '3', NOW(), NOW()),
-(165, 'PS_SMARTY_CONSOLE', 0, NOW(), NOW()),
+(165, 'PS_SMARTY_CONSOLE', 0, NOW(), NOW());
-(166, 'PS_B2B_ENABLE', '0', NOW(), NOW()),
-(167, 'PS_INVOICE_MODEL', 'invoice', NOW(), NOW()),
-(168, 'PS_LIMIT_UPLOAD_IMAGE_VALUE', '2', NOW(), NOW()),
-(169, 'PS_LIMIT_UPLOAD_FILE_VALUE', '2', NOW(), NOW());
 
 INSERT INTO `PREFIX_configuration_lang` (`id_configuration`, `id_lang`, `value`, `date_upd`) VALUES
 (36, 1, 'IN', NOW()),(36, 2, 'FA', NOW()),(36, 3, 'CU', NOW()),(36, 4, 'FA', NOW()),(36, 5, 'FA', NOW()),
@@ -908,15 +904,15 @@ INSERT INTO `PREFIX_currency` (`name`, `iso_code`, `iso_code_num`, `sign`, `blan
 ('Singapour Dollar', 'SGD', '702', '$', 1, 1.77, 2, 0, 0), ('Baht', 'THB', '764', '฿', 1, 40.96, 2, 0, 0), ('Rand', 'ZAR', '710', 'R', 1, 9.38, 2, 0, 0);*/
 INSERT INTO `PREFIX_currency_shop` (`id_currency`, `id_shop`) VALUES (1,1), (2,1), (3,1);
 
-INSERT INTO `PREFIX_image_type` (`id_image_type`, `name`, `width`, `height`, `products`, `categories`, `manufacturers`, `suppliers`, `scenes`, `stores`) VALUES
+INSERT INTO `PREFIX_image_type` (`id_image_type`, `id_theme`, `name`, `width`, `height`, `products`, `categories`, `manufacturers`, `suppliers`, `scenes`, `stores`) VALUES
-(1, 'small', 45, 45, 1, 1, 1, 1, 0, 0),
+(1, 1, 'small', 45, 45, 1, 1, 1, 1, 0, 0),
-(2, 'medium', 58, 58, 1, 1, 1, 1, 0, 1),
+(2, 1, 'medium', 58, 58, 1, 1, 1, 1, 0, 1),
-(3, 'large', 264, 264, 1, 1, 1, 1, 0, 0),
+(3, 1, 'large', 264, 264, 1, 1, 1, 1, 0, 0),
-(4, 'thickbox', 600, 600, 1, 0, 0, 0, 0, 0),
+(4, 1, 'thickbox', 600, 600, 1, 0, 0, 0, 0, 0),
-(5, 'category', 500, 150, 0, 1, 0, 0, 0, 0),
+(5, 1, 'category', 500, 150, 0, 1, 0, 0, 0, 0),
-(6, 'home', 124, 124, 1, 0, 0, 0, 0, 0),
+(6, 1, 'home', 124, 124, 1, 0, 0, 0, 0, 0),
-(7, 'large_scene', 556, 200, 0, 0, 0, 0, 1, 0),
+(7, 1, 'large_scene', 556, 200, 0, 0, 0, 0, 1, 0),
-(8, 'thumb_scene', 161, 58, 0, 0, 0, 0, 1, 0);
+(8, 1, 'thumb_scene', 161, 58, 0, 0, 0, 0, 1, 0);
 
 INSERT INTO `PREFIX_contact_shop` (`id_contact`, `id_shop`) VALUES (1,1), (2,1);
 
@@ -935,12 +931,11 @@ INSERT INTO `PREFIX_contact_lang` (`id_contact`, `id_lang`, `name`, `description
 INSERT INTO `PREFIX_profile` (`id_profile`) VALUES (1);
 INSERT INTO `PREFIX_profile_lang` (`id_profile`, `id_lang`, `name`) VALUES (1, 1, 'SuperAdmin'),(1, 2, 'SuperAdmin'),(1, 3, 'SuperAdmin'),(1, 4, 'SuperAdmin'),(1, 5, 'SuperAdmin');
 
-/* Active tabs */
 INSERT INTO `PREFIX_tab` (`id_tab`, `class_name`, `id_parent`, `position`) VALUES (1, 'AdminCatalog', 0, 1),(2, 'AdminCustomers', 0, 2),(3, 'AdminOrders', 0, 3),
 (4, 'AdminPayment', 0, 4),(5, 'AdminShipping', 0, 5),(6, 'AdminStats', 0, 6),(7, 'AdminModules', 0, 7),(29, 'AdminEmployees', 0, 8),(8, 'AdminPreferences', 0, 9),
 (9, 'AdminTools', 0, 10),(82, 'AdminStores', 9, 11),(60, 'AdminTracking', 1, 3),(10, 'AdminManufacturers', 1, 4),(34, 'AdminSuppliers', 1, 5),(11, 'AdminAttributesGroups', 1, 6),
 (36, 'AdminFeatures', 1, 7),(58, 'AdminScenes', 1, 8),(66, 'AdminTags', 1, 9),(68, 'AdminAttachments', 1, 10),(12, 'AdminAddresses', 2, 1),(63, 'AdminGroups', 2, 2),
-(65, 'AdminCarts', 2, 3),(42, 'AdminInvoices', 3, 1),(55, 'AdminDeliverySlip', 3, 2),(47, 'AdminReturn', 3, 3),(49, 'AdminSlip', 3, 4),
+(65, 'AdminCarts', 2, 3),(42, 'AdminInvoices', 3, 1),(55, 'AdminDeliverySlip', 3, 2),(47, 'AdminReturn', 3, 3),(49, 'AdminSlip', 3, 4),(59, 'AdminMessages', 3, 5),
 (13, 'AdminStatuses', 3, 6),(54, 'AdminOrderMessage', 3, 7),(14, 'AdminCartRules', 4, 4),(15, 'AdminCurrencies', 4, 1),(16, 'AdminTaxes', 4, 2),
 (17, 'AdminCarriers', 5, 1),(46, 'AdminStates', 5, 2),(18, 'AdminCountries', 5, 3),(19, 'AdminZones', 5, 5),(20, 'AdminRangePrice', 5, 6),
 (21, 'AdminRangeWeight', 5, 7),(61, 'AdminSearchEngines', 6, 2),(62, 'AdminReferrers', 6, 3),
@@ -971,9 +966,6 @@ INSERT INTO `PREFIX_tab` (`id_tab`, `class_name`, `id_parent`, `position`) VALUE
 (108, 'AdminStockConfiguration', 95, 7),
 (109, 'AdminSpecificPriceRule', 1, 11);
 
-/* Inactive tabs */
-INSERT INTO `PREFIX_tab` (`id_tab`, `class_name`, `id_parent`, `position`, `active`) VALUES (110, 'AdminOutstanding', 2, 5, 0);
-
 INSERT INTO `PREFIX_access` (`id_profile`, `id_tab`, `view`, `add`, `edit`, `delete`) (SELECT 1, id_tab, 1, 1, 1, 1 FROM `PREFIX_tab`);
 
 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
@@ -1005,8 +997,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (1, 105, 'CMS categories'),
 (1, 106, 'CMS pages'),
 (1, 108, 'Configuration'),
-(1, 109, 'Catalog price rules'),
+(1, 109, 'Catalog price rules');
-(1, 110, 'Outstanding');
 
 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (2, 1, 'Catalogue'),(2, 2, 'Clients'),(2, 3, 'Commandes'),(2, 4, 'Paiement'),(2, 5, 'Transport'),
@@ -1037,8 +1028,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (2, 105, 'Catégories CMS'),
 (2, 106, 'Pages CMS'),
 (2, 108, 'Configuration'),
-(2, 109, 'Règles de prix catalogue'),
+(2, 109, 'Règles de prix catalogue');
-(2, 110, 'Encours');
 
 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (3, 1, 'Catálogo'),(3, 2, 'Clientes'),(3, 3, 'Pedidos'),(3, 4, 'Pago'),(3, 5, 'Transporte'),
@@ -1068,8 +1058,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (3, 105, 'CMS categories'),
 (3, 106, 'CMS pages'),
 (3, 108, 'Configuration'),
-(3, 109, 'Catalog price rules'),
+(3, 110, 'Catalog price rules');
-(3, 110, 'Outstanding');
 
 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (4, 1, 'Katalog'),(4, 2, 'Kunden'),(4, 3, 'Bestellungen'),(4, 4, 'Zahlung'),
@@ -1100,8 +1089,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (4, 105, 'CMS categories'),
 (4, 106, 'CMS pages'),
 (4, 108, 'Configuration'),
-(4, 109, 'Catalog price rules'),
+(4, 109, 'Catalog price rules');
-(4, 110, 'Outstanding');
 
 INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (5, 1, 'Catalogo'),(5, 2, 'Clienti'),(5, 3, 'Ordini'),(5, 4, 'Pagamento'),
@@ -1132,8 +1120,7 @@ INSERT INTO `PREFIX_tab_lang` (`id_lang`, `id_tab`, `name`) VALUES
 (5, 105, 'CMS categories'),
 (5, 106, 'CMS pages'),
 (5, 108, 'Configuration'),
-(5, 109, 'Catalog price rules'),
+(5, 109, 'Catalog price rules');
-(5, 110, 'Outstanding');
 
 INSERT IGNORE INTO `PREFIX_tab_lang` (`id_tab`, `id_lang`, `name`)
 	(SELECT `id_tab`, id_lang, (SELECT tl.`name`
@@ -1619,31 +1606,3 @@ INSERT INTO `PREFIX_supply_order_state_lang` (`id_supply_order_state`, `id_lang`
 (6, 3, 'order fenced'),
 (6, 4, 'order fenced'),
 (6, 5, 'order fenced');
-
-INSERT INTO `PREFIX_risk` (`id_risk`, `percent`, `color`) VALUES
-(1, 0, 'LimeGreen'),
-(2, 35, 'DarkOrange'),
-(3, 75, 'Crimson'),
-(4, 100, '#ec2e15');
-
-INSERT INTO `PREFIX_risk_lang` (`id_risk`, `id_lang`, `name`) VALUES
-(1, 1, 'None'),
-(2, 1, 'Low'),
-(3, 1, 'Middle'),
-(4, 1, 'Hight'),
-(1, 2, 'Aucun'),
-(2, 2, 'Faible'),
-(3, 2, 'Moyen'),
-(4, 2, 'Élevé'),
-(1, 3, 'None'),
-(2, 3, 'Low'),
-(3, 3, 'Middle'),
-(4, 3, 'Hight'),
-(1, 4, 'None'),
-(2, 4, 'Low'),
-(3, 4, 'Middle'),
-(4, 4, 'Hight'),
-(1, 5, 'None'),
-(2, 5, 'Low'),
-(3, 5, 'Middle'),
-(4, 5, 'Hight');

install-dev/sql/upgrade/1.5.0.2.sql

@@ -420,6 +420,10 @@ WHERE `class_name` = 'AdminAccounting';
 
 ALTER TABLE `PREFIX_order_slip_detail` CHANGE `amount` `amount_tax_excl` DECIMAL( 10, 2 ) default NULL;
 ALTER TABLE `PREFIX_order_slip_detail` ADD COLUMN `amount_tax_incl` DECIMAL(10,2) default NULL AFTER `amount_tax_excl`;
+ALTER TABLE `PREFIX_image_type` DROP INDEX `name`;
+ALTER TABLE `PREFIX_image_type` ADD `id_theme` INT(11) NOT NULL AFTER `id_image_type`;
+ALTER TABLE `PREFIX_image_type` ADD UNIQUE (`id_theme` ,`name`);
+UPDATE `PREFIX_image_type` SET `id_theme`=1;
 
 CREATE TABLE `PREFIX_webservice_account_shop` (
 `id_webservice_account` INT( 11 ) UNSIGNED NOT NULL,

modules/themeinstallator/themeinstallator.php

@@ -392,30 +392,14 @@ class ThemeInstallator extends Module
 		}
 	}
 
-	private function updateImages()
+	private function updateImages($id_theme)
 	{
 		foreach ($this->xml->images->image as $row)
 		{
-			$foo = Db::getInstance()->getRow('
+
-				SELECT name FROM `'._DB_PREFIX_.'image_type` i
+			Db::getInstance()->execute('
-				WHERE i.name LIKE \''.pSQL($row['name']).'\'');
+					INSERT INTO `'._DB_PREFIX_.'image_type` (`id_theme`, `name`, `width`, `height`, `products`, `categories`, `manufacturers`, `suppliers`, `scenes`)
-			if ((int)(Tools::getValue('imagesConfig')) == 1 AND $foo)
+					VALUES ('.(int)$id_theme.',
-				continue ;
-			if ($foo)
-				Db::getInstance()->execute('
-					UPDATE `'._DB_PREFIX_.'image_type` i
-					SET `width` = '.(int)($row['width']).',
-					`height` = '.(int)($row['height']).',
-					`products` = '.($row['products'] == 'true' ? 1 : 0).',
-					`categories` = '.($row['categories'] == 'true' ? 1 : 0).',
-					`manufacturers` = '.($row['manufacturers'] == 'true' ? 1 : 0).',
-					`suppliers` = '.($row['suppliers'] == 'true' ? 1 : 0).',
-					`scenes` = '.($row['scenes'] == 'true' ? 1 : 0).'
-					WHERE i.name LIKE \''.pSQL($row['name']).'\'');
-			else
-				Db::getInstance()->execute('
-					INSERT INTO `'._DB_PREFIX_.'image_type` (`name`, `width`, `height`, `products`, `categories`, `manufacturers`, `suppliers`, `scenes`)
-					VALUES (
 						\''.pSQL($row['name']).'\',
 						'.(int)($row['width']).',
 						'.(int)($row['height']).',
@@ -540,12 +524,13 @@ class ThemeInstallator extends Module
 						}
 				}
 		}
-		if ((int)(Tools::getValue('imagesConfig')) != 3 AND self::updateImages())
-			$msg .= '<br /><b>'.$this->l('Images have been correctly updated in database').'</b><br />';
-
 		$theme = new Theme();
 		$theme->name = (string)$this->xml['name'];
 		$theme->add();
+		
+		if ((int)(Tools::getValue('imagesConfig')) != 3 AND self::updateImages((int)$theme->id))
+			$msg .= '<br /><b>'.$this->l('Images have been correctly updated in database').'</b><br />';
+			
 		$this->_msg .= parent::displayConfirmation($msg);
 		$this->_html .= '
 			<input type="submit" class="button" name="submitThemes" value="'.$this->l('Previous').'" />