Eoxia / wpshop

includes/librairies/HTML2PDF/_class/tcpdfConfig.php

Indentation +206 added lines, -206 removed lines

@@ -34,212 +34,212 @@
 
 if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {
 
-    define('K_TCPDF_EXTERNAL_CONFIG', true);
-
-    // DOCUMENT_ROOT fix for IIS Webserver
-    if ((!isset($_SERVER['DOCUMENT_ROOT'])) OR (empty($_SERVER['DOCUMENT_ROOT']))) {
-        if (isset($_SERVER['SCRIPT_FILENAME'])) {
-            $_SERVER['DOCUMENT_ROOT'] = str_replace(
-                '\\',
-                '/',
-                substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF']))
-            );
-        } elseif (isset($_SERVER['PATH_TRANSLATED'])) {
-            $_SERVER['DOCUMENT_ROOT'] = str_replace(
-                '\\',
-                '/',
-                substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0-strlen($_SERVER['PHP_SELF']))
-            );
-        } else {
-            // define here your DOCUMENT_ROOT path if the previous fails
-            $_SERVER['DOCUMENT_ROOT'] = '/var/www';
-        }
-    }
-
-    // Automatic calculation for the following K_PATH_MAIN constant
-    $kPathMain = str_replace('\\', '/', dirname(__FILE__));
-    $kPathMain = dirname($kPathMain).'/'; // remove the current directory
-    $kPathMain.= '_tcpdf_'.HTML2PDF_USED_TCPDF_VERSION.'/';
-    define('K_PATH_MAIN', $kPathMain);
-
-    // Automatic calculation for the following K_PATH_URL constant
-    if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) {
-        if (isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND strtolower($_SERVER['HTTPS'])!='off') {
-            $kPathUrl = 'https://';
-        } else {
-            $kPathUrl = 'http://';
-        }
-        $kPathUrl .= $_SERVER['HTTP_HOST'];
-        $kPathUrl .= str_replace('\\', '/', substr(K_PATH_MAIN, (strlen($_SERVER['DOCUMENT_ROOT']) - 1)));
-    }
-
-    /**
-     * URL path to tcpdf installation folder (http://localhost/tcpdf/).
-     * By default it is automatically calculated but you can also set it as a fixed string to improve performances.
-     */
-    define('K_PATH_URL', $kPathUrl);
-
-    /**
-     * path for PDF fonts
-     * use K_PATH_MAIN.'fonts/old/' for old non-UTF8 fonts
-     */
-    define('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
-
-    /**
-     * cache directory for temporary files (full path)
-     */
-    define('K_PATH_CACHE', K_PATH_MAIN.'cache/');
-
-    /**
-     * cache directory for temporary files (url path)
-     */
-    define('K_PATH_URL_CACHE', K_PATH_URL.'cache/');
-
-    /**
-     *images directory
-     */
-    define('K_PATH_IMAGES', K_PATH_MAIN.'images/');
-
-    /**
-     * blank image
-     */
-    define('K_BLANK_IMAGE', K_PATH_IMAGES.'_blank.png');
-
-    /**
-     * page format
-     */
-    define('PDF_PAGE_FORMAT', 'A4');
-
-    /**
-     * page orientation (P=portrait, L=landscape)
-     */
-    define('PDF_PAGE_ORIENTATION', 'P');
-
-    /**
-     * document creator
-     */
-    define('PDF_CREATOR', 'HTML2PDF - TCPDF');
-
-    /**
-     * document author
-     */
-    define('PDF_AUTHOR', 'HTML2PDF - TCPDF');
-
-    /**
-     * header title
-     */
-    define('PDF_HEADER_TITLE', null);
-
-    /**
-     * header description string
-     */
-    define('PDF_HEADER_STRING', null);
-
-    /**
-     * image logo
-     */
-    define('PDF_HEADER_LOGO', null);
-
-    /**
-     * header logo image width [mm]
-     */
-    define('PDF_HEADER_LOGO_WIDTH', null);
-
-    /**
-     *  document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch]
-     */
-    define('PDF_UNIT', 'mm');
-
-    /**
-     * header margin
-     */
-    define('PDF_MARGIN_HEADER', 0);
-
-    /**
-     * footer margin
-     */
-    define('PDF_MARGIN_FOOTER', 0);
-
-    /**
-     * top margin
-     */
-    define('PDF_MARGIN_TOP', 0);
-
-    /**
-     * bottom margin
-     */
-    define('PDF_MARGIN_BOTTOM', 0);
-
-    /**
-     * left margin
-     */
-    define('PDF_MARGIN_LEFT', 0);
-
-    /**
-     * right margin
-     */
-    define('PDF_MARGIN_RIGHT', 0);
-
-    /**
-     * default main font name
-     */
-    define('PDF_FONT_NAME_MAIN', 'helvetica');
-
-    /**
-     * default main font size
-     */
-    define('PDF_FONT_SIZE_MAIN', 10);
-
-    /**
-     * default data font name
-     */
-    define('PDF_FONT_NAME_DATA', 'helvetica');
-
-    /**
-     * default data font size
-     */
-    define('PDF_FONT_SIZE_DATA', 8);
-
-    /**
-     * default monospaced font name
-     */
-    define('PDF_FONT_MONOSPACED', 'courier');
-
-    /**
-     * ratio used to adjust the conversion of pixels to user units
-     */
-    define('PDF_IMAGE_SCALE_RATIO', 1);
-
-    /**
-     * magnification factor for titles
-     */
-    define('HEAD_MAGNIFICATION', 1);
-
-    /**
-     * height of cell repect font height
-     */
-    define('K_CELL_HEIGHT_RATIO', 1);
-
-    /**
-     * title magnification respect main font size
-     */
-    define('K_TITLE_MAGNIFICATION', 1);
-
-    /**
-     * reduction factor for small font
-     */
-    define('K_SMALL_RATIO', 2/3);
-
-    /**
-     * set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language
-     */
-    define('K_THAI_TOPCHARS', true);
-
-    /**
-     * if true allows to call TCPDF methods using HTML syntax
-     * IMPORTANT: For security reason, disable this feature if you are printing user HTML content.
-     */
-    define('K_TCPDF_CALLS_IN_HTML', false);
+	define('K_TCPDF_EXTERNAL_CONFIG', true);
+
+	// DOCUMENT_ROOT fix for IIS Webserver
+	if ((!isset($_SERVER['DOCUMENT_ROOT'])) OR (empty($_SERVER['DOCUMENT_ROOT']))) {
+		if (isset($_SERVER['SCRIPT_FILENAME'])) {
+			$_SERVER['DOCUMENT_ROOT'] = str_replace(
+				'\\',
+				'/',
+				substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF']))
+			);
+		} elseif (isset($_SERVER['PATH_TRANSLATED'])) {
+			$_SERVER['DOCUMENT_ROOT'] = str_replace(
+				'\\',
+				'/',
+				substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0-strlen($_SERVER['PHP_SELF']))
+			);
+		} else {
+			// define here your DOCUMENT_ROOT path if the previous fails
+			$_SERVER['DOCUMENT_ROOT'] = '/var/www';
+		}
+	}
+
+	// Automatic calculation for the following K_PATH_MAIN constant
+	$kPathMain = str_replace('\\', '/', dirname(__FILE__));
+	$kPathMain = dirname($kPathMain).'/'; // remove the current directory
+	$kPathMain.= '_tcpdf_'.HTML2PDF_USED_TCPDF_VERSION.'/';
+	define('K_PATH_MAIN', $kPathMain);
+
+	// Automatic calculation for the following K_PATH_URL constant
+	if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) {
+		if (isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND strtolower($_SERVER['HTTPS'])!='off') {
+			$kPathUrl = 'https://';
+		} else {
+			$kPathUrl = 'http://';
+		}
+		$kPathUrl .= $_SERVER['HTTP_HOST'];
+		$kPathUrl .= str_replace('\\', '/', substr(K_PATH_MAIN, (strlen($_SERVER['DOCUMENT_ROOT']) - 1)));
+	}
+
+	/**
+	 * URL path to tcpdf installation folder (http://localhost/tcpdf/).
+	 * By default it is automatically calculated but you can also set it as a fixed string to improve performances.
+	 */
+	define('K_PATH_URL', $kPathUrl);
+
+	/**
+	 * path for PDF fonts
+	 * use K_PATH_MAIN.'fonts/old/' for old non-UTF8 fonts
+	 */
+	define('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
+
+	/**
+	 * cache directory for temporary files (full path)
+	 */
+	define('K_PATH_CACHE', K_PATH_MAIN.'cache/');
+
+	/**
+	 * cache directory for temporary files (url path)
+	 */
+	define('K_PATH_URL_CACHE', K_PATH_URL.'cache/');
+
+	/**
+	 *images directory
+	 */
+	define('K_PATH_IMAGES', K_PATH_MAIN.'images/');
+
+	/**
+	 * blank image
+	 */
+	define('K_BLANK_IMAGE', K_PATH_IMAGES.'_blank.png');
+
+	/**
+	 * page format
+	 */
+	define('PDF_PAGE_FORMAT', 'A4');
+
+	/**
+	 * page orientation (P=portrait, L=landscape)
+	 */
+	define('PDF_PAGE_ORIENTATION', 'P');
+
+	/**
+	 * document creator
+	 */
+	define('PDF_CREATOR', 'HTML2PDF - TCPDF');
+
+	/**
+	 * document author
+	 */
+	define('PDF_AUTHOR', 'HTML2PDF - TCPDF');
+
+	/**
+	 * header title
+	 */
+	define('PDF_HEADER_TITLE', null);
+
+	/**
+	 * header description string
+	 */
+	define('PDF_HEADER_STRING', null);
+
+	/**
+	 * image logo
+	 */
+	define('PDF_HEADER_LOGO', null);
+
+	/**
+	 * header logo image width [mm]
+	 */
+	define('PDF_HEADER_LOGO_WIDTH', null);
+
+	/**
+	 *  document unit of measure [pt=point, mm=millimeter, cm=centimeter, in=inch]
+	 */
+	define('PDF_UNIT', 'mm');
+
+	/**
+	 * header margin
+	 */
+	define('PDF_MARGIN_HEADER', 0);
+
+	/**
+	 * footer margin
+	 */
+	define('PDF_MARGIN_FOOTER', 0);
+
+	/**
+	 * top margin
+	 */
+	define('PDF_MARGIN_TOP', 0);
+
+	/**
+	 * bottom margin
+	 */
+	define('PDF_MARGIN_BOTTOM', 0);
+
+	/**
+	 * left margin
+	 */
+	define('PDF_MARGIN_LEFT', 0);
+
+	/**
+	 * right margin
+	 */
+	define('PDF_MARGIN_RIGHT', 0);
+
+	/**
+	 * default main font name
+	 */
+	define('PDF_FONT_NAME_MAIN', 'helvetica');
+
+	/**
+	 * default main font size
+	 */
+	define('PDF_FONT_SIZE_MAIN', 10);
+
+	/**
+	 * default data font name
+	 */
+	define('PDF_FONT_NAME_DATA', 'helvetica');
+
+	/**
+	 * default data font size
+	 */
+	define('PDF_FONT_SIZE_DATA', 8);
+
+	/**
+	 * default monospaced font name
+	 */
+	define('PDF_FONT_MONOSPACED', 'courier');
+
+	/**
+	 * ratio used to adjust the conversion of pixels to user units
+	 */
+	define('PDF_IMAGE_SCALE_RATIO', 1);
+
+	/**
+	 * magnification factor for titles
+	 */
+	define('HEAD_MAGNIFICATION', 1);
+
+	/**
+	 * height of cell repect font height
+	 */
+	define('K_CELL_HEIGHT_RATIO', 1);
+
+	/**
+	 * title magnification respect main font size
+	 */
+	define('K_TITLE_MAGNIFICATION', 1);
+
+	/**
+	 * reduction factor for small font
+	 */
+	define('K_SMALL_RATIO', 2/3);
+
+	/**
+	 * set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language
+	 */
+	define('K_THAI_TOPCHARS', true);
+
+	/**
+	 * if true allows to call TCPDF methods using HTML syntax
+	 * IMPORTANT: For security reason, disable this feature if you are printing user HTML content.
+	 */
+	define('K_TCPDF_CALLS_IN_HTML', false);
 }
 
 //============================================================+

Spacing +12 added lines, -12 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 //============================================================+
 // File name   : tcpdf_config.php
 // Begin       : 2004-06-11
@@ -42,13 +42,13 @@ 
             $_SERVER['DOCUMENT_ROOT'] = str_replace(
                 '\\',
                 '/',
-                substr($_SERVER['SCRIPT_FILENAME'], 0, 0-strlen($_SERVER['PHP_SELF']))
+                substr($_SERVER['SCRIPT_FILENAME'], 0, 0 - strlen($_SERVER['PHP_SELF']))
             );
         } elseif (isset($_SERVER['PATH_TRANSLATED'])) {
             $_SERVER['DOCUMENT_ROOT'] = str_replace(
                 '\\',
                 '/',
-                substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0-strlen($_SERVER['PHP_SELF']))
+                substr(str_replace('\\\\', '\\', $_SERVER['PATH_TRANSLATED']), 0, 0 - strlen($_SERVER['PHP_SELF']))
             );
         } else {
             // define here your DOCUMENT_ROOT path if the previous fails
@@ -58,13 +58,13 @@ 
 
     // Automatic calculation for the following K_PATH_MAIN constant
     $kPathMain = str_replace('\\', '/', dirname(__FILE__));
-    $kPathMain = dirname($kPathMain).'/'; // remove the current directory
-    $kPathMain.= '_tcpdf_'.HTML2PDF_USED_TCPDF_VERSION.'/';
+    $kPathMain = dirname($kPathMain) . '/'; // remove the current directory
+    $kPathMain .= '_tcpdf_' . HTML2PDF_USED_TCPDF_VERSION . '/';
     define('K_PATH_MAIN', $kPathMain);
 
     // Automatic calculation for the following K_PATH_URL constant
     if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) {
-        if (isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND strtolower($_SERVER['HTTPS'])!='off') {
+        if (isset($_SERVER['HTTPS']) AND (!empty($_SERVER['HTTPS'])) AND strtolower($_SERVER['HTTPS']) != 'off') {
             $kPathUrl = 'https://';
         } else {
             $kPathUrl = 'http://';
@@ -83,27 +83,27 @@ 
      * path for PDF fonts
      * use K_PATH_MAIN.'fonts/old/' for old non-UTF8 fonts
      */
-    define('K_PATH_FONTS', K_PATH_MAIN.'fonts/');
+    define('K_PATH_FONTS', K_PATH_MAIN . 'fonts/');
 
     /**
      * cache directory for temporary files (full path)
      */
-    define('K_PATH_CACHE', K_PATH_MAIN.'cache/');
+    define('K_PATH_CACHE', K_PATH_MAIN . 'cache/');
 
     /**
      * cache directory for temporary files (url path)
      */
-    define('K_PATH_URL_CACHE', K_PATH_URL.'cache/');
+    define('K_PATH_URL_CACHE', K_PATH_URL . 'cache/');
 
     /**
      *images directory
      */
-    define('K_PATH_IMAGES', K_PATH_MAIN.'images/');
+    define('K_PATH_IMAGES', K_PATH_MAIN . 'images/');
 
     /**
      * blank image
      */
-    define('K_BLANK_IMAGE', K_PATH_IMAGES.'_blank.png');
+    define('K_BLANK_IMAGE', K_PATH_IMAGES . '_blank.png');
 
     /**
      * page format
@@ -228,7 +228,7 @@ 
     /**
      * reduction factor for small font
      */
-    define('K_SMALL_RATIO', 2/3);
+    define('K_SMALL_RATIO', 2 / 3);
 
     /**
      * set to true to enable the special procedure used to avoid the overlappind of symbols on Thai language

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/librairies/HTML2PDF/_class/exception.class.php

Indentation +154 added lines, -154 removed lines

@@ -11,158 +11,158 @@
 
 class HTML2PDF_exception extends exception
 {
-    protected $_tag = null;
-    protected $_html = null;
-    protected $_other = null;
-    protected $_image = null;
-    protected $_messageHtml = '';
-
-    /**
-     * generate a HTML2PDF exception
-     *
-     * @param    int     $err error number
-     * @param    mixed   $other additionnal informations
-     * @return   string  $html optionnal code HTML associated to the error
-     */
-    final public function __construct($err = 0, $other = null, $html = '')
-    {
-        // read the error
-        switch($err)
-        {
-            case 1: // Unsupported tag
-                $msg = (HTML2PDF_locale::get('err01'));
-                $msg = str_replace('[[OTHER]]', $other, $msg);
-                $this->_tag = $other;
-                break;
-
-            case 2: // too long sentence
-                $msg = (HTML2PDF_locale::get('err02'));
-                $msg = str_replace('[[OTHER_0]]', $other[0], $msg);
-                $msg = str_replace('[[OTHER_1]]', $other[1], $msg);
-                $msg = str_replace('[[OTHER_2]]', $other[2], $msg);
-                break;
-
-            case 3: // closing tag in excess
-                $msg = (HTML2PDF_locale::get('err03'));
-                $msg = str_replace('[[OTHER]]', $other, $msg);
-                $this->_tag = $other;
-                break;
-
-            case 4: // tags closed in the wrong order
-                $msg = (HTML2PDF_locale::get('err04'));
-                $msg = str_replace('[[OTHER]]', print_r($other, true), $msg);
-                break;
-
-            case 5: // unclosed tag
-                $msg = (HTML2PDF_locale::get('err05'));
-                $msg = str_replace('[[OTHER]]', print_r($other, true), $msg);
-                break;
-
-            case 6: // image can not be loaded
-                $msg = (HTML2PDF_locale::get('err06'));
-                $msg = str_replace('[[OTHER]]', $other, $msg);
-                $this->_image = $other;
-                break;
-
-            case 7: // too big TD content
-                $msg = (HTML2PDF_locale::get('err07'));
-                break;
-
-            case 8: // SVG tag not in DRAW tag
-                $msg = (HTML2PDF_locale::get('err08'));
-                $msg = str_replace('[[OTHER]]', $other, $msg);
-                $this->_tag = $other;
-                break;
-
-            case 9: // deprecated
-                $msg = (HTML2PDF_locale::get('err09'));
-                $msg = str_replace('[[OTHER_0]]', $other[0], $msg);
-                $msg = str_replace('[[OTHER_1]]', $other[1], $msg);
-                $this->_tag = $other[0];
-                break;
-
-            case 0: // specific error
-            default:
-                $msg = $other;
-                break;
-        }
-
-        // create the HTML message
-        $this->_messageHtml = '<span style="color: #AA0000; font-weight: bold;">'.HTML2PDF_locale::get('txt01', 'error: ').$err.'</span><br>';
-        $this->_messageHtml.= HTML2PDF_locale::get('txt02', 'file:').' '.$this->file.'<br>';
-        $this->_messageHtml.= HTML2PDF_locale::get('txt03', 'line:').' '.$this->line.'<br>';
-        $this->_messageHtml.= '<br>';
-        $this->_messageHtml.= $msg;
-
-        // create the text message
-        $msg = HTML2PDF_locale::get('txt01', 'error: ').$err.' : '.strip_tags($msg);
-
-        // add the optionnal html content
-        if ($html) {
-            $this->_messageHtml.= "<br><br>HTML : ...".trim(htmlentities($html)).'...';
-            $this->_html = $html;
-            $msg.= ' HTML : ...'.trim($html).'...';
-        }
-
-        // save the other informations
-        $this->_other = $other;
-
-        // construct the exception
-        parent::__construct($msg, $err);
-    }
-
-    /**
-     * get the message as string
-     *
-     * @access public
-     * @return string $messageHtml
-     */
-    public function __toString()
-    {
-        return $this->_messageHtml;
-    }
-
-    /**
-     * get the html tag name
-     *
-     * @access public
-     * @return string $tagName
-     */
-    public function getTAG()
-    {
-        return $this->_tag;
-    }
-
-    /**
-     * get the optional html code
-     *
-     * @access public
-     * @return string $html
-     */
-    public function getHTML()
-    {
-        return $this->_html;
-    }
-
-    /**
-     * get the optional other informations
-     *
-     * @access public
-     * @return mixed $other
-     */
-    public function getOTHER()
-    {
-        return $this->_other;
-    }
-
-    /**
-     * get the image source
-     *
-     * @access public
-     * @return string $imageSrc
-     */
-    public function getIMAGE()
-    {
-        return $this->_image;
-    }
+	protected $_tag = null;
+	protected $_html = null;
+	protected $_other = null;
+	protected $_image = null;
+	protected $_messageHtml = '';
+
+	/**
+	 * generate a HTML2PDF exception
+	 *
+	 * @param    int     $err error number
+	 * @param    mixed   $other additionnal informations
+	 * @return   string  $html optionnal code HTML associated to the error
+	 */
+	final public function __construct($err = 0, $other = null, $html = '')
+	{
+		// read the error
+		switch($err)
+		{
+			case 1: // Unsupported tag
+				$msg = (HTML2PDF_locale::get('err01'));
+				$msg = str_replace('[[OTHER]]', $other, $msg);
+				$this->_tag = $other;
+				break;
+
+			case 2: // too long sentence
+				$msg = (HTML2PDF_locale::get('err02'));
+				$msg = str_replace('[[OTHER_0]]', $other[0], $msg);
+				$msg = str_replace('[[OTHER_1]]', $other[1], $msg);
+				$msg = str_replace('[[OTHER_2]]', $other[2], $msg);
+				break;
+
+			case 3: // closing tag in excess
+				$msg = (HTML2PDF_locale::get('err03'));
+				$msg = str_replace('[[OTHER]]', $other, $msg);
+				$this->_tag = $other;
+				break;
+
+			case 4: // tags closed in the wrong order
+				$msg = (HTML2PDF_locale::get('err04'));
+				$msg = str_replace('[[OTHER]]', print_r($other, true), $msg);
+				break;
+
+			case 5: // unclosed tag
+				$msg = (HTML2PDF_locale::get('err05'));
+				$msg = str_replace('[[OTHER]]', print_r($other, true), $msg);
+				break;
+
+			case 6: // image can not be loaded
+				$msg = (HTML2PDF_locale::get('err06'));
+				$msg = str_replace('[[OTHER]]', $other, $msg);
+				$this->_image = $other;
+				break;
+
+			case 7: // too big TD content
+				$msg = (HTML2PDF_locale::get('err07'));
+				break;
+
+			case 8: // SVG tag not in DRAW tag
+				$msg = (HTML2PDF_locale::get('err08'));
+				$msg = str_replace('[[OTHER]]', $other, $msg);
+				$this->_tag = $other;
+				break;
+
+			case 9: // deprecated
+				$msg = (HTML2PDF_locale::get('err09'));
+				$msg = str_replace('[[OTHER_0]]', $other[0], $msg);
+				$msg = str_replace('[[OTHER_1]]', $other[1], $msg);
+				$this->_tag = $other[0];
+				break;
+
+			case 0: // specific error
+			default:
+				$msg = $other;
+				break;
+		}
+
+		// create the HTML message
+		$this->_messageHtml = '<span style="color: #AA0000; font-weight: bold;">'.HTML2PDF_locale::get('txt01', 'error: ').$err.'</span><br>';
+		$this->_messageHtml.= HTML2PDF_locale::get('txt02', 'file:').' '.$this->file.'<br>';
+		$this->_messageHtml.= HTML2PDF_locale::get('txt03', 'line:').' '.$this->line.'<br>';
+		$this->_messageHtml.= '<br>';
+		$this->_messageHtml.= $msg;
+
+		// create the text message
+		$msg = HTML2PDF_locale::get('txt01', 'error: ').$err.' : '.strip_tags($msg);
+
+		// add the optionnal html content
+		if ($html) {
+			$this->_messageHtml.= "<br><br>HTML : ...".trim(htmlentities($html)).'...';
+			$this->_html = $html;
+			$msg.= ' HTML : ...'.trim($html).'...';
+		}
+
+		// save the other informations
+		$this->_other = $other;
+
+		// construct the exception
+		parent::__construct($msg, $err);
+	}
+
+	/**
+	 * get the message as string
+	 *
+	 * @access public
+	 * @return string $messageHtml
+	 */
+	public function __toString()
+	{
+		return $this->_messageHtml;
+	}
+
+	/**
+	 * get the html tag name
+	 *
+	 * @access public
+	 * @return string $tagName
+	 */
+	public function getTAG()
+	{
+		return $this->_tag;
+	}
+
+	/**
+	 * get the optional html code
+	 *
+	 * @access public
+	 * @return string $html
+	 */
+	public function getHTML()
+	{
+		return $this->_html;
+	}
+
+	/**
+	 * get the optional other informations
+	 *
+	 * @access public
+	 * @return mixed $other
+	 */
+	public function getOTHER()
+	{
+		return $this->_other;
+	}
+
+	/**
+	 * get the image source
+	 *
+	 * @access public
+	 * @return string $imageSrc
+	 */
+	public function getIMAGE()
+	{
+		return $this->_image;
+	}
 }
\ No newline at end of file

Spacing +10 added lines, -10 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * HTML2PDF Librairy - HTML2PDF Exception
  *
@@ -27,7 +27,7 @@ 
     final public function __construct($err = 0, $other = null, $html = '')
     {
         // read the error
-        switch($err)
+        switch ($err)
         {
             case 1: // Unsupported tag
                 $msg = (HTML2PDF_locale::get('err01'));
@@ -88,20 +88,20 @@ 
         }
 
         // create the HTML message
-        $this->_messageHtml = '<span style="color: #AA0000; font-weight: bold;">'.HTML2PDF_locale::get('txt01', 'error: ').$err.'</span><br>';
-        $this->_messageHtml.= HTML2PDF_locale::get('txt02', 'file:').' '.$this->file.'<br>';
-        $this->_messageHtml.= HTML2PDF_locale::get('txt03', 'line:').' '.$this->line.'<br>';
-        $this->_messageHtml.= '<br>';
-        $this->_messageHtml.= $msg;
+        $this->_messageHtml = '<span style="color: #AA0000; font-weight: bold;">' . HTML2PDF_locale::get('txt01', 'error: ') . $err . '</span><br>';
+        $this->_messageHtml .= HTML2PDF_locale::get('txt02', 'file:') . ' ' . $this->file . '<br>';
+        $this->_messageHtml .= HTML2PDF_locale::get('txt03', 'line:') . ' ' . $this->line . '<br>';
+        $this->_messageHtml .= '<br>';
+        $this->_messageHtml .= $msg;
 
         // create the text message
-        $msg = HTML2PDF_locale::get('txt01', 'error: ').$err.' : '.strip_tags($msg);
+        $msg = HTML2PDF_locale::get('txt01', 'error: ') . $err . ' : ' . strip_tags($msg);
 
         // add the optionnal html content
         if ($html) {
-            $this->_messageHtml.= "<br><br>HTML : ...".trim(htmlentities($html)).'...';
+            $this->_messageHtml .= "<br><br>HTML : ..." . trim(htmlentities($html)) . '...';
             $this->_html = $html;
-            $msg.= ' HTML : ...'.trim($html).'...';
+            $msg .= ' HTML : ...' . trim($html) . '...';
         }
 
         // save the other informations

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/librairies/HTML2PDF/_class/locale.class.php

Indentation +71 added lines, -71 removed lines

@@ -11,86 +11,86 @@
 
 class HTML2PDF_locale
 {
-    /**
-     * code of the current used locale
-     * @var string
-     */
-    static protected $_code = null;
+	/**
+	 * code of the current used locale
+	 * @var string
+	 */
+	static protected $_code = null;
 
-    /**
-     * texts of the current used locale
-     * @var array
-     */
-    static protected $_list = array();
+	/**
+	 * texts of the current used locale
+	 * @var array
+	 */
+	static protected $_list = array();
 
-    /**
-     * directory where locale files are
-     * @var string
-     */
-    static protected $_directory = null;
+	/**
+	 * directory where locale files are
+	 * @var string
+	 */
+	static protected $_directory = null;
 
-    /**
-     * load the locale
-     *
-     * @access public
-     * @param  string $code
-     */
-    static public function load($code)
-    {
-        if (self::$_directory===null) {
-            self::$_directory = dirname(dirname(__FILE__)).'/locale/';
-        }
+	/**
+	 * load the locale
+	 *
+	 * @access public
+	 * @param  string $code
+	 */
+	static public function load($code)
+	{
+		if (self::$_directory===null) {
+			self::$_directory = dirname(dirname(__FILE__)).'/locale/';
+		}
 
-        // must be in lower case
-        $code = strtolower($code);
+		// must be in lower case
+		$code = strtolower($code);
 
-        // must be [a-z-0-9]
-        if (!preg_match('/^([a-z0-9]+)$/isU', $code)) {
-            throw new HTML2PDF_exception(0, 'invalid language code ['.self::$_code.']');
-        }
+		// must be [a-z-0-9]
+		if (!preg_match('/^([a-z0-9]+)$/isU', $code)) {
+			throw new HTML2PDF_exception(0, 'invalid language code ['.self::$_code.']');
+		}
 
-        // save the code
-        self::$_code = $code;
+		// save the code
+		self::$_code = $code;
 
-        // get the name of the locale file
-        $file = self::$_directory.self::$_code.'.csv';
+		// get the name of the locale file
+		$file = self::$_directory.self::$_code.'.csv';
 
-        // the file must exist
-        if (!is_file($file)) {
-            throw new HTML2PDF_exception(0, 'language code ['.self::$_code.'] unknown. You can create the translation file ['.$file.'] and send it to the webmaster of html2pdf in order to integrate it into a future release');
-        }
+		// the file must exist
+		if (!is_file($file)) {
+			throw new HTML2PDF_exception(0, 'language code ['.self::$_code.'] unknown. You can create the translation file ['.$file.'] and send it to the webmaster of html2pdf in order to integrate it into a future release');
+		}
 
-        // load the file
-        self::$_list = array();
-        $handle = fopen($file, 'r');
-        while (!feof($handle)) {
-            $line = fgetcsv($handle);
-            if (count($line)!=2) continue;
-            self::$_list[trim($line[0])] = trim($line[1]);
-        }
-        fclose($handle);
-    }
+		// load the file
+		self::$_list = array();
+		$handle = fopen($file, 'r');
+		while (!feof($handle)) {
+			$line = fgetcsv($handle);
+			if (count($line)!=2) continue;
+			self::$_list[trim($line[0])] = trim($line[1]);
+		}
+		fclose($handle);
+	}
 
-    /**
-     * clean the locale
-     *
-     * @access public static
-     */
-    static public function clean()
-    {
-        self::$_code = null;
-        self::$_list = array();
-    }
+	/**
+	 * clean the locale
+	 *
+	 * @access public static
+	 */
+	static public function clean()
+	{
+		self::$_code = null;
+		self::$_list = array();
+	}
 
-    /**
-     * get a text
-     *
-     * @access public static
-     * @param  string $key
-     * @return string
-     */
-    static public function get($key, $default='######')
-    {
-        return (isset(self::$_list[$key]) ? self::$_list[$key] : $default);
-    }
+	/**
+	 * get a text
+	 *
+	 * @access public static
+	 * @param  string $key
+	 * @return string
+	 */
+	static public function get($key, $default='######')
+	{
+		return (isset(self::$_list[$key]) ? self::$_list[$key] : $default);
+	}
 }
\ No newline at end of file

Spacing +8 added lines, -8 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * HTML2PDF Librairy - HTML2PDF Locale
  *
@@ -37,8 +37,8 @@ 
      */
     static public function load($code)
     {
-        if (self::$_directory===null) {
-            self::$_directory = dirname(dirname(__FILE__)).'/locale/';
+        if (self::$_directory === null) {
+            self::$_directory = dirname(dirname(__FILE__)) . '/locale/';
         }
 
         // must be in lower case
@@ -46,18 +46,18 @@ 
 
         // must be [a-z-0-9]
         if (!preg_match('/^([a-z0-9]+)$/isU', $code)) {
-            throw new HTML2PDF_exception(0, 'invalid language code ['.self::$_code.']');
+            throw new HTML2PDF_exception(0, 'invalid language code [' . self::$_code . ']');
         }
 
         // save the code
         self::$_code = $code;
 
         // get the name of the locale file
-        $file = self::$_directory.self::$_code.'.csv';
+        $file = self::$_directory . self::$_code . '.csv';
 
         // the file must exist
         if (!is_file($file)) {
-            throw new HTML2PDF_exception(0, 'language code ['.self::$_code.'] unknown. You can create the translation file ['.$file.'] and send it to the webmaster of html2pdf in order to integrate it into a future release');
+            throw new HTML2PDF_exception(0, 'language code [' . self::$_code . '] unknown. You can create the translation file [' . $file . '] and send it to the webmaster of html2pdf in order to integrate it into a future release');
         }
 
         // load the file
@@ -65,7 +65,7 @@ 
         $handle = fopen($file, 'r');
         while (!feof($handle)) {
             $line = fgetcsv($handle);
-            if (count($line)!=2) continue;
+            if (count($line) != 2) continue;
             self::$_list[trim($line[0])] = trim($line[1]);
         }
         fclose($handle);
@@ -89,7 +89,7 @@ 
      * @param  string $key
      * @return string
      */
-    static public function get($key, $default='######')
+    static public function get($key, $default = '######')
     {
         return (isset(self::$_list[$key]) ? self::$_list[$key] : $default);
     }

Braces +6 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * HTML2PDF Librairy - HTML2PDF Locale
  *
@@ -65,7 +67,9 @@ 
         $handle = fopen($file, 'r');
         while (!feof($handle)) {
             $line = fgetcsv($handle);
-            if (count($line)!=2) continue;
+            if (count($line)!=2) {
+            	continue;
+            }
             self::$_list[trim($line[0])] = trim($line[1]);
         }
         fclose($handle);

includes/librairies/catalog/products.class.php

Indentation +37 added lines, -37 removed lines

@@ -23,8 +23,8 @@ 
  */
 class wpshop_products {
 	/**
-	*	Définition du code de la classe courante
-	*/
+	 *	Définition du code de la classe courante
+	 */
 	const currentPageCode = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
 	const current_page_variation_code = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION;
 
@@ -61,10 +61,10 @@ 
 
 
 	/**
-	*	Déclaration des produits et variations en tant que "post" de wordpress
-	*
-	*	@see register_post_type()
-	*/
+	 *	Déclaration des produits et variations en tant que "post" de wordpress
+	 *
+	 *	@see register_post_type()
+	 */
 	public static function create_wpshop_products_type() {
 
 		$options = get_option('wpshop_catalog_product_option', array());
@@ -176,8 +176,8 @@ 
 	}
 
 	/**
-	*	Create the different bow for the product management page looking for the attribute set to create the different boxes
-	*/
+	 *	Create the different bow for the product management page looking for the attribute set to create the different boxes
+	 */
 	public static function add_meta_boxes() {
 		global $post, $currentTabContent;
 
@@ -607,21 +607,21 @@ 
 	}
 
 	/**
-	* Display a list of product from a shortcode
-	*
-	* @param array $atts {
-	*	limit : The number of element to display
-	*	order : The information to order list by
-	*	sorting : List order (ASC | DESC)
-	*	display : Display size (normal | mini)
-	*	type : Display tyep (grid | list) only work with display=normal
-	*	pagination : The number of element per page
-	* display_pagination : Display the pagination or not
-	* }
-	*
-	* @return string
-	*
-	**/
+	 * Display a list of product from a shortcode
+	 *
+	 * @param array $atts {
+	 *	limit : The number of element to display
+	 *	order : The information to order list by
+	 *	sorting : List order (ASC | DESC)
+	 *	display : Display size (normal | mini)
+	 *	type : Display tyep (grid | list) only work with display=normal
+	 *	pagination : The number of element per page
+	 * display_pagination : Display the pagination or not
+	 * }
+	 *
+	 * @return string
+	 *
+	 **/
 	public static function wpshop_products_func($atts) {
 		global $wpdb, $wp_query;
 
@@ -1134,7 +1134,7 @@ 
 	 * @param $description Description of the product
 	 * @param $attrs List of the attributes and values of the product
 	 * @return boolean
-	*/
+	 */
 	function addProduct($name, $description, $attrs=array()) {
 		$new_product = wpshop_entities::create_new_entity(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, $name, $description, $attrs);
 		return $new_product[0];
@@ -1448,13 +1448,13 @@ 
 
 
 	/**
-	*	Define output for product
-	*
-	*	@param mixed $initialContent The initial product content defined into wordpress basic admin interface
-	*	@param integer $product_id The product identifier we want to get and output attribute for
-	*
-	*	@return mixed $content The content to add or to modify the product output in frontend
-	*/
+	 *	Define output for product
+	 *
+	 *	@param mixed $initialContent The initial product content defined into wordpress basic admin interface
+	 *	@param integer $product_id The product identifier we want to get and output attribute for
+	 *
+	 *	@return mixed $content The content to add or to modify the product output in frontend
+	 */
 	public static function product_complete_sheet_output($initialContent, $product_id) {
 		$content = $attributeContentOutput = '';
 		$wps_product_ctr = new wps_product_ctr();
@@ -1754,12 +1754,12 @@ 
 
 
 	/**
-	*	Get the products (post) of a given category
-	*
-	*	@param string $category_slug The category slug we want to get the product list for
-	*
-	*	@return mixed $widget_content The output for the product list
-	*/
+	 *	Get the products (post) of a given category
+	 *
+	 *	@param string $category_slug The category slug we want to get the product list for
+	 *
+	 *	@return mixed $widget_content The output for the product list
+	 */
 	public static function get_product_of_category($category_slug, $category_id){
 		global $top_categories;
 		$widget_content = '';

Braces +89 added lines, -131 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
 * Products management method file
 *
@@ -200,8 +202,7 @@ 
 			if(((count($attributeEntitySetList) == 1) || ((count($attributeEntitySetList) > 1) && (($post_attribute_set_id > 0) || (isset($attribute_set_id->value) && ($attribute_set_id->value > 0)))))){
 				if((count($attributeEntitySetList) == 1) || (($post_attribute_set_id <= 0) && ($attribute_set_id->value <= 0))){
 					$post_attribute_set_id = $attributeEntitySetList[0]->id;
-				}
-				elseif(($post_attribute_set_id <= 0) && ($attribute_set_id->value > 0)){
+				} elseif(($post_attribute_set_id <= 0) && ($attribute_set_id->value > 0)){
 					$post_attribute_set_id = $attribute_set_id->value;
 				}
 
@@ -213,8 +214,9 @@ 
 					foreach($currentTabContent['box'] as $boxIdentifier => $boxTitle){
 						if(!empty($currentTabContent['box'][$boxIdentifier.'_backend_display_type']) &&( $currentTabContent['box'][$boxIdentifier.'_backend_display_type'] == 'movable-tab')){
 							add_meta_box('wpshop_product_' . $boxIdentifier, __($boxTitle, 'wpshop'), array('wpshop_products', 'meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'default', array('boxIdentifier' => $boxIdentifier));
+						} else {
+							$fixed_box_exist = true;
 						}
-						else $fixed_box_exist = true;
 					}
 				}
 				if ( $fixed_box_exist ) {
@@ -228,8 +230,7 @@ 
 
 				/**	Product option	*/
 				add_meta_box('wpshop_product_options', __('Options', 'wpshop'), array('wpshop_products', 'product_options_meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'side', 'default');
-			}
-			else if ( count($attributeEntitySetList) > 1 ) {
+			} else if ( count($attributeEntitySetList) > 1 ) {
 				$input_def['id'] = 'product_attribute_set_id';
 				$input_def['name'] = 'product_attribute_set_id';
 				$input_def['value'] = '';
@@ -477,8 +478,9 @@ 
 			$tpl_component = array();
 			$tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT'] = '';
 			for ( $i=1; $i<=$column_count; $i++ ) {
-				if (!empty($sub_content[$i]))
-					$tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT'] .= '<div class="alignleft" >' . $sub_content[$i] . '</div>';
+				if (!empty($sub_content[$i])) {
+									$tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT'] .= '<div class="alignleft" >' . $sub_content[$i] . '</div>';
+				}
 			}
 			$tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT_CLASS'] = empty($product_attribute_frontend_display_config) ? ' class="wpshopHide" ' : '';
 			$tpl_component['ADMIN_PRODUCT_ATTRIBUTE_FRONTEND_DISPLAY_MAIN_CHOICE_CHECK'] = empty($product_attribute_frontend_display_config) ? ' checked="checked"' : '';
@@ -501,7 +503,9 @@ 
 
 		$query = $wpdb->prepare("SELECT code, frontend_label FROM ".WPSHOP_DBT_ATTRIBUTE." WHERE is_used_for_sort_by = %s",  'yes');
 		$results = $wpdb->get_results($query, ARRAY_A);
-		if(!empty($results))$data = array_merge($data, $results);
+		if(!empty($results)) {
+			$data = array_merge($data, $results);
+		}
 
 		return $data;
 	}
@@ -516,12 +520,7 @@ 
 		if(!empty($data)) {
 			if ($data['data_type_to_use'] == 'custom' ) {
 				// Find which table to take
-				if($data['data_type']=='datetime') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME; }
-				elseif($data['data_type']=='decimal') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL; }
-				elseif($data['data_type']=='integer') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER; }
-				elseif($data['data_type']=='options') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS; }
-				elseif($data['data_type']=='text') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT; }
-				elseif($data['data_type']=='varchar') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR; }
+				if($data['data_type']=='datetime') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME; } elseif($data['data_type']=='decimal') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL; } elseif($data['data_type']=='integer') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER; } elseif($data['data_type']=='options') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS; } elseif($data['data_type']=='text') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT; } elseif($data['data_type']=='varchar') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR; }
 
 				if(isset($table_name)) {
 					// If the value is an id of a select, radio or checkbox
@@ -535,8 +534,7 @@ 
 							WHERE ATT.code=%s AND ( ATT_OPT.value=%s OR ATT_OPT.value=%s )", $attr_name, strtolower( __( $attr_value, 'wpshop' ) ), $attr_value
 						);
 						$data = $wpdb->get_results($query);
-					}
-					else {
+					} else {
 
 						$query = $wpdb->prepare("
 							SELECT ".$table_name.".entity_id FROM ".$table_name."
@@ -548,10 +546,10 @@ 
 						$data = $wpdb->get_results($query);
 
 					}
+				} else {
+					return __('Incorrect shortcode','wpshop');
 				}
-				else return __('Incorrect shortcode','wpshop');
-			}
-			elseif( $data['data_type_to_use'] == 'internal' )  {
+			} elseif( $data['data_type_to_use'] == 'internal' )  {
 				/** Check the ID of manufacturer **/
 				$default_value = unserialize( $data['default_value'] );
 				if( !empty($default_value) && !empty($default_value['default_value']) ) {
@@ -562,9 +560,13 @@ 
 						$data = $wpdb->get_results( $query );
 					}
 				}
-			}else return __('Incorrect shortcode','wpshop');
+			} else {
+				return __('Incorrect shortcode','wpshop');
+			}
 
-		} else return __('Incorrect shortcode','wpshop');
+		} else {
+			return __('Incorrect shortcode','wpshop');
+		}
 
 		if(!empty($data)) {
 			foreach($data as $p) {
@@ -591,7 +593,9 @@ 
 		global $wp_query;
 
 		$atts['product_type'] = 'related';
-		if(empty($atts['pid'])) $atts['pid'] = $wp_query->posts[0]->ID;
+		if(empty($atts['pid'])) {
+			$atts['pid'] = $wp_query->posts[0]->ID;
+		}
 
 		$related_product_output = self::wpshop_products_func($atts);
 
@@ -651,9 +655,12 @@ 
 			// Foreach on the found products
 			if ( !empty($products) ) {
 				$pid = implode(',',$products);
-				if(empty($pid))$output_results = false;
+				if(empty($pid)) {
+					$output_results = false;
+				}
+			} else {
+				$output_results = false;
 			}
-			else $output_results = false;
 		}
 
 		/** Get related products	*/
@@ -712,8 +719,7 @@ 
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 				$sorting = ob_get_contents();
 				ob_end_clean();
-			}
-			else {
+			} else {
 				/*
 				 * Display hidden field every times
 				 */
@@ -745,8 +751,7 @@ 
 					$tpl_component['DISPLAY_TYPE_STATE_GRID'] = $type == 'grid' ?' active' : null;
 					$tpl_component['DISPLAY_TYPE_STATE_LIST'] = $type == 'list' ?' active' : null;
 					$sorting = wpshop_display::display_template_element($template_part, $tpl_component);
-				}
-				else if ( !empty($atts['sorting']) && ($atts['sorting'] == 'no') ) {
+				} else if ( !empty($atts['sorting']) && ($atts['sorting'] == 'no') ) {
 					$sub_template_part = 'product_listing_sorting_criteria_hidden';
 					$sub_tpl_component = array();
 					$sub_tpl_component['CRITERIA_DEFAULT'] = !empty($sorting_criteria[0]['code']) ? $sorting_criteria[0]['code'] : 'title';
@@ -761,12 +766,10 @@ 
 
 			if ( !empty( $atts) && !empty($atts['container']) && $atts['container'] == 'no') {
 				$string = $sorting.'<div class="wps-catalog-container wps-bloc-loader">'.$string.'</div>';
-			}
-			else {
+			} else {
 				$string = '<div class="wpshop_products_block">'.$sorting.'<div class="wps-catalog-container wps-bloc-loader">'.$string.'</div></div>';
 			}
-		}
-		else if ( empty($atts['no_result_message']) || ($atts['no_result_message'] != 'no') ) {
+		} else if ( empty($atts['no_result_message']) || ($atts['no_result_message'] != 'no') ) {
 			$string = __('There is nothing to output here', 'wpshop');
 		}
 
@@ -831,24 +834,21 @@ 
 				default:
 					if(!empty($pid)) {
 						$post_meta = get_post_meta($pid, '_'.$criteria, true);
-					}
-					else{
+					} else{
 						$check_meta = $wpdb->prepare("SELECT COUNT(meta_id) as meta_criteria FROM " . $wpdb->postmeta . " WHERE meta_key = %s", '_'.$criteria);
 						$post_meta = $wpdb->get_var($check_meta);
 					}
 					if(!empty($post_meta)){
 						if ( in_array( $criteria, array( 'wpshop_displayed_price', 'product_price' ) ) ) {
 							$query['orderby'] = 'meta_value_num';
-						}
-						else {
+						} else {
 							$query['orderby'] = 'meta_value';
 						}
 						$query['meta_key'] = '_'.$criteria;
 					}
 					break;
 			}
-		}
-		else {
+		} else {
 			$query['orderby'] = 'menu_order ID';
 		}
 		$post_per_page = $query['posts_per_page'];
@@ -860,8 +860,7 @@ 
 				for( $i = 0; $i < $query['posts_per_page']; $i++ ) {
 					$tmp_array[] = $query['post__in'][$i];
 				}
-			}
-			else {
+			} else {
 				$begin_number = ( ($page_number - 1) * $query['posts_per_page'] ) ;
 				for( $i = $begin_number ; $i < $query['posts_per_page'] + $begin_number ; $i++ ) {
 					if ( !empty($query['post__in'][$i]) ) {
@@ -1091,8 +1090,7 @@ 
 						$product_meta['attribute_visible_listing'][$attribute->attribute_code] = $value;
 					}
 				}
-			}
-			else {
+			} else {
 
 			}
 
@@ -1194,8 +1192,7 @@ 
 					$query = "SELECT MAX(ID) AS PDCT_ID FROM {$wpdb->posts}";
 					$last_ref = $wpdb->get_var($query);
 					$data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'] = WPSHOP_PRODUCT_REFERENCE_PREFIX . str_repeat(0, WPSHOP_PRODUCT_REFERENCE_PREFIX_NB_FILL) . $last_ref;
-				}
-				else {
+				} else {
 					/* Check if the product reference existing in the database */
 					$ref = $data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'];
 					$query = $wpdb->prepare(
@@ -1250,8 +1247,7 @@ 
 
 			if ( !empty($data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']) && empty($data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']['default_config']) ) {
 				update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, $data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']);
-			}
-			else if ( $data_to_save['action'] != 'autosave') {
+			} else if ( $data_to_save['action'] != 'autosave') {
 				delete_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_FRONT_DISPLAY_CONF);
 			}
 
@@ -1325,23 +1321,20 @@ 
 			/*	Update the related products list*/
 			if ( !empty($data_to_save['related_products_list']) ) {
 				update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_RELATED_PRODUCTS, $data_to_save['related_products_list']);
-			}
-			else if ( $data_to_save['action'] != 'autosave') {
+			} else if ( $data_to_save['action'] != 'autosave') {
 				delete_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_RELATED_PRODUCTS);
 			}
 			/*	Update the provider list*/
 			if ( !empty($data_to_save['provider_list']) ) {
 				update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_PROVIDER, $data_to_save['provider_list']);
-			}
-			else if ( $data_to_save['action'] != 'autosave') {
+			} else if ( $data_to_save['action'] != 'autosave') {
 				delete_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_PROVIDER);
 			}
 
 			/*	Update product options	*/
 			if ( !empty($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['options']) ) {
 				update_post_meta($data_to_save['post_ID'], '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options', $data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['options']);
-			}
-			else if ( $data_to_save['action'] != 'autosave') {
+			} else if ( $data_to_save['action'] != 'autosave') {
 				delete_post_meta($data_to_save['post_ID'], '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options');
 			}
 
@@ -1372,8 +1365,7 @@ 
 				foreach( $variations as $variation_id => $variation_data ) {
 					if( !empty($variation_data) && !empty($variation_data['variation_def']) && count($variation_data['variation_def']) == 1 ) {
 						return 'single';
-					}
-					elseif( !empty($variation_data) && !empty($variation_data['variation_def']) && count($variation_data['variation_def']) > 1 ) {
+					} elseif( !empty($variation_data) && !empty($variation_data['variation_def']) && count($variation_data['variation_def']) > 1 ) {
 						$variation_type = 'combined';
 					}
 				}
@@ -1529,8 +1521,7 @@ 
 		$display_price_state_when_price_is_empty = true;
 		if ( empty( $productPrice ) && ( !empty( $catalog_options ) || ( !empty( $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] ) && $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] == 'yes' ) ) ) {
 			$display_price_state_when_price_is_empty = false;
-		}
-		else if ( !empty( $productPrice ) ) {
+		} else if ( !empty( $productPrice ) ) {
 			$display_price_state_when_price_is_empty = true;
 		}
 		$add_to_cart_button = ( true === $add_to_cart_button_display_state)  && ( true === $display_price_state_when_price_is_empty ) ? self::display_add_to_cart_button( $product_id, $productStock, 'complete' ) : '';
@@ -1590,8 +1581,7 @@ 
 			require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 			$content = ob_get_contents();
 			ob_end_clean();
-		}
-		else {
+		} else {
 			$content = wpshop_display::display_template_element($template_part, $tpl_component);
 		}
 		unset($tpl_component);
@@ -1625,8 +1615,7 @@ 
 				$product_more_informations = $post_content[0];
 			}
 
-		}
-		else {
+		} else {
 			$productThumbnail = wpshop_display::display_template_element('product_thumbnail_default', array());
 			$product_title = '<i>'.__('This product does not exist', 'wpshop').'</i>';
 			$product_link = '';
@@ -1655,8 +1644,7 @@ 
 	 			$tpl_component_price['MESSAGE_SAVE_MONEY'] = $product_price_infos['MESSAGE_SAVE_MONEY'];
 	 			$tpl_component_price['TAX_PILOTING'] = (!empty($price_ploting) && $price_ploting == 'HT' ) ? __('ET', 'wpshop') : ''; $product_price_infos['MESSAGE_SAVE_MONEY'];
 	 			$productPrice = wpshop_display::display_template_element('product_price_template_mini_output', $tpl_component_price );
-	 		}
-			else {
+	 		} else {
 				$productPrice = wpshop_prices::get_product_price($product, 'price_display', array('mini_output', $output_type) );
 	 		}
 		}
@@ -1671,8 +1659,7 @@ 
 		$display_price_state_when_price_is_empty = false;
 		if ( empty( $productPrice ) && ( !empty( $catalog_options ) || ( !empty( $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] ) && $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] == 'yes' ) ) ) {
 			$display_price_state_when_price_is_empty = false;
-		}
-		else if ( !empty( $productPrice ) ) {
+		} else if ( !empty( $productPrice ) ) {
 			$display_price_state_when_price_is_empty = true;
 		}
 		$add_to_cart_button = ( true === $add_to_cart_button_display_state)  && ( true === $display_price_state_when_price_is_empty ) ? self::display_add_to_cart_button( $product_id, $productStock, 'mini' ) : '';
@@ -1739,8 +1726,7 @@ 
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 				$content = ob_get_contents();
 				ob_end_clean();
-			}
-			else {
+			} else {
 				$content = wpshop_display::display_template_element($template_part, $tpl_component);
 			}
 			unset($tpl_component);
@@ -1862,8 +1848,7 @@ 
 					$option_value = $wpdb->get_var($query);
 					$parent_post = $parent_product['parent_post'];
 					$tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => $parent_post->post_title. ' <br/>('. $option_name . ' : ' . $option_value. ')');
-				}
-				else {
+				} else {
 					$tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => $post->post_title);
 				}
 
@@ -1958,8 +1943,7 @@ 
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 				$product_special_state['output'] = ob_get_contents();
 				ob_end_clean();
-			}
-			else {
+			} else {
 				$product_special_state['output'] = wpshop_display::display_template_element($template_part, $tpl_component);
 			}
 			unset($tpl_component);
@@ -1995,8 +1979,7 @@ 
 		/** Si aucun prix trouvé on stop la méthode / If not found price, stop the method */
 		if( empty( $prices_attribute ) ) {
 			return false;
-		}
-		else {
+		} else {
 			/**
 			 * Récupère le prix de base selon le pilotage de prix de la boutique / Get
 			 * the base amount according on the shop price control
@@ -2024,8 +2007,7 @@ 
 			if ( WPSHOP_PRODUCT_PRICE_PILOT == 'HT' ) {
 				$price_with_vat = ($base_price * $divider_price_ttc );
 				$price_no_vat 	= $base_price;
-			}
-			else if ( WPSHOP_PRODUCT_PRICE_PILOT == 'TTC' ) {
+			} else if ( WPSHOP_PRODUCT_PRICE_PILOT == 'TTC' ) {
 				$price_with_vat = $base_price;
 				$price_no_vat	= ($price_with_vat / $divider_price_ttc );
 			}
@@ -2118,8 +2100,7 @@ 
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 				$button = ob_get_contents();
 				ob_end_clean();
-			}
-			else {
+			} else {
 				$button = wpshop_display::display_template_element($template_part, $tpl_component, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $product_id, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . 'output_type' => $output_type));
 			}
 			unset($tpl_component);
@@ -2161,8 +2142,7 @@ 
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 				$quotation_button = ob_get_contents();
 				ob_end_clean();
-			}
-			else {
+			} else {
 				$quotation_button = wpshop_display::display_template_element($template_part, $tpl_component);
 			}
 			unset($tpl_component);
@@ -2213,8 +2193,7 @@ 
 			require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 			$galery_output = ob_get_contents();
 			ob_end_clean();
-		}
-		else {
+		} else {
 			$galery_output = wpshop_display::display_template_element($template_part, $tpl_component);
 		}
 		unset($tpl_component);
@@ -2363,8 +2342,7 @@ 
 					if ( !empty($content->$attribute_value) ) {
 						if ( !empty($head_wpshop_variation_definition['attributes']) && in_array($content->code, $head_wpshop_variation_definition['attributes']) ) {
 							$variations_output[$post_def->ID]['variation_def'][$content->code] = $content->$attribute_value;
-						}
-						else {
+						} else {
 							$variations_output[$post_def->ID]['variation_dif'][$content->code] = $content->$attribute_value;
 						}
 					}
@@ -2404,8 +2382,7 @@ 
 				$tpl_component['VARIATION_DETAIL_PRICE'] = number_format( $p, 2, '.', '').' '.$productCurrency.' '.( ( !empty($price_piloting) && $price_piloting == 'HT' ) ? __( 'ET', 'wpshop' ) : __( 'ATI', 'wpshop' ) );
 				if ( !empty($price_piloting) && $price_piloting == 'HT' ) {
 
-				}
-				else {
+				} else {
 
 				}
 				$post_obj = $variation['post'];
@@ -2417,17 +2394,14 @@ 
 					if ( !empty($product_option_postmeta['options']['price_behaviour']) && !empty($product_option_postmeta['options']['price_behaviour'][0]) && $product_option_postmeta['options']['price_behaviour'][0] == 'addition') {
 						if( !empty($price_piloting) && $price_piloting == 'HT' ) {
 							$product_price = ( ( !empty($variation['variation_dif']['price_ht']) ) ? $variation['variation_dif']['price_ht'] : 0 ) + $parent_product_infos['parent_post_meta']['price_ht'];
-						}
-						else {
+						} else {
 							$product_price = ( ( !empty($variation['variation_dif']['product_price']) ) ? $variation['variation_dif']['product_price'] : 0 ) + $parent_product_infos['parent_post_meta']['product_price'];
 						}
 						$tpl_component['VARIATION_DETAIL_SALE_PRICE_INDICATION'] = __('Variation price combined with the parent product price', 'wpshop');
-					}
-					else {
+					} else {
 						if( !empty($price_piloting) && $price_piloting == 'HT' ) {
 							$product_price = ( !empty($variation['variation_dif']['price_ht']) ) ? $variation['variation_dif']['price_ht'] : 0;
-						}
-						else {
+						} else {
 							$product_price = ( !empty($variation['variation_dif']['product_price']) ) ? $variation['variation_dif']['product_price'] : 0;
 						}
 						$tpl_component['VARIATION_DETAIL_SALE_PRICE_INDICATION'] = __('Only variation\'s price is used', 'wpshop');
@@ -2498,8 +2472,7 @@ 
 			$output .= wpshop_display::display_template_element('wpshop_admin_existing_variation_list', array('ADMIN_EXISTING_VARIATIONS_CONTAINER_CLASS' => '', 'ADMIN_EXISTING_VARIATIONS_CONTAINER' => $existing_variation_list), array(), 'admin');
 			/*	Reset de la liste des résultats pour éviter les comportements indésirables	*/
 			wp_reset_query();
-		}
-		else {
+		} else {
 			$output = __('No variation found for this product. Please use button above for create one', 'wpshop');
 		}
 
@@ -2525,8 +2498,9 @@ 
 			if (!empty($product_attribute_order_detail) ) {
 				foreach ( $product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
 					foreach ( $product_attr_group_detail['attribut'] as $position => $attribute_def) {
-						if ( !empty($attribute_def->code) )
-							$output_order[$attribute_def->code] = $position;
+						if ( !empty($attribute_def->code) ) {
+													$output_order[$attribute_def->code] = $position;
+						}
 					}
 				}
 			}
@@ -2564,8 +2538,7 @@ 
 							if ( !empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'custom')) {
 								$tpl_component['VARIATION_VALUE'] = stripslashes(wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'label', 'custom'));
 								$position = wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'position', 'custom');
-							}
-							else if ( !empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'internal')) {
+							} else if ( !empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'internal')) {
 								$post_def = get_post($attribute_value);
 								$tpl_component['VARIATION_VALUE'] = stripslashes($post_def->post_title);
 								$position = $post_def->menu_order;
@@ -2899,8 +2872,7 @@ 
 				//Get Summary cart
 				$response['product_output'] = $wpshop_products->wps_get_summary_variations_product( $product_id, $the_product, ( !empty( $wpshop_variation_selected ) || !empty( $wpshop_free_variation ) ? true : false )  );
 				$response_status = true;
-			}
-			else {
+			} else {
 				//Product without variations
 				$product_data = wpshop_products::get_product_data($product_id);
 				$response['product_price_output'] = wpshop_prices::get_product_price($product_data, 'price_display', 'complete_sheet');
@@ -2971,8 +2943,7 @@ 
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				// Get combined variations
 				$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->postmeta . " AS P_META INNER JOIN " . $wpdb->posts . " as P ON ((P.ID = P_META.post_id) AND (P.post_parent = %d)) WHERE P_META.meta_key = '_wpshop_variations_attribute_def' AND P_META.meta_value = '" . serialize($query_variation) . "'", $product_id);
 				$combined_variation_id = $wpdb->get_var($query);
@@ -2995,12 +2966,10 @@ 
 						}
 					}
 					$product_to_add_to_cart['display_lower_price'] = true;
-				}
-				else {
+				} else {
 					$product_to_add_to_cart[$product_id]['variations'] = array();
 				}
-			}
-			else {
+			} else {
 				$product_to_add_to_cart['text_from'] = '';
 				$product_to_add_to_cart[$product_id]['variations'] = ( !empty($product_variation_type) && $product_variation_type == 'single' ) ? $single_variations : $combined_variations;
 			}
@@ -3051,11 +3020,9 @@ 
 
 						if( !empty($discount_config['type']) && $discount_config['type'] == 'discount_amount' ) {
 							$product_into_cart['discount_amount'] = $discount_amount + $product_into_cart['discount_amount'];
-						}
-						elseif( !empty($discount_config['type']) && $discount_config['type'] == 'discount_rate' ) {
+						} elseif( !empty($discount_config['type']) && $discount_config['type'] == 'discount_rate' ) {
 							$product_into_cart['discount_rate'] = $discount_rate + $discount_config['value'];
-						}
-						elseif( !empty($discount_config['type']) && $discount_config['type'] == 'special_price' ) {
+						} elseif( !empty($discount_config['type']) && $discount_config['type'] == 'special_price' ) {
 							$product_into_cart['special_price'] = $special_price + $discount_config['value'];
 						}
 					}
@@ -3076,14 +3043,12 @@ 
 					$product_into_cart['product_price'] = $variations_discount_total_price['price_ati'];
 					$product_into_cart['price_ht'] = $variations_discount_total_price['price_et'];
 					$product_into_cart['tva'] = $variations_discount_total_price['vat_amount'];
-				}
-				else {
+				} else {
 					$product_into_cart['product_price'] = $variations_total_price['price_ati'];
 					$product_into_cart['price_ht'] = $variations_total_price['price_et'];
 					$product_into_cart['tva'] = $variations_total_price['vat_amount'];
 				}
-			}
-			else {
+			} else {
 				// Add variations price to product price
 				if( !empty($variations_discount_total_price) && !empty($variations_discount_total_price['price_ati']) ) {
 					$product_into_cart['price_ttc_before_discount'] = ( $product_into_cart['product_price'] + $variations_total_price['price_ati'] );
@@ -3092,8 +3057,7 @@ 
 					$product_into_cart['product_price'] += $variations_discount_total_price['price_ati'];
 					$product_into_cart['price_ht'] += $variations_discount_total_price['price_et'];
 					$product_into_cart['tva'] += $variations_discount_total_price['vat_amount'];
-				}
-				else {
+				} else {
 					$product_into_cart['product_price'] += $variations_total_price['price_ati'];
 					$product_into_cart['price_ht'] += $variations_total_price['price_et'];
 					$product_into_cart['tva'] += $variations_total_price['vat_amount'];
@@ -3107,17 +3071,14 @@ 
 
 					if( !empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'discount_amount' ) {
 						$product_into_cart['discount_amount'] = $discount_amount +  $parent_discount_config['value'];
-					}
-					elseif( !empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'discount_rate' ) {
+					} elseif( !empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'discount_rate' ) {
 						$product_into_cart['discount_rate'] = $discount_rate + $parent_discount_config['value'];
-					}
-					elseif( !empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'special_price' ) {
+					} elseif( !empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'special_price' ) {
 						$product_into_cart['special_price'] = $special_price + $parent_discount_config['value'];
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			// If product have just Free variations
 			$discount_config = wpshop_prices::check_discount_for_product( $head_product_id );
 			if( !empty($discount_config) ) {
@@ -3161,8 +3122,7 @@ 
 					if( !in_array($display_data, $variation_attribute_ordered['attribute_list']) ) {
 						$variation_attribute_ordered['attribute_list'][$output_order[$variation_attribute_code]] = $display_data;
 					}
-				}
-				else {
+				} else {
 					$display_data = wpshop_display::display_template_element('cart_variation_detail', $variation_tpl_component, array('page' => $from_page, 'type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $variation_attribute_code), $template_part);
 					if( !in_array($display_data, $variation_attribute_ordered['attribute_list']) ) {
 						$variation_attribute_ordered['attribute_list'][] = $display_data;
@@ -3202,8 +3162,7 @@ 
 					$variation_definition = explode('-_variation_val_-', $build_variation);
 					$attribute_code = $variation_definition[0];
 					$attribute_selected_value = $variation_definition[1];
-				}
-				else {
+				} else {
 					$attribute_code = $build_variation_key;
 					$attribute_selected_value = $build_variation;
 				}
@@ -3291,8 +3250,7 @@ 
 				$output .= '<li>' .sprintf( __( 'Ordered by %s %s (%s) on %s (Order ref. : %s)', 'wpshop'), $sales_information['customer_name'], $sales_information['customer_firstname'], $sales_information['customer_email'], $sales_information['order_date'], $sales_information['order_key'] ). '</li>';
 			}
 			$output .= '</ul>';
-		}
-		else {
+		} else {
 			$output .= __( 'This product has never been ordered', 'wpshop');
 		}
 
@@ -3310,8 +3268,9 @@ 
 		if ( count($product_attribute_order_detail) > 0 ) {
 			foreach ( $product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
 				foreach ( $product_attr_group_detail['attribut'] as $position => $attribute_def) {
-					if ( !empty($attribute_def->code) )
-						$output_order[$attribute_def->code] = $position;
+					if ( !empty($attribute_def->code) ) {
+											$output_order[$attribute_def->code] = $position;
+					}
 				}
 			}
 		}
@@ -3331,8 +3290,7 @@ 
 				if ( !empty($wpshop_current_for_display) && in_array($product_definition_key, unserialize(WPSHOP_ATTRIBUTE_PRICES)) ) {
 					$tpl_component['PRODUCT_MAIN_INFO_' . strtoupper($product_definition_key)] = $product_definition_value;
 				}
-			}
-			else {
+			} else {
 				$variation_attribute_ordered = wpshop_products::get_selected_variation_display( $product_definition_value, $output_order, 'selection_summary' );
 			}
 		}

Doc Comments +7 added lines, -4 removed lines

@@ -1131,7 +1131,7 @@ 
 	/**
 	 * Add a product into the db. This function is used for the EDI
 	 * @param $name Name of the product
-	 * @param $description Description of the product
+	 * @param string $description Description of the product
 	 * @param $attrs List of the attributes and values of the product
 	 * @return boolean
 	*/
@@ -1450,10 +1450,10 @@ 
 	/**
 	*	Define output for product
 	*
-	*	@param mixed $initialContent The initial product content defined into wordpress basic admin interface
+	*	@param string $initialContent The initial product content defined into wordpress basic admin interface
 	*	@param integer $product_id The product identifier we want to get and output attribute for
 	*
-	*	@return mixed $content The content to add or to modify the product output in frontend
+	*	@return string $content The content to add or to modify the product output in frontend
 	*/
 	public static function product_complete_sheet_output($initialContent, $product_id) {
 		$content = $attributeContentOutput = '';
@@ -2508,7 +2508,7 @@ 
 
 	/**
 	 * Retrieve and display the variation for a given product
-	 * @param integer $product_id The product identifier to get variation for
+	 * @param integer $post_id The product identifier to get variation for
 	 */
 	public static function wpshop_variation( $post_id = '', $from_admin = false, $order_id = '', $qty = 1 ) {
 		global $wp_query;
@@ -3300,6 +3300,9 @@ 
 	}
 
 
+	/**
+	 * @param boolean $has_variation
+	 */
 	function wps_get_summary_variations_product( $product_id, $the_product, $has_variation ) {
 		global $wpdb, $wpshop_payment;
 		$output = '';

Spacing +802 added lines, -802 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
 * Products management method file
 *
@@ -10,8 +10,8 @@ 
 */
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -37,25 +37,25 @@ 
 		die();
 	}
 
-	function products_list_js () {
+	function products_list_js() {
 		global $wpdb;
 		/** Create a JS Array of products **/
 // 		$query = $wpdb->prepare('SELECT ID, post_title FROM ' .$wpdb->posts. '  WHERE post_type = %s AND post_status = %s', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish');
 // 		$products_post = $wpdb->get_results( $query );
 
-		$products_post = get_posts( array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'post_status' => 'publish', 'posts_per_page' => -1 ) );
+		$products_post = get_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'post_status' => 'publish', 'posts_per_page' => -1));
 
-		if ( !empty( $products_post ) ) {
-			$products_js_array  = 'var products = [';
-			foreach ( $products_post as $product ) {
-				$barcode = get_post_meta( $product->ID, '_barcode', true);
-				$products_js_array .= '{label:"#' .$product->ID. ' ' .str_replace('"', '', $product->post_title). ' - ' .( (!empty($barcode) ) ? $barcode : '' ). '", ';
-				$products_js_array .= 'value:"' .$product->ID. '", ';
-				$products_js_array .= ( !empty($barcode) ) ? 'desc:"' .$barcode. '"},' : '},';
+		if (!empty($products_post)) {
+			$products_js_array = 'var products = [';
+			foreach ($products_post as $product) {
+				$barcode = get_post_meta($product->ID, '_barcode', true);
+				$products_js_array .= '{label:"#' . $product->ID . ' ' . str_replace('"', '', $product->post_title) . ' - ' . ((!empty($barcode)) ? $barcode : '') . '", ';
+				$products_js_array .= 'value:"' . $product->ID . '", ';
+				$products_js_array .= (!empty($barcode)) ? 'desc:"' . $barcode . '"},' : '},';
 			}
 			$products_js_array .= '];';
 		}
-		$output = wpshop_display::display_template_element('wps_orders_products_list_js', array('PRODUCTS_JS_ARRAY' => $products_js_array) , array(), 'admin');
+		$output = wpshop_display::display_template_element('wps_orders_products_list_js', array('PRODUCTS_JS_ARRAY' => $products_js_array), array(), 'admin');
 		return $output;
 	}
 
@@ -77,11 +77,11 @@ 
 				'with_front'		=> false,
 		);
 
-		if ( empty( $options['wpshop_catalog_product_slug'] ) || $options['wpshop_catalog_product_slug'] == '/' ) {
+		if (empty($options['wpshop_catalog_product_slug']) || $options['wpshop_catalog_product_slug'] == '/') {
 			$slug = false;
 		} else {
 			$slug['slug'] = $options['wpshop_catalog_product_slug'];
-			if( !empty( $options['wpshop_catalog_product_slug_with_category'] ) ) {
+			if (!empty($options['wpshop_catalog_product_slug_with_category'])) {
 				$slug['slug'] .= '/%' . WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '%';
 			}
 		}
@@ -90,17 +90,17 @@ 
 		/*	Définition des produits 	*/
 		register_post_type(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, array(
 			'labels' => array(
-				'name'					=> __( 'Products', 'wpshop' ),
-				'singular_name' 		=> __( 'Catalog', 'wpshop' ),
-				'add_new_item' 			=> __( 'Add new product', 'wpshop' ),
-				'add_new' 				=> __( 'Add new product', 'wpshop' ),
-				'add_new_item' 			=> __( 'Add new product', 'wpshop' ),
-				'edit_item' 			=> __( 'Edit product', 'wpshop' ),
-				'new_item' 				=> __( 'New product', 'wpshop' ),
-				'view_item' 			=> __( 'View product', 'wpshop' ),
-				'search_items' 			=> __( 'Search products', 'wpshop' ),
-				'not_found' 			=> __( 'No products found', 'wpshop' ),
-				'not_found_in_trash' 	=> __( 'No products found in Trash', 'wpshop' ),
+				'name'					=> __('Products', 'wpshop'),
+				'singular_name' 		=> __('Catalog', 'wpshop'),
+				'add_new_item' 			=> __('Add new product', 'wpshop'),
+				'add_new' 				=> __('Add new product', 'wpshop'),
+				'add_new_item' 			=> __('Add new product', 'wpshop'),
+				'edit_item' 			=> __('Edit product', 'wpshop'),
+				'new_item' 				=> __('New product', 'wpshop'),
+				'view_item' 			=> __('View product', 'wpshop'),
+				'search_items' 			=> __('Search products', 'wpshop'),
+				'not_found' 			=> __('No products found', 'wpshop'),
+				'not_found_in_trash' 	=> __('No products found in Trash', 'wpshop'),
 				'parent_item_colon' 	=> ''
 			),
 			'supports' 				=> unserialize(WPSHOP_REGISTER_POST_TYPE_SUPPORT),
@@ -108,26 +108,26 @@ 
 			'has_archive'			=> false,
 			'show_in_nav_menus' 	=> true,
 			//'rewrite' 				=> false,	//	For information see below
-			'taxonomies' 			=> array( WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES ),
+			'taxonomies' 			=> array(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES),
 			'menu_icon' 			=> 'dashicons-archive',
 			'rewrite' 				=> $slug,
 		));
 
 		/*	Définition des variations de produit (Déclinaisons)	*/
-		register_post_type( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, array(
+		register_post_type(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, array(
 			'labels'				=> array(
-				'name' 					=> __( 'Variations', 'wpshop' ),
-				'singular_name' 		=> __( 'Variation', 'wpshop' ),
-				'add_new' 				=> __( 'Add Variation', 'wpshop' ),
-				'add_new_item' 			=> __( 'Add New Variation', 'wpshop' ),
-				'edit' 					=> __( 'Edit', 'wpshop' ),
-				'edit_item' 			=> __( 'Edit Variation', 'wpshop' ),
-				'new_item' 				=> __( 'New Variation', 'wpshop' ),
-				'view' 					=> __( 'View Variation', 'wpshop' ),
-				'view_item' 			=> __( 'View Variation', 'wpshop' ),
-				'search_items' 			=> __( 'Search Variations', 'wpshop' ),
-				'not_found' 			=> __( 'No Variations found', 'wpshop' ),
-				'not_found_in_trash' 	=> __( 'No Variations found in trash', 'wpshop' ),
+				'name' 					=> __('Variations', 'wpshop'),
+				'singular_name' 		=> __('Variation', 'wpshop'),
+				'add_new' 				=> __('Add Variation', 'wpshop'),
+				'add_new_item' 			=> __('Add New Variation', 'wpshop'),
+				'edit' 					=> __('Edit', 'wpshop'),
+				'edit_item' 			=> __('Edit Variation', 'wpshop'),
+				'new_item' 				=> __('New Variation', 'wpshop'),
+				'view' 					=> __('View Variation', 'wpshop'),
+				'view_item' 			=> __('View Variation', 'wpshop'),
+				'search_items' 			=> __('Search Variations', 'wpshop'),
+				'not_found' 			=> __('No Variations found', 'wpshop'),
+				'not_found_in_trash' 	=> __('No Variations found in trash', 'wpshop'),
 				'parent_item_colon' 	=> ''
 			),
 			'supports' 				=> unserialize(WPSHOP_REGISTER_POST_TYPE_SUPPORT),
@@ -163,12 +163,12 @@ 
 
 	public static function hidden_meta_boxes($hidden, $screen, $use_defaults) {
 		global $wpdb;
-		if ( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT === $screen->post_type ) {
-			$user_meta_for_wpshop = array('metaboxhidden_'.WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-			foreach($user_meta_for_wpshop as $meta_to_check){
-				$metas_hidden = get_user_meta( get_current_user_id(), $meta_to_check, true );
-				if( empty( $metas_hidden ) && !is_array( $metas_hidden ) ) {
-					$hidden = unserialize( WPSHOP_PRODUCT_HIDDEN_METABOX );
+		if (WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT === $screen->post_type) {
+			$user_meta_for_wpshop = array('metaboxhidden_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+			foreach ($user_meta_for_wpshop as $meta_to_check) {
+				$metas_hidden = get_user_meta(get_current_user_id(), $meta_to_check, true);
+				if (empty($metas_hidden) && !is_array($metas_hidden)) {
+					$hidden = unserialize(WPSHOP_PRODUCT_HIDDEN_METABOX);
 				}
 			}
 		}
@@ -181,7 +181,7 @@ 
 	public static function add_meta_boxes() {
 		global $post, $currentTabContent;
 
-		if(!empty($post->post_type) && ( ($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) || ($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) ) ) {
+		if (!empty($post->post_type) && (($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) || ($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION))) {
 			/*	Get the attribute set list for the current entity	*/
 			$attributeEntitySetList = wpshop_attributes_set::get_attribute_set_list_for_entity(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode));
 			/*	Check if the meta information of the current product already exists 	*/
@@ -189,19 +189,19 @@ 
 			/*	Check if the product has been saved without meta information set	*/
 			$attribute_set_id = wpshop_attributes::get_attribute_value_content('product_attribute_set_id', $post->ID, self::currentPageCode);
 			/*	Unset 'free_product' from list of attributes set	*/
-			foreach( $attributeEntitySetList as $key_attribute_set => $attribute_set ) {
-				if( $attribute_set->slug == 'free_product' ) {
+			foreach ($attributeEntitySetList as $key_attribute_set => $attribute_set) {
+				if ($attribute_set->slug == 'free_product') {
 					unset($attributeEntitySetList[$key_attribute_set]);
 					break;
 				}
 			}
 
 			/*	Check if an attribute has already been choosen for the curernt entity or if the user has to choose a entity set before continuing	*/
-			if(((count($attributeEntitySetList) == 1) || ((count($attributeEntitySetList) > 1) && (($post_attribute_set_id > 0) || (isset($attribute_set_id->value) && ($attribute_set_id->value > 0)))))){
-				if((count($attributeEntitySetList) == 1) || (($post_attribute_set_id <= 0) && ($attribute_set_id->value <= 0))){
+			if (((count($attributeEntitySetList) == 1) || ((count($attributeEntitySetList) > 1) && (($post_attribute_set_id > 0) || (isset($attribute_set_id->value) && ($attribute_set_id->value > 0)))))) {
+				if ((count($attributeEntitySetList) == 1) || (($post_attribute_set_id <= 0) && ($attribute_set_id->value <= 0))) {
 					$post_attribute_set_id = $attributeEntitySetList[0]->id;
 				}
-				elseif(($post_attribute_set_id <= 0) && ($attribute_set_id->value > 0)){
+				elseif (($post_attribute_set_id <= 0) && ($attribute_set_id->value > 0)) {
 					$post_attribute_set_id = $attribute_set_id->value;
 				}
 
@@ -209,15 +209,15 @@ 
 
 				$fixed_box_exist = false;
 				/*	Get all the other attribute set for hte current entity	*/
-				if(isset($currentTabContent['box']) && count($currentTabContent['box']) > 0){
-					foreach($currentTabContent['box'] as $boxIdentifier => $boxTitle){
-						if(!empty($currentTabContent['box'][$boxIdentifier.'_backend_display_type']) &&( $currentTabContent['box'][$boxIdentifier.'_backend_display_type'] == 'movable-tab')){
+				if (isset($currentTabContent['box']) && count($currentTabContent['box']) > 0) {
+					foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
+						if (!empty($currentTabContent['box'][$boxIdentifier . '_backend_display_type']) && ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'movable-tab')) {
 							add_meta_box('wpshop_product_' . $boxIdentifier, __($boxTitle, 'wpshop'), array('wpshop_products', 'meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'default', array('boxIdentifier' => $boxIdentifier));
 						}
 						else $fixed_box_exist = true;
 					}
 				}
-				if ( $fixed_box_exist ) {
+				if ($fixed_box_exist) {
 					add_meta_box('wpshop_product_fixed_tab', __('Product data', 'wpshop'), array('wpshop_products', 'product_data_meta_box'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'normal', 'high', array('currentTabContent' => $currentTabContent));
 					add_meta_box('wpshop_product_fixed_tab', __('Product data', 'wpshop'), array('wpshop_products', 'product_data_meta_box'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'normal', 'high', array('currentTabContent' => $currentTabContent));
 				}
@@ -229,7 +229,7 @@ 
 				/**	Product option	*/
 				add_meta_box('wpshop_product_options', __('Options', 'wpshop'), array('wpshop_products', 'product_options_meta_box_content'), WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'side', 'default');
 			}
-			else if ( count($attributeEntitySetList) > 1 ) {
+			else if (count($attributeEntitySetList) > 1) {
 				$input_def['id'] = 'product_attribute_set_id';
 				$input_def['name'] = 'product_attribute_set_id';
 				$input_def['value'] = '';
@@ -238,7 +238,7 @@ 
 
 				$input_def['value'] = '';
 				foreach ($attributeEntitySetList as $set) {
-					if( $set->default_set == 'yes' ) {
+					if ($set->default_set == 'yes') {
 						$input_def['value'] = $set->id;
 					}
 				}
@@ -246,7 +246,7 @@ 
 				$currentTabContent['boxContent']['attribute_set_selector'] = '
 	<ul class="attribute_set_selector" >
 		<li class="attribute_set_selector_title_select" ><label for="title" >' . __('Choose a title for your product', 'wpshop') . '</label></li>
-		<li class="attribute_set_selector_group_selector" ><label for="' . $input_def['id'] . '" >' . __('Choose an attribute group for this product', 'wpshop') . '</label>&nbsp;'.wpshop_form::check_input_type($input_def, self::currentPageCode.'_attribute[integer]').'</li>
+		<li class="attribute_set_selector_group_selector" ><label for="' . $input_def['id'] . '" >' . __('Choose an attribute group for this product', 'wpshop') . '</label>&nbsp;' . wpshop_form::check_input_type($input_def, self::currentPageCode . '_attribute[integer]') . '</li>
 		<li class="attribute_set_selector_save_instruction" >' . __('Save the product with the "Save draft" button on the right side', 'wpshop') . '</li>
 		<li class="attribute_set_selector_after_save_instruction" >' . __('Once the group chosen, the different attribute will be displayed here', 'wpshop') . '</li>
 	</ul>';
@@ -262,10 +262,10 @@ 
 	 *
 	 * @param object $post
 	 */
-	public static function product_options_meta_box_content( $post ) {
+	public static function product_options_meta_box_content($post) {
 		$output = '';
 
-		$product_current_options = get_post_meta( $post->ID, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options', true);
+		$product_current_options = get_post_meta($post->ID, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options', true);
 
 		$tpl_component = array();
 		$tpl_component['ADMIN_PRODUCT_OPTION_FOR_CART_AUTOADD_CHECKBOX_STATE'] = (!empty($product_current_options['cart']) && !empty($product_current_options['cart']['auto_add'])) ? ' checked="checked"' : '';
@@ -284,25 +284,25 @@ 
 
 		echo '<div id="fixed-tabs" class="wpshop_tabs wpshop_detail_tabs wpshop_product_attribute_tabs" >
 				<ul>';
-		if(!empty($currentTabContent['box'])){
-			foreach($currentTabContent['box'] as $boxIdentifier => $boxTitle){
-				if(!empty($currentTabContent['boxContent'][$boxIdentifier])) {
-					if($currentTabContent['box'][$boxIdentifier.'_backend_display_type']=='fixed-tab') {
-						echo '<li><a href="#tabs-'.sanitize_title($boxIdentifier).'">'.__($boxTitle, 'wpshop').'</a></li>';
+		if (!empty($currentTabContent['box'])) {
+			foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
+				if (!empty($currentTabContent['boxContent'][$boxIdentifier])) {
+					if ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'fixed-tab') {
+						echo '<li><a href="#tabs-' . sanitize_title($boxIdentifier) . '">' . __($boxTitle, 'wpshop') . '</a></li>';
 					}
 				}
 			}
 		}
-		echo '<li><a href="#tabs-product-related">'.__('Related products', 'wpshop').'</a></li>';
-		echo '<li><a href="#tabs-product-provider">'.__('Providers', 'wpshop').'</a></li>';
-		echo '<li class="wpshop_product_data_display_tab" ><a href="#tabs-product-display">'.__('Product display', 'wpshop').'</a></li>';
+		echo '<li><a href="#tabs-product-related">' . __('Related products', 'wpshop') . '</a></li>';
+		echo '<li><a href="#tabs-product-provider">' . __('Providers', 'wpshop') . '</a></li>';
+		echo '<li class="wpshop_product_data_display_tab" ><a href="#tabs-product-display">' . __('Product display', 'wpshop') . '</a></li>';
 		echo '</ul>';
 
-		if(!empty($currentTabContent['box'])){
-			foreach($currentTabContent['box'] as $boxIdentifier => $boxTitle){
-				if(!empty($currentTabContent['boxContent'][$boxIdentifier])) {
-					if($currentTabContent['box'][$boxIdentifier.'_backend_display_type']=='fixed-tab') {
-						echo '<div id="tabs-'.sanitize_title($boxIdentifier).'">'.$currentTabContent['boxContent'][$boxIdentifier].'</div>';
+		if (!empty($currentTabContent['box'])) {
+			foreach ($currentTabContent['box'] as $boxIdentifier => $boxTitle) {
+				if (!empty($currentTabContent['boxContent'][$boxIdentifier])) {
+					if ($currentTabContent['box'][$boxIdentifier . '_backend_display_type'] == 'fixed-tab') {
+						echo '<div id="tabs-' . sanitize_title($boxIdentifier) . '">' . $currentTabContent['boxContent'][$boxIdentifier] . '</div>';
 					}
 				}
 			}
@@ -324,12 +324,12 @@ 
 	 * @param object $post The current edited post
 	 * @return string
 	 */
-	public static function related_products_meta_box_content( $post ) {
+	public static function related_products_meta_box_content($post) {
 		$content = $existing_selection = '';
 
-		if( !empty($post->ID) ) {
+		if (!empty($post->ID)) {
 			$related_products_id = get_post_meta($post->ID, WPSHOP_PRODUCT_RELATED_PRODUCTS, true);
-			if( !empty($related_products_id) && !empty($related_products_id[0]) ) {
+			if (!empty($related_products_id) && !empty($related_products_id[0])) {
 				foreach ($related_products_id as $related_product_id) {
 					$existing_selection .= '<option selected value="' . $related_product_id . '" >' . get_the_title($related_product_id) . '</option>';
 				}
@@ -349,14 +349,14 @@ 
 	 * @param object $post The current edited post
 	 * @return string
 	 */
-	public static function provider_products_meta_box_content( $post ) {
+	public static function provider_products_meta_box_content($post) {
 		$content = $existing_selection = '';
 
-		if( !empty($post->ID) ) {
+		if (!empty($post->ID)) {
 			$providers_id = get_post_meta($post->ID, WPSHOP_PRODUCT_PROVIDER, true);
-			if( !empty($providers_id) && !empty($providers_id[0]) ) {
+			if (!empty($providers_id) && !empty($providers_id[0])) {
 				foreach ($providers_id as $provider_id) {
-					$existing_selection .= '<option selected value="' . $provider_id . '" >' . get_the_title( $provider_id ) . '</option>';
+					$existing_selection .= '<option selected value="' . $provider_id . '" >' . get_the_title($provider_id) . '</option>';
 				}
 			}
 		}
@@ -373,7 +373,7 @@ 
 	 * Define the metabox content for the action box
 	 * @param obejct $post The current element being edited
 	 */
-	public static function product_actions_meta_box_content( $post ) {
+	public static function product_actions_meta_box_content($post) {
 		$output = '';
 		/*
 		 * Template parameters
@@ -381,7 +381,7 @@ 
 		$template_part = 'wpshop_duplicate_product';
 		$tpl_component = array();
 		$tpl_component['PRODUCT_ID'] = $post->ID;
-		$tpl_component['PRINT_PRODUCT_SHEET_LINK'] = WPSHOP_TEMPLATES_URL.'product_sheet.php?pid='.$post->ID;
+		$tpl_component['PRINT_PRODUCT_SHEET_LINK'] = WPSHOP_TEMPLATES_URL . 'product_sheet.php?pid=' . $post->ID;
 		/*
 		 * Build template
 		*/
@@ -394,7 +394,7 @@ 
 	/**
 	 *	Define the content of the product main information box
 	 */
-	public static function meta_box_content($post, $metaboxArgs){
+	public static function meta_box_content($post, $metaboxArgs) {
 		global $currentTabContent;
 
 		/*	Add the extra fields defined by the default attribute group in the general section	*/
@@ -407,19 +407,19 @@ 
 	 * @param object $post The current element being edited
 	 * @return string The metabox content
 	 */
-	public static function product_frontend_display_config_meta_box( $post ) {
+	public static function product_frontend_display_config_meta_box($post) {
 		$content = '';
 
 		$product_attribute_frontend_display_config = null;
-		if( !empty($post->ID) ) {
+		if (!empty($post->ID)) {
 			$product_attribute_frontend_display_config = get_post_meta($post->ID, WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, true);
 
 			$extra_options = get_option('wpshop_extra_options', array());
-			$column_count = (!empty($extra_options['WPSHOP_COLUMN_NUMBER_PRODUCT_EDITION_FOR_FRONT_DISPLAY'])?$extra_options['WPSHOP_COLUMN_NUMBER_PRODUCT_EDITION_FOR_FRONT_DISPLAY']:3);
-			$attribute_list = wpshop_attributes::getElementWithAttributeAndValue(wpshop_entities::get_entity_identifier_from_code( self::currentPageCode ), $post->ID, WPSHOP_CURRENT_LOCALE);
+			$column_count = (!empty($extra_options['WPSHOP_COLUMN_NUMBER_PRODUCT_EDITION_FOR_FRONT_DISPLAY']) ? $extra_options['WPSHOP_COLUMN_NUMBER_PRODUCT_EDITION_FOR_FRONT_DISPLAY'] : 3);
+			$attribute_list = wpshop_attributes::getElementWithAttributeAndValue(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode), $post->ID, WPSHOP_CURRENT_LOCALE);
 			$column = 1;
 
-			if ( WPSHOP_DEFINED_SHOP_TYPE == 'sale' ) {
+			if (WPSHOP_DEFINED_SHOP_TYPE == 'sale') {
 				$sub_tpl_component = array();
 				$sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_NAME'] = __('Action on product', 'wpshop');
 
@@ -429,8 +429,8 @@ 
 				$tpl_component['ADMIN_ATTRIBUTE_FD_ID'] = $post->ID . '_product_action_button_add_to_cart';
 				$button_is_set_to_be_displayed = (WPSHOP_DEFINED_SHOP_TYPE == 'sale') ? 'yes' : 'no';
 
-				$tpl_component['ADMIN_ATTRIBUTE_COMPLETE_SHEET_CHECK'] = wpshop_attributes::check_attribute_display( $button_is_set_to_be_displayed, $product_attribute_frontend_display_config, 'product_action_button', 'add_to_cart', 'complete_sheet') ? ' checked="checked"' : '';
-				$tpl_component['ADMIN_ATTRIBUTE_MINI_OUTPUT_CHECK'] = wpshop_attributes::check_attribute_display( $button_is_set_to_be_displayed, $product_attribute_frontend_display_config, 'product_action_button', 'add_to_cart', 'mini_output') ? ' checked="checked"' : '';
+				$tpl_component['ADMIN_ATTRIBUTE_COMPLETE_SHEET_CHECK'] = wpshop_attributes::check_attribute_display($button_is_set_to_be_displayed, $product_attribute_frontend_display_config, 'product_action_button', 'add_to_cart', 'complete_sheet') ? ' checked="checked"' : '';
+				$tpl_component['ADMIN_ATTRIBUTE_MINI_OUTPUT_CHECK'] = wpshop_attributes::check_attribute_display($button_is_set_to_be_displayed, $product_attribute_frontend_display_config, 'product_action_button', 'add_to_cart', 'mini_output') ? ' checked="checked"' : '';
 				$sub_tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_CONTENT'] = wpshop_display::display_template_element('wpshop_admin_attr_config_for_front_display', $tpl_component, array(), 'admin');
 				unset($tpl_component);
 
@@ -440,21 +440,21 @@ 
 				$sub_content[1] = wpshop_display::display_template_element('wpshop_admin_attr_set_section_for_front_display', $sub_tpl_component, array(), 'admin');
 			}
 
-			if ( !empty($attribute_list[$post->ID]) && is_array($attribute_list[$post->ID]) ) {
-				foreach ( $attribute_list[$post->ID] as $attribute_set_section_name => $attribute_set_section_content ) {
-					if ( !isset($sub_content[$column]) ) {
+			if (!empty($attribute_list[$post->ID]) && is_array($attribute_list[$post->ID])) {
+				foreach ($attribute_list[$post->ID] as $attribute_set_section_name => $attribute_set_section_content) {
+					if (!isset($sub_content[$column])) {
 						$sub_content[$column] = '';
 					}
 
 					$attribute_sub_output = '';
-					foreach ( $attribute_set_section_content['attributes'] as $attribute_id => $attribute_def ) {
-						if ( $attribute_def['attribute_code'] != 'product_attribute_set_id' ) {
+					foreach ($attribute_set_section_content['attributes'] as $attribute_id => $attribute_def) {
+						if ($attribute_def['attribute_code'] != 'product_attribute_set_id') {
 							$tpl_component = array();
 							$tpl_component['ADMIN_ATTRIBUTE_LABEL'] = $attribute_def['frontend_label'];
 							$tpl_component['ADMIN_ATTRIBUTE_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[attribute][' . $attribute_def['attribute_code'] . ']';
 							$tpl_component['ADMIN_ATTRIBUTE_FD_ID'] = $post->ID . '_' . $attribute_def['attribute_code'];
-							$tpl_component['ADMIN_ATTRIBUTE_COMPLETE_SHEET_CHECK'] = wpshop_attributes::check_attribute_display( $attribute_def['is_visible_in_front'], $product_attribute_frontend_display_config, 'attribute', $attribute_def['attribute_code'], 'complete_sheet') ? ' checked="checked"' : '';
-							$tpl_component['ADMIN_ATTRIBUTE_MINI_OUTPUT_CHECK'] = wpshop_attributes::check_attribute_display( $attribute_def['is_visible_in_front_listing'], $product_attribute_frontend_display_config, 'attribute', $attribute_def['attribute_code'], 'mini_output') ? ' checked="checked"' : '';
+							$tpl_component['ADMIN_ATTRIBUTE_COMPLETE_SHEET_CHECK'] = wpshop_attributes::check_attribute_display($attribute_def['is_visible_in_front'], $product_attribute_frontend_display_config, 'attribute', $attribute_def['attribute_code'], 'complete_sheet') ? ' checked="checked"' : '';
+							$tpl_component['ADMIN_ATTRIBUTE_MINI_OUTPUT_CHECK'] = wpshop_attributes::check_attribute_display($attribute_def['is_visible_in_front_listing'], $product_attribute_frontend_display_config, 'attribute', $attribute_def['attribute_code'], 'mini_output') ? ' checked="checked"' : '';
 							$attribute_sub_output .= wpshop_display::display_template_element('wpshop_admin_attr_config_for_front_display', $tpl_component, array(), 'admin');
 							unset($tpl_component);
 						}
@@ -465,18 +465,18 @@ 
 					$tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_CONTENT'] = $attribute_sub_output;
 					$tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_FD_NAME'] = self::currentPageCode . '_attr_frontend_display[attribute_set_section][' . $attribute_set_section_content['code'] . ']';
 					$tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_FD_ID'] = $attribute_set_section_content['code'];
-					$ADMIN_ATTRIBUTE_SET_SECTION_COMPLETE_SHEET_CHECK = wpshop_attributes::check_attribute_display( $attribute_set_section_content['display_on_frontend'], $product_attribute_frontend_display_config, 'attribute_set_section', $attribute_set_section_content['code'], 'complete_sheet') ? ' checked="checked"' : '';
-					$tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_INPUT_CHECKBOX'] = '<input type="checkbox" name="' .  self::currentPageCode . '_attr_frontend_display[attribute_set_section][' . $attribute_set_section_content['code'] . '][complete_sheet]" id="' .  $attribute_set_section_content['code'] . '_complete_sheet" value="yes"' . $ADMIN_ATTRIBUTE_SET_SECTION_COMPLETE_SHEET_CHECK . ' /><label for="' .  $attribute_set_section_content['code'] . '_complete_sheet" >' . __('Display in product page', 'wpshop') . '</label>';
+					$ADMIN_ATTRIBUTE_SET_SECTION_COMPLETE_SHEET_CHECK = wpshop_attributes::check_attribute_display($attribute_set_section_content['display_on_frontend'], $product_attribute_frontend_display_config, 'attribute_set_section', $attribute_set_section_content['code'], 'complete_sheet') ? ' checked="checked"' : '';
+					$tpl_component['ADMIN_ATTRIBUTE_SET_SECTION_INPUT_CHECKBOX'] = '<input type="checkbox" name="' . self::currentPageCode . '_attr_frontend_display[attribute_set_section][' . $attribute_set_section_content['code'] . '][complete_sheet]" id="' . $attribute_set_section_content['code'] . '_complete_sheet" value="yes"' . $ADMIN_ATTRIBUTE_SET_SECTION_COMPLETE_SHEET_CHECK . ' /><label for="' . $attribute_set_section_content['code'] . '_complete_sheet" >' . __('Display in product page', 'wpshop') . '</label>';
 					$sub_content[$column] .= wpshop_display::display_template_element('wpshop_admin_attr_set_section_for_front_display', $tpl_component, array(), 'admin');
 					$column++;
-					if ( $column > $column_count ){
+					if ($column > $column_count) {
 						$column = 1;
 					}
 				}
 			}
 			$tpl_component = array();
 			$tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT'] = '';
-			for ( $i=1; $i<=$column_count; $i++ ) {
+			for ($i = 1; $i <= $column_count; $i++) {
 				if (!empty($sub_content[$i]))
 					$tpl_component['ADMIN_ATTRIBUTE_FRONTEND_DISPLAY_CONTENT'] .= '<div class="alignleft" >' . $sub_content[$i] . '</div>';
 			}
@@ -484,7 +484,7 @@ 
 			$tpl_component['ADMIN_PRODUCT_ATTRIBUTE_FRONTEND_DISPLAY_MAIN_CHOICE_CHECK'] = empty($product_attribute_frontend_display_config) ? ' checked="checked"' : '';
 			$tpl_component['ADMIN_ATTRIBUTE_FD_NAME'] = self::currentPageCode . '_attr_frontend_display';
 
-			$content = wpshop_display::display_template_element('wpshop_admin_attr_set_section_for_front_display_default_choice',$tpl_component, array(), 'admin') . '<div class="wpshop_cls"></div>';
+			$content = wpshop_display::display_template_element('wpshop_admin_attr_set_section_for_front_display_default_choice', $tpl_component, array(), 'admin') . '<div class="wpshop_cls"></div>';
 		}
 
 		return $content;
@@ -499,9 +499,9 @@ 
 
 		$data = array(array('code' => 'title', 'frontend_label' => __('Product name', 'wpshop')), array('code' => 'date', 'frontend_label' => __('Date added', 'wpshop')), array('code' => 'modified', 'frontend_label' => __('Date modified', 'wpshop')));
 
-		$query = $wpdb->prepare("SELECT code, frontend_label FROM ".WPSHOP_DBT_ATTRIBUTE." WHERE is_used_for_sort_by = %s",  'yes');
+		$query = $wpdb->prepare("SELECT code, frontend_label FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE is_used_for_sort_by = %s", 'yes');
 		$results = $wpdb->get_results($query, ARRAY_A);
-		if(!empty($results))$data = array_merge($data, $results);
+		if (!empty($results))$data = array_merge($data, $results);
 
 		return $data;
 	}
@@ -513,62 +513,62 @@ 
 		$query = "SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE . " WHERE code=%s";
 		$data = (array)$wpdb->get_row($wpdb->prepare($query, $attr_name));
 
-		if(!empty($data)) {
-			if ($data['data_type_to_use'] == 'custom' ) {
+		if (!empty($data)) {
+			if ($data['data_type_to_use'] == 'custom') {
 				// Find which table to take
-				if($data['data_type']=='datetime') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME; }
-				elseif($data['data_type']=='decimal') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL; }
-				elseif($data['data_type']=='integer') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER; }
-				elseif($data['data_type']=='options') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS; }
-				elseif($data['data_type']=='text') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT; }
-				elseif($data['data_type']=='varchar') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR; }
-
-				if(isset($table_name)) {
+				if ($data['data_type'] == 'datetime') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DATETIME; }
+				elseif ($data['data_type'] == 'decimal') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL; }
+				elseif ($data['data_type'] == 'integer') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER; }
+				elseif ($data['data_type'] == 'options') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS; }
+				elseif ($data['data_type'] == 'text') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_TEXT; }
+				elseif ($data['data_type'] == 'varchar') { $table_name = WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR; }
+
+				if (isset($table_name)) {
 					// If the value is an id of a select, radio or checkbox
-					if(in_array($data['backend_input'], array('select','multiple-select', 'radio','checkbox'))) {
+					if (in_array($data['backend_input'], array('select', 'multiple-select', 'radio', 'checkbox'))) {
 
 						$query = $wpdb->prepare("
-							SELECT ".$table_name.".entity_id FROM ".$table_name."
-							INNER JOIN {$wpdb->posts} AS P ON ( ( P.ID = ".$table_name.".entity_id ) AND ( P.post_status = 'publish' ) )
-							LEFT JOIN ".WPSHOP_DBT_ATTRIBUTE." AS ATT ON ATT.id = ".$table_name.".attribute_id
-							LEFT JOIN ".WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS." AS ATT_OPT ON ".$table_name.".value = ATT_OPT.id
-							WHERE ATT.code=%s AND ( ATT_OPT.value=%s OR ATT_OPT.value=%s )", $attr_name, strtolower( __( $attr_value, 'wpshop' ) ), $attr_value
+							SELECT ".$table_name . ".entity_id FROM " . $table_name . "
+							INNER JOIN {$wpdb->posts} AS P ON ( ( P.ID = " . $table_name . ".entity_id ) AND ( P.post_status = 'publish' ) )
+							LEFT JOIN ".WPSHOP_DBT_ATTRIBUTE . " AS ATT ON ATT.id = " . $table_name . ".attribute_id
+							LEFT JOIN ".WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " AS ATT_OPT ON " . $table_name . ".value = ATT_OPT.id
+							WHERE ATT.code=%s AND ( ATT_OPT.value=%s OR ATT_OPT.value=%s )", $attr_name, strtolower(__($attr_value, 'wpshop')), $attr_value
 						);
 						$data = $wpdb->get_results($query);
 					}
 					else {
 
 						$query = $wpdb->prepare("
-							SELECT ".$table_name.".entity_id FROM ".$table_name."
-							INNER JOIN {$wpdb->posts} AS P ON ( ( P.ID = ".$table_name.".entity_id ) AND ( P.post_status = 'publish' ) )
-							INNER JOIN ".WPSHOP_DBT_ATTRIBUTE." AS ATT ON ATT.id = ".$table_name.".attribute_id
-								INNER JOIN {$wpdb->posts} AS P ON ( ( P.ID = ".$table_name.".entity_id ) AND ( P.post_status = 'publish' ) )
-							WHERE ATT.code=%s AND ".$table_name.".value=%s", $attr_name, sprintf('%.5f', $attr_value) // force useless zero like 48.58000
+							SELECT ".$table_name . ".entity_id FROM " . $table_name . "
+							INNER JOIN {$wpdb->posts} AS P ON ( ( P.ID = " . $table_name . ".entity_id ) AND ( P.post_status = 'publish' ) )
+							INNER JOIN ".WPSHOP_DBT_ATTRIBUTE . " AS ATT ON ATT.id = " . $table_name . ".attribute_id
+								INNER JOIN {$wpdb->posts} AS P ON ( ( P.ID = " . $table_name . ".entity_id ) AND ( P.post_status = 'publish' ) )
+							WHERE ATT.code=%s AND ".$table_name . ".value=%s", $attr_name, sprintf('%.5f', $attr_value) // force useless zero like 48.58000
 						);
 						$data = $wpdb->get_results($query);
 
 					}
 				}
-				else return __('Incorrect shortcode','wpshop');
+				else return __('Incorrect shortcode', 'wpshop');
 			}
-			elseif( $data['data_type_to_use'] == 'internal' )  {
+			elseif ($data['data_type_to_use'] == 'internal') {
 				/** Check the ID of manufacturer **/
-				$default_value = unserialize( $data['default_value'] );
-				if( !empty($default_value) && !empty($default_value['default_value']) ) {
-					$query = get_post( $attr_value );
-					$pid = ( !empty($query) && !empty($query->ID) ) ? $query->ID : '';
-					if ( !empty($pid) ) {
-						$query = $wpdb->prepare( 'SELECT post_id AS entity_id FROM '.$wpdb->postmeta.' WHERE post_id = ID AND post_status = %s AND meta_key = %s AND meta_value = %s', 'publish', '_'.$data['code'], $pid);
-						$data = $wpdb->get_results( $query );
+				$default_value = unserialize($data['default_value']);
+				if (!empty($default_value) && !empty($default_value['default_value'])) {
+					$query = get_post($attr_value);
+					$pid = (!empty($query) && !empty($query->ID)) ? $query->ID : '';
+					if (!empty($pid)) {
+						$query = $wpdb->prepare('SELECT post_id AS entity_id FROM ' . $wpdb->postmeta . ' WHERE post_id = ID AND post_status = %s AND meta_key = %s AND meta_value = %s', 'publish', '_' . $data['code'], $pid);
+						$data = $wpdb->get_results($query);
 					}
 				}
-			}else return __('Incorrect shortcode','wpshop');
+			} else return __('Incorrect shortcode', 'wpshop');
 
-		} else return __('Incorrect shortcode','wpshop');
+		} else return __('Incorrect shortcode', 'wpshop');
 
-		if(!empty($data)) {
-			foreach($data as $p) {
-				if ( !empty($p) && is_object($p) && !empty($p->entity_id) ) {
+		if (!empty($data)) {
+			foreach ($data as $p) {
+				if (!empty($p) && is_object($p) && !empty($p->entity_id)) {
 					$products[] = $p->entity_id;
 				}
 			}
@@ -591,14 +591,14 @@ 
 		global $wp_query;
 
 		$atts['product_type'] = 'related';
-		if(empty($atts['pid'])) $atts['pid'] = $wp_query->posts[0]->ID;
+		if (empty($atts['pid'])) $atts['pid'] = $wp_query->posts[0]->ID;
 
 		$related_product_output = self::wpshop_products_func($atts);
 
 		$output = '';
-		if ( !empty( $related_product_output ) ) {
+		if (!empty($related_product_output)) {
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, 'frontend', 'related_product') );
+			require(wpshop_tools::get_template_part(WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, 'frontend', 'related_product'));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -629,7 +629,7 @@ 
 		$string = '';
 		$have_results = false;
 		$output_results = true;
-		$type = ( empty($atts['type']) OR !in_array($atts['type'], array('grid','list')) ) ? WPSHOP_DISPLAY_LIST_TYPE : $atts['type'];
+		$type = (empty($atts['type']) OR !in_array($atts['type'], array('grid', 'list'))) ? WPSHOP_DISPLAY_LIST_TYPE : $atts['type'];
 		$pagination = isset($atts['pagination']) ? intval($atts['pagination']) : WPSHOP_ELEMENT_NB_PER_PAGE;
 		$cid = !empty($atts['cid']) ? $atts['cid'] : 0;
 		$pid = !empty($atts['pid']) ? $atts['pid'] : 0;
@@ -644,14 +644,14 @@ 
 
 		/** Get products which have att_name equal to att_value	*/
 		if (!empty($atts['att_name']) && !empty($atts['att_value'])) {
-			$attr = $atts['att_name'].':'.$atts['att_value'];
+			$attr = $atts['att_name'] . ':' . $atts['att_value'];
 
 			$products = self::get_products_matching_attribute($atts['att_name'], $atts['att_value']);
 
 			// Foreach on the found products
-			if ( !empty($products) ) {
-				$pid = implode(',',$products);
-				if(empty($pid))$output_results = false;
+			if (!empty($products)) {
+				$pid = implode(',', $products);
+				if (empty($pid))$output_results = false;
 			}
 			else $output_results = false;
 		}
@@ -661,14 +661,14 @@ 
 			switch ($atts['product_type']) {
 				case 'related':
 					$product_id = !empty($atts['pid']) ? (int)$atts['pid'] : get_the_ID();
-					$type = !empty($atts['display_mode']) && in_array($atts['display_mode'],array('list','grid')) ? $atts['display_mode'] : WPSHOP_DISPLAY_LIST_TYPE;
+					$type = !empty($atts['display_mode']) && in_array($atts['display_mode'], array('list', 'grid')) ? $atts['display_mode'] : WPSHOP_DISPLAY_LIST_TYPE;
 					$grid_element_nb_per_line = !empty($atts['grid_element_nb_per_line']) ? $atts['grid_element_nb_per_line'] : WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE;
 
 					$pids = get_post_meta((int)$product_id, WPSHOP_PRODUCT_RELATED_PRODUCTS, true);
-					if ( !empty($pids) && !empty($pids[0]) ) {
+					if (!empty($pids) && !empty($pids[0])) {
 						$pid = implode(',', $pids);
 					}
-					if(empty($pid) || $pid == $product_id) {
+					if (empty($pid) || $pid == $product_id) {
 						$output_results = false;
 					}
 
@@ -677,21 +677,21 @@ 
 		}
 
 		/** Output all the products	*/
-		if ( $output_results ) {
+		if ($output_results) {
 			$data = self::wpshop_get_product_by_criteria((!empty($atts['order']) ? $atts['order'] : (!empty($atts['creator']) ? ($atts['creator'] == 'current') : '')), $cid, $pid, $type, $order_by_sorting, 1, $pagination, $limit, $grid_element_nb_per_line, $display_pagination);
 
-			if ( $data[0] ) {
+			if ($data[0]) {
 				$have_results = true;
 				$string = $data[1];
 			}
 		}
 
 		/** If there are result to display	*/
-		if ( $have_results ) {
+		if ($have_results) {
 			$sorting = '';
-			if ( !empty($pid) ) {
+			if (!empty($pid)) {
 				$product_list = explode(',', $pid);
-				if ( count($product_list) == 1 ) {
+				if (count($product_list) == 1) {
 					$atts['sorting'] = 'no';
 				}
 			}
@@ -706,7 +706,7 @@ 
 			 * Build template
 			*/
 			$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-			if ( $tpl_way_to_take[0] && !empty($tpl_way_to_take[1]) ) {
+			if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
 				/*	Include the old way template part	*/
 				ob_start();
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -729,24 +729,24 @@ 
 				$tpl_component['SORTING_HIDDEN_FIELDS'] = wpshop_display::display_template_element($sub_template_part, $sub_tpl_component, array(), 'admin');
 				unset($sub_tpl_component);
 
-				if ( (!empty($sorting_criteria) && is_array($sorting_criteria)) ) {
+				if ((!empty($sorting_criteria) && is_array($sorting_criteria))) {
 					$sub_template_part = 'product_listing_sorting_criteria';
 					$sub_tpl_component = array();
 					$criteria = '';
-					foreach($sorting_criteria as $c):
-						$criteria .= '<option value="' . $c['code'] . '">' . __($c['frontend_label'],'wpshop') . '</option>';
+					foreach ($sorting_criteria as $c):
+						$criteria .= '<option value="' . $c['code'] . '">' . __($c['frontend_label'], 'wpshop') . '</option>';
 					endforeach;
 					$sub_tpl_component['SORTING_CRITERIA_LIST'] = $criteria;
 					$tpl_component['SORTING_CRITERIA'] = wpshop_display::display_template_element($sub_template_part, $sub_tpl_component);
 					unset($sub_tpl_component);
 				}
 
-				if ( empty($atts['sorting']) || ( !empty($atts['sorting']) && ($atts['sorting'] != 'no') ) ) {
-					$tpl_component['DISPLAY_TYPE_STATE_GRID'] = $type == 'grid' ?' active' : null;
-					$tpl_component['DISPLAY_TYPE_STATE_LIST'] = $type == 'list' ?' active' : null;
+				if (empty($atts['sorting']) || (!empty($atts['sorting']) && ($atts['sorting'] != 'no'))) {
+					$tpl_component['DISPLAY_TYPE_STATE_GRID'] = $type == 'grid' ? ' active' : null;
+					$tpl_component['DISPLAY_TYPE_STATE_LIST'] = $type == 'list' ? ' active' : null;
 					$sorting = wpshop_display::display_template_element($template_part, $tpl_component);
 				}
-				else if ( !empty($atts['sorting']) && ($atts['sorting'] == 'no') ) {
+				else if (!empty($atts['sorting']) && ($atts['sorting'] == 'no')) {
 					$sub_template_part = 'product_listing_sorting_criteria_hidden';
 					$sub_tpl_component = array();
 					$sub_tpl_component['CRITERIA_DEFAULT'] = !empty($sorting_criteria[0]['code']) ? $sorting_criteria[0]['code'] : 'title';
@@ -759,31 +759,31 @@ 
 			}
 			unset($tpl_component);
 
-			if ( !empty( $atts) && !empty($atts['container']) && $atts['container'] == 'no') {
-				$string = $sorting.'<div class="wps-catalog-container wps-bloc-loader">'.$string.'</div>';
+			if (!empty($atts) && !empty($atts['container']) && $atts['container'] == 'no') {
+				$string = $sorting . '<div class="wps-catalog-container wps-bloc-loader">' . $string . '</div>';
 			}
 			else {
-				$string = '<div class="wpshop_products_block">'.$sorting.'<div class="wps-catalog-container wps-bloc-loader">'.$string.'</div></div>';
+				$string = '<div class="wpshop_products_block">' . $sorting . '<div class="wps-catalog-container wps-bloc-loader">' . $string . '</div></div>';
 			}
 		}
-		else if ( empty($atts['no_result_message']) || ($atts['no_result_message'] != 'no') ) {
+		else if (empty($atts['no_result_message']) || ($atts['no_result_message'] != 'no')) {
 			$string = __('There is nothing to output here', 'wpshop');
 		}
 
 		return do_shortcode($string);
 	}
 
-	public static function wpshop_get_product_by_criteria( $criteria = null, $cid=0, $pid=0, $display_type, $order='ASC', $page_number, $products_per_page=0, $nb_of_product_limit=0, $grid_element_nb_per_line=WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE, $display_pagination = true ) {
+	public static function wpshop_get_product_by_criteria($criteria = null, $cid = 0, $pid = 0, $display_type, $order = 'ASC', $page_number, $products_per_page = 0, $nb_of_product_limit = 0, $grid_element_nb_per_line = WPSHOP_DISPLAY_GRID_ELEMENT_NUMBER_PER_LINE, $display_pagination = true) {
 		global $wpdb;
 
 		$string = '<span id="wpshop_loading">&nbsp;</span>';
 		$have_results = false;
-		$display_type = (!empty($display_type) && in_array($display_type,array('grid','list'))) ? $display_type : 'grid';
+		$display_type = (!empty($display_type) && in_array($display_type, array('grid', 'list'))) ? $display_type : 'grid';
 
 		/** Check if Discount are activated */
-		$discount_option = get_option( 'wpshop_catalog_product_option' );
+		$discount_option = get_option('wpshop_catalog_product_option');
 
-		if ( $criteria == 'product_price' && !empty($discount_option) && !empty($discount_option['discount']) && $discount_option['discount'] == 'on') {
+		if ($criteria == 'product_price' && !empty($discount_option) && !empty($discount_option['discount']) && $discount_option['discount'] == 'on') {
 			$criteria = 'wpshop_displayed_price';
 		}
 
@@ -796,18 +796,18 @@ 
 		);
 
 		// If the limit is greater than zero, hide pagination and change posts_per_page var
-		if ( $nb_of_product_limit > 0 ) {
+		if ($nb_of_product_limit > 0) {
 			$query['posts_per_page'] = $nb_of_product_limit;
 			unset($query['paged']);
 		}
-		if( !empty($pid) ) {
-			if(!is_array($pid)){
+		if (!empty($pid)) {
+			if (!is_array($pid)) {
 				$pid = explode(',', $pid);
 			}
 
 			$query['post__in'] = $pid;
 		}
-		if ( !empty($cid) ) {
+		if (!empty($cid)) {
 			$cid = explode(',', $cid);
 			$query['tax_query'] = array(array(
 				'taxonomy' => WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES,
@@ -816,8 +816,8 @@ 
 				'operator' => 'IN'
 			));
 		}
-		if($criteria != null) {
-			switch($criteria){
+		if ($criteria != null) {
+			switch ($criteria) {
 				case 'creator':
 				case 'author':
 					$query['author'] = get_current_user_id();
@@ -829,21 +829,21 @@ 
 					$query['orderby'] = $criteria;
 					break;
 				default:
-					if(!empty($pid)) {
-						$post_meta = get_post_meta($pid, '_'.$criteria, true);
+					if (!empty($pid)) {
+						$post_meta = get_post_meta($pid, '_' . $criteria, true);
 					}
-					else{
-						$check_meta = $wpdb->prepare("SELECT COUNT(meta_id) as meta_criteria FROM " . $wpdb->postmeta . " WHERE meta_key = %s", '_'.$criteria);
+					else {
+						$check_meta = $wpdb->prepare("SELECT COUNT(meta_id) as meta_criteria FROM " . $wpdb->postmeta . " WHERE meta_key = %s", '_' . $criteria);
 						$post_meta = $wpdb->get_var($check_meta);
 					}
-					if(!empty($post_meta)){
-						if ( in_array( $criteria, array( 'wpshop_displayed_price', 'product_price' ) ) ) {
+					if (!empty($post_meta)) {
+						if (in_array($criteria, array('wpshop_displayed_price', 'product_price'))) {
 							$query['orderby'] = 'meta_value_num';
 						}
 						else {
 							$query['orderby'] = 'meta_value';
 						}
-						$query['meta_key'] = '_'.$criteria;
+						$query['meta_key'] = '_' . $criteria;
 					}
 					break;
 			}
@@ -852,33 +852,33 @@ 
 			$query['orderby'] = 'menu_order ID';
 		}
 		$post_per_page = $query['posts_per_page'];
-		$total_products = ( !empty($query['post__in']) ) ? $query['post__in'] : 0;
-		if ( !empty($pid) && !empty($query['post__in']) && count($query['post__in']) > $query['posts_per_page'] ) {
+		$total_products = (!empty($query['post__in'])) ? $query['post__in'] : 0;
+		if (!empty($pid) && !empty($query['post__in']) && count($query['post__in']) > $query['posts_per_page']) {
 			$tmp_array = array();
 
-			if ( empty($page_number) || $page_number == 1 ) {
-				for( $i = 0; $i < $query['posts_per_page']; $i++ ) {
+			if (empty($page_number) || $page_number == 1) {
+				for ($i = 0; $i < $query['posts_per_page']; $i++) {
 					$tmp_array[] = $query['post__in'][$i];
 				}
 			}
 			else {
-				$begin_number = ( ($page_number - 1) * $query['posts_per_page'] ) ;
-				for( $i = $begin_number ; $i < $query['posts_per_page'] + $begin_number ; $i++ ) {
-					if ( !empty($query['post__in'][$i]) ) {
+				$begin_number = (($page_number - 1) * $query['posts_per_page']);
+				for ($i = $begin_number; $i < $query['posts_per_page'] + $begin_number; $i++) {
+					if (!empty($query['post__in'][$i])) {
 						$tmp_array[] = $query['post__in'][$i];
 					}
 				}
 			}
-			unset( $query['post__in'] );
+			unset($query['post__in']);
 			$query['post__in'] = $tmp_array;
 			$query['posts_per_page'] = -1;
 		}
 
 		$query['post_status'] = 'publish';
 
-		$custom_query = new WP_Query( $query );
+		$custom_query = new WP_Query($query);
 
-		if ( $custom_query->have_posts() ) {
+		if ($custom_query->have_posts()) {
 			$have_results = true;
 
 			// ---------------- //
@@ -894,7 +894,7 @@ 
 				$current_position++;
 			endwhile;
 			$tpl_component = array();
-			$tpl_component['PRODUCT_CONTAINER_TYPE_CLASS'] = ($display_type == 'grid' ? ' ' . $display_type . '_' . $grid_element_nb_per_line : '') . ' '. $display_type .'_mode';
+			$tpl_component['PRODUCT_CONTAINER_TYPE_CLASS'] = ($display_type == 'grid' ? ' ' . $display_type . '_' . $grid_element_nb_per_line : '') . ' ' . $display_type . '_mode';
 			$tpl_component['PRODUCT_LIST_DISPLAY_TYPE'] = $display_type;
 			$tpl_component['PRODUCT_LIST_PER_LINE'] = $grid_element_nb_per_line;
 			$tpl_component['PRODUCT_LIST'] = $product_list;
@@ -905,39 +905,39 @@ 
 			// --------------------- //
 			// Pagination management //
 			// --------------------- //
-			if($display_pagination) {
-				if($nb_of_product_limit==0) {
+			if ($display_pagination) {
+				if ($nb_of_product_limit == 0) {
 
 					$paginate = paginate_links(array(
 						'base' => '%_%',
 						'format' => '/?page_product=%#%',
-						'current' => $page_number ,
+						'current' => $page_number,
 						'total' => $custom_query->max_num_pages,
 						'type' => 'array',
 						'prev_next' => false
 					));
-					if(!empty($paginate)) {
+					if (!empty($paginate)) {
 						$string .= '<ul class="pagination wps-pagination">';
-						foreach($paginate as $p) {
-							$string .= '<li>'.$p.'</li>';
+						foreach ($paginate as $p) {
+							$string .= '<li>' . $p . '</li>';
 						}
 						$string .= '</ul>';
 					}
 				}
 
-				if ( !empty($pid) && !empty($query['post__in']) && count($total_products) > $post_per_page ) {
+				if (!empty($pid) && !empty($query['post__in']) && count($total_products) > $post_per_page) {
 					$paginate = paginate_links(array(
 							'base' => '%_%',
 							'format' => '/?page_product=%#%',
 							'current' => $page_number,
-							'total' => ceil( count($total_products) / $post_per_page ) ,
+							'total' => ceil(count($total_products) / $post_per_page),
 							'type' => 'array',
 							'prev_next' => false
 					));
-					if(!empty($paginate)) {
+					if (!empty($paginate)) {
 						$string .= '<ul class="pagination wps-pagination">';
-						foreach($paginate as $p) {
-							$string .= '<li>'.$p.'</li>';
+						foreach ($paginate as $p) {
+							$string .= '<li>' . $p . '</li>';
 						}
 						$string .= '</ul>';
 					}
@@ -955,21 +955,21 @@ 
 	 * @param integer $product_id The product we want to update quantity for
 	 * @param decimal $qty The new quantity
 	 */
-	public static function reduce_product_stock_qty($product_id, $qty, $variation_id = '' ) {
+	public static function reduce_product_stock_qty($product_id, $qty, $variation_id = '') {
 		global $wpdb;
 
 		$product = self::get_product_data($product_id);
 		/** Check if there is variation ***/
-		if ( !empty($variation_id) && $variation_id != $product_id ) {
-			$variation_post_type = get_post_type( $variation_id );
-			if ( $variation_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
+		if (!empty($variation_id) && $variation_id != $product_id) {
+			$variation_post_type = get_post_type($variation_id);
+			if ($variation_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
 				/** Check if variation def is combined **/
-				$variations = get_post_meta( $product_id, '_wpshop_variation_defining', true );
-				if ( !empty($variations) && !empty($variations['options']) && !empty($variations['options']['priority']) && in_array( 'combined', $variations['options']['priority']) ) {
+				$variations = get_post_meta($product_id, '_wpshop_variation_defining', true);
+				if (!empty($variations) && !empty($variations['options']) && !empty($variations['options']['priority']) && in_array('combined', $variations['options']['priority'])) {
 					/** Get post meta of variation */
-					$variation_metadata = get_post_meta( $variation_id, '_wpshop_product_metadata', true );
-					if ( !empty($variation_metadata) && isset($variation_metadata['product_stock']) ) {
-						$product = self::get_product_data( $variation_id );
+					$variation_metadata = get_post_meta($variation_id, '_wpshop_product_metadata', true);
+					if (!empty($variation_metadata) && isset($variation_metadata['product_stock'])) {
+						$product = self::get_product_data($variation_id);
 						$product_id = $variation_id;
 					}
 				}
@@ -979,12 +979,12 @@ 
 		if (!empty($product)) {
 			$newQty = $product['product_stock'] - $qty;
 			$value_id = 0;
-			if ( $newQty >= 0 ) {
+			if ($newQty >= 0) {
 				$query = '
 					SELECT wp_wpshop__attribute_value_decimal.value_id
 					FROM wp_wpshop__attribute_value_decimal
 					LEFT JOIN wp_wpshop__attribute ON wp_wpshop__attribute_value_decimal.attribute_id = wp_wpshop__attribute.id
-					WHERE wp_wpshop__attribute_value_decimal.entity_id='.$product_id.' AND wp_wpshop__attribute.code="product_stock"
+					WHERE wp_wpshop__attribute_value_decimal.entity_id='.$product_id . ' AND wp_wpshop__attribute.code="product_stock"
 					LIMIT 1
 				';
 				$value_id = $wpdb->get_var($query);
@@ -994,10 +994,10 @@ 
 			$attribute_histo_content = array();
 			$attribute_histo_content['status'] = 'valid';
 			$attribute_histo_content['creation_date'] = current_time('mysql', 0);
-			$attribute_histo_content['creation_date_value'] = ( !empty( $attribute_histo[0]->creation_date_value ) ) ? $attribute_histo[0]->creation_date_value : current_time('mysql', 0);
+			$attribute_histo_content['creation_date_value'] = (!empty($attribute_histo[0]->creation_date_value)) ? $attribute_histo[0]->creation_date_value : current_time('mysql', 0);
 			$attribute_histo_content['original_value_id'] = $value_id;
-			$attribute_histo_content['entity_type_id'] = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
-			$stock_atribute = wpshop_attributes::getElement( 'product_stock', "'valid'", 'code' );
+			$attribute_histo_content['entity_type_id'] = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+			$stock_atribute = wpshop_attributes::getElement('product_stock', "'valid'", 'code');
 			$attribute_histo_content['attribute_id'] = $stock_atribute->id;
 			$attribute_histo_content['entity_id'] = $product_id;
 			$attribute_histo_content['value'] = $product['product_stock'];
@@ -1017,15 +1017,15 @@ 
 	 * @param boolean $for_cart_storage
 	 * @return array Information about the product defined by first parameter
 	 */
-	public static function get_product_data( $product_id, $for_cart_storage = false, $post_status = '"publish"') {
+	public static function get_product_data($product_id, $for_cart_storage = false, $post_status = '"publish"') {
 		global $wpdb;
 			$query = $wpdb->prepare('
 			SELECT P.*, PM.meta_value AS attribute_set_id
-			FROM '.$wpdb->posts.' AS P
-				INNER JOIN '.$wpdb->postmeta.' AS PM ON (PM.post_id=P.ID)
+			FROM '.$wpdb->posts . ' AS P
+				INNER JOIN '.$wpdb->postmeta . ' AS PM ON (PM.post_id=P.ID)
 			WHERE
 				P.ID = %d
-				AND ( (P.post_type = "'.WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT.'") OR (P.post_type = "' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION . '") OR (P.post_type = "free_product") )
+				AND ( (P.post_type = "'.WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '") OR (P.post_type = "' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION . '") OR (P.post_type = "free_product") )
 				AND P.post_status IN (' . $post_status . ')
 				AND	PM.meta_key = "_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id"
 			LIMIT 1
@@ -1037,35 +1037,35 @@ 
 		$product_meta = array();
 
 		if (!empty($product)) {
-			$product_data['product_id'] = ( !empty($product->ID) ) ?  $product->ID : '';
-			$product_data['post_name'] = ( !empty($product->post_name) ) ? $product->post_name : '';
-			$product_data['product_name'] = ( !empty($product->post_title) ) ? $product->post_title : '';
-			$product_data['post_title'] = ( !empty($product->post_title) ) ? $product->post_title : '';
+			$product_data['product_id'] = (!empty($product->ID)) ? $product->ID : '';
+			$product_data['post_name'] = (!empty($product->post_name)) ? $product->post_name : '';
+			$product_data['product_name'] = (!empty($product->post_title)) ? $product->post_title : '';
+			$product_data['post_title'] = (!empty($product->post_title)) ? $product->post_title : '';
 
-			$product_data['product_author_id'] = ( !empty($product->post_author) ) ? $product->post_author : '';
-			$product_data['product_date'] = ( !empty($product->post_date) ) ? $product->post_date : '';
-			$product_data['product_content'] = ( !empty($product->post_content) ) ? $product->post_content : '';
-			$product_data['product_excerpt'] = ( !empty($product->post_excerpt) ) ? $product->post_excerpt : wp_trim_words( $product_data['product_content'], apply_filters( 'excerpt_length', 50 ), '...' );
+			$product_data['product_author_id'] = (!empty($product->post_author)) ? $product->post_author : '';
+			$product_data['product_date'] = (!empty($product->post_date)) ? $product->post_date : '';
+			$product_data['product_content'] = (!empty($product->post_content)) ? $product->post_content : '';
+			$product_data['product_excerpt'] = (!empty($product->post_excerpt)) ? $product->post_excerpt : wp_trim_words($product_data['product_content'], apply_filters('excerpt_length', 50), '...');
 
-			$product_data['product_meta_attribute_set_id'] = ( !empty($product->attribute_set_id) ) ? $product->attribute_set_id : '';
+			$product_data['product_meta_attribute_set_id'] = (!empty($product->attribute_set_id)) ? $product->attribute_set_id : '';
 
 			$data = wpshop_attributes::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT), $product->ID, WPSHOP_CURRENT_LOCALE, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-			if ( !empty($data) ) {
+			if (!empty($data)) {
 				foreach ($data as $attribute) {
-					$data_type = 'attribute_value_'.$attribute->data_type;
+					$data_type = 'attribute_value_' . $attribute->data_type;
 					$value = $attribute->$data_type;
-					if (in_array($attribute->backend_input, array('select','multiple-select', 'radio','checkbox'))) {
+					if (in_array($attribute->backend_input, array('select', 'multiple-select', 'radio', 'checkbox'))) {
 						$value = wpshop_attributes::get_attribute_type_select_option_info($value, 'value');
 					}
 
 					/** Special traitment regarding attribute_code	*/
-					switch($attribute->attribute_code) {
+					switch ($attribute->attribute_code) {
 						case 'product_weight':
 							$default_weight_unity = get_option('wpshop_shop_default_weight_unity');
-							if ( !empty($default_weight_unity) ) {
-								$query = $wpdb->prepare('SELECT unit FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE id = %d', $default_weight_unity);
+							if (!empty($default_weight_unity)) {
+								$query = $wpdb->prepare('SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id = %d', $default_weight_unity);
 								$unity = $wpdb->get_var($query);
-								if ( $unity == 'kg') {
+								if ($unity == 'kg') {
 									$value *= 1000;
 								}
 
@@ -1077,17 +1077,17 @@ 
 					}
 					$product_data[$attribute->attribute_code] = $value;
 
-					if(!$for_cart_storage OR $for_cart_storage && $attribute->is_recordable_in_cart_meta == 'yes') {
-						$meta = get_post_meta($product->ID, 'attribute_option_'.$attribute->attribute_code, true);
-						if(!empty($meta)) {
+					if (!$for_cart_storage OR $for_cart_storage && $attribute->is_recordable_in_cart_meta == 'yes') {
+						$meta = get_post_meta($product->ID, 'attribute_option_' . $attribute->attribute_code, true);
+						if (!empty($meta)) {
 							$product_meta[$attribute->attribute_code] = $meta;
 						}
 					}
 
-					if ( ($attribute->is_visible_in_front == 'yes') && (!in_array($attribute->attribute_code, unserialize(WPSHOP_ATTRIBUTE_PRICES))) ) {
+					if (($attribute->is_visible_in_front == 'yes') && (!in_array($attribute->attribute_code, unserialize(WPSHOP_ATTRIBUTE_PRICES)))) {
 						$product_meta['attribute_visible'][$attribute->attribute_code] = $value;
 					}
-					if ( ($attribute->is_visible_in_front_listing == 'yes') && (!in_array($attribute->attribute_code, unserialize(WPSHOP_ATTRIBUTE_PRICES))) ) {
+					if (($attribute->is_visible_in_front_listing == 'yes') && (!in_array($attribute->attribute_code, unserialize(WPSHOP_ATTRIBUTE_PRICES)))) {
 						$product_meta['attribute_visible_listing'][$attribute->attribute_code] = $value;
 					}
 				}
@@ -1097,16 +1097,16 @@ 
 			}
 
 			/**	Get datas about product options	*/
-			if ( $product->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
+			if ($product->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
 				$variation_details = get_post_meta($product->ID, '_wpshop_variations_attribute_def', true);
 
-				foreach ( $variation_details as $attribute_code => $attribute_value) {
+				foreach ($variation_details as $attribute_code => $attribute_value) {
 					$variation_id = $attribute_value;
 					$attribute_definition = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
 
 					$product_meta['variation_definition'][$attribute_code]['UNSTYLED_VALUE'] = stripslashes(wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'label', $attribute_definition->data_type_to_use, true));
 					$product_meta['variation_definition'][$attribute_code]['NAME'] = $attribute_definition->frontend_label;
-					switch( $attribute_definition->backend_input ) {
+					switch ($attribute_definition->backend_input) {
 						case 'select':
 						case 'multiple-select':
 						case 'radio':
@@ -1135,7 +1135,7 @@ 
 	 * @param $attrs List of the attributes and values of the product
 	 * @return boolean
 	*/
-	function addProduct($name, $description, $attrs=array()) {
+	function addProduct($name, $description, $attrs = array()) {
 		$new_product = wpshop_entities::create_new_entity(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, $name, $description, $attrs);
 		return $new_product[0];
 	}
@@ -1146,13 +1146,13 @@ 
 	 * @param string $product_search Optionnal Define a search term for request
 	 * @return object|string If $formated is set to true will display an html output with all product. Else return a wordpress database object with the product list
 	 */
-	function product_list($formated=false, $product_search=null) {
+	function product_list($formated = false, $product_search = null) {
 		global $wpdb;
 
 		$query_extra_params = $query_extra_params_value = '';
-		if( !empty($product_search) ) {
-			$query_extra_params = " AND post_title LIKE '%%".$product_search."%%'";
-			if ( is_array($product_search) ) {
+		if (!empty($product_search)) {
+			$query_extra_params = " AND post_title LIKE '%%" . $product_search . "%%'";
+			if (is_array($product_search)) {
 				$query_extra_params = " AND ID IN (%s)";
 				$query_extra_params_value = implode(",", $product_search);
 			}
@@ -1164,12 +1164,12 @@ 
 		/*
 		 * Make some arangement on output if parameter is given
 		 */
-		if ( $formated ) {
-			$product_string='';
+		if ($formated) {
+			$product_string = '';
 			foreach ($data as $d) {
 				$product_string .= '
 					<li class="wpshop_shortcode_element_container wpshop_shortcode_element_container_product" >
-						<input type="checkbox" class="wpshop_shortcode_element wpshop_shortcode_element_product" value="'.$d->ID.'" id="'.WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT.'-'.$d->ID.'" name="products[]" /><label for="'.WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT.'-'.$d->ID.'" > '.$d->post_title.'</label>
+						<input type="checkbox" class="wpshop_shortcode_element wpshop_shortcode_element_product" value="'.$d->ID . '" id="' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '-' . $d->ID . '" name="products[]" /><label for="' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '-' . $d->ID . '" > ' . $d->post_title . '</label>
 					</li>';
 			}
 		}
@@ -1180,17 +1180,17 @@ 
 	/**
 	 * Enregistrement des données pour le produit
 	 */
-	function save_product_custom_informations( $post_id , $data_to_save = array() ) {
+	function save_product_custom_informations($post_id, $data_to_save = array()) {
 		global $wpdb;
 
-		$data_to_save = ( !empty($data_to_save) ) ? $data_to_save : (array) $_REQUEST;
+		$data_to_save = (!empty($data_to_save)) ? $data_to_save : (array)$_REQUEST;
 		// Apply a filter to extra actions
-		$data_to_save = apply_filters( 'wps_save_product_extra_filter', $data_to_save );
+		$data_to_save = apply_filters('wps_save_product_extra_filter', $data_to_save);
 
-		if ( !empty($data_to_save['post_ID']) && ( (get_post_type($data_to_save['post_ID']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) || (get_post_type($data_to_save['post_ID']) == "free_product") ) ) {
-			if ( !empty($data_to_save[wpshop_products::currentPageCode . '_attribute']) ) {
+		if (!empty($data_to_save['post_ID']) && ((get_post_type($data_to_save['post_ID']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) || (get_post_type($data_to_save['post_ID']) == "free_product"))) {
+			if (!empty($data_to_save[wpshop_products::currentPageCode . '_attribute'])) {
 				/*	Fill the product reference automatically if nothing is sent	*/
-				if ( empty($data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference']) ) {
+				if (empty($data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'])) {
 					$query = "SELECT MAX(ID) AS PDCT_ID FROM {$wpdb->posts}";
 					$last_ref = $wpdb->get_var($query);
 					$data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'] = WPSHOP_PRODUCT_REFERENCE_PREFIX . str_repeat(0, WPSHOP_PRODUCT_REFERENCE_PREFIX_NB_FILL) . $last_ref;
@@ -1200,16 +1200,16 @@ 
 					$ref = $data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'];
 					$query = $wpdb->prepare(
 						"SELECT value_id
-						FROM ".WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR."
+						FROM ".WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR . "
 							INNER JOIN {$wpdb->posts} ON ( ID = entity_id )
 						WHERE value = %s
 							AND entity_id != %d
 							AND entity_type_id = %d"
 						, $ref, $data_to_save['post_ID'], wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT));
-					$existing_reference = $wpdb->get_var( $query );
+					$existing_reference = $wpdb->get_var($query);
 
 					/* If this product reference exist -> Create a new product reference */
-					if ( $wpdb->num_rows > 0 ) {
+					if ($wpdb->num_rows > 0) {
 						$query = "SELECT MAX(ID) AS PDCT_ID FROM " . $wpdb->posts;
 						$last_ref = $wpdb->get_var($query);
 						$data_to_save[wpshop_products::currentPageCode . '_attribute']['varchar']['product_reference'] = WPSHOP_PRODUCT_REFERENCE_PREFIX . str_repeat(0, WPSHOP_PRODUCT_REFERENCE_PREFIX_NB_FILL) . $last_ref;
@@ -1219,27 +1219,27 @@ 
 				/*	Save the attributes values into wpshop eav database	*/
 				$update_from = !empty($data_to_save[wpshop_products::currentPageCode . '_provenance']) ? $data_to_save[wpshop_products::currentPageCode . '_provenance'] : '';
 				$lang = WPSHOP_CURRENT_LOCALE;
-				if ( !empty($data_to_save['icl_post_language']) ) {
+				if (!empty($data_to_save['icl_post_language'])) {
 					$query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", $data_to_save['icl_post_language']);
 					$lang = $wpdb->get_var($query);
 				}
 				wpshop_attributes::saveAttributeForEntity($data_to_save[wpshop_products::currentPageCode . '_attribute'], wpshop_entities::get_entity_identifier_from_code(wpshop_products::currentPageCode), $data_to_save['post_ID'], $lang, $update_from);
 
 				/*	Update product price looking for shop parameters	*/
-				wpshop_products::calculate_price( $data_to_save['post_ID'] );
+				wpshop_products::calculate_price($data_to_save['post_ID']);
 
 				/*	Save the attributes values into wordpress post metadata database in order to have a backup and to make frontend search working	*/
 				$productMetaDatas = array();
-				foreach ( $data_to_save[wpshop_products::currentPageCode . '_attribute'] as $attributeType => $attributeValues ) {
-					foreach ( $attributeValues as $attributeCode => $attributeValue ) {
-						if ( $attributeCode == 'product_attribute_set_id' ) {
+				foreach ($data_to_save[wpshop_products::currentPageCode . '_attribute'] as $attributeType => $attributeValues) {
+					foreach ($attributeValues as $attributeCode => $attributeValue) {
+						if ($attributeCode == 'product_attribute_set_id') {
 							/*	Update the attribute set id for the current product	*/
 							update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, $attributeValue);
 						}
-						if ( $attributeType == 'decimal' ) {
+						if ($attributeType == 'decimal') {
 							$attributeValue = str_replace(',', '.', $attributeValue);
 						}
-						if ( ($attributeType == 'integer') && !is_array($attributeValue) ) {
+						if (($attributeType == 'integer') && !is_array($attributeValue)) {
 							$attributeValue = (int)$attributeValue;
 						}
 						$productMetaDatas[$attributeCode] = $attributeValue;
@@ -1248,51 +1248,51 @@ 
 				update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $productMetaDatas);
 			}
 
-			if ( !empty($data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']) && empty($data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']['default_config']) ) {
+			if (!empty($data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']) && empty($data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']['default_config'])) {
 				update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_FRONT_DISPLAY_CONF, $data_to_save[wpshop_products::currentPageCode . '_attr_frontend_display']);
 			}
-			else if ( $data_to_save['action'] != 'autosave') {
+			else if ($data_to_save['action'] != 'autosave') {
 				delete_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_FRONT_DISPLAY_CONF);
 			}
 
 
-			$product = wpshop_products::get_product_data( $data_to_save['post_ID'], false, '"publish"' );
-			if( empty($product['product_id']) ) {
+			$product = wpshop_products::get_product_data($data_to_save['post_ID'], false, '"publish"');
+			if (empty($product['product_id'])) {
 				$product['product_id'] = $data_to_save['post_ID'];
 			}
-			$price = wpshop_prices::get_product_price( $product, 'just_price_infos', array('mini_output', 'grid') );
-			update_post_meta( $data_to_save['post_ID'], '_wps_price_infos', $price );
+			$price = wpshop_prices::get_product_price($product, 'just_price_infos', array('mini_output', 'grid'));
+			update_post_meta($data_to_save['post_ID'], '_wps_price_infos', $price);
 
 
 			/**	Save product variation	*/
-			if ( !empty($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION]) ) {
-				foreach ( $data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION] as $variation_id => $variation_definition ) {
+			if (!empty($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION])) {
+				foreach ($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION] as $variation_id => $variation_definition) {
 
-					foreach ( unserialize(WPSHOP_ATTRIBUTE_PRICES) as $price_attribute_code) {
+					foreach (unserialize(WPSHOP_ATTRIBUTE_PRICES) as $price_attribute_code) {
 						$price_attr_def = wpshop_attributes::getElement($price_attribute_code, "'valid'", 'code');
-						if ( !empty($variation_definition) && !empty($variation_definition['attribute']) && is_object($price_attr_def) && !empty($variation_definition['attribute'][$price_attr_def->data_type]) && is_array($variation_definition['attribute'][$price_attr_def->data_type]) && !array_key_exists($price_attribute_code, $variation_definition['attribute'][$price_attr_def->data_type]) ) {
+						if (!empty($variation_definition) && !empty($variation_definition['attribute']) && is_object($price_attr_def) && !empty($variation_definition['attribute'][$price_attr_def->data_type]) && is_array($variation_definition['attribute'][$price_attr_def->data_type]) && !array_key_exists($price_attribute_code, $variation_definition['attribute'][$price_attr_def->data_type])) {
 							$variation_definition['attribute'][$price_attr_def->data_type][$price_attribute_code] = !empty($data_to_save[wpshop_products::currentPageCode . '_attribute'][$price_attr_def->data_type][$price_attribute_code]) ? $data_to_save[wpshop_products::currentPageCode . '_attribute'][$price_attr_def->data_type][$price_attribute_code] : 0;
 						}
 					}
 					$lang = WPSHOP_CURRENT_LOCALE;
-					if ( !empty($data_to_save['icl_post_language']) ) {
+					if (!empty($data_to_save['icl_post_language'])) {
 						$query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", $data_to_save['icl_post_language']);
 						$lang = $wpdb->get_var($query);
 					}
 					wpshop_attributes::saveAttributeForEntity($variation_definition['attribute'], wpshop_entities::get_entity_identifier_from_code(wpshop_products::currentPageCode), $variation_id, $lang);
 
 					/**	Save the attributes values into wordpress post metadata database in order to have a backup and to make frontend search working	*/
-					$variation_metadata = get_post_meta( $variation_id, '_wpshop_product_metadata', true);
-					if ( !empty($variation_metadata) ) {
-						$attributes_list = wpshop_attributes::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION),  $variation_id);
-						if ( !empty($attributes_list)) {
+					$variation_metadata = get_post_meta($variation_id, '_wpshop_product_metadata', true);
+					if (!empty($variation_metadata)) {
+						$attributes_list = wpshop_attributes::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION), $variation_id);
+						if (!empty($attributes_list)) {
 							foreach ($attributes_list as $attribute) {
-								$value_key = 'attribute_value_'.$attribute->data_type;
+								$value_key = 'attribute_value_' . $attribute->data_type;
 								$attributeValue = $attribute->$value_key;
-								if ( $attribute->data_type == 'decimal' ) {
+								if ($attribute->data_type == 'decimal') {
 									$attributeValue = str_replace(',', '.', $attribute->$value_key);
 								}
-								if ( ($attribute->data_type == 'integer') && !is_array($attributeValue) ) {
+								if (($attribute->data_type == 'integer') && !is_array($attributeValue)) {
 									$attributeValue = (int)$attribute->$value_key;
 								}
 								$variation_metadata[$attribute->code] = $attribute->$value_key;
@@ -1300,12 +1300,12 @@ 
 						}
 					}
 
-					foreach ( $variation_definition['attribute'] as $attributeType => $attributeValues ) {
-						foreach ( $attributeValues as $attributeCode => $attributeValue ) {
-							if ( $attributeType == 'decimal' ) {
+					foreach ($variation_definition['attribute'] as $attributeType => $attributeValues) {
+						foreach ($attributeValues as $attributeCode => $attributeValue) {
+							if ($attributeType == 'decimal') {
 								$attributeValue = str_replace(',', '.', $attributeValue);
 							}
-							if ( ($attributeType == 'integer') && !is_array($attributeValue) ) {
+							if (($attributeType == 'integer') && !is_array($attributeValue)) {
 								$attributeValue = (int)$attributeValue;
 							}
 							$variation_metadata[$attributeCode] = $attributeValue;
@@ -1314,46 +1314,46 @@ 
 					update_post_meta($variation_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $variation_metadata);
 
 					/** Save attached picture id **/
-					$attached_picture_id = ( !empty($data_to_save['wps_pdt_variations'][$variation_id]['wps_attached_picture_id']) ) ? intval( $data_to_save['wps_pdt_variations'][$variation_id]['wps_attached_picture_id'] ) : '';
-					$selected_picture = update_post_meta( $variation_id, '_wps_variation_attached_picture', $attached_picture_id );
+					$attached_picture_id = (!empty($data_to_save['wps_pdt_variations'][$variation_id]['wps_attached_picture_id'])) ? intval($data_to_save['wps_pdt_variations'][$variation_id]['wps_attached_picture_id']) : '';
+					$selected_picture = update_post_meta($variation_id, '_wps_variation_attached_picture', $attached_picture_id);
 
 					/*	Update product price looking for shop parameters	*/
-					wpshop_products::calculate_price( $variation_id );
+					wpshop_products::calculate_price($variation_id);
 				}
 			}
 
 			/*	Update the related products list*/
-			if ( !empty($data_to_save['related_products_list']) ) {
+			if (!empty($data_to_save['related_products_list'])) {
 				update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_RELATED_PRODUCTS, $data_to_save['related_products_list']);
 			}
-			else if ( $data_to_save['action'] != 'autosave') {
+			else if ($data_to_save['action'] != 'autosave') {
 				delete_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_RELATED_PRODUCTS);
 			}
 			/*	Update the provider list*/
-			if ( !empty($data_to_save['provider_list']) ) {
+			if (!empty($data_to_save['provider_list'])) {
 				update_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_PROVIDER, $data_to_save['provider_list']);
 			}
-			else if ( $data_to_save['action'] != 'autosave') {
+			else if ($data_to_save['action'] != 'autosave') {
 				delete_post_meta($data_to_save['post_ID'], WPSHOP_PRODUCT_PROVIDER);
 			}
 
 			/*	Update product options	*/
-			if ( !empty($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['options']) ) {
+			if (!empty($data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['options'])) {
 				update_post_meta($data_to_save['post_ID'], '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options', $data_to_save[WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['options']);
 			}
-			else if ( $data_to_save['action'] != 'autosave') {
+			else if ($data_to_save['action'] != 'autosave') {
 				delete_post_meta($data_to_save['post_ID'], '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options');
 			}
 
 			/** Add flag on variations to check which type of variation **/
-			$check_product_have_variations = self::get_variation( $post_id );
-			if( !empty($check_product_have_variations) ) {
-				$variation_flag = self::check_variation_type( $post_id );
-				$variation_defining = get_post_meta( $post_id, '_wpshop_variation_defining', true );
+			$check_product_have_variations = self::get_variation($post_id);
+			if (!empty($check_product_have_variations)) {
+				$variation_flag = self::check_variation_type($post_id);
+				$variation_defining = get_post_meta($post_id, '_wpshop_variation_defining', true);
 				$variation_defining['variation_type'] = $variation_flag;
-				update_post_meta( $post_id, '_wpshop_variation_defining', $variation_defining );
+				update_post_meta($post_id, '_wpshop_variation_defining', $variation_defining);
 			}
-			add_post_meta( $post_id, '_wpshop_variation_defining', array( 'follow_general_config' => true, 'options' => array( 'priority' => array( 'combined' ), 'price_behaviour' => array( 'replacement' ), 'price_display' => ( !empty($catalog_product_option) && !empty($catalog_product_option['price_display']) ) ? $catalog_product_option['price_display'] : array( 'text_from' => 'on', 'lower_price' => 'on' ) ) ), true );
+			add_post_meta($post_id, '_wpshop_variation_defining', array('follow_general_config' => true, 'options' => array('priority' => array('combined'), 'price_behaviour' => array('replacement'), 'price_display' => (!empty($catalog_product_option) && !empty($catalog_product_option['price_display'])) ? $catalog_product_option['price_display'] : array('text_from' => 'on', 'lower_price' => 'on'))), true);
 		}
 
 		flush_rewrite_rules();
@@ -1364,16 +1364,16 @@ 
 	 * @param integer $post_id
 	 * @return string
 	 */
-	public function check_variation_type( $post_id ) {
+	public function check_variation_type($post_id) {
 		$variation_type = 'single';
-		if( !empty($variation_type) ) {
-			$variations = self::get_variation( $post_id );
-			if( !empty($variations) ) {
-				foreach( $variations as $variation_id => $variation_data ) {
-					if( !empty($variation_data) && !empty($variation_data['variation_def']) && count($variation_data['variation_def']) == 1 ) {
+		if (!empty($variation_type)) {
+			$variations = self::get_variation($post_id);
+			if (!empty($variations)) {
+				foreach ($variations as $variation_id => $variation_data) {
+					if (!empty($variation_data) && !empty($variation_data['variation_def']) && count($variation_data['variation_def']) == 1) {
 						return 'single';
 					}
-					elseif( !empty($variation_data) && !empty($variation_data['variation_def']) && count($variation_data['variation_def']) > 1 ) {
+					elseif (!empty($variation_data) && !empty($variation_data['variation_def']) && count($variation_data['variation_def']) > 1) {
 						$variation_type = 'combined';
 					}
 				}
@@ -1391,21 +1391,21 @@ 
 	 *
 	 * @return mixed The new permalink for the current element
 	 */
-	public static function set_product_permalink($permalink, $post, $unknown){
+	public static function set_product_permalink($permalink, $post, $unknown) {
 		$options = get_option('wpshop_catalog_product_option', array());
 
-		if( $post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT /* && 'publish' == $post->post_status */ ) {
-			if( !isset( $options['wpshop_catalog_product_slug_with_category'] ) || $options['wpshop_catalog_product_slug_with_category'] != 'yes' ) {
+		if ($post->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT /* && 'publish' == $post->post_status */) {
+			if (!isset($options['wpshop_catalog_product_slug_with_category']) || $options['wpshop_catalog_product_slug_with_category'] != 'yes') {
 				return $permalink;
 			} else {
-				$options_cats = get_option( 'wpshop_catalog_categories_option', array() );
-				$product_categories = wp_get_object_terms( $post->ID, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES );
-				if( empty( $product_categories ) ) {
+				$options_cats = get_option('wpshop_catalog_categories_option', array());
+				$product_categories = wp_get_object_terms($post->ID, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
+				if (empty($product_categories)) {
 					$product_category_slug = $options_cats['wpshop_catalog_no_category_slug'];
 				} else {
 					$product_category_slug = $product_categories[0]->slug;
 				}
-				$permalink = str_replace( '%' . WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '%', $product_category_slug, $permalink );
+				$permalink = str_replace('%' . WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '%', $product_category_slug, $permalink);
 			}
 		}
 
@@ -1439,10 +1439,10 @@ 
 		}*/
 	}
 
-	public static function set_product_request_by_name( $query ) {
+	public static function set_product_request_by_name($query) {
 		$options = get_option('wpshop_catalog_product_option', array());
 
-		if ( $query->is_main_query() && ( 2 == count( $query->query ) || isset( $query->query['page'] ) ) && ! empty( $query->query['name'] ) && empty( $options['wpshop_catalog_product_slug'] ) );
+		if ($query->is_main_query() && (2 == count($query->query) || isset($query->query['page'])) && !empty($query->query['name']) && empty($options['wpshop_catalog_product_slug']));
 		//	$query->set( 'post_type', array( 'post', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'page' ) );
 	}
 
@@ -1466,57 +1466,57 @@ 
 		/** Get product definition	*/
 
 		$product = self::get_product_data($product_id);
-		wp_cache_set( 'wpshop_product_data_'.$product_id, $product );
+		wp_cache_set('wpshop_product_data_' . $product_id, $product);
 
 		/** Get the product thumbnail	*/
 		$productThumbnail = wpshop_display::display_template_element('product_thumbnail_default', array());
-		if ( has_post_thumbnail($product_id) ) {
-			$thumbnail_url = wp_get_attachment_image_src( get_post_thumbnail_id(), 'full' );
+		if (has_post_thumbnail($product_id)) {
+			$thumbnail_url = wp_get_attachment_image_src(get_post_thumbnail_id(), 'full');
 			$tpl_component = array();
 			$tpl_component['PRODUCT_THUMBNAIL_URL'] = $thumbnail_url[0];
-			$tpl_component['PRODUCT_THUMBNAIL'] = get_the_post_thumbnail( $product_id, 'wpshop-product-galery' );
-			$tpl_component['PRODUCT_THUMBNAIL_FULL'] = get_the_post_thumbnail( $product_id, 'full' );
-			$image_attributes = wp_get_attachment_metadata( get_post_thumbnail_id() );
-			if ( !empty($image_attributes) && !empty($image_attributes['sizes']) && is_array($image_attributes['sizes']) ) {
-				foreach ( $image_attributes['sizes'] as $size_name => $size_def) {
+			$tpl_component['PRODUCT_THUMBNAIL'] = get_the_post_thumbnail($product_id, 'wpshop-product-galery');
+			$tpl_component['PRODUCT_THUMBNAIL_FULL'] = get_the_post_thumbnail($product_id, 'full');
+			$image_attributes = wp_get_attachment_metadata(get_post_thumbnail_id());
+			if (!empty($image_attributes) && !empty($image_attributes['sizes']) && is_array($image_attributes['sizes'])) {
+				foreach ($image_attributes['sizes'] as $size_name => $size_def) {
 					$tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = wp_get_attachment_image(get_post_thumbnail_id(), $size_name);
-					$tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = ( !empty( $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] ) ) ? $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] : WPSHOP_DEFAULT_PRODUCT_PICTURE;
+					$tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = (!empty($tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)])) ? $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] : WPSHOP_DEFAULT_PRODUCT_PICTURE;
 				}
 			}
-			$tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'] = ( !empty( $tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'] ) ) ? $tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'] : WPSHOP_DEFAULT_PRODUCT_PICTURE;
-			$productThumbnail = wpshop_display::display_template_element( 'product_thumbnail', $tpl_component );
+			$tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'] = (!empty($tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'])) ? $tpl_component['PRODUCT_THUMBNAIL_WPSHOP-PRODUCT-GALERY'] : WPSHOP_DEFAULT_PRODUCT_PICTURE;
+			$productThumbnail = wpshop_display::display_template_element('product_thumbnail', $tpl_component);
 			unset($tpl_component);
 		}
 
-		$product_document_galery = wps_media_manager_frontend_ctr::get_product_complete_sheet_attachments( $product_id );
+		$product_document_galery = wps_media_manager_frontend_ctr::get_product_complete_sheet_attachments($product_id);
 
 		/**	Retrieve product attributes for output	*/
-		$attributeContentOutput = wpshop_attributes::attribute_of_entity_to_tab( wpshop_entities::get_entity_identifier_from_code( self::currentPageCode ), $product_id, $product);
+		$attributeContentOutput = wpshop_attributes::attribute_of_entity_to_tab(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode), $product_id, $product);
 
 		/** Retrieve product price */
-		$price_attribute = wpshop_attributes::getElement( 'product_price', "'valid'", 'code' );
-		$price_display = wpshop_attributes::check_attribute_display( $price_attribute->is_visible_in_front, $product['custom_display'], 'attribute', 'product_price', 'complete_sheet');
-		$catalog_options = get_option( 'wpshop_catalog_main_option' , array() );
+		$price_attribute = wpshop_attributes::getElement('product_price', "'valid'", 'code');
+		$price_display = wpshop_attributes::check_attribute_display($price_attribute->is_visible_in_front, $product['custom_display'], 'attribute', 'product_price', 'complete_sheet');
+		$catalog_options = get_option('wpshop_catalog_main_option', array());
 		$productPrice = '';
 		$wpshop_price_piloting_option = get_option('wpshop_shop_price_piloting');
 		$check_product_price = wpshop_prices::check_product_price($product);
-		$result_price_piloting = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $check_product_price['et'] : $check_product_price['ati'];
-		if ( $price_display && !( !empty( $catalog_options ) && ( !empty( $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] ) && $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] == 'yes' ) && $result_price_piloting == 0 ) ) {
+		$result_price_piloting = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $check_product_price['et'] : $check_product_price['ati'];
+		if ($price_display && !(!empty($catalog_options) && (!empty($catalog_options['wpshop_catalog_empty_price_behaviour']) && $catalog_options['wpshop_catalog_empty_price_behaviour'] == 'yes') && $result_price_piloting == 0)) {
 			$productPrice = wpshop_prices::get_product_price($product, 'price_display', 'complete_sheet');
 		}
 
 		/** Check if there is at less 1 product in stock	*/
 		$productStock = $wps_product_ctr->check_stock($product_id, 1);
-		$productStock = ( $productStock === true ) ? 1 : null;
+		$productStock = ($productStock === true) ? 1 : null;
 
 		/** if !product stock check product have variation with stock **/
 // 		if ( empty($productStock) ) {
-			$product_variation_meta = get_post_meta( $product_id, '_wpshop_variation_defining', true );
-			if ( !empty($product_variation_meta) && !empty($product_variation_meta['options']) && !empty($product_variation_meta['options']['priority']) && in_array('combined', $product_variation_meta['options']['priority']) ) {
-				$variations = wpshop_products::get_variation( $product_id );
-				if ( !empty($variations) ) {
-					foreach( $variations as $variation ) {
-						if ( !empty($variation) && !empty($variation['variation_dif']) && array_key_exists('product_stock', $variation['variation_dif']) && round( $variation['variation_dif']['product_stock'] ) > 0 ) {
+			$product_variation_meta = get_post_meta($product_id, '_wpshop_variation_defining', true);
+			if (!empty($product_variation_meta) && !empty($product_variation_meta['options']) && !empty($product_variation_meta['options']['priority']) && in_array('combined', $product_variation_meta['options']['priority'])) {
+				$variations = wpshop_products::get_variation($product_id);
+				if (!empty($variations)) {
+					foreach ($variations as $variation) {
+						if (!empty($variation) && !empty($variation['variation_dif']) && array_key_exists('product_stock', $variation['variation_dif']) && round($variation['variation_dif']['product_stock']) > 0) {
 							$productStock = 1;
 						}
 					}
@@ -1525,16 +1525,16 @@ 
 // 		}
 
 		/** Define "Add to cart" button	 */
-		$add_to_cart_button_display_state = wpshop_attributes::check_attribute_display( ((WPSHOP_DEFINED_SHOP_TYPE == 'sale') ? 'yes' : 'no'), $product['custom_display'], 'product_action_button', 'add_to_cart', 'complete_sheet');
+		$add_to_cart_button_display_state = wpshop_attributes::check_attribute_display(((WPSHOP_DEFINED_SHOP_TYPE == 'sale') ? 'yes' : 'no'), $product['custom_display'], 'product_action_button', 'add_to_cart', 'complete_sheet');
 		$display_price_state_when_price_is_empty = true;
-		if ( empty( $productPrice ) && ( !empty( $catalog_options ) || ( !empty( $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] ) && $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] == 'yes' ) ) ) {
+		if (empty($productPrice) && (!empty($catalog_options) || (!empty($catalog_options['wpshop_catalog_empty_price_behaviour']) && $catalog_options['wpshop_catalog_empty_price_behaviour'] == 'yes'))) {
 			$display_price_state_when_price_is_empty = false;
 		}
-		else if ( !empty( $productPrice ) ) {
+		else if (!empty($productPrice)) {
 			$display_price_state_when_price_is_empty = true;
 		}
-		$add_to_cart_button = ( true === $add_to_cart_button_display_state)  && ( true === $display_price_state_when_price_is_empty ) ? self::display_add_to_cart_button( $product_id, $productStock, 'complete' ) : '';
-		$product_quantity_chooser_input = ( true === $add_to_cart_button_display_state ) ? wpshop_display::display_template_element( 'product_complete_sheet_quantity_chooser', array( 'PRODUCT_ID' => $product_id, ) ) : '';
+		$add_to_cart_button = (true === $add_to_cart_button_display_state) && (true === $display_price_state_when_price_is_empty) ? self::display_add_to_cart_button($product_id, $productStock, 'complete') : '';
+		$product_quantity_chooser_input = (true === $add_to_cart_button_display_state) ? wpshop_display::display_template_element('product_complete_sheet_quantity_chooser', array('PRODUCT_ID' => $product_id,)) : '';
 
 		/** Define "Ask a quotation" button	*/
 		$quotation_button = self::display_quotation_button($product_id, (!empty($product['quotation_allowed']) ? $product['quotation_allowed'] : null), 'complete');
@@ -1551,14 +1551,14 @@ 
 		$tpl_component['PRODUCT_PRICE'] = $productPrice;
 		$modules_option = get_option('wpshop_modules');
 		$tpl_component['LOW_STOCK_ALERT_MESSAGE'] = '';
-		if ( !empty($modules_option) && !empty($modules_option['wpshop_low_stock_alert']) && $modules_option['wpshop_low_stock_alert']['activated'] == 'on' ) {
+		if (!empty($modules_option) && !empty($modules_option['wpshop_low_stock_alert']) && $modules_option['wpshop_low_stock_alert']['activated'] == 'on') {
 			$wps_marketing_tools = new wps_marketing_tools_ctr();
-			$tpl_component['LOW_STOCK_ALERT_MESSAGE'] = $wps_marketing_tools->display_alert_stock_message( array( 'id' => $product_id ) );
+			$tpl_component['LOW_STOCK_ALERT_MESSAGE'] = $wps_marketing_tools->display_alert_stock_message(array('id' => $product_id));
 		}
 
 
 		/** Gallery **/
-		$tpl_component['PRODUCT_COMPLETE_SHEET_GALLERY'] = wps_media_manager_frontend_ctr::get_product_complete_sheet_galery( $product_id );
+		$tpl_component['PRODUCT_COMPLETE_SHEET_GALLERY'] = wps_media_manager_frontend_ctr::get_product_complete_sheet_galery($product_id);
 
 		$product_new_def = self::display_product_special_state('declare_new', 'complete', (!empty($product['declare_new']) ? $product['declare_new'] : 'no'), (!empty($product['set_new_from']) ? $product['set_new_from'] : ''), (!empty($product['set_new_to']) ? $product['set_new_to'] : ''));
 
@@ -1577,14 +1577,14 @@ 
 		$tpl_component['PRODUCT_BUTTON_ADD_TO_CART'] = $add_to_cart_button;
 		$tpl_component['PRODUCT_BUTTON_QUOTATION'] = $quotation_button;
 		$tpl_component['PRODUCT_QUANTITY_CHOOSER'] = $product_quantity_chooser_input;
-		$tpl_component['PRODUCT_BUTTONS'] = $tpl_component['PRODUCT_BUTTON_QUOTATION'].$tpl_component['PRODUCT_BUTTON_ADD_TO_CART'];
+		$tpl_component['PRODUCT_BUTTONS'] = $tpl_component['PRODUCT_BUTTON_QUOTATION'] . $tpl_component['PRODUCT_BUTTON_ADD_TO_CART'];
 		$tpl_component['PRODUCT_GALERY_DOCS'] = $product_document_galery;
 		$tpl_component['PRODUCT_FEATURES'] = $attributeContentOutput;
-		$tpl_component = apply_filters( 'wps-filter-product-complete-sheet-output', $tpl_component, $product_id );
+		$tpl_component = apply_filters('wps-filter-product-complete-sheet-output', $tpl_component, $product_id);
 
 		/** Build template	*/
 		$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-		if ( $tpl_way_to_take[0] && !empty($tpl_way_to_take[1]) ) {
+		if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
 			/*	Include the old way template part	*/
 			ob_start();
 			require(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -1605,14 +1605,14 @@ 
 
 		/** Get the product thumbnail	*/
 		$productThumbnail = wpshop_display::display_template_element('product_thumbnail_default', array());
-		if(has_post_thumbnail($product_id)){
+		if (has_post_thumbnail($product_id)) {
 			$productThumbnail = get_the_post_thumbnail($product_id, 'thumbnail');
 		}
 
 		$product = self::get_product_data($product_id);
 
 		/**	Get the product information for output	*/
-		if ( !empty($product) ) {
+		if (!empty($product)) {
 
 			$product_title = $product['post_title'];
 			$product_name = $product['post_name'];
@@ -1620,7 +1620,7 @@ 
 			$product_more_informations = $product['product_content'];
 			$product_excerpt = $product['product_excerpt'];
 
-			if ( strpos($product['product_content'], '<!--more-->') ) {
+			if (strpos($product['product_content'], '<!--more-->')) {
 				$post_content = explode('<!--more-->', $product['product_content']);
 				$product_more_informations = $post_content[0];
 			}
@@ -1628,55 +1628,55 @@ 
 		}
 		else {
 			$productThumbnail = wpshop_display::display_template_element('product_thumbnail_default', array());
-			$product_title = '<i>'.__('This product does not exist', 'wpshop').'</i>';
+			$product_title = '<i>' . __('This product does not exist', 'wpshop') . '</i>';
 			$product_link = '';
 			$product_more_informations = '';
 			$product_excerpt = '';
 		}
 
 		/** Retrieve product price	*/
-		$price_attribute = wpshop_attributes::getElement( 'product_price', "'valid'", 'code' );
-		$price_display = wpshop_attributes::check_attribute_display( $price_attribute->is_visible_in_front_listing, $product['custom_display'], 'attribute', 'product_price', 'mini_output');
-		$catalog_options = get_option( 'wpshop_catalog_main_option' , array() );
+		$price_attribute = wpshop_attributes::getElement('product_price', "'valid'", 'code');
+		$price_display = wpshop_attributes::check_attribute_display($price_attribute->is_visible_in_front_listing, $product['custom_display'], 'attribute', 'product_price', 'mini_output');
+		$catalog_options = get_option('wpshop_catalog_main_option', array());
 		$productPrice = '';
 		$wpshop_price_piloting_option = get_option('wpshop_shop_price_piloting');
 		$check_product_price = wpshop_prices::check_product_price($product);
-		$result_price_piloting = ( !empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $check_product_price['et'] : $check_product_price['ati'];
-		if ( $price_display && !( !empty( $catalog_options ) && ( !empty( $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] ) && $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] == 'yes' ) && $result_price_piloting == 0 ) ) {
-			$product_price_infos = wpshop_prices::get_product_price( $product, 'just_price_infos', 'mini_output' );
+		$result_price_piloting = (!empty($wpshop_price_piloting_option) && $wpshop_price_piloting_option == 'HT') ? $check_product_price['et'] : $check_product_price['ati'];
+		if ($price_display && !(!empty($catalog_options) && (!empty($catalog_options['wpshop_catalog_empty_price_behaviour']) && $catalog_options['wpshop_catalog_empty_price_behaviour'] == 'yes') && $result_price_piloting == 0)) {
+			$product_price_infos = wpshop_prices::get_product_price($product, 'just_price_infos', 'mini_output');
 
-	 		if ( !empty($product_price_infos) ) {
+	 		if (!empty($product_price_infos)) {
 	 			$tpl_component_price = array();
 	 			/** Price piloting **/
-	 			$price_ploting = get_option( 'wpshop_shop_price_piloting' );
-	 			$tpl_component_price['CROSSED_OUT_PRICE'] = ( !empty($product_price_infos['CROSSED_OUT_PRICE']) ) ? ( ( !empty($product_price_infos['PRICE_FROM']) ) ? __('Price from', 'wpshop') . ' ' : '' ) . wpshop_display::display_template_element('product_price_template_crossed_out_price', array('CROSSED_OUT_PRICE_VALUE' => $product_price_infos['CROSSED_OUT_PRICE'])) : '';
-	 			$variations = wpshop_products::get_variation( $product_id );
-				$tpl_component_price['PRODUCT_PRICE'] = ( empty($product_price_infos['CROSSED_OUT_PRICE']) && ( !empty( $variations ) && !empty($product_price_infos['PRICE_FROM'] ) ) ) ? __('Price from', 'wpshop') . ' ' . $product_price_infos['PRODUCT_PRICE'] : $product_price_infos['PRODUCT_PRICE'];
+	 			$price_ploting = get_option('wpshop_shop_price_piloting');
+	 			$tpl_component_price['CROSSED_OUT_PRICE'] = (!empty($product_price_infos['CROSSED_OUT_PRICE'])) ? ((!empty($product_price_infos['PRICE_FROM'])) ? __('Price from', 'wpshop') . ' ' : '') . wpshop_display::display_template_element('product_price_template_crossed_out_price', array('CROSSED_OUT_PRICE_VALUE' => $product_price_infos['CROSSED_OUT_PRICE'])) : '';
+	 			$variations = wpshop_products::get_variation($product_id);
+				$tpl_component_price['PRODUCT_PRICE'] = (empty($product_price_infos['CROSSED_OUT_PRICE']) && (!empty($variations) && !empty($product_price_infos['PRICE_FROM']))) ? __('Price from', 'wpshop') . ' ' . $product_price_infos['PRODUCT_PRICE'] : $product_price_infos['PRODUCT_PRICE'];
 	 			$tpl_component_price['MESSAGE_SAVE_MONEY'] = $product_price_infos['MESSAGE_SAVE_MONEY'];
-	 			$tpl_component_price['TAX_PILOTING'] = (!empty($price_ploting) && $price_ploting == 'HT' ) ? __('ET', 'wpshop') : ''; $product_price_infos['MESSAGE_SAVE_MONEY'];
-	 			$productPrice = wpshop_display::display_template_element('product_price_template_mini_output', $tpl_component_price );
+	 			$tpl_component_price['TAX_PILOTING'] = (!empty($price_ploting) && $price_ploting == 'HT') ? __('ET', 'wpshop') : ''; $product_price_infos['MESSAGE_SAVE_MONEY'];
+	 			$productPrice = wpshop_display::display_template_element('product_price_template_mini_output', $tpl_component_price);
 	 		}
 			else {
-				$productPrice = wpshop_prices::get_product_price($product, 'price_display', array('mini_output', $output_type) );
+				$productPrice = wpshop_prices::get_product_price($product, 'price_display', array('mini_output', $output_type));
 	 		}
 		}
 
 		/** Check if there is at less 1 product in stock	*/
 		$wps_product_ctr = new wps_product_ctr();
 		$productStock = $wps_product_ctr->check_stock($product_id, 1);
-		$productStock = $productStock===true ? 1 : null;
+		$productStock = $productStock === true ? 1 : null;
 
 		/** Define "Add to cart" button	*/
-		$add_to_cart_button_display_state = wpshop_attributes::check_attribute_display( ((WPSHOP_DEFINED_SHOP_TYPE == 'sale') ? 'yes' : 'no'), $product['custom_display'], 'product_action_button', 'add_to_cart', 'mini_output');
+		$add_to_cart_button_display_state = wpshop_attributes::check_attribute_display(((WPSHOP_DEFINED_SHOP_TYPE == 'sale') ? 'yes' : 'no'), $product['custom_display'], 'product_action_button', 'add_to_cart', 'mini_output');
 		$display_price_state_when_price_is_empty = false;
-		if ( empty( $productPrice ) && ( !empty( $catalog_options ) || ( !empty( $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] ) && $catalog_options[ 'wpshop_catalog_empty_price_behaviour' ] == 'yes' ) ) ) {
+		if (empty($productPrice) && (!empty($catalog_options) || (!empty($catalog_options['wpshop_catalog_empty_price_behaviour']) && $catalog_options['wpshop_catalog_empty_price_behaviour'] == 'yes'))) {
 			$display_price_state_when_price_is_empty = false;
 		}
-		else if ( !empty( $productPrice ) ) {
+		else if (!empty($productPrice)) {
 			$display_price_state_when_price_is_empty = true;
 		}
-		$add_to_cart_button = ( true === $add_to_cart_button_display_state)  && ( true === $display_price_state_when_price_is_empty ) ? self::display_add_to_cart_button( $product_id, $productStock, 'mini' ) : '';
-		$product_quantity_chooser_input = ( true === $add_to_cart_button_display_state ) ? wpshop_display::display_template_element( 'product_complete_sheet_quantity_chooser', array( 'PRODUCT_ID' => $product_id, ) ) : '';
+		$add_to_cart_button = (true === $add_to_cart_button_display_state) && (true === $display_price_state_when_price_is_empty) ? self::display_add_to_cart_button($product_id, $productStock, 'mini') : '';
+		$product_quantity_chooser_input = (true === $add_to_cart_button_display_state) ? wpshop_display::display_template_element('product_complete_sheet_quantity_chooser', array('PRODUCT_ID' => $product_id,)) : '';
 
 		/** Define "Ask a quotation" button	*/
 		$quotation_button = self::display_quotation_button($product_id, (!empty($product['quotation_allowed']) ? $product['quotation_allowed'] : null));
@@ -1690,11 +1690,11 @@ 
 		$product_featured = $product_featured_def['output'];
 		$product_class .= $product_featured_def['class'];
 
-		if ( !($current_item_position%$grid_element_nb_per_line) ) {
+		if (!($current_item_position % $grid_element_nb_per_line)) {
 			$product_class .= ' wpshop_last_product_of_line';
 		}
 
-		if ( !empty($product['product_id']) ) {
+		if (!empty($product['product_id'])) {
 			/** Template parameters	*/
 			$template_part = 'product_mini_' . $output_type;
 			$tpl_component = array();
@@ -1708,7 +1708,7 @@ 
 			$tpl_component['PRODUCT_BUTTONS'] = $tpl_component['PRODUCT_BUTTON_ADD_TO_CART'] . $tpl_component['PRODUCT_BUTTON_QUOTATION'];
 			$tpl_component['PRODUCT_PRICE'] = $productPrice;
 			$tpl_component['PRODUCT_PERMALINK'] = $product_link;
-			$tpl_component['PRODUCT_TITLE'] = ( !empty($product_title) ) ? $product_title  : '';
+			$tpl_component['PRODUCT_TITLE'] = (!empty($product_title)) ? $product_title : '';
 			$tpl_component['PRODUCT_NAME'] = $product_name;
 			$tpl_component['PRODUCT_DESCRIPTION'] = $product_more_informations;
 			$tpl_component['PRODUCT_IS_NEW'] = $product_new;
@@ -1716,24 +1716,24 @@ 
 			$tpl_component['PRODUCT_EXTRA_STATE'] = $tpl_component['PRODUCT_IS_NEW'] . $tpl_component['PRODUCT_IS_FEATURED'];
 			$tpl_component['PRODUCT_THUMBNAIL'] = $productThumbnail;
 
-			if ( has_post_thumbnail($product_id) ) {
-				$image_attributes = wp_get_attachment_metadata( get_post_thumbnail_id($product_id)  );
-				if ( !empty($image_attributes) && !empty($image_attributes['sizes']) && is_array($image_attributes['sizes']) ) {
+			if (has_post_thumbnail($product_id)) {
+				$image_attributes = wp_get_attachment_metadata(get_post_thumbnail_id($product_id));
+				if (!empty($image_attributes) && !empty($image_attributes['sizes']) && is_array($image_attributes['sizes'])) {
 					$existing_image_sizes = get_intermediate_image_sizes();
-					foreach ( $existing_image_sizes as $size_name) {
+					foreach ($existing_image_sizes as $size_name) {
 						$tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = wp_get_attachment_image(get_post_thumbnail_id($product_id), $size_name);
-						$tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = ( !empty( $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] ) ) ? $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] : WPSHOP_DEFAULT_PRODUCT_PICTURE;
+						$tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] = (!empty($tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)])) ? $tpl_component['PRODUCT_THUMBNAIL_' . strtoupper($size_name)] : WPSHOP_DEFAULT_PRODUCT_PICTURE;
 					}
 				}
 			}
 
 			$tpl_component['PRODUCT_EXCERPT'] = $product_excerpt;
 			$tpl_component['PRODUCT_OUTPUT_TYPE'] = $output_type;
-			$tpl_component = apply_filters( 'wps-filter-product-mini-output', $tpl_component, $product_id );
+			$tpl_component = apply_filters('wps-filter-product-mini-output', $tpl_component, $product_id);
 
 			/** Build template	*/
 			$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-			if ( $tpl_way_to_take[0] && !empty($tpl_way_to_take[1]) ) {
+			if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
 				/**	Include the old way template part	*/
 				ob_start();
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -1760,18 +1760,18 @@ 
 	*
 	*	@return mixed $widget_content The output for the product list
 	*/
-	public static function get_product_of_category($category_slug, $category_id){
+	public static function get_product_of_category($category_slug, $category_id) {
 		global $top_categories;
 		$widget_content = '';
-		$products = wp_cache_get( 'wpshop_products_category_'.$category_id );
-		if( false == $products ) {
+		$products = wp_cache_get('wpshop_products_category_' . $category_id);
+		if (false == $products) {
 			$args = array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES => $category_slug);
 			$products = get_posts($args);
-			wp_cache_set( 'wpshop_products_category_'.$category_id, $products );
+			wp_cache_set('wpshop_products_category_' . $category_id, $products);
 		}
-		if(is_array($products) && (count($products) > 0)){
-			foreach($products as $product){
-				if ( $product->post_status == "publish" ) {
+		if (is_array($products) && (count($products) > 0)) {
+			foreach ($products as $product) {
+				if ($product->post_status == "publish") {
 					ob_start();
 					require(wpshop_display::get_template_file('categories_products-widget.tpl.php'));
 					$widget_content .= ob_get_contents();
@@ -1788,7 +1788,7 @@ 
 	 * @param unknown_type $selected_product
 	 * @return string
 	 */
-	function custom_product_list($selected_product = array()){
+	function custom_product_list($selected_product = array()) {
 		global $wpdb;
 
 		/*	Start the table definition	*/
@@ -1816,9 +1816,9 @@ 
 		$posts = query_posts(array(
 			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'posts_per_page' => -1
 		));
-		if(!empty($posts)){
+		if (!empty($posts)) {
 			$has_result = true;
-			foreach($posts as $post){
+			foreach ($posts as $post) {
 				$tableRowsId[$current_line_index] = 'product_' . $post->ID;
 
 				$post_info = get_post_meta($post->ID, '_wpshop_product_metadata', true);
@@ -1826,12 +1826,12 @@ 
 				unset($tableRowValue);
 				$tableRowValue[] = array('class' => 'wpshop_product_selector_cell', 'value' => '<input type="checkbox" name="wp_list_product[]" value="' . $post->ID . '" class="wpshop_product_cb_dialog" id="wpshop_product_cb_dialog_' . $post->ID . '" />');
 				$tableRowValue[] = array('class' => 'wpshop_product_identifier_cell', 'value' => '<label for="wpshop_product_cb_dialog_' . $post->ID . '" >' . WPSHOP_IDENTIFIER_PRODUCT . $post->ID . '</label>');
-				$tableRowValue[] = array('class' => 'wpshop_product_quantity_cell', 'value' => '<a href="#" class="order_product_action_button qty_change">-</a><input type="text" name="wpshop_pdt_qty[' . $post->ID  . ']" value="1" class="wpshop_order_product_qty" /><a href="#" class="order_product_action_button qty_change">+</a>');
-				$tableRowValue[] = array('class' => 'wpshop_product_sku_cell', 'value' => ( !empty($post_info['product_reference']) ) ? $post_info['product_reference'] : '');
+				$tableRowValue[] = array('class' => 'wpshop_product_quantity_cell', 'value' => '<a href="#" class="order_product_action_button qty_change">-</a><input type="text" name="wpshop_pdt_qty[' . $post->ID . ']" value="1" class="wpshop_order_product_qty" /><a href="#" class="order_product_action_button qty_change">+</a>');
+				$tableRowValue[] = array('class' => 'wpshop_product_sku_cell', 'value' => (!empty($post_info['product_reference'])) ? $post_info['product_reference'] : '');
 				$tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => $post->post_title);
 				$tableRowValue[] = array('class' => 'wpshop_product_link_cell', 'value' => '<a href="' . $post->guid . '" target="wpshop_product_view_product" target="wpshop_view_product" >' . __('View product', 'wpshop') . '</a><br/>
-				<a href="' . admin_url('post.php?post=' . $post->ID  . '&action=edit') . '" target="wpshop_edit_product" >' . __('Edit product', 'wpshop') . '</a>');
-				$tableRowValue[] = array('class' => 'wpshop_product_price_cell', 'value' => __('Price ET', 'wpshop') . '&nbsp;:&nbsp;' . ( ( !empty( $post_info[WPSHOP_PRODUCT_PRICE_HT]) ) ? round($post_info[WPSHOP_PRODUCT_PRICE_HT],2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : '') . '<br/>' . __('Price ATI', 'wpshop') . '&nbsp;:&nbsp;' . ( ( !empty($post_info[WPSHOP_PRODUCT_PRICE_TTC]) ) ? round($post_info[WPSHOP_PRODUCT_PRICE_TTC],2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : ''));
+				<a href="' . admin_url('post.php?post=' . $post->ID . '&action=edit') . '" target="wpshop_edit_product" >' . __('Edit product', 'wpshop') . '</a>');
+				$tableRowValue[] = array('class' => 'wpshop_product_price_cell', 'value' => __('Price ET', 'wpshop') . '&nbsp;:&nbsp;' . ((!empty($post_info[WPSHOP_PRODUCT_PRICE_HT])) ? round($post_info[WPSHOP_PRODUCT_PRICE_HT], 2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : '') . '<br/>' . __('Price ATI', 'wpshop') . '&nbsp;:&nbsp;' . ((!empty($post_info[WPSHOP_PRODUCT_PRICE_TTC])) ? round($post_info[WPSHOP_PRODUCT_PRICE_TTC], 2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : ''));
 				$tableRows[] = $tableRowValue;
 
 				$current_line_index++;
@@ -1841,9 +1841,9 @@ 
 		$posts = query_posts(array(
 				'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'posts_per_page' => -1
 		));
-		if(!empty($posts)){
+		if (!empty($posts)) {
 			$has_result = true;
-			foreach($posts as $post){
+			foreach ($posts as $post) {
 				$tableRowsId[$current_line_index] = 'product_' . $post->ID;
 
 				$post_info = get_post_meta($post->ID, '_wpshop_product_metadata', true);
@@ -1851,25 +1851,25 @@ 
 				unset($tableRowValue);
 				$tableRowValue[] = array('class' => 'wpshop_product_selector_cell', 'value' => '<input type="checkbox" name="wp_list_product[]" value="' . $post->ID . '" class="wpshop_product_cb_dialog" id="wpshop_product_cb_dialog_' . $post->ID . '" />');
 				$tableRowValue[] = array('class' => 'wpshop_product_identifier_cell', 'value' => '<label for="wpshop_product_cb_dialog_' . $post->ID . '" >' . WPSHOP_IDENTIFIER_PRODUCT . $post->ID . '</label>');
-				$tableRowValue[] = array('class' => 'wpshop_product_quantity_cell', 'value' => '<a href="#" class="order_product_action_button qty_change">-</a><input type="text" name="wpshop_pdt_qty[' . $post->ID  . ']" value="1" class="wpshop_order_product_qty" /><a href="#" class="order_product_action_button qty_change">+</a>');
-				$tableRowValue[] = array('class' => 'wpshop_product_sku_cell', 'value' => ( !empty($post_info['product_reference']) ) ? $post_info['product_reference'] : '');
+				$tableRowValue[] = array('class' => 'wpshop_product_quantity_cell', 'value' => '<a href="#" class="order_product_action_button qty_change">-</a><input type="text" name="wpshop_pdt_qty[' . $post->ID . ']" value="1" class="wpshop_order_product_qty" /><a href="#" class="order_product_action_button qty_change">+</a>');
+				$tableRowValue[] = array('class' => 'wpshop_product_sku_cell', 'value' => (!empty($post_info['product_reference'])) ? $post_info['product_reference'] : '');
 				$parent_product = wpshop_products::get_parent_variation($post->ID);
-				if ( !empty($parent_product) && !empty($parent_product['parent_post']) ) {
-					$product_variations_postmeta = get_post_meta($post->ID,'_wpshop_variations_attribute_def', true);
-					$query = $wpdb->prepare('SELECT frontend_label FROM ' .WPSHOP_DBT_ATTRIBUTE. ' WHERE code = %s', key($product_variations_postmeta) );
+				if (!empty($parent_product) && !empty($parent_product['parent_post'])) {
+					$product_variations_postmeta = get_post_meta($post->ID, '_wpshop_variations_attribute_def', true);
+					$query = $wpdb->prepare('SELECT frontend_label FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code = %s', key($product_variations_postmeta));
 					$option_name = $wpdb->get_var($query);
-					$query = $wpdb->prepare('SELECT label FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id = %d', $product_variations_postmeta[key($product_variations_postmeta)]);
+					$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $product_variations_postmeta[key($product_variations_postmeta)]);
 					$option_value = $wpdb->get_var($query);
 					$parent_post = $parent_product['parent_post'];
-					$tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => $parent_post->post_title. ' <br/>('. $option_name . ' : ' . $option_value. ')');
+					$tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => $parent_post->post_title . ' <br/>(' . $option_name . ' : ' . $option_value . ')');
 				}
 				else {
 					$tableRowValue[] = array('class' => 'wpshop_product_name_cell', 'value' => $post->post_title);
 				}
 
 				$tableRowValue[] = array('class' => 'wpshop_product_link_cell', 'value' => '<a href="' . $post->guid . '" target="wpshop_product_view_product" target="wpshop_view_product" >' . __('View product', 'wpshop') . '</a><br/>
-				<a href="' . admin_url('post.php?post=' . $post->ID  . '&action=edit') . '" target="wpshop_edit_product" >' . __('Edit product', 'wpshop') . '</a>');
-				$tableRowValue[] = array('class' => 'wpshop_product_price_cell', 'value' => __('Price ET', 'wpshop') . '&nbsp;:&nbsp;' . ( ( !empty( $post_info[WPSHOP_PRODUCT_PRICE_HT]) ) ? round($post_info[WPSHOP_PRODUCT_PRICE_HT],2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : '') . '<br/>' . __('Price ATI', 'wpshop') . '&nbsp;:&nbsp;' . ( ( !empty($post_info[WPSHOP_PRODUCT_PRICE_TTC]) ) ? round($post_info[WPSHOP_PRODUCT_PRICE_TTC],2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : ''));
+				<a href="' . admin_url('post.php?post=' . $post->ID . '&action=edit') . '" target="wpshop_edit_product" >' . __('Edit product', 'wpshop') . '</a>');
+				$tableRowValue[] = array('class' => 'wpshop_product_price_cell', 'value' => __('Price ET', 'wpshop') . '&nbsp;:&nbsp;' . ((!empty($post_info[WPSHOP_PRODUCT_PRICE_HT])) ? round($post_info[WPSHOP_PRODUCT_PRICE_HT], 2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : '') . '<br/>' . __('Price ATI', 'wpshop') . '&nbsp;:&nbsp;' . ((!empty($post_info[WPSHOP_PRODUCT_PRICE_TTC])) ? round($post_info[WPSHOP_PRODUCT_PRICE_TTC], 2) . '&nbsp;' . wpshop_tools::wpshop_get_currency() : ''));
 				$tableRows[] = $tableRowValue;
 
 				$current_line_index++;
@@ -1927,15 +1927,15 @@ 
 
 		/** PRODUCT MARK AS NEW */
 		$show_product_special_state = false;
-		if ( (strtolower(__($special_state_def, 'wpshop')) === strtolower(__('Yes', 'wpshop')) ) &&
+		if ((strtolower(__($special_state_def, 'wpshop')) === strtolower(__('Yes', 'wpshop'))) &&
 				(empty($special_state_start) || ($special_state_start == '0000-00-00') || ($special_state_start >= $current_time)) &&
-				(empty($special_state_end) || ($special_state_end == '0000-00-00') || ($special_state_end <= $current_time)) ) {
+				(empty($special_state_end) || ($special_state_end == '0000-00-00') || ($special_state_end <= $current_time))) {
 			$show_product_special_state = true;
 		}
 
-		if ( $show_product_special_state ) {
+		if ($show_product_special_state) {
 			/** Check the type of special output needed	*/
-			switch ( $special ) {
+			switch ($special) {
 				case 'declare_new':
 					$product_special_state['class'] = ' wpshop_product_is_new_' . $output_type;
 					$template_part = 'product_is_new_sticker';
@@ -1952,7 +1952,7 @@ 
 
 			/** Build template		*/
 			$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-			if ( $tpl_way_to_take[0] && !empty($tpl_way_to_take[1]) ) {
+			if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
 				/**	Include the old way template part	*/
 				ob_start();
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -1975,7 +1975,7 @@ 
 	 *
 	 * @param integer $element_id Identifier of current product
 	 */
-	public static function calculate_price( $element_id ) {
+	public static function calculate_price($element_id) {
 		global $wpdb;
 
 		/**
@@ -1987,13 +1987,13 @@ 
 			"SELECT ATTR.code, ATTR_VAL.value_id AS id, ATTR_VAL.value, ATTR.id AS attribute_id
 			FROM " . WPSHOP_DBT_ATTRIBUTE . " AS ATTR
 				RIGHT JOIN " . WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL . " AS ATTR_VAL ON ((ATTR_VAL.attribute_id = ATTR.id) AND (ATTR_VAL.entity_id = %d))
-			WHERE ATTR.code IN ('" . implode( "', '",  unserialize( WPSHOP_ATTRIBUTE_PRICES ) ) . "')",
+			WHERE ATTR.code IN ('" . implode("', '", unserialize(WPSHOP_ATTRIBUTE_PRICES)) . "')",
 			$element_id
 		);
-		$prices_attribute = $wpdb->get_results( $query, OBJECT_K );
+		$prices_attribute = $wpdb->get_results($query, OBJECT_K);
 
 		/** Si aucun prix trouvé on stop la méthode / If not found price, stop the method */
-		if( empty( $prices_attribute ) ) {
+		if (empty($prices_attribute)) {
 			return false;
 		}
 		else {
@@ -2001,18 +2001,18 @@ 
 			 * Récupère le prix de base selon le pilotage de prix de la boutique / Get
 			 * the base amount according on the shop price control
 			 */
-			$base_price 		= $prices_attribute[constant( 'WPSHOP_PRODUCT_PRICE_' . WPSHOP_PRODUCT_PRICE_PILOT )]->value;
-			$rate_vat			= wpshop_prices::get_rate_vat( $element_id );
-			$divider_price_ttc 	= 1 + ( $rate_vat->value / 100 );
+			$base_price = $prices_attribute[constant('WPSHOP_PRODUCT_PRICE_' . WPSHOP_PRODUCT_PRICE_PILOT)]->value;
+			$rate_vat = wpshop_prices::get_rate_vat($element_id);
+			$divider_price_ttc = 1 + ($rate_vat->value / 100);
 
 			/**
 			 * Informations nécessaire pour crée un attribut / Information needed to
 			 * create an attribute
 			 */
-			$entity_type_id	= wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-			$language 		= WPSHOP_CURRENT_LOCALE;
+			$entity_type_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+			$language = WPSHOP_CURRENT_LOCALE;
 
-			if ( !empty($_REQUEST['icl_post_language']) ) {
+			if (!empty($_REQUEST['icl_post_language'])) {
 				$query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", sanitize_text_field($_REQUEST['icl_post_language']));
 				$language = $wpdb->get_var($query);
 			}
@@ -2021,13 +2021,13 @@ 
 			 * Vérifie la configuration pour savoir comment calculer les prix pour le produit /
 			 * Check configuration to know how to make the calcul for the product
 			 */
-			if ( WPSHOP_PRODUCT_PRICE_PILOT == 'HT' ) {
-				$price_with_vat = ($base_price * $divider_price_ttc );
-				$price_no_vat 	= $base_price;
+			if (WPSHOP_PRODUCT_PRICE_PILOT == 'HT') {
+				$price_with_vat = ($base_price * $divider_price_ttc);
+				$price_no_vat = $base_price;
 			}
-			else if ( WPSHOP_PRODUCT_PRICE_PILOT == 'TTC' ) {
+			else if (WPSHOP_PRODUCT_PRICE_PILOT == 'TTC') {
 				$price_with_vat = $base_price;
-				$price_no_vat	= ($price_with_vat / $divider_price_ttc );
+				$price_no_vat = ($price_with_vat / $divider_price_ttc);
 			}
 
 			/**
@@ -2035,29 +2035,29 @@ 
 			 * type que celui-ci / The last parameter allows not to delete the
 			 * attributes of the same type as this one
 			 */
-			wpshop_attributes::saveAttributeForEntity( array( 'decimal' => array( 'product_price' => $price_with_vat )), $entity_type_id, $element_id, $language, 'wpshop_products' );
-			wpshop_attributes::saveAttributeForEntity( array( 'decimal' => array( 'price_ht' => $price_no_vat )), $entity_type_id, $element_id, $language, 'wpshop_product' );
+			wpshop_attributes::saveAttributeForEntity(array('decimal' => array('product_price' => $price_with_vat)), $entity_type_id, $element_id, $language, 'wpshop_products');
+			wpshop_attributes::saveAttributeForEntity(array('decimal' => array('price_ht' => $price_no_vat)), $entity_type_id, $element_id, $language, 'wpshop_product');
 
 			/** Ajout ou met à jour de l'attribut tva / Add or update the attribute vat */
 			$vat_amount = $price_with_vat - $price_no_vat;
-			wpshop_attributes::saveAttributeForEntity( array( 'decimal' => array( 'tva' => $vat_amount )), $entity_type_id, $element_id, $language, 'wpshop_product' );
+			wpshop_attributes::saveAttributeForEntity(array('decimal' => array('tva' => $vat_amount)), $entity_type_id, $element_id, $language, 'wpshop_product');
 
 			/**	Update the product meta information with the calculated prices	*/
-			$product_postmeta 									= get_post_meta( $element_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, true );
-			$product_postmeta[WPSHOP_PRODUCT_PRICE_TTC] 		= number_format( round( $price_with_vat, 5 ), 5, '.', '' );
-			$product_postmeta[WPSHOP_PRODUCT_PRICE_HT] 			= number_format( round( $price_no_vat, 5 ), 5, '.', '' );
-			$product_postmeta[WPSHOP_PRODUCT_PRICE_TAX_AMOUNT] 	= number_format( round( $vat_amount, 5 ), 5, '.', '' );
+			$product_postmeta = get_post_meta($element_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, true);
+			$product_postmeta[WPSHOP_PRODUCT_PRICE_TTC] 		= number_format(round($price_with_vat, 5), 5, '.', '');
+			$product_postmeta[WPSHOP_PRODUCT_PRICE_HT] 			= number_format(round($price_no_vat, 5), 5, '.', '');
+			$product_postmeta[WPSHOP_PRODUCT_PRICE_TAX_AMOUNT] = number_format(round($vat_amount, 5), 5, '.', '');
 			$product_postmeta[WPSHOP_PRODUCT_PRICE_TAX] 		= $rate_vat->id;
 
-			update_post_meta($element_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $product_postmeta );
+			update_post_meta($element_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, $product_postmeta);
 
 			/** Met à jour la meta _wps_price_infos */
-			$p 		= wpshop_products::get_product_data( $element_id );
-			$price 	= wpshop_prices::get_product_price( $p, 'just_price_infos', array( 'mini_output', 'grid' ) );
-			update_post_meta( $element_id, '_wps_price_infos', $price );
+			$p = wpshop_products::get_product_data($element_id);
+			$price = wpshop_prices::get_product_price($p, 'just_price_infos', array('mini_output', 'grid'));
+			update_post_meta($element_id, '_wps_price_infos', $price);
 
 			/** Met à jour la meta _wpshop_displayed_price */
-			wps_filter_search::save_displayed_price_meta( $element_id );
+			wps_filter_search::save_displayed_price_meta($element_id);
 		}
 
 		return true;
@@ -2077,24 +2077,24 @@ 
 		$button = '';
 // 		$attributes_frontend_display = get_post_meta( $product_id, '_wpshop_product_attributes_frontend_display', true );
 
-		if ( WPSHOP_DEFINED_SHOP_TYPE == 'sale' /*&& ( empty($attributes_frontend_display) || ( !empty($attributes_frontend_display) && !empty($attributes_frontend_display['product_action_button']) && !empty($attributes_frontend_display['product_action_button']['mini_output']) && $output_type == 'mini') || ( !empty($attributes_frontend_display) && !empty($attributes_frontend_display['product_action_button']) && !empty($attributes_frontend_display['product_action_button']['complete_sheet']) && $output_type == 'complete') ) */) {
+		if (WPSHOP_DEFINED_SHOP_TYPE == 'sale' /*&& ( empty($attributes_frontend_display) || ( !empty($attributes_frontend_display) && !empty($attributes_frontend_display['product_action_button']) && !empty($attributes_frontend_display['product_action_button']['mini_output']) && $output_type == 'mini') || ( !empty($attributes_frontend_display) && !empty($attributes_frontend_display['product_action_button']) && !empty($attributes_frontend_display['product_action_button']['complete_sheet']) && $output_type == 'complete') ) */) {
 			/*
 			 * Check if current product has variation for button display
 			 */
-			$variations_exists = get_posts( array( 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'post_parent' => $product_id) );
-			$variations_list = ( !empty($variations_exists) && is_array( wpshop_attributes::get_attribute_user_defined( array('entity_type_id' => self::currentPageCode)) ) ) ? true : false;
+			$variations_exists = get_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, 'post_parent' => $product_id));
+			$variations_list = (!empty($variations_exists) && is_array(wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode)))) ? true : false;
 
 			/*
 			 * Template parameters
 			 */
 
 
-			if( get_post_type($product_id) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ) {
+			if (get_post_type($product_id) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) {
 				/** Check variation stock **/
-				$variations = self::get_variation( $product_id );
-				if ( !empty($variations) ) {
-					foreach($variations as $variation ) {
-						if( !empty($variation) && !empty($variation['variation_dif']) && !empty($variation['variation_dif']['product_stock']) ) {
+				$variations = self::get_variation($product_id);
+				if (!empty($variations)) {
+					foreach ($variations as $variation) {
+						if (!empty($variation) && !empty($variation['variation_dif']) && !empty($variation['variation_dif']['product_stock'])) {
 							$productStock += $variation['variation_dif']['product_stock'];
 						}
 					}
@@ -2112,7 +2112,7 @@ 
 			 * Build template
 			 */
 			$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-			if ( $tpl_way_to_take[0] && !empty($tpl_way_to_take[1]) ) {
+			if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
 				/*	Include the old way template part	*/
 				ob_start();
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -2137,11 +2137,11 @@ 
 	 *
 	 * @return string $button The html output for the button
 	 */
-	public static function display_quotation_button($product_id, $product_quotation_state,  $output_type = 'mini') {
+	public static function display_quotation_button($product_id, $product_quotation_state, $output_type = 'mini') {
 		$quotation_button = '';
 
-		if ( WPSHOP_ADDONS_QUOTATION && (!empty($product_quotation_state) && strtolower(__($product_quotation_state, 'wpshop')) == strtolower(__('Yes', 'wpshop'))) && (empty($_SESSION['cart']['cart_type']) || ($_SESSION['cart']['cart_type'] == 'quotation')) ) {
-			$variations_list = ( is_array( wpshop_products::get_variation( $product_id ) ) && is_array( wpshop_attributes::get_attribute_user_defined( array('entity_type_id' => self::currentPageCode)) ) ) ? array_merge( wpshop_products::get_variation( $product_id ), wpshop_attributes::get_attribute_user_defined( array('entity_type_id' => self::currentPageCode) ) ) : array();
+		if (WPSHOP_ADDONS_QUOTATION && (!empty($product_quotation_state) && strtolower(__($product_quotation_state, 'wpshop')) == strtolower(__('Yes', 'wpshop'))) && (empty($_SESSION['cart']['cart_type']) || ($_SESSION['cart']['cart_type'] == 'quotation'))) {
+			$variations_list = (is_array(wpshop_products::get_variation($product_id)) && is_array(wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode)))) ? array_merge(wpshop_products::get_variation($product_id), wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode))) : array();
 			/**
 			 * Template parameters
 			 */
@@ -2155,7 +2155,7 @@ 
 			 * Build template
 			 */
 			$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-			if ( $tpl_way_to_take[0] && !empty($tpl_way_to_take[1]) ) {
+			if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
 				/*	Include the old way template part	*/
 				ob_start();
 				require(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -2181,13 +2181,13 @@ 
 	 *
 	 * @return string The attachement gallery output
 	 */
-	public static function display_attachment_gallery( $attachement_type, $content ) {
+	public static function display_attachment_gallery($attachement_type, $content) {
 		$galery_output = '';
 
 		/*
 		 * Get the template part for given galery type
 		 */
-		switch ( $attachement_type ) {
+		switch ($attachement_type) {
 			case 'picture':
 					$template_part = 'product_attachment_picture_galery';
 				break;
@@ -2207,7 +2207,7 @@ 
 		 * Build template
 		 */
 		$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-		if ( $tpl_way_to_take[0] && !empty($tpl_way_to_take[1]) ) {
+		if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
 			/*	Include the old way template part	*/
 			ob_start();
 			require(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -2227,11 +2227,11 @@ 
 	 * Define the metabox to display in product edition page in backend
 	 * @param object $post The current element displayed for edition
 	 */
-	public static function meta_box_variations( $post ) {
+	public static function meta_box_variations($post) {
 		$output = '';
 		/*	Variations container	*/
 		$tpl_component = array();
-		$tpl_component['ADMIN_VARIATION_CONTAINER'] = self::display_variation_admin( $post->ID );
+		$tpl_component['ADMIN_VARIATION_CONTAINER'] = self::display_variation_admin($post->ID);
 		$output .= wpshop_display::display_template_element('wpshop_admin_variation_metabox', $tpl_component, array(), 'admin');
 		echo '<span class="wpshop_loading_ wpshopHide" ><img src="' . admin_url('images/loading.gif') . '" alt="loading picture" /></span>' . $output . '<div class="wpshop_cls" ></div>';
 	}
@@ -2246,12 +2246,12 @@ 
 	 *
 	 * @return mixed The last created variation identifier
 	 */
-	public static function creation_variation_callback( $possible_variations, $element_id ) {
+	public static function creation_variation_callback($possible_variations, $element_id) {
 		/** Get existing variation	*/
-		$existing_variations_in_db = wpshop_products::get_variation( $element_id );
+		$existing_variations_in_db = wpshop_products::get_variation($element_id);
 		$existing_variations = array();
-		if ( !empty($existing_variations_in_db) ) {
-			foreach ( $existing_variations_in_db as $variations_def) {
+		if (!empty($existing_variations_in_db)) {
+			foreach ($existing_variations_in_db as $variations_def) {
 				$existing_variations[] = $variations_def['variation_def'];
 			}
 		}
@@ -2259,22 +2259,22 @@ 
 		$attribute_defining_variation = get_post_meta($element_id, '_wpshop_variation_defining', true);
 
 		/**	Read possible values	*/
-		foreach ( $possible_variations as $variation_definition) {
-			if ( in_array($variation_definition, $existing_variations) ) {
+		foreach ($possible_variations as $variation_definition) {
+			if (in_array($variation_definition, $existing_variations)) {
 				continue;
 			}
 
 			$attribute_to_set = array();
-			foreach ( $variation_definition as $attribute_code => $attribute_selected_value ) {
+			foreach ($variation_definition as $attribute_code => $attribute_selected_value) {
 				$attribute = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
 				$attribute_to_set[$attribute->data_type][$attribute_code] = $attribute_selected_value;
-				if ( empty($attribute_defining_variation['attributes']) || (!in_array($attribute_code, $attribute_defining_variation['attributes'])) ) {
+				if (empty($attribute_defining_variation['attributes']) || (!in_array($attribute_code, $attribute_defining_variation['attributes']))) {
 					$attribute_defining_variation['attributes'][] = $attribute_code;
 				}
 			}
 			$variation_id = wpshop_products::create_variation($element_id, $attribute_to_set);
 		}
-		update_post_meta($element_id, '_wpshop_variation_defining', $attribute_defining_variation );
+		update_post_meta($element_id, '_wpshop_variation_defining', $attribute_defining_variation);
 
 		return !empty($variation_id) ? $variation_id : 0;
 	}
@@ -2288,13 +2288,13 @@ 
 	 *
 	 * @return mixed <number, WP_Error> The variation identifier or an error in case the creation was not succesfull
 	 */
-	public static function create_variation( $head_product, $variation_attributes ) {
+	public static function create_variation($head_product, $variation_attributes) {
 		/** Create custom title */
 		$title_variation = "";
-		if(!empty($variation_attributes)) {
-			foreach($variation_attributes as $type => $array) {
-				if(!empty($array)) {
-					foreach($array as $code => $value) {
+		if (!empty($variation_attributes)) {
+			foreach ($variation_attributes as $type => $array) {
+				if (!empty($array)) {
+					foreach ($array as $code => $value) {
 						$title_variation .= " " . $code . " " . $value;
 					}
 				}
@@ -2302,25 +2302,25 @@ 
 		}
 
 		$variation = array(
-			'post_title' => sprintf(__('Product %s variation %s', 'wpshop'), $head_product, get_the_title( $head_product )) . $title_variation,
+			'post_title' => sprintf(__('Product %s variation %s', 'wpshop'), $head_product, get_the_title($head_product)) . $title_variation,
 			'post_content' => '',
 			'post_status' => 'publish',
 			'post_author' => get_current_user_id(),
 			'post_parent' => $head_product,
 			'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION
 		);
-		$variation_id = wp_insert_post( $variation );
+		$variation_id = wp_insert_post($variation);
 
 		wpshop_attributes::saveAttributeForEntity($variation_attributes, wpshop_entities::get_entity_identifier_from_code(wpshop_products::currentPageCode), $variation_id, WPSHOP_CURRENT_LOCALE, '');
 
 		/*	Update product price looking for shop parameters	*/
-		wpshop_products::calculate_price( $variation_id );
+		wpshop_products::calculate_price($variation_id);
 
 		/*	Save the attributes values into wordpress post metadata database in order to have a backup and to make frontend search working	*/
 		$productMetaDatas = array();
-		foreach ( $variation_attributes as $attributeType => $attributeValues ) {
-			foreach ( $attributeValues as $attributeCode => $attributeValue ) {
-				if ( !empty($attributeValue) ) {
+		foreach ($variation_attributes as $attributeType => $attributeValues) {
+			foreach ($attributeValues as $attributeCode => $attributeValue) {
+				if (!empty($attributeValue)) {
 					$productMetaDatas[$attributeCode] = $attributeValue;
 				}
 			}
@@ -2339,7 +2339,7 @@ 
 	 * @param integer $head_product The product identifier to get the variation for
 	 * @return object The variation list
 	 */
-	public static function get_variation( $head_product ) {
+	public static function get_variation($head_product) {
 		global $wpdb;
 		$variations_output = null;
 // 		$variations = query_posts(array(
@@ -2350,18 +2350,18 @@ 
 // 			'posts_per_page'=> -1
 // 		));
 
-		$query = $wpdb->prepare( 'SELECT * FROM ' .$wpdb->posts.' WHERE post_type = %s AND post_parent = %d AND post_status = %s ORDER BY ID ASC', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, $head_product, 'publish' );
-		$variations = $wpdb->get_results( $query );
+		$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_parent = %d AND post_status = %s ORDER BY ID ASC', WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, $head_product, 'publish');
+		$variations = $wpdb->get_results($query);
 
-		if ( !empty( $variations ) ) {
-			$head_wpshop_variation_definition = get_post_meta( $head_product, '_wpshop_variation_defining', true );
+		if (!empty($variations)) {
+			$head_wpshop_variation_definition = get_post_meta($head_product, '_wpshop_variation_defining', true);
 
-			foreach ( $variations as $post_def ) {
-				$data = wpshop_attributes::get_attribute_list_for_item( wpshop_entities::get_entity_identifier_from_code(self::currentPageCode), $post_def->ID, WPSHOP_CURRENT_LOCALE, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
-				foreach ( $data as $content ) {
+			foreach ($variations as $post_def) {
+				$data = wpshop_attributes::get_attribute_list_for_item(wpshop_entities::get_entity_identifier_from_code(self::currentPageCode), $post_def->ID, WPSHOP_CURRENT_LOCALE, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+				foreach ($data as $content) {
 					$attribute_value = 'attribute_value_' . $content->data_type;
-					if ( !empty($content->$attribute_value) ) {
-						if ( !empty($head_wpshop_variation_definition['attributes']) && in_array($content->code, $head_wpshop_variation_definition['attributes']) ) {
+					if (!empty($content->$attribute_value)) {
+						if (!empty($head_wpshop_variation_definition['attributes']) && in_array($content->code, $head_wpshop_variation_definition['attributes'])) {
 							$variations_output[$post_def->ID]['variation_def'][$content->code] = $content->$attribute_value;
 						}
 						else {
@@ -2383,26 +2383,26 @@ 
 	 * @param integer $head_product L'identifiant du produit dont on veut afficher les variations
 	 * @return string Le code html permettant l'affichage des variations dans l'interface d'édition du produit
 	 */
-	public static function display_variation_admin( $head_product ) {
+	public static function display_variation_admin($head_product) {
 		$output = '';
 		$productCurrency = wpshop_tools::wpshop_get_currency();
 		/*	Récupération de la liste des variations pour le produit en cours d'édition	*/
-		$variations = self::get_variation( $head_product );
-		$price_piloting = get_option( 'wpshop_shop_price_piloting' );
+		$variations = self::get_variation($head_product);
+		$price_piloting = get_option('wpshop_shop_price_piloting');
 
 		/*	Affichage de la liste des variations pour le produit en cours d'édition	*/
-		if ( !empty($variations) && is_array($variations) ) {
+		if (!empty($variations) && is_array($variations)) {
 			$existing_variation_list = wpshop_display::display_template_element('wpshop_admin_existing_variation_controller', array(), array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $head_product), 'admin');
 
-			foreach ( $variations as $variation ) {
+			foreach ($variations as $variation) {
 				$tpl_component = array();
 
 				$tpl_component['ADMIN_EXISTING_VARIATIONS_CLASS'] = ' wpshop_variation_' . self::currentPageCode;
 				$tpl_component['VARIATION_IDENTIFIER'] = $variation['post']->ID;
 				$tpl_component['VARIATION_DETAIL'] = '  ';
-				$p = ( !empty($variation['variation_dif']['product_price']) || !empty($variation['variation_dif']['price_ht']) ) ? ( ( !empty($price_piloting) && $price_piloting == 'HT' && !empty($variation['variation_dif']['price_ht']) ) ? $variation['variation_dif']['price_ht'] : ( !empty($variation['variation_dif']['product_price']) ) ? $variation['variation_dif']['product_price'] : 0 ) : 0;
-				$tpl_component['VARIATION_DETAIL_PRICE'] = number_format( $p, 2, '.', '').' '.$productCurrency.' '.( ( !empty($price_piloting) && $price_piloting == 'HT' ) ? __( 'ET', 'wpshop' ) : __( 'ATI', 'wpshop' ) );
-				if ( !empty($price_piloting) && $price_piloting == 'HT' ) {
+				$p = (!empty($variation['variation_dif']['product_price']) || !empty($variation['variation_dif']['price_ht'])) ? ((!empty($price_piloting) && $price_piloting == 'HT' && !empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : (!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0) : 0;
+				$tpl_component['VARIATION_DETAIL_PRICE'] = number_format($p, 2, '.', '') . ' ' . $productCurrency . ' ' . ((!empty($price_piloting) && $price_piloting == 'HT') ? __('ET', 'wpshop') : __('ATI', 'wpshop'));
+				if (!empty($price_piloting) && $price_piloting == 'HT') {
 
 				}
 				else {
@@ -2410,66 +2410,66 @@ 
 				}
 				$post_obj = $variation['post'];
 
-				$parent_product_infos = wpshop_products::get_parent_variation( $post_obj->ID );
-				if ( !empty($parent_product_infos) ) {
+				$parent_product_infos = wpshop_products::get_parent_variation($post_obj->ID);
+				if (!empty($parent_product_infos)) {
 					$parent_post = $parent_product_infos['parent_post'];
 					$product_option_postmeta = get_post_meta($parent_post->ID, '_wpshop_variation_defining', true);
-					if ( !empty($product_option_postmeta['options']['price_behaviour']) && !empty($product_option_postmeta['options']['price_behaviour'][0]) && $product_option_postmeta['options']['price_behaviour'][0] == 'addition') {
-						if( !empty($price_piloting) && $price_piloting == 'HT' ) {
-							$product_price = ( ( !empty($variation['variation_dif']['price_ht']) ) ? $variation['variation_dif']['price_ht'] : 0 ) + $parent_product_infos['parent_post_meta']['price_ht'];
+					if (!empty($product_option_postmeta['options']['price_behaviour']) && !empty($product_option_postmeta['options']['price_behaviour'][0]) && $product_option_postmeta['options']['price_behaviour'][0] == 'addition') {
+						if (!empty($price_piloting) && $price_piloting == 'HT') {
+							$product_price = ((!empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : 0) + $parent_product_infos['parent_post_meta']['price_ht'];
 						}
 						else {
-							$product_price = ( ( !empty($variation['variation_dif']['product_price']) ) ? $variation['variation_dif']['product_price'] : 0 ) + $parent_product_infos['parent_post_meta']['product_price'];
+							$product_price = ((!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0) + $parent_product_infos['parent_post_meta']['product_price'];
 						}
 						$tpl_component['VARIATION_DETAIL_SALE_PRICE_INDICATION'] = __('Variation price combined with the parent product price', 'wpshop');
 					}
 					else {
-						if( !empty($price_piloting) && $price_piloting == 'HT' ) {
-							$product_price = ( !empty($variation['variation_dif']['price_ht']) ) ? $variation['variation_dif']['price_ht'] : 0;
+						if (!empty($price_piloting) && $price_piloting == 'HT') {
+							$product_price = (!empty($variation['variation_dif']['price_ht'])) ? $variation['variation_dif']['price_ht'] : 0;
 						}
 						else {
-							$product_price = ( !empty($variation['variation_dif']['product_price']) ) ? $variation['variation_dif']['product_price'] : 0;
+							$product_price = (!empty($variation['variation_dif']['product_price'])) ? $variation['variation_dif']['product_price'] : 0;
 						}
 						$tpl_component['VARIATION_DETAIL_SALE_PRICE_INDICATION'] = __('Only variation\'s price is used', 'wpshop');
 					}
-					$product_price = number_format(str_replace(',', '.',$product_price), 2, '.', '').' '.$productCurrency.' '.( ( !empty($price_piloting) && $price_piloting == 'HT' ) ? __( 'ET', 'wpshop' ) : __( 'ATI', 'wpshop' ) );
+					$product_price = number_format(str_replace(',', '.', $product_price), 2, '.', '') . ' ' . $productCurrency . ' ' . ((!empty($price_piloting) && $price_piloting == 'HT') ? __('ET', 'wpshop') : __('ATI', 'wpshop'));
 					$tpl_component['VARIATION_DETAIL_SALE_PRICE'] = $product_price;
 				}
 
-				if ( !empty($variation['variation_def']) ) {
-					foreach ( $variation['variation_def'] as $variation_key => $variation_value ) {
-						if ( !empty($variation_value) ) {
+				if (!empty($variation['variation_def'])) {
+					foreach ($variation['variation_def'] as $variation_key => $variation_value) {
+						if (!empty($variation_value)) {
 							$attribute_def_for_variation = wpshop_attributes::getElement($variation_key, "'valid'", 'code');
 							$tpl_component['VARIATION_DETAIL'] .= '<input type="hidden" name="' . self::current_page_variation_code . '[' . $variation['post']->ID . '][attribute][' . $attribute_def_for_variation->data_type . '][' . $variation_key . ']" value="' . $variation_value . '" />' . wpshop_display::display_template_element('wpshop_admin_variation_item_def_header', array('VARIATION_ATTRIBUTE_CODE' => $attribute_def_for_variation->frontend_label, 'VARIATION_ATTRIBUTE_CODE_VALUE' => stripslashes(wpshop_attributes::get_attribute_type_select_option_info($variation_value, 'label', $attribute_def_for_variation->data_type_to_use, true))), array(), 'admin');
 							$tpl_component['VARIATION_IMAGE_CHOICE'] = '';
 
 							/** Define Link image to variation interface **/
-							if( !empty($product_option_postmeta) && !empty($product_option_postmeta['attributes']) && !empty($product_option_postmeta['variation_type']) && ( ( count( $product_option_postmeta['attributes'] ) == 1 && $product_option_postmeta['variation_type'] == 'single' ) || ($product_option_postmeta['variation_type'] == 'combined' ) ) ) {
-								$pictures = get_posts( array('post_type' => 'attachment', 'posts_per_page' => -1, 'post_status' => null, 'post_parent' => $head_product) );
+							if (!empty($product_option_postmeta) && !empty($product_option_postmeta['attributes']) && !empty($product_option_postmeta['variation_type']) && ((count($product_option_postmeta['attributes']) == 1 && $product_option_postmeta['variation_type'] == 'single') || ($product_option_postmeta['variation_type'] == 'combined'))) {
+								$pictures = get_posts(array('post_type' => 'attachment', 'posts_per_page' => -1, 'post_status' => null, 'post_parent' => $head_product));
 
-								$media_id_data = get_post_meta( $head_product, '_wps_product_media', true );
-								if( !empty($media_id_data) ) {
-									$medias_ids = explode( ',', $media_id_data );
+								$media_id_data = get_post_meta($head_product, '_wps_product_media', true);
+								if (!empty($media_id_data)) {
+									$medias_ids = explode(',', $media_id_data);
 
-									if ( !empty( $medias_ids ) ) {
-										foreach ( $medias_ids as $media_id ) {
-											if ( !empty( $media_id ) ) {
-												$pictures[] = get_post( $media_id );
+									if (!empty($medias_ids)) {
+										foreach ($medias_ids as $media_id) {
+											if (!empty($media_id)) {
+												$pictures[] = get_post($media_id);
 											}
 										}
 									}
 								}
 
 								$pictures_data = '';
-								if( !empty($pictures) ) {
-									$selected_picture = get_post_meta($variation['post']->ID, '_wps_variation_attached_picture', true );
+								if (!empty($pictures)) {
+									$selected_picture = get_post_meta($variation['post']->ID, '_wps_variation_attached_picture', true);
 
 									$done_picture = array();
-									foreach( $pictures as $picture ) {
-										if ( !in_array( $picture->ID, $done_picture ) ) {
-											if( wp_attachment_is_image( $picture->ID ) ) {
-												$checked = ( ( !empty($selected_picture) && $selected_picture == $picture->ID ) ? 'checked="checked"' : '' );
-												$pictures_data .= wpshop_display::display_template_element('wpshop_admin_variation_picture_choice_element', array( 'PICTURE_CHOICE_VARIATION_ID' => $picture->ID, 'PRODUCT_VARIATION_ID' =>$variation['post']->ID, 'PICTURE_CHOICE_SELECTED' => $checked, 'PICTURE_CHOICE_VARIATION_IMG' => wp_get_attachment_image( $picture->ID, 'thumbnail' ) ), array(), 'admin');
+									foreach ($pictures as $picture) {
+										if (!in_array($picture->ID, $done_picture)) {
+											if (wp_attachment_is_image($picture->ID)) {
+												$checked = ((!empty($selected_picture) && $selected_picture == $picture->ID) ? 'checked="checked"' : '');
+												$pictures_data .= wpshop_display::display_template_element('wpshop_admin_variation_picture_choice_element', array('PICTURE_CHOICE_VARIATION_ID' => $picture->ID, 'PRODUCT_VARIATION_ID' =>$variation['post']->ID, 'PICTURE_CHOICE_SELECTED' => $checked, 'PICTURE_CHOICE_VARIATION_IMG' => wp_get_attachment_image($picture->ID, 'thumbnail')), array(), 'admin');
 
 												$done_picture[] = $picture->ID;
 											}
@@ -2477,7 +2477,7 @@ 
 									}
 								}
 
-								$tpl_component['VARIATION_IMAGE_CHOICE'] = wpshop_display::display_template_element('wpshop_admin_variation_picture_choice_container',  array( 'PICTURE_CHOICE_CONTAINER_CONTENT' => $pictures_data ), array(), 'admin');
+								$tpl_component['VARIATION_IMAGE_CHOICE'] = wpshop_display::display_template_element('wpshop_admin_variation_picture_choice_container', array('PICTURE_CHOICE_CONTAINER_CONTENT' => $pictures_data), array(), 'admin');
 							}
 
 						}
@@ -2488,7 +2488,7 @@ 
 				$tpl_component['VARIATION_DETAIL'] = substr($tpl_component['VARIATION_DETAIL'], 0, -2);
 
 				$tpl_component['ADMIN_VARIATION_SPECIFIC_DEFINITION_CONTAINER_CLASS'] = ' wpshopHide';
-				$tpl_component['VARIATION_DEFINITION'] = wpshop_attributes::get_variation_attribute( array('input_class' => ' ', 'field_name' => wpshop_products::current_page_variation_code . '[' . $variation['post']->ID . ']','page_code' => self::current_page_variation_code, 'field_id' => self::current_page_variation_code . '_' . $variation['post']->ID, 'variation_dif_values' => (!empty($variation['variation_dif']) ? $variation['variation_dif'] : array())) );
+				$tpl_component['VARIATION_DEFINITION'] = wpshop_attributes::get_variation_attribute(array('input_class' => ' ', 'field_name' => wpshop_products::current_page_variation_code . '[' . $variation['post']->ID . ']', 'page_code' => self::current_page_variation_code, 'field_id' => self::current_page_variation_code . '_' . $variation['post']->ID, 'variation_dif_values' => (!empty($variation['variation_dif']) ? $variation['variation_dif'] : array())));
 				$tpl_component['VARIATION_DEFINITION_CONTENT'] = wpshop_display::display_template_element('wpshop_admin_variation_item_specific_def', $tpl_component, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT => $head_product, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION => $variation['post']->ID), 'admin');
 
 				/*	Add the variation definition to output	*/
@@ -2510,22 +2510,22 @@ 
 	 * Retrieve and display the variation for a given product
 	 * @param integer $product_id The product identifier to get variation for
 	 */
-	public static function wpshop_variation( $post_id = '', $from_admin = false, $order_id = '', $qty = 1 ) {
+	public static function wpshop_variation($post_id = '', $from_admin = false, $order_id = '', $qty = 1) {
 		global $wp_query;
 		$output = '';
 
-		$product_id = empty($post_id) ? $wp_query->post->ID : $post_id ;
-		$wpshop_product_attributes_frontend_display = get_post_meta( $product_id, '_wpshop_product_attributes_frontend_display', true );
-		$head_wpshop_variation_definition = get_post_meta( $product_id, '_wpshop_variation_defining', true );
+		$product_id = empty($post_id) ? $wp_query->post->ID : $post_id;
+		$wpshop_product_attributes_frontend_display = get_post_meta($product_id, '_wpshop_product_attributes_frontend_display', true);
+		$head_wpshop_variation_definition = get_post_meta($product_id, '_wpshop_variation_defining', true);
 
 		/**	Get attribute order for current product	*/
-		$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails( get_post_meta($product_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true)  ) ;
+		$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails(get_post_meta($product_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
 		$output_order = array();
-		if ( count($product_attribute_order_detail) > 0 ) {
-			if (!empty($product_attribute_order_detail) ) {
-				foreach ( $product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
-					foreach ( $product_attr_group_detail['attribut'] as $position => $attribute_def) {
-						if ( !empty($attribute_def->code) )
+		if (count($product_attribute_order_detail) > 0) {
+			if (!empty($product_attribute_order_detail)) {
+				foreach ($product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
+					foreach ($product_attr_group_detail['attribut'] as $position => $attribute_def) {
+						if (!empty($attribute_def->code))
 							$output_order[$attribute_def->code] = $position;
 					}
 				}
@@ -2539,49 +2539,49 @@ 
 		$possible_values_for_selection_calculation = array();
 
 		/*	Vérification de l'existence de déclinaison pour le produit	*/
-		$wpshop_variation_list = self::get_variation( $product_id );
-		if ( !empty($wpshop_variation_list) ) {
+		$wpshop_variation_list = self::get_variation($product_id);
+		if (!empty($wpshop_variation_list)) {
 			foreach ($wpshop_variation_list as $variation) {
-				if (!empty($variation['variation_def']) ) {
-					$display_option = get_post_meta( $post_id, '_wpshop_product_attributes_frontend_display', true );
-					foreach ( $variation['variation_def'] as $attribute_code => $attribute_value ) {
-						if ( empty($display_option) || ( !empty($display_option['attribute']) && !empty($display_option['attribute'][$attribute_code]) && !empty($display_option['attribute'][$attribute_code]['complete_sheet']) ) ) {
+				if (!empty($variation['variation_def'])) {
+					$display_option = get_post_meta($post_id, '_wpshop_product_attributes_frontend_display', true);
+					foreach ($variation['variation_def'] as $attribute_code => $attribute_value) {
+						if (empty($display_option) || (!empty($display_option['attribute']) && !empty($display_option['attribute'][$attribute_code]) && !empty($display_option['attribute'][$attribute_code]['complete_sheet']))) {
 							$tpl_component = array();
 
 							$attribute_db_definition = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
 							$default_value_is_serial = false;
 							$attribute_list_first_element = $attribute_db_definition->default_value;
-							if ( !empty($attribute_db_definition->default_value) && ($attribute_db_definition->default_value == serialize(false) || @unserialize($attribute_db_definition->default_value) !== false) ) {
+							if (!empty($attribute_db_definition->default_value) && ($attribute_db_definition->default_value == serialize(false) || @unserialize($attribute_db_definition->default_value) !== false)) {
 								$default_value_is_serial = true;
 								$tmp_default_value = unserialize($attribute_db_definition->default_value);
 								$attribute_list_first_element = !empty($tmp_default_value['field_options']['label_for_first_item']) ? $tmp_default_value['field_options']['label_for_first_item'] : null;
 							}
 
-							if ( $default_value_is_serial && !empty($attribute_list_first_element) && ($attribute_list_first_element != 'none') ) {
-								$possible_values[$attribute_code][0][0] = ($default_value_is_serial && !empty($attribute_list_first_element) && ($attribute_list_first_element != 'none')) ? stripslashes( sprintf( $attribute_list_first_element, strtolower($attribute_db_definition->frontend_label)) ) : __('Choose a value', 'wpshop');
+							if ($default_value_is_serial && !empty($attribute_list_first_element) && ($attribute_list_first_element != 'none')) {
+								$possible_values[$attribute_code][0][0] = ($default_value_is_serial && !empty($attribute_list_first_element) && ($attribute_list_first_element != 'none')) ? stripslashes(sprintf($attribute_list_first_element, strtolower($attribute_db_definition->frontend_label))) : __('Choose a value', 'wpshop');
 							}
 
-							if ( !empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'custom')) {
+							if (!empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'custom')) {
 								$tpl_component['VARIATION_VALUE'] = stripslashes(wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'label', 'custom'));
 								$position = wpshop_attributes::get_attribute_type_select_option_info($attribute_value, 'position', 'custom');
 							}
-							else if ( !empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'internal')) {
+							else if (!empty($attribute_value) && ($attribute_db_definition->data_type_to_use == 'internal')) {
 								$post_def = get_post($attribute_value);
 								$tpl_component['VARIATION_VALUE'] = stripslashes($post_def->post_title);
 								$position = $post_def->menu_order;
 							}
 
-							if ( !empty($variation['variation_dif']) ) {
-								foreach ( $variation['variation_dif'] as $attribute_dif_code => $attribute_dif_value) {
+							if (!empty($variation['variation_dif'])) {
+								foreach ($variation['variation_dif'] as $attribute_dif_code => $attribute_dif_value) {
 									$wpshop_prices_attributes = unserialize(WPSHOP_ATTRIBUTE_PRICES);
 									$the_value = $attribute_dif_value;
-									if ( in_array($attribute_dif_code, $wpshop_prices_attributes) ) {
+									if (in_array($attribute_dif_code, $wpshop_prices_attributes)) {
 										$the_value = wpshop_display::format_field_output('wpshop_product_price', $attribute_dif_value);
 									}
 									$tpl_component['VARIATION_DIF_' . strtoupper($attribute_dif_code)] = stripslashes($the_value);
 								}
 							}
-							if ( !empty($attribute_value) ) {
+							if (!empty($attribute_value)) {
 								$possible_values[$attribute_code][$position][$attribute_value] = wpshop_display::display_template_element('product_variation_item_possible_values', $tpl_component, array('type' => 'attribute_for_variation', 'id' => $attribute_code));
 								$possible_values_for_selection_calculation[$attribute_code][$attribute_value] = $tpl_component['VARIATION_VALUE'];
 							}
@@ -2592,33 +2592,33 @@ 
 			}
 
 			$variation_tpl = array();
-			if ( !empty($head_wpshop_variation_definition['attributes']) ) {
-				foreach ( $head_wpshop_variation_definition['attributes'] as $attribute_code ) {
+			if (!empty($head_wpshop_variation_definition['attributes'])) {
+				foreach ($head_wpshop_variation_definition['attributes'] as $attribute_code) {
 					$attribute_db_definition = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
-					if ( !empty( $attribute_db_definition ) ) {
-						$attribute_display_state = wpshop_attributes::check_attribute_display( $attribute_db_definition->is_visible_in_front, $wpshop_product_attributes_frontend_display, 'attribute', $attribute_code, 'complete_sheet');
+					if (!empty($attribute_db_definition)) {
+						$attribute_display_state = wpshop_attributes::check_attribute_display($attribute_db_definition->is_visible_in_front, $wpshop_product_attributes_frontend_display, 'attribute', $attribute_code, 'complete_sheet');
 
 
 
-						$is_required = ( (!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['required_attributes']) && ( in_array( $attribute_code, $head_wpshop_variation_definition['options']['required_attributes']) )) ) ? true : false;
-						if ( !$is_required && $attribute_db_definition->is_required == 'yes' ) {
+						$is_required = ((!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['required_attributes']) && (in_array($attribute_code, $head_wpshop_variation_definition['options']['required_attributes'])))) ? true : false;
+						if (!$is_required && $attribute_db_definition->is_required == 'yes') {
 							$is_required = true;
 						}
 
 						$input_def = array();
 						$input_def['type'] = $attribute_db_definition->frontend_input;
 						$value = isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code] : (!empty($attribute_db_definition->default_value) ? $attribute_db_definition->default_value : null);
-						if ( in_array($attribute_db_definition->frontend_input, array('radio', 'checkbox')) ) {
+						if (in_array($attribute_db_definition->frontend_input, array('radio', 'checkbox'))) {
 							unset($possible_values[$attribute_code][0]);
 							$value = array($value);
 						}
 						$input_def['id'] = 'wpshop_variation_attr_' . $attribute_code;
 						$input_def['name'] = $attribute_code;
 						$real_possible_values = array();
-						if ( !empty($possible_values[$attribute_code]) ) {
+						if (!empty($possible_values[$attribute_code])) {
 							ksort($possible_values[$attribute_code]);
-							foreach ( $possible_values[$attribute_code] as $position => $def ) {
-								foreach ( $def as $attribute_value => $attribute_value_output ) {
+							foreach ($possible_values[$attribute_code] as $position => $def) {
+								foreach ($def as $attribute_value => $attribute_value_output) {
 									$real_possible_values[$attribute_value] = $attribute_value_output;
 								}
 							}
@@ -2628,19 +2628,19 @@ 
 						$input_def['value'] = $value;
 
 						$input_def['options']['more_input'] = '';
-						if ( !empty($possible_values_for_selection_calculation[$attribute_code]) ) {
-							foreach ( $possible_values_for_selection_calculation[$attribute_code] as $value_id => $value ) {
+						if (!empty($possible_values_for_selection_calculation[$attribute_code])) {
+							foreach ($possible_values_for_selection_calculation[$attribute_code] as $value_id => $value) {
 								$input_def['options']['more_input'] .= '<input type="hidden" disabled="disabled" value="' . str_replace("\\", "", $value) . '" name="' . $input_def['id'] . '_current_value" id="' . $input_def['id'] . '_current_value_' . $value_id . '" />';
 							}
 						}
 
 						$input_def['options_label']['original'] = true;
-						$input_def['option'] = 'data-nonce="' . wp_create_nonce( 'wpshop_ajax_wpshop_variation_selection' ) . '" class="wpshop_variation_selector_input' . ($is_required ? ' attribute_is_required_input attribute_is_required_input_' . $attribute_code . ' ' : '') . ( $attribute_db_definition->_display_informations_about_value == 'yes' ? ' wpshop_display_information_about_value' : '' ) . ' ' . (( is_admin() ) ? $attribute_db_definition->backend_css_class : $attribute_db_definition->frontend_css_class) . '" ';
-						if ( !empty(  $real_possible_values ) ) {
+						$input_def['option'] = 'data-nonce="' . wp_create_nonce('wpshop_ajax_wpshop_variation_selection') . '" class="wpshop_variation_selector_input' . ($is_required ? ' attribute_is_required_input attribute_is_required_input_' . $attribute_code . ' ' : '') . ($attribute_db_definition->_display_informations_about_value == 'yes' ? ' wpshop_display_information_about_value' : '') . ' ' . ((is_admin()) ? $attribute_db_definition->backend_css_class : $attribute_db_definition->frontend_css_class) . '" ';
+						if (!empty($real_possible_values)) {
 							$tpl_component = array();
 							$attribute_output_def['value'] = isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_code] : $input_def['value'];
 							$tpl_component['VARIATION_INPUT'] = wpshop_form::check_input_type($input_def, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) . $input_def['options']['more_input'];
-							$tpl_component['VARIATION_LABEL'] = ($is_required ? '<span class="attribute_is_required attribute_is_required_' . $attribute_code . '" >' . stripslashes($attribute_db_definition->frontend_label) . '</span> <span class="required" >*</span>' : stripslashes($attribute_db_definition->frontend_label) );
+							$tpl_component['VARIATION_LABEL'] = ($is_required ? '<span class="attribute_is_required attribute_is_required_' . $attribute_code . '" >' . stripslashes($attribute_db_definition->frontend_label) . '</span> <span class="required" >*</span>' : stripslashes($attribute_db_definition->frontend_label));
 							$tpl_component['VARIATION_CODE'] = $attribute_code;
 							$tpl_component['VARIATION_LABEL_HELPER'] = !empty($attribute_db_definition->frontend_help_message) ? ' title="' . $attribute_db_definition->frontend_help_message . '" ' : '';
 						 	$tpl_component['VARIATION_LABEL_CLASS'] = !empty($attribute_db_definition->frontend_help_message) ? ' wpshop_att_variation_helper' : '';
@@ -2648,7 +2648,7 @@ 
 							$tpl_component['VARIATION_PARENT_ID'] = $product_id;
 							$tpl_component['VARIATION_PARENT_TYPE'] = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
 							$tpl_component['VARIATION_CONTAINER_CLASS'] = ($is_required ? ' attribute_is_required_container attribute_is_required_container_' . $attribute_code : '') . ' wpshop_variation_' . $attribute_code . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . ' wpshop_variation_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_' . $product_id;
-							$tpl_component['VARIATION_REQUIRED_INDICATION'] = ( $is_required ) ? __('Required variation', 'wpshop') : '';
+							$tpl_component['VARIATION_REQUIRED_INDICATION'] = ($is_required) ? __('Required variation', 'wpshop') : '';
 							$variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_code)] = wpshop_display::display_template_element('product_variation_item', $tpl_component);
 							$variation_attribute_ordered[$output_order[$attribute_code]] = $variation_tpl['VARIATION_COMPLETE_OUTPUT_' . strtoupper($attribute_code)];
 						}
@@ -2662,23 +2662,23 @@ 
 		$variation_tpl['VARIATION_FORM_ELEMENT_ID'] = $product_id;
 		wp_reset_query();
 
-		$attribute_defined_to_be_user_defined = wpshop_attributes::get_attribute_user_defined( array('entity_type_id' => self::currentPageCode) );
-		if ( !empty($attribute_defined_to_be_user_defined) ) {
-			foreach ( $attribute_defined_to_be_user_defined as $attribute_not_in_variation_but_user_defined ) {
-				$is_required = ( (!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['required_attributes']) && ( in_array( $attribute_not_in_variation_but_user_defined->code, $head_wpshop_variation_definition['options']['required_attributes']) )) || $attribute_not_in_variation_but_user_defined->is_required == 'yes' ) ? true : false;
+		$attribute_defined_to_be_user_defined = wpshop_attributes::get_attribute_user_defined(array('entity_type_id' => self::currentPageCode));
+		if (!empty($attribute_defined_to_be_user_defined)) {
+			foreach ($attribute_defined_to_be_user_defined as $attribute_not_in_variation_but_user_defined) {
+				$is_required = ((!empty($head_wpshop_variation_definition['options']) && !empty($head_wpshop_variation_definition['options']['required_attributes']) && (in_array($attribute_not_in_variation_but_user_defined->code, $head_wpshop_variation_definition['options']['required_attributes']))) || $attribute_not_in_variation_but_user_defined->is_required == 'yes') ? true : false;
 
-				$attribute_display_state = wpshop_attributes::check_attribute_display( $attribute_not_in_variation_but_user_defined->is_visible_in_front, $wpshop_product_attributes_frontend_display, 'attribute', $attribute_not_in_variation_but_user_defined->code, 'complete_sheet');
-				if ( $attribute_display_state &&  array_key_exists($attribute_not_in_variation_but_user_defined->code, $output_order) && !in_array($attribute_not_in_variation_but_user_defined->code, $variation_attribute) && ($attribute_not_in_variation_but_user_defined->is_used_for_variation == 'no') ) {
-					$attribute_output_def = wpshop_attributes::get_attribute_field_definition( $attribute_not_in_variation_but_user_defined, (is_array($head_wpshop_variation_definition) && isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_not_in_variation_but_user_defined->code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_not_in_variation_but_user_defined->code] : 'Salut' ));
+				$attribute_display_state = wpshop_attributes::check_attribute_display($attribute_not_in_variation_but_user_defined->is_visible_in_front, $wpshop_product_attributes_frontend_display, 'attribute', $attribute_not_in_variation_but_user_defined->code, 'complete_sheet');
+				if ($attribute_display_state && array_key_exists($attribute_not_in_variation_but_user_defined->code, $output_order) && !in_array($attribute_not_in_variation_but_user_defined->code, $variation_attribute) && ($attribute_not_in_variation_but_user_defined->is_used_for_variation == 'no')) {
+					$attribute_output_def = wpshop_attributes::get_attribute_field_definition($attribute_not_in_variation_but_user_defined, (is_array($head_wpshop_variation_definition) && isset($head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_not_in_variation_but_user_defined->code]) ? $head_wpshop_variation_definition['options']['attributes_default_value'][$attribute_not_in_variation_but_user_defined->code] : 'Salut'));
 
 					$tpl_component = array();
-					$attribute_output_def['option'] = 'data-nonce="' . wp_create_nonce( 'wpshop_ajax_wpshop_variation_selection' ) . '" class="wpshop_variation_selector_input' . ($is_required ? ' attribute_is_required_input attribute_is_required_input_' . $attribute_not_in_variation_but_user_defined->code : '') . ' ' . ( str_replace('"', '', str_replace('class="', '', $attribute_output_def['option'])) ) . ' ' . (( is_admin() ) ? $attribute_not_in_variation_but_user_defined->backend_css_class : $attribute_not_in_variation_but_user_defined->frontend_css_class) . '" ';
+					$attribute_output_def['option'] = 'data-nonce="' . wp_create_nonce('wpshop_ajax_wpshop_variation_selection') . '" class="wpshop_variation_selector_input' . ($is_required ? ' attribute_is_required_input attribute_is_required_input_' . $attribute_not_in_variation_but_user_defined->code : '') . ' ' . (str_replace('"', '', str_replace('class="', '', $attribute_output_def['option']))) . ' ' . ((is_admin()) ? $attribute_not_in_variation_but_user_defined->backend_css_class : $attribute_not_in_variation_but_user_defined->frontend_css_class) . '" ';
 					$tpl_component['VARIATION_INPUT'] = wpshop_form::check_input_type($attribute_output_def, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION . '[free]') . $attribute_output_def['options'];
-					$tpl_component['VARIATION_LABEL'] = ($is_required ? '<span class="attribute_is_required attribute_is_required_' . $attribute_not_in_variation_but_user_defined->code . '" >' . stripslashes($attribute_not_in_variation_but_user_defined->frontend_label) . '</span> <span class="required" >*</span>' : stripslashes($attribute_not_in_variation_but_user_defined->frontend_label) );
+					$tpl_component['VARIATION_LABEL'] = ($is_required ? '<span class="attribute_is_required attribute_is_required_' . $attribute_not_in_variation_but_user_defined->code . '" >' . stripslashes($attribute_not_in_variation_but_user_defined->frontend_label) . '</span> <span class="required" >*</span>' : stripslashes($attribute_not_in_variation_but_user_defined->frontend_label));
 					$tpl_component['VARIATION_CODE'] = $attribute_not_in_variation_but_user_defined->code;
 					$tpl_component['VARIATION_LABEL_HELPER'] = !empty($attribute_not_in_variation_but_user_defined->frontend_help_message) ? ' title="' . $attribute_not_in_variation_but_user_defined->frontend_help_message . '" ' : '';
 					$tpl_component['VARIATION_LABEL_CLASS'] = !empty($attribute_not_in_variation_but_user_defined->frontend_help_message) ? ' wpshop_att_variation_helper' : '';
-					$tpl_component['VARIATION_REQUIRED_INDICATION'] = ( $is_required ) ? __('Required variation', 'wpshop') : '';
+					$tpl_component['VARIATION_REQUIRED_INDICATION'] = ($is_required) ? __('Required variation', 'wpshop') : '';
 					$tpl_component['VARIATION_IDENTIFIER'] = $attribute_output_def['id'];
 					$tpl_component['VARIATION_PARENT_ID'] = $product_id;
 					$tpl_component['VARIATION_PARENT_TYPE'] = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
@@ -2690,17 +2690,17 @@ 
 		}
 
 		$variation_tpl['VARIATION_FORM_VARIATION_LIST'] = '';
-		if ( !empty($variation_attribute_ordered) && is_array($variation_attribute_ordered) ) {
+		if (!empty($variation_attribute_ordered) && is_array($variation_attribute_ordered)) {
 			ksort($variation_attribute_ordered);
-			foreach ( $variation_attribute_ordered as $attribute_variation_to_output ) {
+			foreach ($variation_attribute_ordered as $attribute_variation_to_output) {
 				$variation_tpl['VARIATION_FORM_VARIATION_LIST'] .= $attribute_variation_to_output;
 			}
 		}
 		$variation_tpl['FROM_ADMIN_INDICATOR'] = $variation_tpl['ORDER_ID_INDICATOR'] = '';
-		$variation_tpl['PRODUCT_ADDED_TO_CART_QTY'] = ( !empty( $qty ) ) ? $qty : 1;
-		if ( $from_admin && !empty($order_id) ) {
+		$variation_tpl['PRODUCT_ADDED_TO_CART_QTY'] = (!empty($qty)) ? $qty : 1;
+		if ($from_admin && !empty($order_id)) {
 			$variation_tpl['FROM_ADMIN_INDICATOR'] = '<input type="hidden" name="wps_orders_from_admin" value="1" />';
-			$variation_tpl['ORDER_ID_INDICATOR'] = '<input type="hidden" name="wps_orders_order_id" value="' .$order_id. '" />';
+			$variation_tpl['ORDER_ID_INDICATOR'] = '<input type="hidden" name="wps_orders_order_id" value="' . $order_id . '" />';
 
 		}
 		$output = !empty($variation_tpl['VARIATION_FORM_VARIATION_LIST']) ? wpshop_display::display_template_element('product_variation_form', $variation_tpl) : '';
@@ -2708,11 +2708,11 @@ 
 		return $output;
 	}
 
-	public static function get_parent_variation ( $variation_id ) {
+	public static function get_parent_variation($variation_id) {
 		$result = array();
-		if ( !empty($variation_id) ) {
-			$variation_post = get_post( $variation_id);
-			if ( !empty($variation_post) && !empty($variation_post->post_parent) ) {
+		if (!empty($variation_id)) {
+			$variation_post = get_post($variation_id);
+			if (!empty($variation_post) && !empty($variation_post->post_parent)) {
 				$result['parent_post'] = get_post($variation_post->post_parent);
 				$result['parent_post_meta'] = get_post_meta($variation_post->post_parent, '_wpshop_product_metadata', true);
 			}
@@ -2724,7 +2724,7 @@ 
 	 * Display the current configuration for a given product
 	 * @param array $shortcode_attribute Some parameters given by the shortcode for display
 	 */
-	function wpshop_product_variations_summary( $shortcode_attribute ) {
+	function wpshop_product_variations_summary($shortcode_attribute) {
 		$output = '';
 
 		$product_variations_selection_args = array(
@@ -2734,36 +2734,36 @@ 
 
 		$current_user_id = get_current_user_id();
 
-		if ( !empty( $_SESSION ) && !empty( $_SESSION[ 'cart' ] ) && !empty( $_SESSION[ 'cart' ][ 'order_items' ] ) ) {
-			foreach ( $_SESSION[ 'cart' ][ 'order_items' ] as $item_id => $item ) {
-				if ( !empty( $item ) && !empty( $item[ 'item_id' ] ) ) {
+		if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['order_items'])) {
+			foreach ($_SESSION['cart']['order_items'] as $item_id => $item) {
+				if (!empty($item) && !empty($item['item_id'])) {
 
 					$free_variations = array();
-					if ( !empty( $item['item_meta'] ) && !empty( $item['item_meta']['free_variation'] ) ) {
-						foreach ( $item['item_meta']['free_variation'] as $attribute_code => $attribute_value ) {
+					if (!empty($item['item_meta']) && !empty($item['item_meta']['free_variation'])) {
+						foreach ($item['item_meta']['free_variation'] as $attribute_code => $attribute_value) {
 							$free_variations[] = $attribute_code . '-_variation_val_-' . $attribute_value;
 						}
 					}
 
 					$variations = array();
-					if ( !empty( $item['item_meta'] ) && !empty( $item['item_meta']['variations'] ) ) {
-						foreach ( $item['item_meta']['variations'] as $variation_id => $variation_def ) {
+					if (!empty($item['item_meta']) && !empty($item['item_meta']['variations'])) {
+						foreach ($item['item_meta']['variations'] as $variation_id => $variation_def) {
 
-							if ( !empty( $variation_def[ 'item_meta' ] ) && !empty( $variation_def[ 'item_meta' ][ 'variation_definition' ] ) ) {
-								foreach ( $variation_def[ 'item_meta' ][ 'variation_definition' ] as $attribute_code => $attribute_selected_data ) {
-									$variations[] = $attribute_code . '-_variation_val_-' . $attribute_selected_data[ 'ID' ];
+							if (!empty($variation_def['item_meta']) && !empty($variation_def['item_meta']['variation_definition'])) {
+								foreach ($variation_def['item_meta']['variation_definition'] as $attribute_code => $attribute_selected_data) {
+									$variations[] = $attribute_code . '-_variation_val_-' . $attribute_selected_data['ID'];
 								}
 							}
 						}
 					}
-					$product_variation_summary = self::wpshop_ajax_wpshop_variation_selection( $item[ 'item_id' ], $variations, $free_variations, null, $item[ 'item_qty' ] );
+					$product_variation_summary = self::wpshop_ajax_wpshop_variation_selection($item['item_id'], $variations, $free_variations, null, $item['item_qty']);
 
-					$product_variations_selection_args['PRODUCT_VARIATION_SELECTION_DISPLAY'] .= $product_variation_summary[ 1 ][ 'product_output' ];
+					$product_variations_selection_args['PRODUCT_VARIATION_SELECTION_DISPLAY'] .= $product_variation_summary[1]['product_output'];
 				}
 			}
 		}
 
-		$output .= wpshop_display::display_template_element( 'wpshop_product_configuration_summary', $product_variations_selection_args );
+		$output .= wpshop_display::display_template_element('wpshop_product_configuration_summary', $product_variations_selection_args);
 
 		echo $output;
 	}
@@ -2779,53 +2779,53 @@ 
 	 *
 	 * @return array Le résultat du calcul pour l'affichage / Output result
 	 */
-	public static function wpshop_ajax_wpshop_variation_selection( $product_id, $wpshop_variation_selected, $wpshop_free_variation, $wpshop_current_for_display, $product_qty = 1 ) {
+	public static function wpshop_ajax_wpshop_variation_selection($product_id, $wpshop_variation_selected, $wpshop_free_variation, $wpshop_current_for_display, $product_qty = 1) {
 		global $wpdb;
 
 		$wpshop_cart = new wps_cart();
 		$wpshop_products = new wpshop_products();
 
 		$response = '';
-		$response_status = $has_variation = false ;
+		$response_status = $has_variation = false;
 		$tpl_component = array();
 
 		// Check if variations exists
-		if ( !empty( $wpshop_variation_selected ) || !empty( $wpshop_free_variation ) ) {
+		if (!empty($wpshop_variation_selected) || !empty($wpshop_free_variation)) {
 
 			//Recover all selected variations
 			$variations_selected = array();
-			if ( !empty($wpshop_variation_selected) ) {
-				foreach ( $wpshop_variation_selected as $selected_variation ) {
+			if (!empty($wpshop_variation_selected)) {
+				foreach ($wpshop_variation_selected as $selected_variation) {
 					$variation_definition = explode('-_variation_val_-', $selected_variation);
 					$variations_selected[$variation_definition[0]] = $variation_definition[1];
 				}
 			}
 
 			// Check variations priority
-			$product_with_variation = wpshop_products::get_variation_by_priority( $variations_selected, $product_id );
+			$product_with_variation = wpshop_products::get_variation_by_priority($variations_selected, $product_id);
 
 			// Check if $product_with_variation have variations
-			if ( !empty($product_with_variation[$product_id]['variations']) || !empty( $wpshop_free_variation )  ) {
+			if (!empty($product_with_variation[$product_id]['variations']) || !empty($wpshop_free_variation)) {
 
-				$formatted_product = $wpshop_cart->prepare_product_to_add_to_cart( $product_id, $product_qty, $variations_selected );
+				$formatted_product = $wpshop_cart->prepare_product_to_add_to_cart($product_id, $product_qty, $variations_selected);
 				$product_to_add_to_cart = $formatted_product[0];
-				foreach ( $formatted_product[0] as $pid => $product_more_content) {
+				foreach ($formatted_product[0] as $pid => $product_more_content) {
 					$order_items[$pid]['product_id'] = $product_more_content['id'];
 
 					/** For product with variation	*/
-					$order_items[$pid]['product_variation_type'] = !empty( $product_more_content['variation_priority']) ? $product_more_content['variation_priority'] : '';
+					$order_items[$pid]['product_variation_type'] = !empty($product_more_content['variation_priority']) ? $product_more_content['variation_priority'] : '';
 					$order_items[$pid]['free_variation'] = !empty($product_more_content['free_variation']) ? $product_more_content['free_variation'] : '';
 					$order_items[$pid]['product_variation'] = '';
-					if ( !empty($product_more_content['variations']) ) {
-						foreach ( $product_more_content['variations'] as $variation_id) {
+					if (!empty($product_more_content['variations'])) {
+						foreach ($product_more_content['variations'] as $variation_id) {
 							$order_items[$pid]['product_variation'][] = $variation_id;
 						}
 					}
 				}
 
 				// If Product list is not empty, add products to order
-				if( !empty($order_items) ) {
-					foreach ( $order_items as $product_id => $d ) {
+				if (!empty($order_items)) {
+					foreach ($order_items as $product_id => $d) {
 						$product_key = $product_id;
 
 						// Formate datas
@@ -2833,71 +2833,71 @@ 
 						$product_variation = !empty($d['product_variation']) ? $d['product_variation'] : null;
 
 						// If product is a single variation product
-						if ( !empty($product_variation) && ( count($product_variation) == 1 ) ) {
+						if (!empty($product_variation) && (count($product_variation) == 1)) {
 							$product_id = $product_variation[0];
 						}
 
 						// Construct final product
 						$product = wpshop_products::get_product_data($d['product_id'], true);
-						$the_product = array_merge( array('product_id'	=> $d['product_id'], 'product_qty' 	=> 1 ), $product);
+						$the_product = array_merge(array('product_id'	=> $d['product_id'], 'product_qty' 	=> 1), $product);
 
 						//	Add variation to product into cart for storage
-						if ( !empty($product_variation) ) {
-							$the_product = wpshop_products::get_variation_price_behaviour( $the_product, $product_variation, $head_product_id, array('type' => $d['product_variation_type']) );
+						if (!empty($product_variation)) {
+							$the_product = wpshop_products::get_variation_price_behaviour($the_product, $product_variation, $head_product_id, array('type' => $d['product_variation_type']));
 						}
 
 						// Free Variations Checking
-						if ( !empty( $d['free_variation'] ) ) {
+						if (!empty($d['free_variation'])) {
 							$the_product['item_meta']['free_variation'] = $d['free_variation'];
 							$head_product_id = $the_product['product_id'];
 						}
 
 						// If product is a variation, we check parent product general
-						if( get_post_type( $the_product['product_id'] )  == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-							$parent_def = wpshop_products::get_parent_variation ( $the_product['product_id'] );
-							if( !empty($parent_def) && !empty($parent_def['parent_post']) ) {
-								$variation_def = get_post_meta( $parent_def['parent_post']->ID, '_wpshop_variation_defining', true );
+						if (get_post_type($the_product['product_id']) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+							$parent_def = wpshop_products::get_parent_variation($the_product['product_id']);
+							if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
+								$variation_def = get_post_meta($parent_def['parent_post']->ID, '_wpshop_variation_defining', true);
 								$parent_meta = $parent_def['parent_post_meta'];
-								if( !empty($variation_def) && !empty($variation_def['options']) && !empty($variation_def['options']['priority']) && in_array('combined', $variation_def['options']['priority'] ) && !empty($variation_def['options']['price_behaviour']) && in_array( 'addition', $variation_def['options']['price_behaviour']) && !empty($variation_def['attributes']) && count($variation_def['attributes']) > 1 ) {
-									$the_product['product_price'] += number_format( str_replace( ',', '.', $parent_meta['product_price'] ), 2, '.', '' );
-									$the_product['price_ht'] += number_format( str_replace( ',', '.',$parent_meta['price_ht']) , 2, '.', '' );
-									$the_product['tva'] += number_format( str_replace( ',', '.', $parent_meta['tva']) , 2, '.', '' );
+								if (!empty($variation_def) && !empty($variation_def['options']) && !empty($variation_def['options']['priority']) && in_array('combined', $variation_def['options']['priority']) && !empty($variation_def['options']['price_behaviour']) && in_array('addition', $variation_def['options']['price_behaviour']) && !empty($variation_def['attributes']) && count($variation_def['attributes']) > 1) {
+									$the_product['product_price'] += number_format(str_replace(',', '.', $parent_meta['product_price']), 2, '.', '');
+									$the_product['price_ht'] += number_format(str_replace(',', '.', $parent_meta['price_ht']), 2, '.', '');
+									$the_product['tva'] += number_format(str_replace(',', '.', $parent_meta['tva']), 2, '.', '');
 								}
 							}
 						}
 					}
 				}
 
-				if( !empty($the_product) && empty($the_product['price_ttc_before_discount']) && empty($the_product['price_ht_before_discount']) ) {
-					$price_infos = wpshop_prices::check_product_price( $the_product, true );
-					if ( !empty($price_infos['discount']['discount_exist']) ) {
+				if (!empty($the_product) && empty($the_product['price_ttc_before_discount']) && empty($the_product['price_ht_before_discount'])) {
+					$price_infos = wpshop_prices::check_product_price($the_product, true);
+					if (!empty($price_infos['discount']['discount_exist'])) {
 						$the_product['price_ttc_before_discount'] = $the_product['product_price'];
 						$the_product['price_ht_before_discount'] = $the_product['price_ht'];
 					}
-					$the_product['price_ht'] = ( !empty($price_infos['discount']) &&  !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ?  $price_infos['discount']['discount_et_price'] : $price_infos['et'];
-					$the_product['product_price'] = ( !empty($price_infos['discount']) &&  !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_ati_price'] : $price_infos['ati'];
-					$the_product['tva'] = ( !empty($price_infos['discount']) &&  !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_tva'] : $price_infos['tva'];
+					$the_product['price_ht'] = (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_et_price'] : $price_infos['et'];
+					$the_product['product_price'] = (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_ati_price'] : $price_infos['ati'];
+					$the_product['tva'] = (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_tva'] : $price_infos['tva'];
 				}
 
-				$product = wpshop_products::get_product_data( $product_id, true );
+				$product = wpshop_products::get_product_data($product_id, true);
 				// Add free variations to product
-				if (  !empty( $wpshop_free_variation )  ) {
+				if (!empty($wpshop_free_variation)) {
 					$the_product['item_meta']['free_variation'] = $wpshop_free_variation;
 				}
 				// Change picture if have a selected variation
-				$the_selected_variation = !empty( $product_with_variation ) && !empty( $product_with_variation[$head_product_id] ) && !empty( $product_with_variation[$head_product_id]['variations'] ) ? $product_with_variation[$head_product_id]['variations'] : null;
-				$response['wps_product_image'] = $wpshop_products->wps_selected_variation_picture( $head_product_id, $the_selected_variation );
+				$the_selected_variation = !empty($product_with_variation) && !empty($product_with_variation[$head_product_id]) && !empty($product_with_variation[$head_product_id]['variations']) ? $product_with_variation[$head_product_id]['variations'] : null;
+				$response['wps_product_image'] = $wpshop_products->wps_selected_variation_picture($head_product_id, $the_selected_variation);
 
 				// Price Display
-				$price_attribute = wpshop_attributes::getElement( 'product_price', "'valid'", 'code' );
-				$price_display = wpshop_attributes::check_attribute_display( $price_attribute->is_visible_in_front, $product['custom_display'], 'attribute', 'product_price', 'complete_sheet');
+				$price_attribute = wpshop_attributes::getElement('product_price', "'valid'", 'code');
+				$price_display = wpshop_attributes::check_attribute_display($price_attribute->is_visible_in_front, $product['custom_display'], 'attribute', 'product_price', 'complete_sheet');
 				$productPrice = '';
-				if ( $price_display ) {
+				if ($price_display) {
 					$response['product_price_output'] = wpshop_prices::get_product_price($the_product, 'price_display', 'complete_sheet', false, true);
 				}
 
 				//Get Summary cart
-				$response['product_output'] = $wpshop_products->wps_get_summary_variations_product( $product_id, $the_product, ( !empty( $wpshop_variation_selected ) || !empty( $wpshop_free_variation ) ? true : false )  );
+				$response['product_output'] = $wpshop_products->wps_get_summary_variations_product($product_id, $the_product, (!empty($wpshop_variation_selected) || !empty($wpshop_free_variation) ? true : false));
 				$response_status = true;
 			}
 			else {
@@ -2907,7 +2907,7 @@ 
 			}
 		}
 
-		return array( $response_status, $response );
+		return array($response_status, $response);
 	}
 
 	/**
@@ -2915,7 +2915,7 @@ 
 	 *
 	 * @param array $shortcode_attribute Some parameters given by the shortcode for display
 	 */
-	function wpshop_product_variation_value_detail( $shortcode_attribute ) {
+	function wpshop_product_variation_value_detail($shortcode_attribute) {
 		echo wpshop_display::display_template_element('wpshop_product_variation_value_detail_container', array());
 	}
 
@@ -2927,47 +2927,47 @@ 
 	 *
 	 * @return array The product list for adding to the cart build by variation priority
 	 */
-	public static function get_variation_by_priority( $selected_variation, $product_id, $add_to_cart_action = false ) {
+	public static function get_variation_by_priority($selected_variation, $product_id, $add_to_cart_action = false) {
 		global $wpdb;
 		$all_required_variations_selected = $no_selected_variation = true;
 		$single_variations = $combined_variations = $product_to_add_to_cart = array();
 
 		// Check if all required variations are selected
-		$required_attributes_list = wpshop_prices::check_required_attributes( $product_id );
-		foreach( $selected_variation as $k => $value ) {
-			if( $value == 0 && in_array($k, $required_attributes_list) ) {
+		$required_attributes_list = wpshop_prices::check_required_attributes($product_id);
+		foreach ($selected_variation as $k => $value) {
+			if ($value == 0 && in_array($k, $required_attributes_list)) {
 				$all_required_variations_selected = false;
 			}
-			if( $value != 0 ) {
+			if ($value != 0) {
 				$no_selected_variation = false;
 			}
 		}
-		if( !empty($selected_variation) ) {
+		if (!empty($selected_variation)) {
 			//Check variations configuration
 			$product_variation_configuration = get_post_meta($product_id, '_wpshop_variation_defining', true);
 			// Check variations type
-			$product_variation_type = ( !empty($product_variation_configuration) && !empty($product_variation_configuration['variation_type']) ) ? $product_variation_configuration['variation_type'] : 'single';
+			$product_variation_type = (!empty($product_variation_configuration) && !empty($product_variation_configuration['variation_type'])) ? $product_variation_configuration['variation_type'] : 'single';
 			$product_to_add_to_cart[$product_id]['variation_priority'] = $product_variation_type;
 
 			//Check defined variation priority
-			$priority = (!empty($product_variation_configuration['options']) && !empty($product_variation_configuration['options']['priority'][0]) ) ?  $product_variation_configuration['options']['priority'][0] : 'combined';
+			$priority = (!empty($product_variation_configuration['options']) && !empty($product_variation_configuration['options']['priority'][0])) ? $product_variation_configuration['options']['priority'][0] : 'combined';
 			$product_to_add_to_cart[$product_id]['defined_variation_priority'] = $priority;
 
 			// Recover all product variations
 			$query_variation = $selected_variation;
 			// Delete free variations
-			unset( $query_variation['free'] );
+			unset($query_variation['free']);
 
-			if( $product_variation_type == 'single' ) {
+			if ($product_variation_type == 'single') {
 				// Get single variations
 				$single_variations = array();
-				foreach ( $selected_variation as $attribute_code => $attribute_value ) {
-					if ( isset($attribute_value) && $attribute_code != 'free' ) {
+				foreach ($selected_variation as $attribute_code => $attribute_value) {
+					if (isset($attribute_value) && $attribute_code != 'free') {
 						$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->postmeta . " AS P_META INNER JOIN " . $wpdb->posts . " as P ON ((P.ID = P_META.post_id) AND (P.post_parent = %d)) WHERE P_META.meta_value = '" . serialize(array($attribute_code => $attribute_value)) . "'", $product_id);
 						$single_variation_id = $wpdb->get_var($query);
-						if ( !empty($single_variation_id) ) {
+						if (!empty($single_variation_id)) {
 							$single_variations[] = $single_variation_id;
-							unset( $query_variation[$attribute_code] );
+							unset($query_variation[$attribute_code]);
 						}
 					}
 				}
@@ -2976,21 +2976,21 @@ 
 				// Get combined variations
 				$query = $wpdb->prepare("SELECT ID FROM " . $wpdb->postmeta . " AS P_META INNER JOIN " . $wpdb->posts . " as P ON ((P.ID = P_META.post_id) AND (P.post_parent = %d)) WHERE P_META.meta_key = '_wpshop_variations_attribute_def' AND P_META.meta_value = '" . serialize($query_variation) . "'", $product_id);
 				$combined_variation_id = $wpdb->get_var($query);
-				if ( !empty($combined_variation_id) ) {
+				if (!empty($combined_variation_id)) {
 					$combined_variations[] = $combined_variation_id;
 				}
 
 			}
 
 			//If all required variations are not selected
-			if ( !$all_required_variations_selected || $no_selected_variation ) {
+			if (!$all_required_variations_selected || $no_selected_variation) {
 				$product_to_add_to_cart['text_from'] = 'on';
 				// If we choose to display lower price variation combinaison
-				if( empty($product_variation_configuration) || ( !empty($product_variation_configuration) && empty($product_variation_configuration['options']) ) || ( !empty($product_variation_configuration) && !empty($product_variation_configuration['options']) && !empty($product_variation_configuration['options']['price_display']) && !empty($product_variation_configuration['options']['price_display']['lower_price']) ) ) {
+				if (empty($product_variation_configuration) || (!empty($product_variation_configuration) && empty($product_variation_configuration['options'])) || (!empty($product_variation_configuration) && !empty($product_variation_configuration['options']) && !empty($product_variation_configuration['options']['price_display']) && !empty($product_variation_configuration['options']['price_display']['lower_price']))) {
 					//Get lower price variation combinaison
-					$lower_price_variations = wpshop_prices::check_product_lower_price( $product_id );
-					if ( !empty($lower_price_variations['variations']) && is_array($lower_price_variations['variations']) ) {
-						foreach( $lower_price_variations['variations'] as $lower_price_variation ) {
+					$lower_price_variations = wpshop_prices::check_product_lower_price($product_id);
+					if (!empty($lower_price_variations['variations']) && is_array($lower_price_variations['variations'])) {
+						foreach ($lower_price_variations['variations'] as $lower_price_variation) {
 							$product_to_add_to_cart[$product_id]['variations'][] = $lower_price_variation;
 						}
 					}
@@ -3002,7 +3002,7 @@ 
 			}
 			else {
 				$product_to_add_to_cart['text_from'] = '';
-				$product_to_add_to_cart[$product_id]['variations'] = ( !empty($product_variation_type) && $product_variation_type == 'single' ) ? $single_variations : $combined_variations;
+				$product_to_add_to_cart[$product_id]['variations'] = (!empty($product_variation_type) && $product_variation_type == 'single') ? $single_variations : $combined_variations;
 			}
 		}
 
@@ -3010,30 +3010,30 @@ 
 	}
 
 
-	public static function get_variation_price_behaviour( $product_into_cart, $product_variations, $head_product_id, $variations_options ) {
+	public static function get_variation_price_behaviour($product_into_cart, $product_variations, $head_product_id, $variations_options) {
 		global $wpdb;
 
-		if( !empty($product_variations) ) {
+		if (!empty($product_variations)) {
 			// Initialize variations total price datas
-			$variations_total_price = array( 'price_et' => 0, 'vat_amount' => 0, 'price_ati' => 0);
-			$variations_discount_total_price = array( 'price_et' => 0, 'vat_amount' => 0, 'price_ati' => 0 );
+			$variations_total_price = array('price_et' => 0, 'vat_amount' => 0, 'price_ati' => 0);
+			$variations_discount_total_price = array('price_et' => 0, 'vat_amount' => 0, 'price_ati' => 0);
 			$vat_rate = 0;
 			$discount_amount = $discount_rate = $special_price = 0;
 			// Recover Head product metadata
-			$head_product_metadata = get_post_meta( $head_product_id, '_wpshop_product_metadata', true );
-			$tva_rate_id = ( !empty($head_product_metadata['tx_tva']) ) ? $head_product_metadata['tx_tva'] : 0;
-			if( !empty($tva_rate_id) ) {
+			$head_product_metadata = get_post_meta($head_product_id, '_wpshop_product_metadata', true);
+			$tva_rate_id = (!empty($head_product_metadata['tx_tva'])) ? $head_product_metadata['tx_tva'] : 0;
+			if (!empty($tva_rate_id)) {
 				// Recover VAT Rate of product
-				$query = $wpdb->prepare( 'SELECT value FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS.' WHERE id = %d', $tva_rate_id );
-				$vat_rate = $wpdb->get_var( $query );
+				$query = $wpdb->prepare('SELECT value FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $tva_rate_id);
+				$vat_rate = $wpdb->get_var($query);
 			}
-			$price_piloting = get_option( 'wpshop_shop_price_piloting');
-			foreach( $product_variations as $product_variation ) {
+			$price_piloting = get_option('wpshop_shop_price_piloting');
+			foreach ($product_variations as $product_variation) {
 				$variation_metadata['product_price'] = 0;
-				$variation_metadata = get_post_meta( $product_variation, '_wpshop_product_metadata', true );
-				if( !empty($variation_metadata) ) {
-					$p_et = ( ( empty($price_piloting) || $price_piloting == 'TTC' ) ? ( ( !empty( $variation_metadata['product_price'] ) ? $variation_metadata['product_price'] : 0 ) / ( 1 + ( $vat_rate / 100) ) )  : $variation_metadata['price_ht'] );
-					$p_ati = ( ( empty($price_piloting) || $price_piloting == 'TTC' ) ? ( !empty( $variation_metadata['product_price'] ) ? $variation_metadata['product_price'] : 0 ) : ( $variation_metadata['price_ht'] * ( 1 + ( $vat_rate / 100) ) ) );
+				$variation_metadata = get_post_meta($product_variation, '_wpshop_product_metadata', true);
+				if (!empty($variation_metadata)) {
+					$p_et = ((empty($price_piloting) || $price_piloting == 'TTC') ? ((!empty($variation_metadata['product_price']) ? $variation_metadata['product_price'] : 0) / (1 + ($vat_rate / 100))) : $variation_metadata['price_ht']);
+					$p_ati = ((empty($price_piloting) || $price_piloting == 'TTC') ? (!empty($variation_metadata['product_price']) ? $variation_metadata['product_price'] : 0) : ($variation_metadata['price_ht'] * (1 + ($vat_rate / 100))));
 
 					$variations_total_price['price_et'] += $p_et;
 					$variations_total_price['price_ati'] += $p_ati;
@@ -3042,20 +3042,20 @@ 
 					$variation_metadata['tx_tva'] = $product_into_cart['tx_tva'] = $vat_rate;
 
 					// Check discount
-					$discount_config = wpshop_prices::check_discount_for_product( $product_variation );
-					if ( !empty($discount_config) && !empty($discount_config['value']) ) {
-						$variation_discount_prices = wpshop_prices::calcul_discounted_price( $variation_metadata, $discount_config );
+					$discount_config = wpshop_prices::check_discount_for_product($product_variation);
+					if (!empty($discount_config) && !empty($discount_config['value'])) {
+						$variation_discount_prices = wpshop_prices::calcul_discounted_price($variation_metadata, $discount_config);
 						$variations_discount_total_price['price_et'] += $variation_discount_prices['price_ht'];
 						$variations_discount_total_price['price_ati'] += $variation_discount_prices['product_price'];
 						$variations_discount_total_price['vat_amount'] += $variation_discount_prices['tva'];
 
-						if( !empty($discount_config['type']) && $discount_config['type'] == 'discount_amount' ) {
+						if (!empty($discount_config['type']) && $discount_config['type'] == 'discount_amount') {
 							$product_into_cart['discount_amount'] = $discount_amount + $product_into_cart['discount_amount'];
 						}
-						elseif( !empty($discount_config['type']) && $discount_config['type'] == 'discount_rate' ) {
+						elseif (!empty($discount_config['type']) && $discount_config['type'] == 'discount_rate') {
 							$product_into_cart['discount_rate'] = $discount_rate + $discount_config['value'];
 						}
-						elseif( !empty($discount_config['type']) && $discount_config['type'] == 'special_price' ) {
+						elseif (!empty($discount_config['type']) && $discount_config['type'] == 'special_price') {
 							$product_into_cart['special_price'] = $special_price + $discount_config['value'];
 						}
 					}
@@ -3066,10 +3066,10 @@ 
 			}
 
 			// Check if add or replace variation price to head product
-			$product_variation_defining = get_post_meta( $head_product_id, '_wpshop_variation_defining', true );
-			if( empty($product_variation_defining) || ( !empty($product_variation_defining) && empty($product_variation_defining['options']) ) || ( ( !empty($product_variation_defining) ) && !empty($product_variation_defining['options']) && !empty($product_variation_defining['options']['price_behaviour']) && !empty($product_variation_defining['options']['price_behaviour'][0]) && $product_variation_defining['options']['price_behaviour'][0] == 'replacement' ) ){
+			$product_variation_defining = get_post_meta($head_product_id, '_wpshop_variation_defining', true);
+			if (empty($product_variation_defining) || (!empty($product_variation_defining) && empty($product_variation_defining['options'])) || ((!empty($product_variation_defining)) && !empty($product_variation_defining['options']) && !empty($product_variation_defining['options']['price_behaviour']) && !empty($product_variation_defining['options']['price_behaviour'][0]) && $product_variation_defining['options']['price_behaviour'][0] == 'replacement')) {
 				//Replace the product price
-				if( !empty($variations_discount_total_price) && !empty($variations_discount_total_price['price_ati']) ) {
+				if (!empty($variations_discount_total_price) && !empty($variations_discount_total_price['price_ati'])) {
 					$product_into_cart['price_ttc_before_discount'] = $variations_total_price['price_ati'];
 					$product_into_cart['price_ht_before_discount'] = $variations_total_price['price_et'];
 
@@ -3085,9 +3085,9 @@ 
 			}
 			else {
 				// Add variations price to product price
-				if( !empty($variations_discount_total_price) && !empty($variations_discount_total_price['price_ati']) ) {
-					$product_into_cart['price_ttc_before_discount'] = ( $product_into_cart['product_price'] + $variations_total_price['price_ati'] );
-					$product_into_cart['price_ht_before_discount'] = ( $product_into_cart['price_ht'] + $variations_total_price['price_et'] );
+				if (!empty($variations_discount_total_price) && !empty($variations_discount_total_price['price_ati'])) {
+					$product_into_cart['price_ttc_before_discount'] = ($product_into_cart['product_price'] + $variations_total_price['price_ati']);
+					$product_into_cart['price_ht_before_discount'] = ($product_into_cart['price_ht'] + $variations_total_price['price_et']);
 
 					$product_into_cart['product_price'] += $variations_discount_total_price['price_ati'];
 					$product_into_cart['price_ht'] += $variations_discount_total_price['price_et'];
@@ -3099,19 +3099,19 @@ 
 					$product_into_cart['tva'] += $variations_total_price['vat_amount'];
 				}
 				// Check parent discount
-				$parent_discount_config = wpshop_prices::check_discount_for_product( $head_product_id );
-				if( !empty($parent_discount_config) ) {
-					$product_into_cart['price_ttc_before_discount'] = ( !empty( $product_into_cart['price_ttc_before_discount'] ) ) ? $product_into_cart['price_ttc_before_discount'] : $product_into_cart['product_price'];
-					$product_into_cart['price_ht_before_discount'] = ( !empty($product_into_cart['price_ht_before_discount']) ) ? $product_into_cart['price_ht_before_discount'] : $product_into_cart['price_ht'];
-					$product_into_cart = wpshop_prices::calcul_discounted_price( $product_into_cart, $parent_discount_config );
-
-					if( !empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'discount_amount' ) {
-						$product_into_cart['discount_amount'] = $discount_amount +  $parent_discount_config['value'];
+				$parent_discount_config = wpshop_prices::check_discount_for_product($head_product_id);
+				if (!empty($parent_discount_config)) {
+					$product_into_cart['price_ttc_before_discount'] = (!empty($product_into_cart['price_ttc_before_discount'])) ? $product_into_cart['price_ttc_before_discount'] : $product_into_cart['product_price'];
+					$product_into_cart['price_ht_before_discount'] = (!empty($product_into_cart['price_ht_before_discount'])) ? $product_into_cart['price_ht_before_discount'] : $product_into_cart['price_ht'];
+					$product_into_cart = wpshop_prices::calcul_discounted_price($product_into_cart, $parent_discount_config);
+
+					if (!empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'discount_amount') {
+						$product_into_cart['discount_amount'] = $discount_amount + $parent_discount_config['value'];
 					}
-					elseif( !empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'discount_rate' ) {
+					elseif (!empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'discount_rate') {
 						$product_into_cart['discount_rate'] = $discount_rate + $parent_discount_config['value'];
 					}
-					elseif( !empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'special_price' ) {
+					elseif (!empty($parent_discount_config['type']) && $parent_discount_config['type'] == 'special_price') {
 						$product_into_cart['special_price'] = $special_price + $parent_discount_config['value'];
 					}
 				}
@@ -3119,16 +3119,16 @@ 
 		}
 		else {
 			// If product have just Free variations
-			$discount_config = wpshop_prices::check_discount_for_product( $head_product_id );
-			if( !empty($discount_config) ) {
-				$product_into_cart['price_ttc_before_discount'] = ( !empty( $product_into_cart['price_ttc_before_discount'] ) ) ? $product_into_cart['price_ttc_before_discount'] : $product_into_cart['product_price'];
-				$product_into_cart['price_ht_before_discount'] = ( !empty($product_into_cart['price_ht_before_discount']) ) ? $product_into_cart['price_ht_before_discount'] : $product_into_cart['price_ht'];
-				$product_into_cart = wpshop_prices::calcul_discounted_price( $product_into_cart, $discount_config );
+			$discount_config = wpshop_prices::check_discount_for_product($head_product_id);
+			if (!empty($discount_config)) {
+				$product_into_cart['price_ttc_before_discount'] = (!empty($product_into_cart['price_ttc_before_discount'])) ? $product_into_cart['price_ttc_before_discount'] : $product_into_cart['product_price'];
+				$product_into_cart['price_ht_before_discount'] = (!empty($product_into_cart['price_ht_before_discount'])) ? $product_into_cart['price_ht_before_discount'] : $product_into_cart['price_ht'];
+				$product_into_cart = wpshop_prices::calcul_discounted_price($product_into_cart, $discount_config);
 			}
 		}
 
 		// Text From indicator
-		if( !empty($variations_options) && !empty($variations_options['text_from']) ) {
+		if (!empty($variations_options) && !empty($variations_options['text_from'])) {
 			$product_into_cart['text_from'] = $variations_options['text_from'];
 		}
 		return $product_into_cart;
@@ -3143,28 +3143,28 @@ 
 	 *
 	 * @return array The array containing all product options ordered as the admin configure it
 	 */
-	public static function get_selected_variation_display( $product_definition_value, $output_order, $from_page = null, $template_part = 'wpshop', $output_type = null ) {
+	public static function get_selected_variation_display($product_definition_value, $output_order, $from_page = null, $template_part = 'wpshop', $output_type = null) {
 		$variation_attribute_ordered = array();
 		$variation_attribute_ordered['prices'] = array();
 		$variation_attribute_ordered['attribute_list'] = array();
 
-		if ( !empty( $product_definition_value['variation_definition'] ) && is_array( $product_definition_value['variation_definition'] ) ) {
-			foreach ( $product_definition_value['variation_definition'] as $variation_attribute_code => $variation_attribute_detail ) {
+		if (!empty($product_definition_value['variation_definition']) && is_array($product_definition_value['variation_definition'])) {
+			foreach ($product_definition_value['variation_definition'] as $variation_attribute_code => $variation_attribute_detail) {
 				$variation_tpl_component = array();
-				foreach ( $variation_attribute_detail as $info_name => $info_value) {
-					$variation_tpl_component['VARIATION_' . strtoupper($info_name)] = in_array($info_name, unserialize(WPSHOP_ATTRIBUTE_PRICES)) ? wpshop_display::format_field_output('wpshop_product_price', $info_value)  : stripslashes($info_value);
+				foreach ($variation_attribute_detail as $info_name => $info_value) {
+					$variation_tpl_component['VARIATION_' . strtoupper($info_name)] = in_array($info_name, unserialize(WPSHOP_ATTRIBUTE_PRICES)) ? wpshop_display::format_field_output('wpshop_product_price', $info_value) : stripslashes($info_value);
 				}
 				$variation_tpl_component['VARIATION_ID'] = $variation_attribute_code;
 				$variation_tpl_component['VARIATION_ATT_CODE'] = $variation_attribute_code;
-				if( !empty($output_order[$variation_attribute_code]) ){
+				if (!empty($output_order[$variation_attribute_code])) {
 					$display_data = wpshop_display::display_template_element('cart_variation_detail', $variation_tpl_component, array('page' => $from_page, 'type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $variation_attribute_code), $template_part);
-					if( !in_array($display_data, $variation_attribute_ordered['attribute_list']) ) {
+					if (!in_array($display_data, $variation_attribute_ordered['attribute_list'])) {
 						$variation_attribute_ordered['attribute_list'][$output_order[$variation_attribute_code]] = $display_data;
 					}
 				}
 				else {
 					$display_data = wpshop_display::display_template_element('cart_variation_detail', $variation_tpl_component, array('page' => $from_page, 'type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $variation_attribute_code), $template_part);
-					if( !in_array($display_data, $variation_attribute_ordered['attribute_list']) ) {
+					if (!in_array($display_data, $variation_attribute_ordered['attribute_list'])) {
 						$variation_attribute_ordered['attribute_list'][] = $display_data;
 					}
 				}
@@ -3172,15 +3172,15 @@ 
 			}
 		}
 
-		if ( !empty( $product_definition_value['variations'] ) && is_array( $product_definition_value['variations'] ) ) {
-			foreach ( $product_definition_value['variations'] as $variation_id => $variation_details ) {
+		if (!empty($product_definition_value['variations']) && is_array($product_definition_value['variations'])) {
+			foreach ($product_definition_value['variations'] as $variation_id => $variation_details) {
 				$variation_tpl_component = array();
-				foreach ( $variation_details as $info_name => $info_value) {
-					if ( $info_name != 'item_meta' ) {
-						$variation_tpl_component['VARIATION_DETAIL_' . strtoupper($info_name)] = in_array($info_name, unserialize(WPSHOP_ATTRIBUTE_PRICES)) ? wpshop_display::format_field_output('wpshop_product_price', $info_value)  : stripslashes($info_value);
+				foreach ($variation_details as $info_name => $info_value) {
+					if ($info_name != 'item_meta') {
+						$variation_tpl_component['VARIATION_DETAIL_' . strtoupper($info_name)] = in_array($info_name, unserialize(WPSHOP_ATTRIBUTE_PRICES)) ? wpshop_display::format_field_output('wpshop_product_price', $info_value) : stripslashes($info_value);
 					}
 				}
-				foreach ( $variation_details['item_meta']['variation_definition'] as $variation_attribute_code => $variation_attribute_def ) {
+				foreach ($variation_details['item_meta']['variation_definition'] as $variation_attribute_code => $variation_attribute_def) {
 					$variation_tpl_component['VARIATION_NAME'] = stripslashes($variation_attribute_def['NAME']);
 					$variation_tpl_component['VARIATION_VALUE'] = stripslashes($variation_attribute_def['VALUE']);
 					$variation_tpl_component['VARIATION_ID'] = $variation_id;
@@ -3188,7 +3188,7 @@ 
 
 					$variation_attribute_ordered['prices'][$variation_attribute_code] = $variation_tpl_component['VARIATION_DETAIL_PRODUCT_PRICE'];
 				}
-				if( !empty($output_order[$variation_attribute_code]) ) {
+				if (!empty($output_order[$variation_attribute_code])) {
 					$variation_attribute_ordered['attribute_list'][$output_order[$variation_attribute_code]] = wpshop_display::display_template_element('cart_variation_detail', $variation_tpl_component, array('page' => $from_page, 'type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $variation_attribute_code), $template_part);
 				}
 				unset($variation_tpl_component);
@@ -3196,9 +3196,9 @@ 
 		}
 
 		/**	Free Variation part	*/
-		if ( !empty( $product_definition_value['free_variation'] ) && is_array( $product_definition_value['free_variation'] ) ) {
-			foreach ( $product_definition_value['free_variation'] as $build_variation_key => $build_variation ) {
-				if ( strpos($build_variation, '-_variation_val_-')) {
+		if (!empty($product_definition_value['free_variation']) && is_array($product_definition_value['free_variation'])) {
+			foreach ($product_definition_value['free_variation'] as $build_variation_key => $build_variation) {
+				if (strpos($build_variation, '-_variation_val_-')) {
 					$variation_definition = explode('-_variation_val_-', $build_variation);
 					$attribute_code = $variation_definition[0];
 					$attribute_selected_value = $variation_definition[1];
@@ -3211,17 +3211,17 @@ 
 				$free_variation_attribute_def = wpshop_attributes::getElement($attribute_code, "'valid'", 'code');
 				$variation_tpl_component['VARIATION_NAME'] = stripslashes($free_variation_attribute_def->frontend_label);
 				$value_to_outut = $attribute_selected_value;
-				switch ( $free_variation_attribute_def->data_type ) {
+				switch ($free_variation_attribute_def->data_type) {
 					case 'datetime':
-						$value_to_outut = mysql2date( get_option( 'date_format' ), $attribute_selected_value, true );
+						$value_to_outut = mysql2date(get_option('date_format'), $attribute_selected_value, true);
 					break;
 				}
 				$variation_tpl_component['VARIATION_VALUE'] = stripslashes($value_to_outut);
 				$variation_tpl_component['VARIATION_ID'] = $attribute_code;
 				$variation_tpl_component['VARIATION_ATT_CODE'] = $attribute_code;
-				if ( !empty($value_to_outut) && !empty($output_order[$free_variation_attribute_def->code]) ) {
+				if (!empty($value_to_outut) && !empty($output_order[$free_variation_attribute_def->code])) {
 					$display_data = wpshop_display::display_template_element('cart_variation_detail', $variation_tpl_component, array('page' => $from_page, 'type' => WPSHOP_DBT_ATTRIBUTE, 'id' => $attribute_code), $template_part);
-					if( !in_array($display_data, $variation_attribute_ordered['attribute_list']) ) {
+					if (!in_array($display_data, $variation_attribute_ordered['attribute_list'])) {
 						$variation_attribute_ordered['attribute_list'][$output_order[$free_variation_attribute_def->code]] = $display_data;
 					}
 				}
@@ -3232,23 +3232,23 @@ 
 	}
 
 
-	function wps_selected_variation_picture( $head_product_id, $variations ) {
+	function wps_selected_variation_picture($head_product_id, $variations) {
 		$response = array();
 		/** Selected Product image **/
-		$post_thumbnail_id = get_post_thumbnail_id( $head_product_id );
-		if( !empty($post_thumbnail_id) ) {
+		$post_thumbnail_id = get_post_thumbnail_id($head_product_id);
+		if (!empty($post_thumbnail_id)) {
 			$response['img_id'] = $post_thumbnail_id;
-			$response['img'] = wp_get_attachment_image( $post_thumbnail_id,  'wpshop-product-galery' );
-			$response['img_url'] = wp_get_attachment_url( $post_thumbnail_id );
+			$response['img'] = wp_get_attachment_image($post_thumbnail_id, 'wpshop-product-galery');
+			$response['img_url'] = wp_get_attachment_url($post_thumbnail_id);
 		}
 
 		/** check if have one variation **/
-		if ( !empty($variations) && count($variations) == 1 ) {
-			$variation_attached_image_id = get_post_meta( $variations[0], '_wps_variation_attached_picture', true );
-			if( !empty($variation_attached_image_id) ) {
+		if (!empty($variations) && count($variations) == 1) {
+			$variation_attached_image_id = get_post_meta($variations[0], '_wps_variation_attached_picture', true);
+			if (!empty($variation_attached_image_id)) {
 				$response['img_id'] = $variation_attached_image_id;
-				$response['img'] = wp_get_attachment_image( $variation_attached_image_id,  'wpshop-product-galery' );
-				$response['img_url'] = wp_get_attachment_url( $variation_attached_image_id);
+				$response['img'] = wp_get_attachment_image($variation_attached_image_id, 'wpshop-product-galery');
+				$response['img_url'] = wp_get_attachment_url($variation_attached_image_id);
 			}
 		}
 		return $response;
@@ -3260,23 +3260,23 @@ 
 		global $post;
 		$product_id = $post->ID;
 
-		$variations = self::get_variation( $product_id );
+		$variations = self::get_variation($product_id);
 
 		$sales_informations = array();
 		/** Query **/
-		$data_to_compare = '"item_id";s:' .strlen($product_id). ':"' .$product_id. '";';
-		$query_args = array( 'posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'meta_query' => array( array('key' => '_order_postmeta', 'value' => $data_to_compare, 'compare' => 'LIKE') ) );
-		$orders = new WP_Query( $query_args );
-		if ( !empty($orders) && !empty($orders->posts) ) {
-			foreach( $orders->posts as $order ) {
-				$order_meta = get_post_meta( $order->ID, '_order_postmeta', true );
-				$order_info = get_post_meta( $order->ID, '_order_info', true );
+		$data_to_compare = '"item_id";s:' . strlen($product_id) . ':"' . $product_id . '";';
+		$query_args = array('posts_per_page' => -1, 'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_ORDER, 'meta_query' => array(array('key' => '_order_postmeta', 'value' => $data_to_compare, 'compare' => 'LIKE')));
+		$orders = new WP_Query($query_args);
+		if (!empty($orders) && !empty($orders->posts)) {
+			foreach ($orders->posts as $order) {
+				$order_meta = get_post_meta($order->ID, '_order_postmeta', true);
+				$order_info = get_post_meta($order->ID, '_order_info', true);
 				$sales_informations[] = array(
-											'order_key' => ( !empty($order_meta) && !empty($order_meta['order_key']) ) ? $order_meta['order_key'] : '',
-											'order_date' => ( !empty($order_meta) && !empty($order_meta['order_date']) ) ? $order_meta['order_date'] : '',
-											'customer_firstname' => ( !empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_first_name']) ) ? $order_info['billing']['address']['address_first_name'] : '',
-											'customer_name' => ( !empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_last_name']) ) ? $order_info['billing']['address']['address_last_name'] : '',
-											'customer_email' => ( !empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_user_email']) ) ? $order_info['billing']['address']['address_user_email'] : ''
+											'order_key' => (!empty($order_meta) && !empty($order_meta['order_key'])) ? $order_meta['order_key'] : '',
+											'order_date' => (!empty($order_meta) && !empty($order_meta['order_date'])) ? $order_meta['order_date'] : '',
+											'customer_firstname' => (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_first_name'])) ? $order_info['billing']['address']['address_first_name'] : '',
+											'customer_name' => (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_last_name'])) ? $order_info['billing']['address']['address_last_name'] : '',
+											'customer_email' => (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']) && !empty($order_info['billing']['address']['address_user_email'])) ? $order_info['billing']['address']['address_user_email'] : ''
 										);
 			}
 		}
@@ -3284,33 +3284,33 @@ 
 
 		/** If product has been ordered **/
 		$output = '';
-		if( !empty($sales_informations) ) {
-			$output .= '<p>'.__( 'This product has been ordered', 'wpshop').' :</p>';
+		if (!empty($sales_informations)) {
+			$output .= '<p>' . __('This product has been ordered', 'wpshop') . ' :</p>';
 			$output .= '<ul>';
-			foreach( $sales_informations as $sales_information ) {
-				$output .= '<li>' .sprintf( __( 'Ordered by %s %s (%s) on %s (Order ref. : %s)', 'wpshop'), $sales_information['customer_name'], $sales_information['customer_firstname'], $sales_information['customer_email'], $sales_information['order_date'], $sales_information['order_key'] ). '</li>';
+			foreach ($sales_informations as $sales_information) {
+				$output .= '<li>' . sprintf(__('Ordered by %s %s (%s) on %s (Order ref. : %s)', 'wpshop'), $sales_information['customer_name'], $sales_information['customer_firstname'], $sales_information['customer_email'], $sales_information['order_date'], $sales_information['order_key']) . '</li>';
 			}
 			$output .= '</ul>';
 		}
 		else {
-			$output .= __( 'This product has never been ordered', 'wpshop');
+			$output .= __('This product has never been ordered', 'wpshop');
 		}
 
 		echo $output;
 	}
 
 
-	function wps_get_summary_variations_product( $product_id, $the_product, $has_variation ) {
+	function wps_get_summary_variations_product($product_id, $the_product, $has_variation) {
 		global $wpdb, $wpshop_payment;
 		$output = '';
 		$tpl_component = array();
 		/**	Get attribute order for current product	*/
-		$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails( get_post_meta($product_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true)  ) ;
+		$product_attribute_order_detail = wpshop_attributes_set::getAttributeSetDetails(get_post_meta($product_id, WPSHOP_PRODUCT_ATTRIBUTE_SET_ID_META_KEY, true));
 		$output_order = array();
-		if ( count($product_attribute_order_detail) > 0 ) {
-			foreach ( $product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
-				foreach ( $product_attr_group_detail['attribut'] as $position => $attribute_def) {
-					if ( !empty($attribute_def->code) )
+		if (count($product_attribute_order_detail) > 0) {
+			foreach ($product_attribute_order_detail as $product_attr_group_id => $product_attr_group_detail) {
+				foreach ($product_attr_group_detail['attribut'] as $position => $attribute_def) {
+					if (!empty($attribute_def->code))
 						$output_order[$attribute_def->code] = $position;
 				}
 			}
@@ -3318,22 +3318,22 @@ 
 		$variation_attribute_ordered = array();
 
 		/** Check if product is a variation and change his name **/
-		$product_post_type = get_post_type( $the_product['product_id'] );
-		if ( !empty($product_post_type) && $product_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-			$parent_infos = wpshop_products::get_parent_variation( $the_product['product_id'] );
-			$parent_post = ( !empty($parent_infos) && !empty($parent_infos['parent_post']) ) ? $parent_infos['parent_post'] : array();
+		$product_post_type = get_post_type($the_product['product_id']);
+		if (!empty($product_post_type) && $product_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+			$parent_infos = wpshop_products::get_parent_variation($the_product['product_id']);
+			$parent_post = (!empty($parent_infos) && !empty($parent_infos['parent_post'])) ? $parent_infos['parent_post'] : array();
 			$the_product['product_name'] = $the_product['post_title'] = $parent_post->post_title;
 		}
 
-		foreach ( $the_product as $product_definition_key => $product_definition_value ) {
-			if ( $product_definition_key != 'item_meta' ) {
+		foreach ($the_product as $product_definition_key => $product_definition_value) {
+			if ($product_definition_key != 'item_meta') {
 				$tpl_component['PRODUCT_MAIN_INFO_' . strtoupper($product_definition_key)] = $product_definition_value;
-				if ( !empty($wpshop_current_for_display) && in_array($product_definition_key, unserialize(WPSHOP_ATTRIBUTE_PRICES)) ) {
+				if (!empty($wpshop_current_for_display) && in_array($product_definition_key, unserialize(WPSHOP_ATTRIBUTE_PRICES))) {
 					$tpl_component['PRODUCT_MAIN_INFO_' . strtoupper($product_definition_key)] = $product_definition_value;
 				}
 			}
 			else {
-				$variation_attribute_ordered = wpshop_products::get_selected_variation_display( $product_definition_value, $output_order, 'selection_summary' );
+				$variation_attribute_ordered = wpshop_products::get_selected_variation_display($product_definition_value, $output_order, 'selection_summary');
 			}
 		}
 
@@ -3341,7 +3341,7 @@ 
 
 		ksort($variation_attribute_ordered['attribute_list']);
 		$tpl_component['PRODUCT_VARIATION_SUMMARY_DETAILS'] = '';
-		foreach ( $variation_attribute_ordered['attribute_list'] as $attribute_variation_to_output ) {
+		foreach ($variation_attribute_ordered['attribute_list'] as $attribute_variation_to_output) {
 			$tpl_component['PRODUCT_VARIATION_SUMMARY_DETAILS'] .= $attribute_variation_to_output;
 		}
 
@@ -3349,36 +3349,36 @@ 
 
 		/**	For security get all attributes defined as user defined or used in variation in order to set default value to empty	*/
 		$attribute_list = wpshop_attributes::getElement('yes', "'valid'", "is_used_for_variation", true);
-		if ( !empty($attribute_list) ) {
-			foreach ( $attribute_list as $attribute_def ) {
+		if (!empty($attribute_list)) {
+			foreach ($attribute_list as $attribute_def) {
 				$tpl_component['VARIATION_SUMMARY_ATTRIBUTE_PER_PRICE_' . strtoupper($attribute_def->code)] = '-';
 			}
 		}
 
 		/**	Fill the array with all prices for different variations	*/
-		foreach ( $variation_attribute_ordered['prices'] as $attribute => $prices ) {
+		foreach ($variation_attribute_ordered['prices'] as $attribute => $prices) {
 			$tpl_component['VARIATION_SUMMARY_ATTRIBUTE_PER_PRICE_' . strtoupper($attribute)] = $prices;
 		}
 
 		$tpl_component['PRODUCT_VARIATION_SUMMARY_MORE_CONTENT'] = '';
 		$query = $wpdb->prepare("SELECT post_id, meta_value FROM " . $wpdb->postmeta . " WHERE meta_key = %s ", '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_options');
 		$post_list_with_options = $wpdb->get_results($query);
-		if ( !empty($post_list_with_options) ) {
+		if (!empty($post_list_with_options)) {
 			$additionnal_price = 0;
-			foreach ( $post_list_with_options as $product_info) {
+			foreach ($post_list_with_options as $product_info) {
 				$product_meta = unserialize($product_info->meta_value);
-				if ( !empty($product_meta['cart']) && !empty($product_meta['cart']['auto_add']) && ($product_meta['cart']['auto_add'] == 'yes') ) {
+				if (!empty($product_meta['cart']) && !empty($product_meta['cart']['auto_add']) && ($product_meta['cart']['auto_add'] == 'yes')) {
 					$product = wpshop_products::get_product_data($product_info->post_id, true, '"publish", "draft"');
 
-					$the_product = array_merge( array(
+					$the_product = array_merge(array(
 							'product_id'	=> $product_info->post_id,
 							'product_qty' 	=> 1
 					), $product);
 
-					$additionnal_price += ( !$different_currency || ($change_rate == 1) ) ? $the_product['product_price'] : ($the_product['product_price'] * $change_rate);
+					$additionnal_price += (!$different_currency || ($change_rate == 1)) ? $the_product['product_price'] : ($the_product['product_price'] * $change_rate);
 					$tpl_component['AUTO_PRODUCT_NAME'] = $the_product['product_name'];
 
-					$tpl_component['AUTO_PRODUCT_PRODUCT_PRICE'] = wpshop_display::format_field_output('wpshop_product_price', ( !$different_currency || ($change_rate == 1) ) ? $the_product['product_price'] : ($the_product['product_price'] * $change_rate));
+					$tpl_component['AUTO_PRODUCT_PRODUCT_PRICE'] = wpshop_display::format_field_output('wpshop_product_price', (!$different_currency || ($change_rate == 1)) ? $the_product['product_price'] : ($the_product['product_price'] * $change_rate));
 					$tpl_component['PRODUCT_VARIATION_SUMMARY_MORE_CONTENT'] = wpshop_display::display_template_element('wpshop_product_configuration_summary_detail_auto_product', $tpl_component);
 				}
 			}
@@ -3386,14 +3386,14 @@ 
 
 		$tpl_component['PRODUCT_VARIATION_SUMMARY_GRAND_TOTAL'] = '';
 		$tpl_component['SUMMARY_FINAL_RESULT_PRICE_NO_FORMAT'] = '';
-		if ( !empty($additionnal_price) ) {
+		if (!empty($additionnal_price)) {
 			$tpl_component['SUMMARY_FINAL_RESULT_PRICE'] = wpshop_display::format_field_output('wpshop_product_price', $tpl_component['PRODUCT_MAIN_INFO_PRODUCT_PRICE'] + $additionnal_price);
 			$tpl_component['SUMMARY_FINAL_RESULT_PRICE_NO_FORMAT'] = ($tpl_component['PRODUCT_MAIN_INFO_PRODUCT_PRICE'] + $additionnal_price);
 			$tpl_component['PRODUCT_VARIATION_SUMMARY_GRAND_TOTAL'] = wpshop_display::display_template_element('wpshop_product_configuration_summary_detail_final_result', $tpl_component);
 		}
 
 		/**	Call informtion for partial payment	*/
-		$partial_payment = $wpshop_payment->partial_payment_calcul( $tpl_component['SUMMARY_FINAL_RESULT_PRICE_NO_FORMAT'] );
+		$partial_payment = $wpshop_payment->partial_payment_calcul($tpl_component['SUMMARY_FINAL_RESULT_PRICE_NO_FORMAT']);
 		$tpl_component['PARTIAL_PAYMENT_INFO'] = !empty($partial_payment['amount_to_pay']) ? $partial_payment['display'] : '';
 
 
@@ -3420,13 +3420,13 @@ 
 	 * @param array $old_value
 	 * @return array $new_value
 	 */
-	public static function update_wpshop_catalog_product_option( $new_value, $old_value ) {
+	public static function update_wpshop_catalog_product_option($new_value, $old_value) {
 		global $wpdb;
-		$query = $wpdb->prepare('SELECT post_id, meta_value FROM ' . $wpdb->postmeta . ' WHERE meta_key LIKE %s AND meta_value LIKE %s', '_wpshop_variation_defining', '%' . serialize( 'follow_general_config' ) . '%' );
-		foreach( $wpdb->get_results( $query ) as $wpshop_variation_defining ) {
-			$wpshop_variation_defining_value = unserialize( $wpshop_variation_defining->meta_value );
+		$query = $wpdb->prepare('SELECT post_id, meta_value FROM ' . $wpdb->postmeta . ' WHERE meta_key LIKE %s AND meta_value LIKE %s', '_wpshop_variation_defining', '%' . serialize('follow_general_config') . '%');
+		foreach ($wpdb->get_results($query) as $wpshop_variation_defining) {
+			$wpshop_variation_defining_value = unserialize($wpshop_variation_defining->meta_value);
 			$wpshop_variation_defining_value['options']['price_display'] = $new_value['price_display'];
-			update_post_meta( $wpshop_variation_defining->post_id, '_wpshop_variation_defining', $wpshop_variation_defining_value );
+			update_post_meta($wpshop_variation_defining->post_id, '_wpshop_variation_defining', $wpshop_variation_defining_value);
 		}
 		return $new_value;
 	}

includes/librairies/permissions.class.php

Indentation +7 added lines, -7 removed lines

@@ -23,10 +23,10 @@ 
 class wpshop_permissions {
 
 	/**
-	*	Define the different permission for the plugin. Define an array containing the permission defined with a sub-array
-	*
-	*	@return array $permission An array with the permission list for the plugin
-	*/
+	 *	Define the different permission for the plugin. Define an array containing the permission defined with a sub-array
+	 *
+	 *	@return array $permission An array with the permission list for the plugin
+	 */
 	function permission_list() {
 		$permission = array();
 
@@ -98,9 +98,9 @@ 
 	}
 
 	/**
-	*	Set the different permission for the administrator role. Add all existing permission for this role.
-	*	@see wpshop_permissions::permission_list()
-	*/
+	 *	Set the different permission for the administrator role. Add all existing permission for this role.
+	 *	@see wpshop_permissions::permission_list()
+	 */
 	function set_administrator_role_permission() {
 		$adminRole 	= get_role('administrator');
 		$permissionList = wpshop_permissions::permission_list();

Spacing +6 added lines, -6 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -102,10 +102,10 @@ 
 	*	@see wpshop_permissions::permission_list()
 	*/
 	function set_administrator_role_permission() {
-		$adminRole 	= get_role('administrator');
+		$adminRole = get_role('administrator');
 		$permissionList = wpshop_permissions::permission_list();
 		foreach ($permissionList as $permissionName => $permissionDef) {
-			if ( ($adminRole != null) && !$adminRole->has_cap($permissionName) ) {
+			if (($adminRole != null) && !$adminRole->has_cap($permissionName)) {
 				$adminRole->add_cap($permissionName);
 			}
 		}
@@ -115,7 +115,7 @@ 
 	function wpshop_init_roles() {
 		global $wp_roles;
 
-		if (class_exists('WP_Roles')) if ( ! isset( $wp_roles ) ) $wp_roles = new WP_Roles();
+		if (class_exists('WP_Roles')) if (!isset($wp_roles)) $wp_roles = new WP_Roles();
 
 		if (is_object($wp_roles)) :
 

Braces +6 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
@@ -115,7 +117,9 @@ 
 	function wpshop_init_roles() {
 		global $wp_roles;
 
-		if (class_exists('WP_Roles')) if ( ! isset( $wp_roles ) ) $wp_roles = new WP_Roles();
+		if (class_exists('WP_Roles')) {
+			if ( ! isset( $wp_roles ) ) $wp_roles = new WP_Roles();
+		}
 
 		if (is_object($wp_roles)) :
 

includes/librairies/options/options_shipping.class.php

Spacing +28 added lines, -28 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -24,9 +24,9 @@ 
 	/**
 	*
 	*/
-	function declare_options(){
+	function declare_options() {
 
-		add_settings_section('wpshop_shipping_rules', '<span class="dashicons dashicons-admin-generic"></span>'.__('Shipping general configuration', 'wpshop'), array('wpshop_shipping_options', 'plugin_section_text'), 'wpshop_shipping_rules');
+		add_settings_section('wpshop_shipping_rules', '<span class="dashicons dashicons-admin-generic"></span>' . __('Shipping general configuration', 'wpshop'), array('wpshop_shipping_options', 'plugin_section_text'), 'wpshop_shipping_rules');
 		register_setting('wpshop_options', 'wpshop_shipping_address_choice', array('wpshop_shipping_options', 'wpshop_shipping_address_validator'));
 		add_settings_field('wpshop_shipping_address_choice', __('Shipping address choice', 'wpshop'), array('wpshop_shipping_options', 'wpshop_shipping_address_field'), 'wpshop_shipping_rules', 'wpshop_shipping_rules');
 
@@ -46,9 +46,9 @@ 
 		echo '';
 	}
 
-	public static function wpshop_shipping_address_validator($input){
-		$shipping_option = get_option( 'wpshop_shipping_address_choice' );
-		if( !empty($shipping_option) && !empty($shipping_option['display_model']) ) {
+	public static function wpshop_shipping_address_validator($input) {
+		$shipping_option = get_option('wpshop_shipping_address_choice');
+		if (!empty($shipping_option) && !empty($shipping_option['display_model'])) {
 			$input['display_model'] = $shipping_option['display_model'];
 		}
 
@@ -58,10 +58,10 @@ 
 	public static function wpshop_shipping_address_field() {
 		global $wpdb;
 		$choice = get_option('wpshop_shipping_address_choice', unserialize(WPSHOP_SHOP_CUSTOM_SHIPPING));
-		$query = $wpdb->prepare('SELECT ID FROM ' .$wpdb->posts. ' WHERE post_name = "%s" AND post_type = "%s"', WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES);
+		$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_name = "%s" AND post_type = "%s"', WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS, WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES);
 		$entity_id = $wpdb->get_var($query);
 
-		$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE entity_id = %d', $entity_id);
+		$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id);
 		$content = $wpdb->get_results($query);
 
 		$input_def['name'] = 'wpshop_shipping_address_choice[choice]';
@@ -71,39 +71,39 @@ 
 		$input_def['value'] = $choice['choice'];
 
 		$active = !empty($choice['activate']) ? $choice['activate'] : false;
-		$display_model = ( !empty($choice['display_model']) ) ? addslashes( serialize( $choice['display_model'] ) ) : '';
+		$display_model = (!empty($choice['display_model'])) ? addslashes(serialize($choice['display_model'])) : '';
 
-		echo '<input type="checkbox" name="wpshop_shipping_address_choice[activate]" id="wpshop_shipping_address_choice[activate]" '.($active ? 'checked="checked"' :null).'/> <label for="wpshop_shipping_address_choice[activate]">'.__('Activate shipping address','wpshop').'</label><br/>
-		<div>' .wpshop_form::check_input_type($input_def). '</div>';
+		echo '<input type="checkbox" name="wpshop_shipping_address_choice[activate]" id="wpshop_shipping_address_choice[activate]" ' . ($active ? 'checked="checked"' : null) . '/> <label for="wpshop_shipping_address_choice[activate]">' . __('Activate shipping address', 'wpshop') . '</label><br/>
+		<div>' .wpshop_form::check_input_type($input_def) . '</div>';
 
 	}
 
 	public static function wpshop_shipping_cost_from_fields() {
 		$shipping_cost_from_option = get_option('wpshop_shipping_cost_from');
-		$output = '<input type="checkbox" id="wpshop_shipping_cost_from" name="wpshop_shipping_cost_from" ' . ( (!empty($shipping_cost_from_option)) ? 'checked="checked"' : '') . ' /> ';
-		$output .= '<label for="wpshop_shipping_cost_from">' . __('Display "From" behind Shipping cost in cart while shipping address is undefined', 'wpshop'). '</label>';
+		$output = '<input type="checkbox" id="wpshop_shipping_cost_from" name="wpshop_shipping_cost_from" ' . ((!empty($shipping_cost_from_option)) ? 'checked="checked"' : '') . ' /> ';
+		$output .= '<label for="wpshop_shipping_cost_from">' . __('Display "From" behind Shipping cost in cart while shipping address is undefined', 'wpshop') . '</label>';
 		echo $output;
 	}
 
-	public static function wpshop_shipping_cost_from_validator( $input ) {
+	public static function wpshop_shipping_cost_from_validator($input) {
 
 
 		return $input;
 	}
 
-	public static function wpshop_limit_country_list_validator( $input ) {
+	public static function wpshop_limit_country_list_validator($input) {
 		return $input;
 	}
 
 	public static function wpshop_limit_country_list_fields() {
 		$output = '';
-		$limit_countries_list = get_option( 'wpshop_limit_country_list' );
+		$limit_countries_list = get_option('wpshop_limit_country_list');
 		$countries = unserialize(WPSHOP_COUNTRY_LIST);
-		if ( !empty ($countries) ) {
+		if (!empty ($countries)) {
 			$output .= '<select name="wpshop_limit_country_list[]" class="chosen_select" multiple data-placeholder="Choose a Country">';
-			foreach( $countries as $key => $country ) {
-				$is_selected = ( !empty($limit_countries_list) && is_array($limit_countries_list) && in_array($key, $limit_countries_list) ) ? true : false;
-				$output .= '<option value="' .$key. '" ' . ( ($is_selected) ? 'selected="selected"' : '' ) . '>' .$country. '</option>';
+			foreach ($countries as $key => $country) {
+				$is_selected = (!empty($limit_countries_list) && is_array($limit_countries_list) && in_array($key, $limit_countries_list)) ? true : false;
+				$output .= '<option value="' . $key . '" ' . (($is_selected) ? 'selected="selected"' : '') . '>' . $country . '</option>';
 			}
 			$output .= '</select>';
 		}
@@ -111,18 +111,18 @@ 
 	}
 
 	public static function wpshop_country_default_choice_fields() {
-		$default_country_choice = get_option( 'wpshop_country_default_choice' );
-		$output  = '<select name="wpshop_country_default_choice">';
+		$default_country_choice = get_option('wpshop_country_default_choice');
+		$output = '<select name="wpshop_country_default_choice">';
 		$countries = unserialize(WPSHOP_COUNTRY_LIST);
-		foreach( $countries as $key => $country ) {
-			$is_selected = ( !empty($default_country_choice) &&  $key == $default_country_choice ) ? true : false;
-			$output .= '<option value="' .$key. '" ' . ( ($is_selected) ? 'selected="selected"' : '' ) . '>' .$country. '</option>';
+		foreach ($countries as $key => $country) {
+			$is_selected = (!empty($default_country_choice) && $key == $default_country_choice) ? true : false;
+			$output .= '<option value="' . $key . '" ' . (($is_selected) ? 'selected="selected"' : '') . '>' . $country . '</option>';
 		}
 		$output .= '</select>';
 		echo $output;
 	}
 	
-	public static function wpshop_country_default_choice_validator( $input ) {
+	public static function wpshop_country_default_choice_validator($input) {
 		return $input;
 	}
 }

Indentation +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
 class wpshop_advanced_settings{
 
 	/**
-	*
-	*/
+	 *
+	 */
 	function declare_options(){
 		add_settings_section('wpshop_extra_options', '<span class="dashicons dashicons-carrot"></span>'.__('Advanced configurations', 'wpshop'), array('wpshop_advanced_settings', 'plugin_section_text'), 'wpshop_extra_options');
 			register_setting('wpshop_options', 'wpshop_extra_options', array('wpshop_advanced_settings', 'validate_options'));

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/librairies/options/options_company.class.php

Spacing +36 added lines, -36 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -25,8 +25,8 @@ 
 	/**
 	*
 	*/
-	public static function declare_options(){
-		add_settings_section('wpshop_company_info', '<span class="dashicons dashicons-admin-home"></span>'.__('Company info', 'wpshop'), array('wpshop_company_options', 'plugin_section_text'), 'wpshop_company_info');
+	public static function declare_options() {
+		add_settings_section('wpshop_company_info', '<span class="dashicons dashicons-admin-home"></span>' . __('Company info', 'wpshop'), array('wpshop_company_options', 'plugin_section_text'), 'wpshop_company_info');
 			register_setting('wpshop_options', 'wpshop_company_info', array('wpshop_company_options', 'wpshop_options_validate_company_info'));
 			add_settings_field('wpshop_company_legal_statut', __('Legal status', 'wpshop'), array('wpshop_company_options', 'wpshop_company_legal_statut_field'), 'wpshop_company_info', 'wpshop_company_info');
 			add_settings_field('wpshop_company_capital', __('Capital', 'wpshop'), array('wpshop_company_options', 'wpshop_company_capital_field'), 'wpshop_company_info', 'wpshop_company_info');
@@ -44,7 +44,7 @@ 
 	}
 
 	/**/
-	public static function plugin_section_text(){
+	public static function plugin_section_text() {
 
 	}
 
@@ -55,76 +55,76 @@ 
 		$options = get_option('wpshop_company_info');
 
 		$legal_status = self::get_legal_status();
-		$legal_status = apply_filters( 'wps_legal_status_extender', $legal_status );
+		$legal_status = apply_filters('wps_legal_status_extender', $legal_status);
 
 		$select_legal_statut = '<select name="wpshop_company_info[company_legal_statut]">';
-		foreach($legal_status as $key=>$value) {
-			$selected = $options['company_legal_statut']==$key ? ' selected="selected"' : null;
-			$select_legal_statut .= '<option value="'.$key.'"'.$selected.'>'.__($value,'wpshop').'</option>';
+		foreach ($legal_status as $key=>$value) {
+			$selected = $options['company_legal_statut'] == $key ? ' selected="selected"' : null;
+			$select_legal_statut .= '<option value="' . $key . '"' . $selected . '>' . __($value, 'wpshop') . '</option>';
 		}
 		$select_legal_statut .= '</select>';
-		$select_legal_statut .= ' <a href="#" title="'.__('Legal status will appear in invoices','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		$select_legal_statut .= ' <a href="#" title="' . __('Legal status will appear in invoices', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 		echo $select_legal_statut;
 	}
 	public static function wpshop_company_capital_field() {
 		$options = get_option('wpshop_company_info');
-		echo '<input name="wpshop_company_info[company_capital]" type="text" value="'.$options['company_capital'].'" />
-		<a href="#" title="'.__('Capital of your company','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		echo '<input name="wpshop_company_info[company_capital]" type="text" value="' . $options['company_capital'] . '" />
+		<a href="#" title="'.__('Capital of your company', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 	}
 	public static function wpshop_company_name_field() {
 		$options = get_option('wpshop_company_info');
-		echo '<input name="wpshop_company_info[company_name]" type="text" value="'.$options['company_name'].'" />
-		<a href="#" title="'.__('Name of your company','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		echo '<input name="wpshop_company_info[company_name]" type="text" value="' . $options['company_name'] . '" />
+		<a href="#" title="'.__('Name of your company', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 	}
 	public static function wpshop_company_street_field() {
 		$options = get_option('wpshop_company_info');
-		echo '<input name="wpshop_company_info[company_street]" type="text" value="'.$options['company_street'].'" />
-		<a href="#" title="'.__('Street of your company','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		echo '<input name="wpshop_company_info[company_street]" type="text" value="' . $options['company_street'] . '" />
+		<a href="#" title="'.__('Street of your company', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 	}
 	public static function wpshop_company_postcode_field() {
 		$options = get_option('wpshop_company_info');
-		echo '<input name="wpshop_company_info[company_postcode]" type="text" value="'.$options['company_postcode'].'" />
-		<a href="#" title="'.__('Postcode of your company','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		echo '<input name="wpshop_company_info[company_postcode]" type="text" value="' . $options['company_postcode'] . '" />
+		<a href="#" title="'.__('Postcode of your company', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 	}
 	public static function wpshop_company_city_field() {
 		$options = get_option('wpshop_company_info');
-		echo '<input name="wpshop_company_info[company_city]" type="text" value="'.$options['company_city'].'" />
-		<a href="#" title="'.__('The city in which your company is based','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		echo '<input name="wpshop_company_info[company_city]" type="text" value="' . $options['company_city'] . '" />
+		<a href="#" title="'.__('The city in which your company is based', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 	}
 	public static function wpshop_company_country_field() {
 		$options = get_option('wpshop_company_info');
-		echo '<input name="wpshop_company_info[company_country]" type="text" value="'.$options['company_country'].'" />
-		<a href="#" title="'.__('Country of your company','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		echo '<input name="wpshop_company_info[company_country]" type="text" value="' . $options['company_country'] . '" />
+		<a href="#" title="'.__('Country of your company', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 	}
 	public static function wpshop_company_tva_intra_field() {
 		$options = get_option('wpshop_company_info');
-		echo '<input name="wpshop_company_info[company_tva_intra]" type="text" value="'.$options['company_tva_intra'].'" />
-		<a href="#" title="'.__('Intracommunity VAT of your company','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		echo '<input name="wpshop_company_info[company_tva_intra]" type="text" value="' . $options['company_tva_intra'] . '" />
+		<a href="#" title="'.__('Intracommunity VAT of your company', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 	}
 	public static function wpshop_company_phone_field() {
 		$options = get_option('wpshop_company_info');
-		echo '<input name="wpshop_company_info[company_phone]" type="text" value="'.$options['company_phone'].'" />
-		<a href="#" title="'.__('Phone number of your company','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		echo '<input name="wpshop_company_info[company_phone]" type="text" value="' . $options['company_phone'] . '" />
+		<a href="#" title="'.__('Phone number of your company', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 	}
 	public static function wpshop_company_rcs_field() {
 		$options = get_option('wpshop_company_info');
-		echo '<input name="wpshop_company_info[company_rcs]" type="text" value="'.$options['company_rcs'].'" />
-		<a href="#" title="'.__('RCS of your company','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		echo '<input name="wpshop_company_info[company_rcs]" type="text" value="' . $options['company_rcs'] . '" />
+		<a href="#" title="'.__('RCS of your company', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 	}
 	public static function wpshop_company_siret_field() {
 		$options = get_option('wpshop_company_info');
-		echo '<input name="wpshop_company_info[company_siret]" type="text" value="'.$options['company_siret'].'" />
-		<a href="#" title="'.__('SIRET of your company','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		echo '<input name="wpshop_company_info[company_siret]" type="text" value="' . $options['company_siret'] . '" />
+		<a href="#" title="'.__('SIRET of your company', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 	}
 	public static function wpshop_company_siren_field() {
 		$options = get_option('wpshop_company_info');
-		echo '<input name="wpshop_company_info[company_siren]" type="text" value="'.$options['company_siren'].'" />
-		<a href="#" title="'.__('SIREN of your company','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		echo '<input name="wpshop_company_info[company_siren]" type="text" value="' . $options['company_siren'] . '" />
+		<a href="#" title="'.__('SIREN of your company', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 	}
 	public static function wpshop_company_fax_field() {
 		$options = get_option('wpshop_company_info');
-		echo '<input name="wpshop_company_info[company_fax]" type="text" value="'.$options['company_fax'].'" />
-		<a href="#" title="'.__('Fax number of your company','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		echo '<input name="wpshop_company_info[company_fax]" type="text" value="' . $options['company_fax'] . '" />
+		<a href="#" title="'.__('Fax number of your company', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 	}
 
 	/* Processing */
@@ -147,7 +147,7 @@ 
 				'sa' => 'SA',
 				'sas' => 'SAS',
 				'sasu' => 'SASU',
-				'association' => __( 'Assocation', 'wpshop'),
+				'association' => __('Assocation', 'wpshop'),
 				'sci' => 'SCI',
 				'scp' => 'SCP',
 				'scm' => 'SCM',

Indentation +2 added lines, -2 removed lines

@@ -23,8 +23,8 @@
 class wpshop_advanced_settings{
 
 	/**
-	*
-	*/
+	 *
+	 */
 	function declare_options(){
 		add_settings_section('wpshop_extra_options', '<span class="dashicons dashicons-carrot"></span>'.__('Advanced configurations', 'wpshop'), array('wpshop_advanced_settings', 'plugin_section_text'), 'wpshop_extra_options');
 			register_setting('wpshop_options', 'wpshop_extra_options', array('wpshop_advanced_settings', 'validate_options'));

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

includes/librairies/options/options.class.php

Indentation +2 added lines, -2 removed lines

@@ -162,8 +162,8 @@
 
 
 	/**
-	*	Declare the different options for the plugin
-	*/
+	 *	Declare the different options for the plugin
+	 */
 	public static function add_options(){
 		global $wpshop_display_option;
 

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de définition du modèle des taxinomies / File for term model definition
  *

Spacing +66 added lines, -66 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -43,14 +43,14 @@ 
 		$groups = array();
 
 		$groups['wpshop_general_option'] =
-			array(	'label' => __('General', 'wpshop'),
+			array('label' => __('General', 'wpshop'),
 					'subgroups' => array(
 						'wpshop_general_config' => array('class' => 'wpshop_admin_box_options_general'),
 						'wpshop_company_info' => array('class' => 'wpshop_admin_box_options_company'),
 					),
 			);
 		$groups['wpshop_catalog_option'] =
-			array(	'label' => __('Catalog', 'wpshop'),
+			array('label' => __('Catalog', 'wpshop'),
 					'subgroups' => array(
 						'wpshop_catalog_product_option' => array('class' => ' wpshop_admin_box_options_product'),
 						'wpshop_catalog_main_option' => array('class' => ' wpshop_admin_box_options_catalog'),
@@ -58,13 +58,13 @@ 
 					),
 			);
 		$groups['wpshop_pages_option'] =
-			array(	'label' => __('Pages', 'wpshop'),
+			array('label' => __('Pages', 'wpshop'),
 					'subgroups' => array(
 						'wpshop_pages_option' => array('class' => ' wpshop_admin_box_options_pages'),
 					),
 			);
 		$groups['wpshop_display_option'] =
-			array(	'label' => __('Display', 'wpshop'),
+			array('label' => __('Display', 'wpshop'),
 					'subgroups' => array(
 						'wpshop_display_option' => array('class' => ' wpshop_admin_box_options_display'),
 						'wpshop_customize_display_option' => array('class' => ' wpshop_admin_box_options_display'),
@@ -72,32 +72,32 @@ 
 					),
 			);
 		$groups['wpshop_emails_option'] =
-			array(	'label' => __('Emails', 'wpshop'),
+			array('label' => __('Emails', 'wpshop'),
 					'subgroups' => array(
 						'wpshop_emails' => array('class' => ' wpshop_admin_box_options_email'),
 						'wpshop_messages' => array('class' => ' wpshop_admin_box_options_message'),
 					),
 			);
 
-		$wpshop_shop_type = !empty( $_POST['wpshop_shop_type'] ) ? sanitize_text_field( $_POST['wpshop_shop_type'] ) : '';
+		$wpshop_shop_type = !empty($_POST['wpshop_shop_type']) ? sanitize_text_field($_POST['wpshop_shop_type']) : '';
 
 		/**	Some options are available only when sale mode is active	*/
-		if((WPSHOP_DEFINED_SHOP_TYPE == 'sale') && !isset($wpshop_shop_type) || (isset($wpshop_shop_type) && ($wpshop_shop_type != 'presentation'))) :
+		if ((WPSHOP_DEFINED_SHOP_TYPE == 'sale') && !isset($wpshop_shop_type) || (isset($wpshop_shop_type) && ($wpshop_shop_type != 'presentation'))) :
 			$groups['wpshop_cart_option'] =
-				array(	'label' => __('Cart', 'wpshop'),
+				array('label' => __('Cart', 'wpshop'),
 						'subgroups' => array(
 							'wpshop_cart_info' => array('class' => ' wpshop_admin_box_options_cart'),
 						),
 				);
 			$groups['wpshop_payments_option'] =
-				array(	'label' => __('Payments', 'wpshop'),
+				array('label' => __('Payments', 'wpshop'),
 						'subgroups' => array(
 							'wpshop_paymentMethod' => array('class' => ' wpshop_admin_box_options_payment_method'),
 							'wpshop_payment_partial_on_command' => array('class' => ' wpshop_admin_box_options_payment_partial'),
 						),
 				);
 			$groups['wpshop_shipping_option'] =
-				array(	'label' => __('Shipping', 'wpshop'),
+				array('label' => __('Shipping', 'wpshop'),
 						'subgroups' => array(
 							'wpshop_shipping_rules' => array('class' => ' wpshop_admin_box_options_shipping_rules')
 						),
@@ -105,14 +105,14 @@ 
 		endif;
 
 		$groups['wpshop_addons_option'] =
-			array(	'label' => __('Addons', 'wpshop'),
+			array('label' => __('Addons', 'wpshop'),
 					'subgroups' => array(
 						'wpshop_addons_options' => array('class' => ' wpshop_admin_box_options_addons'),
 					),
 			);
 
 		$groups['wpshop_advanced_options'] =
-			array(	'label' => __('Advanced options', 'wpshop'),
+			array('label' => __('Advanced options', 'wpshop'),
 					'subgroups' => array(
 						'wpshop_extra_options' => array('class' => ' wpshop_admin_box_options_advanced'),
 					),
@@ -138,17 +138,17 @@ 
 		ob_end_clean();
 		$tpl_component['ADMIN_OPTIONS_TAB_LIST'] = '';
 		$tpl_component['ADMIN_OPTIONS_TAB_CONTENT_LIST'] = '';
-		if ( !empty($options_list) ) {
-			foreach ( $options_list as $group_key => $group_content) {
+		if (!empty($options_list)) {
+			foreach ($options_list as $group_key => $group_content) {
 				$sub_tpl_component = array();
-				if ( !empty($group_content['subgroups']) && is_array($group_content['subgroups']) ) {
+				if (!empty($group_content['subgroups']) && is_array($group_content['subgroups'])) {
 					$sub_tpl_component['ADMIN_OPTIONS_GROUP_CONTENT'] = '';
 					$sub_tpl_component['ADMIN_OPTIONS_TAB_KEY'] = $group_key;
-					$sub_tpl_component['ADMIN_OPTIONS_TAB_LABEL'] = ( !empty($group_content['label']) ) ? $group_content['label'] : '';
+					$sub_tpl_component['ADMIN_OPTIONS_TAB_LABEL'] = (!empty($group_content['label'])) ? $group_content['label'] : '';
 					$tpl_component['ADMIN_OPTIONS_TAB_LIST'] .= wpshop_display::display_template_element('wpshop_admin_options_group_tab', $sub_tpl_component, array(), 'admin');
-					foreach ( $group_content['subgroups'] as $subgroup_key => $subgroup_def) {
+					foreach ($group_content['subgroups'] as $subgroup_key => $subgroup_def) {
 						ob_start();
-						do_settings_sections( $subgroup_key );
+						do_settings_sections($subgroup_key);
 						$sub_tpl_component['ADMIN_OPTIONS_SUBGROUP_CONTENT'] = ob_get_contents();
 						ob_end_clean();
 						$sub_tpl_component['ADMIN_OPTIONS_SUBGROUP_CLASS'] = $subgroup_def['class'];
@@ -166,21 +166,21 @@ 
 	/**
 	*	Declare the different options for the plugin
 	*/
-	public static function add_options(){
+	public static function add_options() {
 		global $wpshop_display_option;
 
 
 		/*Catalog - Main	*/
 		register_setting('wpshop_options', 'wpshop_catalog_main_option', array('wpshop_options', 'wpshop_options_validate_catalog_main_option'));
-			add_settings_section('wpshop_catalog_main_section', '<span class="dashicons dashicons-category"></span>'.__('Catalog', 'wpshop'), array('wpshop_options', 'plugin_section_text'), 'wpshop_catalog_main_option');
+			add_settings_section('wpshop_catalog_main_section', '<span class="dashicons dashicons-category"></span>' . __('Catalog', 'wpshop'), array('wpshop_options', 'plugin_section_text'), 'wpshop_catalog_main_option');
 				add_settings_field('wpshop_catalog_empty_price_behaviour', __('Empty price', 'wpshop'), array('wpshop_options', 'wpshop_catalog_empty_price_behaviour'), 'wpshop_catalog_main_option', 'wpshop_catalog_main_section');
 		/* Catalog - Product */
 		register_setting('wpshop_options', 'wpshop_catalog_product_option', array('wpshop_options', 'wpshop_options_validate_catalog_product_option'));
-			add_settings_section('wpshop_catalog_product_section', '<span class="dashicons dashicons-archive"></span>'.__('Products', 'wpshop'), array('wpshop_options', 'plugin_section_text'), 'wpshop_catalog_product_option');
+			add_settings_section('wpshop_catalog_product_section', '<span class="dashicons dashicons-archive"></span>' . __('Products', 'wpshop'), array('wpshop_options', 'plugin_section_text'), 'wpshop_catalog_product_option');
 				add_settings_field('wpshop_catalog_product_slug', __('Products common rewrite param', 'wpshop'), array('wpshop_options', 'wpshop_catalog_product_slug_field'), 'wpshop_catalog_product_option', 'wpshop_catalog_product_section');
 		/* Catalog - Categories */
 		register_setting('wpshop_options', 'wpshop_catalog_categories_option', array('wpshop_options', 'wpshop_options_validate_catalog_categories_option'));
-		add_settings_section('wpshop_catalog_categories_section', '<span class="dashicons dashicons-portfolio"></span>'.__('Categories', 'wpshop'), array('wpshop_options', 'plugin_section_text'), 'wpshop_catalog_categories_option');
+		add_settings_section('wpshop_catalog_categories_section', '<span class="dashicons dashicons-portfolio"></span>' . __('Categories', 'wpshop'), array('wpshop_options', 'plugin_section_text'), 'wpshop_catalog_categories_option');
 		add_settings_field('wpshop_catalog_categories_slug', __('Categories common rewrite param', 'wpshop'), array('wpshop_options', 'wpshop_catalog_categories_slug_field'), 'wpshop_catalog_categories_option', 'wpshop_catalog_categories_section');
 		add_settings_field('wpshop_catalog_no_category_slug', __('Default category slug for unassociated product', 'wpshop'), array('wpshop_options', 'wpshop_catalog_no_category_slug_field'), 'wpshop_catalog_categories_option', 'wpshop_catalog_categories_section');
 
@@ -191,16 +191,16 @@ 
 		wpshop_company_options::declare_options();
 
 		/* Payments */
-		$wpshop_shop_type = !empty( $_POST['wpshop_shop_type'] ) ? sanitize_text_field( $_POST['wpshop_shop_type'] ) : '';
-		$old_wpshop_shop_type = !empty( $_POST['old_wpshop_shop_type'] ) ? sanitize_text_field( $_POST['old_wpshop_shop_type'] ) : '';
-		if((WPSHOP_DEFINED_SHOP_TYPE == 'sale') && !isset($wpshop_shop_type) || (isset($wpshop_shop_type) && ($wpshop_shop_type != 'presentation')) && !isset($old_wpshop_shop_type) || (isset($old_wpshop_shop_type) && ($old_wpshop_shop_type != 'presentation'))){
+		$wpshop_shop_type = !empty($_POST['wpshop_shop_type']) ? sanitize_text_field($_POST['wpshop_shop_type']) : '';
+		$old_wpshop_shop_type = !empty($_POST['old_wpshop_shop_type']) ? sanitize_text_field($_POST['old_wpshop_shop_type']) : '';
+		if ((WPSHOP_DEFINED_SHOP_TYPE == 'sale') && !isset($wpshop_shop_type) || (isset($wpshop_shop_type) && ($wpshop_shop_type != 'presentation')) && !isset($old_wpshop_shop_type) || (isset($old_wpshop_shop_type) && ($old_wpshop_shop_type != 'presentation'))) {
 			wpshop_payment_options::declare_options();
 		}
 
 		/* Cart */
-		if((WPSHOP_DEFINED_SHOP_TYPE == 'sale') && !isset($wpshop_shop_type) || (isset($wpshop_shop_type) && ($wpshop_shop_type != 'presentation')) && !isset($old_wpshop_shop_type) || (isset($old_wpshop_shop_type) && ($old_wpshop_shop_type != 'presentation'))){
+		if ((WPSHOP_DEFINED_SHOP_TYPE == 'sale') && !isset($wpshop_shop_type) || (isset($wpshop_shop_type) && ($wpshop_shop_type != 'presentation')) && !isset($old_wpshop_shop_type) || (isset($old_wpshop_shop_type) && ($old_wpshop_shop_type != 'presentation'))) {
 			register_setting('wpshop_options', 'wpshop_cart_option', array('wpshop_options', 'wpshop_options_validate_cart'));
-			add_settings_section('wpshop_cart_info', '<span class="dashicons dashicons-cart"></span>'.__('Cart', 'wpshop'), array('wpshop_options', 'plugin_section_text'), 'wpshop_cart_info');
+			add_settings_section('wpshop_cart_info', '<span class="dashicons dashicons-cart"></span>' . __('Cart', 'wpshop'), array('wpshop_options', 'plugin_section_text'), 'wpshop_cart_info');
 			add_settings_field('wpshop_cart_product_added_behaviour', __('Action when produt is added succesfully into cart', 'wpshop'), array('wpshop_options', 'wpshop_cart_product_added_behaviour_field'), 'wpshop_cart_info', 'wpshop_cart_info');
 			add_settings_field('wpshop_cart_product_added_to_quotation_behaviour', __('Action when produt is added succesfully into a quotation', 'wpshop'), array('wpshop_options', 'wpshop_cart_product_added_to_quotation_behaviour_field'), 'wpshop_cart_info', 'wpshop_cart_info');
 			add_settings_field('wpshop_cart_total_item_nb', __('Allow only one product into cart', 'wpshop'), array('wpshop_options', 'wpshop_cart_total_item_nb_field'), 'wpshop_cart_info', 'wpshop_cart_info');
@@ -227,7 +227,7 @@ 
 		$wpshop_advanced_settings->declare_options();
 
 		/* Shipping section */
-		if((WPSHOP_DEFINED_SHOP_TYPE == 'sale') && !isset($wpshop_shop_type) || (isset($wpshop_shop_type) && ($wpshop_shop_type != 'presentation')) && !isset($old_wpshop_shop_type) || (isset($old_wpshop_shop_type) && ($old_wpshop_shop_type != 'presentation'))){
+		if ((WPSHOP_DEFINED_SHOP_TYPE == 'sale') && !isset($wpshop_shop_type) || (isset($wpshop_shop_type) && ($wpshop_shop_type != 'presentation')) && !isset($old_wpshop_shop_type) || (isset($old_wpshop_shop_type) && ($old_wpshop_shop_type != 'presentation'))) {
 		$wpshop_shipping_options = new wpshop_shipping_options();
 			$wpshop_shipping_options->declare_options();
 		}
@@ -245,7 +245,7 @@ 
 		$options = get_option('wpshop_catalog_main_option');
 		echo '<input type="checkbox"' . (!empty($options['wpshop_catalog_empty_price_behaviour']) ? ' checked="checked" ' : '') . ' value="yes" name="wpshop_catalog_main_option[wpshop_catalog_empty_price_behaviour]" id="wpshop_catalog_empty_price_behaviour" /> <label for="wpshop_catalog_empty_price_behaviour" >' . __('Hide price and add to cart button when price is empty or equal to 0', 'wpshop') . '</label>';
 	}
-	public static function wpshop_catalog_product_slug_field(){
+	public static function wpshop_catalog_product_slug_field() {
 		$options = get_option('wpshop_catalog_product_option');
 		$catalog_cat_options = get_option('wpshop_catalog_categories_option');
 		echo '<input type="checkbox"' . (!empty($options['wpshop_catalog_product_slug_with_category']) ? ' checked="checked" ' : '') . ' value="yes" name="wpshop_catalog_product_option[wpshop_catalog_product_slug_with_category]" id="wpshop_catalog_product_slug_with_category" /> <label for="wpshop_catalog_product_slug_with_category">' . __('Use product category in url', 'wpshop') . '</label><br/>
@@ -253,24 +253,24 @@ 
 		<div class="alignleft wpshop_options_catalog_product_rewrite" ><input type="text" name="wpshop_catalog_product_option[wpshop_catalog_product_slug]" value="' . (!empty($options['wpshop_catalog_product_slug']) ? $options['wpshop_catalog_product_slug'] : WPSHOP_CATALOG_PRODUCT_SLUG) . '" /></div>
 		<div class="alignleft wpshop_options_catalog_product_rewrite" ><span class="wpshop_catalog_product_slug_category' . (empty($options['wpshop_catalog_product_slug_with_category']) ? ' disable' : '') . '" >/' . (!empty($catalog_cat_options['wpshop_catalog_categories_slug']) ? $catalog_cat_options['wpshop_catalog_categories_slug'] : WPSHOP_CATALOG_CATEGORIES_SLUG) . '</span></div>
 		<div class="alignleft wpshop_options_catalog_product_rewrite" >/' . __('Your_product_slug', 'wpshop') . '</div>
-		<div class="alignleft" ><a href="#" title="'.__('This slug will be used in url to describe products page','wpshop').'" class="wpshop_infobulle_marker">?</a></div><br /><br />
-		<div><span style="color: red;" class="dashicons dashicons-megaphone"></span> '.__('"/" permit to disable slug of products (<b>but don\'t work with rewrites plugins</b>)','wpshop').'</div>';
+		<div class="alignleft" ><a href="#" title="'.__('This slug will be used in url to describe products page', 'wpshop') . '" class="wpshop_infobulle_marker">?</a></div><br /><br />
+		<div><span style="color: red;" class="dashicons dashicons-megaphone"></span> '.__('"/" permit to disable slug of products (<b>but don\'t work with rewrites plugins</b>)', 'wpshop') . '</div>';
 	}
-	public static function wpshop_catalog_categories_slug_field(){
+	public static function wpshop_catalog_categories_slug_field() {
 		$options = get_option('wpshop_catalog_categories_option');
 		echo '<input type="text" name="wpshop_catalog_categories_option[wpshop_catalog_categories_slug]" value="' . (!empty($options['wpshop_catalog_categories_slug']) ? $options['wpshop_catalog_categories_slug'] : WPSHOP_CATALOG_CATEGORIES_SLUG) . '" />
-		<a href="#" title="'.__('This slug will be used in url to describe catagories page','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		<a href="#" title="'.__('This slug will be used in url to describe catagories page', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 	}
-	public static function wpshop_catalog_no_category_slug_field(){
+	public static function wpshop_catalog_no_category_slug_field() {
 		$options = get_option('wpshop_catalog_categories_option');
 		echo '<input type="text" name="wpshop_catalog_categories_option[wpshop_catalog_no_category_slug]" value="' . (!empty($options['wpshop_catalog_no_category_slug']) ? $options['wpshop_catalog_no_category_slug'] : WPSHOP_CATALOG_PRODUCT_NO_CATEGORY) . '" />
-		<a href="#" title="'.__('This slug will be used for products not being related to any category ','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		<a href="#" title="'.__('This slug will be used for products not being related to any category ', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 	}
 
 	/* Processing */
-	public static function wpshop_options_validate_catalog_product_option($input){
-		foreach($input as $option_key => $option_value){
-			switch($option_key){
+	public static function wpshop_options_validate_catalog_product_option($input) {
+		foreach ($input as $option_key => $option_value) {
+			switch ($option_key) {
 				default:
 					$new_input[$option_key] = $option_value;
 				break;
@@ -279,9 +279,9 @@ 
 
 		return $new_input;
 	}
-	public static function wpshop_options_validate_catalog_categories_option($input){
-		foreach($input as $option_key => $option_value){
-			switch($option_key){
+	public static function wpshop_options_validate_catalog_categories_option($input) {
+		foreach ($input as $option_key => $option_value) {
+			switch ($option_key) {
 				default:
 					$new_input[$option_key] = $option_value;
 				break;
@@ -290,11 +290,11 @@ 
 
 		return $new_input;
 	}
-	public static function wpshop_options_validate_catalog_main_option($input){
+	public static function wpshop_options_validate_catalog_main_option($input) {
 		$new_input = $input;
-		if ( !empty($input) && is_array( $input ) ) {
-			foreach($input as $option_key => $option_value){
-				switch($option_key){
+		if (!empty($input) && is_array($input)) {
+			foreach ($input as $option_key => $option_value) {
+				switch ($option_key) {
 					default:
 						$new_input[$option_key] = $option_value;
 						break;
@@ -305,16 +305,16 @@ 
 		return $new_input;
 	}
 
-	public static function wpshop_catalog_varition_product_field () {
+	public static function wpshop_catalog_varition_product_field() {
 		$catalog_product_option = get_option('wpshop_catalog_product_option');
-		$output  = '<input type="checkbox" name="wpshop_catalog_product_option[price_display][text_from]" id="wpshop_catalog_product_option_price_display_text_from" ' .( ( !empty($catalog_product_option) && !empty($catalog_product_option['price_display']) && !empty($catalog_product_option['price_display']['text_from']) ) ? 'checked="checked"' : '' ). ' /> ';
-		$output .= '<label for="wpshop_catalog_product_option_price_display_text_from">'. __('Display "price from" before basic price of product', 'wpshop').'</label><br/>';
-		$output .= '<input type="checkbox" name="wpshop_catalog_product_option[price_display][lower_price]" id="wpshop_catalog_product_option_price_display_lower_price" ' .( ( !empty($catalog_product_option) && !empty($catalog_product_option['price_display']) && !empty($catalog_product_option['price_display']['lower_price']) ) ? 'checked="checked"' : '' ). ' /> ';
-		$output .= '<label for="wpshop_catalog_product_option_price_display_lower_price">'. __('Display the lowest price of variation', 'wpshop').'</label>';
+		$output  = '<input type="checkbox" name="wpshop_catalog_product_option[price_display][text_from]" id="wpshop_catalog_product_option_price_display_text_from" ' . ((!empty($catalog_product_option) && !empty($catalog_product_option['price_display']) && !empty($catalog_product_option['price_display']['text_from'])) ? 'checked="checked"' : '') . ' /> ';
+		$output .= '<label for="wpshop_catalog_product_option_price_display_text_from">' . __('Display "price from" before basic price of product', 'wpshop') . '</label><br/>';
+		$output .= '<input type="checkbox" name="wpshop_catalog_product_option[price_display][lower_price]" id="wpshop_catalog_product_option_price_display_lower_price" ' . ((!empty($catalog_product_option) && !empty($catalog_product_option['price_display']) && !empty($catalog_product_option['price_display']['lower_price'])) ? 'checked="checked"' : '') . ' /> ';
+		$output .= '<label for="wpshop_catalog_product_option_price_display_lower_price">' . __('Display the lowest price of variation', 'wpshop') . '</label>';
 		echo $output;
 	}
 
-	public static function wpshop_catalog_product_variation_option_validate ($input) {
+	public static function wpshop_catalog_product_variation_option_validate($input) {
 		return $input;
 	}
 
@@ -332,7 +332,7 @@ 
 		$input_def['valueToPut'] = 'index';
 		$input_def['value'] = !empty($cart_option['total_nb_of_item_allowed']) ? $cart_option['total_nb_of_item_allowed'][0] : '';
 		$input_def['possible_value'] = 'yes';
-		$output .= wpshop_form::check_input_type($input_def, 'wpshop_cart_option[total_nb_of_item_allowed]') . '<a href="#" title="'.__('Check this box if you want to allow the user to add only one product into cart','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		$output .= wpshop_form::check_input_type($input_def, 'wpshop_cart_option[total_nb_of_item_allowed]') . '<a href="#" title="' . __('Check this box if you want to allow the user to add only one product into cart', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 
 		echo $output;
 	}
@@ -345,7 +345,7 @@ 
 		$input_def['id'] = 'wpshop_cart_option_nb_of_same_item_allowed';
 		$input_def['type'] = 'text';
 		$input_def['value'] = $cart_option['total_nb_of_same_item_allowed'][0];
-		$output .= wpshop_form::check_input_type($input_def, 'wpshop_cart_option[total_nb_of_same_item_allowed]') . '<a href="#" title="'.__('Empty for no restriction','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		$output .= wpshop_form::check_input_type($input_def, 'wpshop_cart_option[total_nb_of_same_item_allowed]') . '<a href="#" title="' . __('Empty for no restriction', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 
 		echo $output;
 	}
@@ -364,11 +364,11 @@ 
 		$input_def['options_label']['container'] = true;
 		$output .= wpshop_form::check_input_type($input_def, 'wpshop_cart_option[product_added_to_cart]');
 
-		$hide = ( (!empty($cart_option) && !empty($cart_option['product_added_to_cart'][0]) && $cart_option['product_added_to_cart'][0] == 'cart_page') ? 'wpshopHide' : null);
-		$output .= '<div id="wpshop_cart_option_animation_cart_type" class="' .$hide. '"><label for="wpshop_cart_option[animation_cart_type]">' .__('Cart animation type', 'wpshop'). '</label>';
+		$hide = ((!empty($cart_option) && !empty($cart_option['product_added_to_cart'][0]) && $cart_option['product_added_to_cart'][0] == 'cart_page') ? 'wpshopHide' : null);
+		$output .= '<div id="wpshop_cart_option_animation_cart_type" class="' . $hide . '"><label for="wpshop_cart_option[animation_cart_type]">' . __('Cart animation type', 'wpshop') . '</label>';
 		$output .= '<select name="wpshop_cart_option[animation_cart_type]" id="wpshop_cart_option[animation_cart_type]">';
-		$output .= '<option value="pop-in" ' .( ( !empty($cart_option['animation_cart_type']) && $cart_option['animation_cart_type'] == 'pop-in') ? 'selected="selected"' : null). '>' .__('Dialog box', 'wpshop'). '</option>';
-		$output .= '<option value="animation" ' .( ( !empty($cart_option['animation_cart_type']) && $cart_option['animation_cart_type'] == 'animation') ? 'selected="selected"' : null). '>' .__('Image animation', 'wpshop'). '</option>';
+		$output .= '<option value="pop-in" ' . ((!empty($cart_option['animation_cart_type']) && $cart_option['animation_cart_type'] == 'pop-in') ? 'selected="selected"' : null) . '>' . __('Dialog box', 'wpshop') . '</option>';
+		$output .= '<option value="animation" ' . ((!empty($cart_option['animation_cart_type']) && $cart_option['animation_cart_type'] == 'animation') ? 'selected="selected"' : null) . '>' . __('Image animation', 'wpshop') . '</option>';
 		$output .= '</select></div>';
 
 		echo $output;
@@ -386,7 +386,7 @@ 
 		$input_def['id'] = 'wpshop_cart_option_action_after_product_added_to_quotation';
 		$input_def['type'] = 'radio';
 		$input_def['valueToPut'] = 'index';
-		$input_def['value'] = ( !empty($cart_option['product_added_to_quotation']) ? $cart_option['product_added_to_quotation'] : null );
+		$input_def['value'] = (!empty($cart_option['product_added_to_quotation']) ? $cart_option['product_added_to_quotation'] : null);
 		$input_def['possible_value'] = array('dialog_msg' => __('Display the dialog allowing to choose between continue shopping or go to cart', 'wpshop'), 'cart_page' => __('Automaticaly send user to cart page', 'wpshop'));
 		$input_def['options_label']['original'] = true;
 		$input_def['options_label']['container'] = true;
@@ -394,14 +394,14 @@ 
 
 		echo $output;
 	}
-	public static function wpshop_options_validate_cart( $input ) {
+	public static function wpshop_options_validate_cart($input) {
 
-		if ( empty( $input ) || empty( $input[ 'display_newsletter' ] ) || empty( $input[ 'display_newsletter' ][ 'partner_subscription' ] ) ) {
-			$input[ 'display_newsletter' ][ 'partner_subscription' ] = 'no';
+		if (empty($input) || empty($input['display_newsletter']) || empty($input['display_newsletter']['partner_subscription'])) {
+			$input['display_newsletter']['partner_subscription'] = 'no';
 		}
 
-		if ( empty( $input ) || empty( $input[ 'display_newsletter' ] ) || empty( $input[ 'display_newsletter' ][ 'site_subscription' ] ) ) {
-			$input[ 'display_newsletter' ][ 'site_subscription' ] = 'no';
+		if (empty($input) || empty($input['display_newsletter']) || empty($input['display_newsletter']['site_subscription'])) {
+			$input['display_newsletter']['site_subscription'] = 'no';
 		}
 
 		return $input;

includes/librairies/options/options_addons.class.php

Spacing +13 added lines, -13 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -20,12 +20,12 @@ 
 * @package wpshop
 * @subpackage librairies
 */
-class wpshop_addons_settings{
+class wpshop_addons_settings {
 
 	/**
 	 * Déclaration des différentes options
 	 */
-	function declare_options(){
+	function declare_options() {
 // 		add_settings_section('wpshop_addons_options', __('Wpshop "addons"', 'wpshop'), array('wpshop_advanced_settings', 'plugin_section_text'), 'wpshop_addons_options');
 // 		register_setting('wpshop_options', 'wpshop_addons_options', array('wpshop_addons_settings', 'validate_options'));
 // 		add_settings_field('wpshop_addons_settings_field', '', array('wpshop_addons_settings', 'addons_definition_fields'), 'wpshop_addons_options', 'wpshop_addons_options');
@@ -42,33 +42,33 @@ 
 	 *
 	 * @param unknown_type $input
 	 */
-	public static function validate_options($input){
+	public static function validate_options($input) {
 
 	}
 
 	/**
 	 * Définition des champs pour l'activation des addons
 	 */
-	function addons_definition_fields () {
+	function addons_definition_fields() {
 		$content = '';
 
-		$content .= '<input type="hidden" name="wpshop_ajax_addons_nonce" id="wpshop_ajax_addons_nonce" value="'.wp_create_nonce('wpshop_ajax_activate_addons').'" />';
+		$content .= '<input type="hidden" name="wpshop_ajax_addons_nonce" id="wpshop_ajax_addons_nonce" value="' . wp_create_nonce('wpshop_ajax_activate_addons') . '" />';
 
 		$addons_options = get_option('wpshop_addons', array());
 		$addons_list = unserialize(WPSHOP_ADDONS_LIST);
 		foreach ($addons_list as $addon => $addon_def) {
 			$activated_status = false;
-			if ( array_key_exists($addon, $addons_options) && ( $addons_options[$addon]['activate'] )) {
+			if (array_key_exists($addon, $addons_options) && ($addons_options[$addon]['activate'])) {
 				$activated_status = true;
 			}
-			$activated_string = $activated_status ? __('Activated','wpshop') : __('Desactivated','wpshop');
+			$activated_string = $activated_status ? __('Activated', 'wpshop') : __('Desactivated', 'wpshop');
 			$activated_class = unserialize(WPSHOP_ADDONS_STATES_CLASS);
-			$content .=  '<strong>' . __($addon_def[0], 'wpshop') . '</strong>: <span class="'.$activated_class[$activated_status].'" id="addon_'.$addon.'_state" >'.$activated_string.'</span>';
+			$content .= '<strong>' . __($addon_def[0], 'wpshop') . '</strong>: <span class="' . $activated_class[$activated_status] . '" id="addon_' . $addon . '_state" >' . $activated_string . '</span>';
 			if (!$activated_status) {
-				$content .=  ' <input type="text" name="'.$addon.'" id="'.$addon.'" value="" /> <input type="button" name="'.$addon.'_button" id="'.$addon.'_button" class="addons_activating_button button-primary" value="'.__('Activate this addon','wpshop').'" />';
+				$content .= ' <input type="text" name="' . $addon . '" id="' . $addon . '" value="" /> <input type="button" name="' . $addon . '_button" id="' . $addon . '_button" class="addons_activating_button button-primary" value="' . __('Activate this addon', 'wpshop') . '" />';
 			}
 			else {
-				$content .= ' <input type="button" name="'.$addon.'_button" id="'.$addon.'_button" class="addons_desactivating_button button-secondary" value="'.__('Desactivate this addon','wpshop').'" />';
+				$content .= ' <input type="button" name="' . $addon . '_button" id="' . $addon . '_button" class="addons_desactivating_button button-secondary" value="' . __('Desactivate this addon', 'wpshop') . '" />';
 			}
 			$content .= '<br/>';
 		}

Braces +4 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <span class="wps-mini-cart-body-title">
 <strong><?php echo $total_cart_item; ?></strong><?php _e( 'item(s)', 'wpshop'); ?><span><strong><?php echo number_format( $total_cart, 2, '.', ''); ?></strong><?php echo $currency; ?></span>
@@ -12,8 +14,7 @@ 
 				$parent_post = $parent_def['parent_post'];
 				$item_id = $parent_post->ID;
 				$item_title =  $parent_post->post_title;
-			}
-			else {
+			} else {
 				$item_title = $item['item_name'];
 			}
 			?>