Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6

classes/controller/AdminController.php

@@ -620,6 +620,10 @@ public function checkToken()
 	 */
 	public function processFilter()
 	{
+		Hook::exec('action'.$this->controller_name.'ListingFieldsModifier', array(
+			'fields' => &$this->fields_list,
+		));
+
 		if (!isset($this->list_id))
 			$this->list_id = $this->table;
 

controllers/admin/AdminDashboardController.php

@@ -352,13 +352,42 @@ public function ajaxProcessGetBlogRss()
 			$articles_limit = 2;
 			foreach ($rss->channel->item as $item)
 			{
-				if ($articles_limit > 0 && Validate::isCleanHtml((string)$item->title) && Validate::isCleanHtml((string)$item->description))
+				if ($articles_limit > 0 && Validate::isCleanHtml((string)$item->title) && Validate::isCleanHtml((string)$item->description)
+					&& isset($item->link) && isset($item->title))
+				{
+					if (in_array($this->context->mode, array(Context::MODE_HOST, Context::MODE_HOST_CONTRIB)))
+						$utm_content = 'cloud';
+					else
+						$utm_content = 'download';
+
+					$shop_default_country_id = (int)Configuration::get('PS_COUNTRY_DEFAULT');
+					$shop_default_iso_country = (string)Tools::strtoupper(Country::getIsoById($shop_default_country_id));
+					$analytics_params = array('utm_source' => 'back-office',
+											'utm_medium' => 'rss',
+											'utm_campaign' => 'back-office-'.$shop_default_iso_country,
+											'utm_content' => $utm_content
+
+										);
+					$url_query = parse_url($item->link, PHP_URL_QUERY);
+					parse_str($url_query, $link_query_params);
+
+					if ($link_query_params)
+					{
+						$full_url_params = array_merge($link_query_params, $analytics_params);
+						$base_url = explode('?', (string)$item->link);
+						$base_url = (string)$base_url[0];
+						$article_link = $base_url.'?'.http_build_query($full_url_params);
+					}
+					else
+						$article_link = (string)$item->link.'?'.http_build_query($analytics_params);
+
 					$return['rss'][] = array(
 						'date' => Tools::displayDate(date('Y-m-d', strtotime((string)$item->pubDate))),
 						'title' => (string)Tools::htmlentitiesUTF8($item->title),
 						'short_desc' => Tools::truncateString(strip_tags((string)$item->description), 150),
-						'link' => (string)$item->link,
+						'link' => (string)$article_link,
 					);
+				}
 				else
 					break;
 				$articles_limit --;

controllers/admin/AdminProductsController.php

@@ -3812,7 +3812,7 @@ public function initFormInformations($product)
 		if (is_array($images))
 		{
 			foreach ($images as $k => $image)
-				$images[$k]['src'] = $this->context->link->getImageLink($product->link_rewrite[$this->context->language->id], $product->id.'-'.$image['id_image'], 'small_default');
+				$images[$k]['src'] = $this->context->link->getImageLink($product->link_rewrite[$this->context->language->id], $product->id.'-'.$image['id_image'], ImageType::getFormatedName('small'));
 			$data->assign('images', $images);
 		}
 		$data->assign('imagesTypes', ImageType::getImagesTypes('products'));
@@ -4077,7 +4077,7 @@ public function initFormImages($obj)
 				if (isset($type['name']))
 					$data->assign('imageType', $type['name']);
 				else
-					$data->assign('imageType', 'small_default');
+					$data->assign('imageType', ImageType::getFormatedName('small'));
 			}
 			else
 				$this->displayWarning($this->l('You must save the product in this shop before adding images.'));
@@ -4143,7 +4143,7 @@ public function initFormAttributes($product)
 					if (isset($type['name']))
 						$data->assign('imageType', $type['name']);
 					else
-						$data->assign('imageType', 'small_default');
+						$data->assign('imageType', ImageType::getFormatedName('small'));
 					$data->assign('imageWidth', (isset($image_type['width']) ? (int)($image_type['width']) : 64) + 25);
 					foreach ($images as $k => $image)
 					{

js/admin/dashboard.js

@@ -197,7 +197,7 @@ function getBlogRss() {
 		success : function(jsonData) {
 			if (typeof jsonData !== 'undefined' && jsonData !== null && !jsonData.has_errors) {
 				for (var article in jsonData.rss) {
-					var article_html = '<article><h4><a href="'+jsonData.rss[article].link+'" class="_blank">'+jsonData.rss[article].title+'</a></h4><span class="dash-news-date text-muted">'+jsonData.rss[article].date+'</span><p>'+jsonData.rss[article].short_desc+' <a href="'+jsonData.rss[article].link+'">'+read_more+'</a><p></article><hr/>';
+					var article_html = '<article><h4><a href="'+jsonData.rss[article].link+'" class="_blank" onclick="return !window.open(this.href);">'+jsonData.rss[article].title+'</a></h4><span class="dash-news-date text-muted">'+jsonData.rss[article].date+'</span><p>'+jsonData.rss[article].short_desc+' <a href="'+jsonData.rss[article].link+'">'+read_more+'</a><p></article><hr/>';
 					$('.dash_news .dash_news_content').append(article_html);
 				}
 			}