Eoxia / wpshop

includes/librairies/pdf/font/zapfdingbats.php

Spacing +14 added lines, -14 removed lines

@@ -1,15 +1,15 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
-$fpdf_charwidths['zapfdingbats']=array(
-	chr(0)=>0,chr(1)=>0,chr(2)=>0,chr(3)=>0,chr(4)=>0,chr(5)=>0,chr(6)=>0,chr(7)=>0,chr(8)=>0,chr(9)=>0,chr(10)=>0,chr(11)=>0,chr(12)=>0,chr(13)=>0,chr(14)=>0,chr(15)=>0,chr(16)=>0,chr(17)=>0,chr(18)=>0,chr(19)=>0,chr(20)=>0,chr(21)=>0,
-	chr(22)=>0,chr(23)=>0,chr(24)=>0,chr(25)=>0,chr(26)=>0,chr(27)=>0,chr(28)=>0,chr(29)=>0,chr(30)=>0,chr(31)=>0,' '=>278,'!'=>974,'"'=>961,'#'=>974,'$'=>980,'%'=>719,'&'=>789,'\''=>790,'('=>791,')'=>690,'*'=>960,'+'=>939,
-	','=>549,'-'=>855,'.'=>911,'/'=>933,'0'=>911,'1'=>945,'2'=>974,'3'=>755,'4'=>846,'5'=>762,'6'=>761,'7'=>571,'8'=>677,'9'=>763,':'=>760,';'=>759,'<'=>754,'='=>494,'>'=>552,'?'=>537,'@'=>577,'A'=>692,
-	'B'=>786,'C'=>788,'D'=>788,'E'=>790,'F'=>793,'G'=>794,'H'=>816,'I'=>823,'J'=>789,'K'=>841,'L'=>823,'M'=>833,'N'=>816,'O'=>831,'P'=>923,'Q'=>744,'R'=>723,'S'=>749,'T'=>790,'U'=>792,'V'=>695,'W'=>776,
-	'X'=>768,'Y'=>792,'Z'=>759,'['=>707,'\\'=>708,']'=>682,'^'=>701,'_'=>826,'`'=>815,'a'=>789,'b'=>789,'c'=>707,'d'=>687,'e'=>696,'f'=>689,'g'=>786,'h'=>787,'i'=>713,'j'=>791,'k'=>785,'l'=>791,'m'=>873,
-	'n'=>761,'o'=>762,'p'=>762,'q'=>759,'r'=>759,'s'=>892,'t'=>892,'u'=>788,'v'=>784,'w'=>438,'x'=>138,'y'=>277,'z'=>415,'{'=>392,'|'=>392,'}'=>668,'~'=>668,chr(127)=>0,chr(128)=>390,chr(129)=>390,chr(130)=>317,chr(131)=>317,
-	chr(132)=>276,chr(133)=>276,chr(134)=>509,chr(135)=>509,chr(136)=>410,chr(137)=>410,chr(138)=>234,chr(139)=>234,chr(140)=>334,chr(141)=>334,chr(142)=>0,chr(143)=>0,chr(144)=>0,chr(145)=>0,chr(146)=>0,chr(147)=>0,chr(148)=>0,chr(149)=>0,chr(150)=>0,chr(151)=>0,chr(152)=>0,chr(153)=>0,
-	chr(154)=>0,chr(155)=>0,chr(156)=>0,chr(157)=>0,chr(158)=>0,chr(159)=>0,chr(160)=>0,chr(161)=>732,chr(162)=>544,chr(163)=>544,chr(164)=>910,chr(165)=>667,chr(166)=>760,chr(167)=>760,chr(168)=>776,chr(169)=>595,chr(170)=>694,chr(171)=>626,chr(172)=>788,chr(173)=>788,chr(174)=>788,chr(175)=>788,
-	chr(176)=>788,chr(177)=>788,chr(178)=>788,chr(179)=>788,chr(180)=>788,chr(181)=>788,chr(182)=>788,chr(183)=>788,chr(184)=>788,chr(185)=>788,chr(186)=>788,chr(187)=>788,chr(188)=>788,chr(189)=>788,chr(190)=>788,chr(191)=>788,chr(192)=>788,chr(193)=>788,chr(194)=>788,chr(195)=>788,chr(196)=>788,chr(197)=>788,
-	chr(198)=>788,chr(199)=>788,chr(200)=>788,chr(201)=>788,chr(202)=>788,chr(203)=>788,chr(204)=>788,chr(205)=>788,chr(206)=>788,chr(207)=>788,chr(208)=>788,chr(209)=>788,chr(210)=>788,chr(211)=>788,chr(212)=>894,chr(213)=>838,chr(214)=>1016,chr(215)=>458,chr(216)=>748,chr(217)=>924,chr(218)=>748,chr(219)=>918,
-	chr(220)=>927,chr(221)=>928,chr(222)=>928,chr(223)=>834,chr(224)=>873,chr(225)=>828,chr(226)=>924,chr(227)=>924,chr(228)=>917,chr(229)=>930,chr(230)=>931,chr(231)=>463,chr(232)=>883,chr(233)=>836,chr(234)=>836,chr(235)=>867,chr(236)=>867,chr(237)=>696,chr(238)=>696,chr(239)=>874,chr(240)=>0,chr(241)=>874,
-	chr(242)=>760,chr(243)=>946,chr(244)=>771,chr(245)=>865,chr(246)=>771,chr(247)=>888,chr(248)=>967,chr(249)=>888,chr(250)=>831,chr(251)=>873,chr(252)=>927,chr(253)=>970,chr(254)=>918,chr(255)=>0);
+<?php if (!defined('ABSPATH')) exit;
+$fpdf_charwidths['zapfdingbats'] = array(
+	chr(0)=>0, chr(1)=>0, chr(2)=>0, chr(3)=>0, chr(4)=>0, chr(5)=>0, chr(6)=>0, chr(7)=>0, chr(8)=>0, chr(9)=>0, chr(10)=>0, chr(11)=>0, chr(12)=>0, chr(13)=>0, chr(14)=>0, chr(15)=>0, chr(16)=>0, chr(17)=>0, chr(18)=>0, chr(19)=>0, chr(20)=>0, chr(21)=>0,
+	chr(22)=>0, chr(23)=>0, chr(24)=>0, chr(25)=>0, chr(26)=>0, chr(27)=>0, chr(28)=>0, chr(29)=>0, chr(30)=>0, chr(31)=>0, ' '=>278, '!'=>974, '"'=>961, '#'=>974, '$'=>980, '%'=>719, '&'=>789, '\''=>790, '('=>791, ')'=>690, '*'=>960, '+'=>939,
+	','=>549, '-'=>855, '.'=>911, '/'=>933, '0'=>911, '1'=>945, '2'=>974, '3'=>755, '4'=>846, '5'=>762, '6'=>761, '7'=>571, '8'=>677, '9'=>763, ':'=>760, ';'=>759, '<'=>754, '='=>494, '>'=>552, '?'=>537, '@'=>577, 'A'=>692,
+	'B'=>786, 'C'=>788, 'D'=>788, 'E'=>790, 'F'=>793, 'G'=>794, 'H'=>816, 'I'=>823, 'J'=>789, 'K'=>841, 'L'=>823, 'M'=>833, 'N'=>816, 'O'=>831, 'P'=>923, 'Q'=>744, 'R'=>723, 'S'=>749, 'T'=>790, 'U'=>792, 'V'=>695, 'W'=>776,
+	'X'=>768, 'Y'=>792, 'Z'=>759, '['=>707, '\\'=>708, ']'=>682, '^'=>701, '_'=>826, '`'=>815, 'a'=>789, 'b'=>789, 'c'=>707, 'd'=>687, 'e'=>696, 'f'=>689, 'g'=>786, 'h'=>787, 'i'=>713, 'j'=>791, 'k'=>785, 'l'=>791, 'm'=>873,
+	'n'=>761, 'o'=>762, 'p'=>762, 'q'=>759, 'r'=>759, 's'=>892, 't'=>892, 'u'=>788, 'v'=>784, 'w'=>438, 'x'=>138, 'y'=>277, 'z'=>415, '{'=>392, '|'=>392, '}'=>668, '~'=>668, chr(127)=>0, chr(128)=>390, chr(129)=>390, chr(130)=>317, chr(131)=>317,
+	chr(132)=>276, chr(133)=>276, chr(134)=>509, chr(135)=>509, chr(136)=>410, chr(137)=>410, chr(138)=>234, chr(139)=>234, chr(140)=>334, chr(141)=>334, chr(142)=>0, chr(143)=>0, chr(144)=>0, chr(145)=>0, chr(146)=>0, chr(147)=>0, chr(148)=>0, chr(149)=>0, chr(150)=>0, chr(151)=>0, chr(152)=>0, chr(153)=>0,
+	chr(154)=>0, chr(155)=>0, chr(156)=>0, chr(157)=>0, chr(158)=>0, chr(159)=>0, chr(160)=>0, chr(161)=>732, chr(162)=>544, chr(163)=>544, chr(164)=>910, chr(165)=>667, chr(166)=>760, chr(167)=>760, chr(168)=>776, chr(169)=>595, chr(170)=>694, chr(171)=>626, chr(172)=>788, chr(173)=>788, chr(174)=>788, chr(175)=>788,
+	chr(176)=>788, chr(177)=>788, chr(178)=>788, chr(179)=>788, chr(180)=>788, chr(181)=>788, chr(182)=>788, chr(183)=>788, chr(184)=>788, chr(185)=>788, chr(186)=>788, chr(187)=>788, chr(188)=>788, chr(189)=>788, chr(190)=>788, chr(191)=>788, chr(192)=>788, chr(193)=>788, chr(194)=>788, chr(195)=>788, chr(196)=>788, chr(197)=>788,
+	chr(198)=>788, chr(199)=>788, chr(200)=>788, chr(201)=>788, chr(202)=>788, chr(203)=>788, chr(204)=>788, chr(205)=>788, chr(206)=>788, chr(207)=>788, chr(208)=>788, chr(209)=>788, chr(210)=>788, chr(211)=>788, chr(212)=>894, chr(213)=>838, chr(214)=>1016, chr(215)=>458, chr(216)=>748, chr(217)=>924, chr(218)=>748, chr(219)=>918,
+	chr(220)=>927, chr(221)=>928, chr(222)=>928, chr(223)=>834, chr(224)=>873, chr(225)=>828, chr(226)=>924, chr(227)=>924, chr(228)=>917, chr(229)=>930, chr(230)=>931, chr(231)=>463, chr(232)=>883, chr(233)=>836, chr(234)=>836, chr(235)=>867, chr(236)=>867, chr(237)=>696, chr(238)=>696, chr(239)=>874, chr(240)=>0, chr(241)=>874,
+	chr(242)=>760, chr(243)=>946, chr(244)=>771, chr(245)=>865, chr(246)=>771, chr(247)=>888, chr(248)=>967, chr(249)=>888, chr(250)=>831, chr(251)=>873, chr(252)=>927, chr(253)=>970, chr(254)=>918, chr(255)=>0);
 ?>

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 $fpdf_charwidths['zapfdingbats']=array(
 	chr(0)=>0,chr(1)=>0,chr(2)=>0,chr(3)=>0,chr(4)=>0,chr(5)=>0,chr(6)=>0,chr(7)=>0,chr(8)=>0,chr(9)=>0,chr(10)=>0,chr(11)=>0,chr(12)=>0,chr(13)=>0,chr(14)=>0,chr(15)=>0,chr(16)=>0,chr(17)=>0,chr(18)=>0,chr(19)=>0,chr(20)=>0,chr(21)=>0,
 	chr(22)=>0,chr(23)=>0,chr(24)=>0,chr(25)=>0,chr(26)=>0,chr(27)=>0,chr(28)=>0,chr(29)=>0,chr(30)=>0,chr(31)=>0,' '=>278,'!'=>974,'"'=>961,'#'=>974,'$'=>980,'%'=>719,'&'=>789,'\''=>790,'('=>791,')'=>690,'*'=>960,'+'=>939,

includes/librairies/display/form_management.class.php

Braces +7 added lines, -4 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' ) ) {
@@ -63,8 +65,10 @@ 
 			}
 			$message .= '</ul></div>';
 			return $message;
-		else :
+		else {
+			:
 			return null;
+		}
 		endif;
 	}
 
@@ -96,8 +100,7 @@ 
 						$email_exist = email_exists($value);
 						if(!is_email($value)) {
 							$this->add_error(sprintf(__('The field "%s" is incorrect','wpshop'),$attribute_definition['label']));
-						}
-						elseif ( empty($from) && (($user_id > 0 && !empty($email_exist) && $email_exist !== $user_id) || (!empty($email_exist) && $user_id <= 0)) ) {
+						} elseif ( empty($from) && (($user_id > 0 && !empty($email_exist) && $email_exist !== $user_id) || (!empty($email_exist) && $user_id <= 0)) ) {
 							$this->add_error(__('An account is already registered with your email address. Please login.', 'wpshop'));
 						}
 					break;

Indentation +15 added lines, -15 removed lines

@@ -26,43 +26,43 @@ 
 	var $filters = array(); // Stores store filters
 
 	/**
-	* Add an error
-	*/
+	 * Add an error
+	 */
 	function add_error( $error ) {
 		$this->errors[] = $error;
 	}
 
 	/**
-	* Add a message
-	*/
+	 * Add a message
+	 */
 	function add_message( $message ) {
 		$this->messages[] = $message;
 	}
 
 		/**
-		* Add a filter
-		*/
+		 * Add a filter
+		 */
 		function add_filter( $attribute_frontend_verification, $function ) {
 			$this->filters[$attribute_frontend_verification] = $function;
 		}
 
 	/**
-	* Get error count
-	*/
+	 * Get error count
+	 */
 	function error_count() {
 		return sizeof($this->errors);
 	}
 
 	/**
-	* Get message count
-	*/
+	 * Get message count
+	 */
 	function message_count() {
 		return sizeof($this->messages);
 	}
 
 	/**
-	* Output the errors and messages
-	*/
+	 * Output the errors and messages
+	 */
 	function show_messages() {
 		if (!empty($this->errors) && $this->error_count()>0) :
 			$message = '<div class="error_bloc">'.__('Errors were detected', 'wpshop').' :<ul>';
@@ -77,9 +77,9 @@ 
 	}
 
 	/** Valide les champs d'un formlaire
-	* @param array $array : Champs a lire
-	* @return boolean
-	*/
+	 * @param array $array : Champs a lire
+	 * @return boolean
+	 */
 	function validateForm($array, $values = array(), $from = '', $partial = false, $user = 0) {
 
 

Spacing +35 added lines, -35 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'));
 }
 
 /**
@@ -28,21 +28,21 @@ 
 	/**
 	* Add an error
 	*/
-	function add_error( $error ) {
+	function add_error($error) {
 		$this->errors[] = $error;
 	}
 
 	/**
 	* Add a message
 	*/
-	function add_message( $message ) {
+	function add_message($message) {
 		$this->messages[] = $message;
 	}
 
 		/**
 		* Add a filter
 		*/
-		function add_filter( $attribute_frontend_verification, $function ) {
+		function add_filter($attribute_frontend_verification, $function) {
 			$this->filters[$attribute_frontend_verification] = $function;
 		}
 
@@ -64,10 +64,10 @@ 
 	* Output the errors and messages
 	*/
 	function show_messages() {
-		if (!empty($this->errors) && $this->error_count()>0) :
-			$message = '<div class="error_bloc">'.__('Errors were detected', 'wpshop').' :<ul>';
-			foreach($this->errors as $e) {
-				$message .= '<li>'.$e.'</li>';
+		if (!empty($this->errors) && $this->error_count() > 0) :
+			$message = '<div class="error_bloc">' . __('Errors were detected', 'wpshop') . ' :<ul>';
+			foreach ($this->errors as $e) {
+				$message .= '<li>' . $e . '</li>';
 			}
 			$message .= '</ul></div>';
 			return $message;
@@ -83,42 +83,42 @@ 
 	function validateForm($array, $values = array(), $from = '', $partial = false, $user = 0) {
 
 
-		$user_id = empty( $user ) ? get_current_user_id() : $user;
-		foreach($array as $attribute_id => $attribute_definition):
-			$values_array = !empty($values) ? $values : (array) $_POST['attribute'];
-			$value = ( !empty($values_array[$attribute_definition['data_type']][$attribute_definition['name']]) ) ? $values_array[$attribute_definition['data_type']][$attribute_definition['name']] : '';
+		$user_id = empty($user) ? get_current_user_id() : $user;
+		foreach ($array as $attribute_id => $attribute_definition):
+			$values_array = !empty($values) ? $values : (array)$_POST['attribute'];
+			$value = (!empty($values_array[$attribute_definition['data_type']][$attribute_definition['name']])) ? $values_array[$attribute_definition['data_type']][$attribute_definition['name']] : '';
 
 			// Si le champ est obligatoire
-			if ( empty($value) && ($attribute_definition['required'] == 'yes') ) {
-				$this->add_error(sprintf(__('The field "%s" is required','wpshop'),__( $attribute_definition['label'], 'wpshop' ) ));
+			if (empty($value) && ($attribute_definition['required'] == 'yes')) {
+				$this->add_error(sprintf(__('The field "%s" is required', 'wpshop'), __($attribute_definition['label'], 'wpshop')));
 			}
-			if( $partial == false && $attribute_definition['_need_verification'] == 'yes'  ) {
-				$value2 = $values_array[$attribute_definition['data_type']][$attribute_definition['name'].'2'];
-				if ( $value != $value2) {
-					$this->add_error(sprintf(__('The  "%s" confirmation is incorrect','wpshop'),__($attribute_definition['label'], 'wpshop') ));
+			if ($partial == false && $attribute_definition['_need_verification'] == 'yes') {
+				$value2 = $values_array[$attribute_definition['data_type']][$attribute_definition['name'] . '2'];
+				if ($value != $value2) {
+					$this->add_error(sprintf(__('The  "%s" confirmation is incorrect', 'wpshop'), __($attribute_definition['label'], 'wpshop')));
 				}
 			}
-			if(!empty($value) && !empty($attribute_definition['type'])) {
-				switch($attribute_definition['frontend_verification']) {
+			if (!empty($value) && !empty($attribute_definition['type'])) {
+				switch ($attribute_definition['frontend_verification']) {
 					case 'email':
 						$email_exist = email_exists($value);
-						if(!is_email($value)) {
-							$this->add_error(sprintf(__('The field "%s" is incorrect','wpshop'),$attribute_definition['label']));
+						if (!is_email($value)) {
+							$this->add_error(sprintf(__('The field "%s" is incorrect', 'wpshop'), $attribute_definition['label']));
 						}
-						elseif ( empty($from) && (($user_id > 0 && !empty($email_exist) && $email_exist !== $user_id) || (!empty($email_exist) && $user_id <= 0)) ) {
+						elseif (empty($from) && (($user_id > 0 && !empty($email_exist) && $email_exist !== $user_id) || (!empty($email_exist) && $user_id <= 0))) {
 							$this->add_error(__('An account is already registered with your email address. Please login.', 'wpshop'));
 						}
 					break;
 
 					case 'postcode':
-						if(!wpshop_tools::is_postcode($value)) {
-							$this->add_error(sprintf(__('The field "%s" is incorrect','wpshop'),__( $attribute_definition['label'], 'wpshop' ) ));
+						if (!wpshop_tools::is_postcode($value)) {
+							$this->add_error(sprintf(__('The field "%s" is incorrect', 'wpshop'), __($attribute_definition['label'], 'wpshop')));
 						}
 					break;
 
 					case 'phone':
-						if(!wpshop_tools::is_phone($value)) {
-							$this->add_error(sprintf(__('The field "%s" is incorrect','wpshop'), __( $attribute_definition['label'], 'wpshop' ) ));
+						if (!wpshop_tools::is_phone($value)) {
+							$this->add_error(sprintf(__('The field "%s" is incorrect', 'wpshop'), __($attribute_definition['label'], 'wpshop')));
 						}
 					break;
 
@@ -126,22 +126,22 @@ 
 						$username_exists = username_exists($value);
 						// On s'assure que le nom d'utilisateur est libre
 						if (!validate_username($value)) :
-							$this->add_error( __('Invalid email/username.', 'wpshop') );
-						elseif ( ($user_id > 0) && !empty($username_exists) && ($username_exists !== $user_id) || !empty($username_exists) && ($user_id <= 0) ) :
-							$this->add_error( __('An account is already registered with that username. Please choose another.', 'wpshop') );
+							$this->add_error(__('Invalid email/username.', 'wpshop'));
+						elseif (($user_id > 0) && !empty($username_exists) && ($username_exists !== $user_id) || !empty($username_exists) && ($user_id <= 0)) :
+							$this->add_error(__('An account is already registered with that username. Please choose another.', 'wpshop'));
 						endif;
 					break;
 				}
 				if (array_key_exists($attribute_definition['name'], $this->filters) && is_callable($this->filters[$attribute_definition['name']])) {
 					$validation = call_user_func($this->filters[$attribute_definition['name']], $value);
-					if( !filter_var($validation, FILTER_VALIDATE_BOOLEAN) ) {
-						$this->add_error( $validation );
+					if (!filter_var($validation, FILTER_VALIDATE_BOOLEAN)) {
+						$this->add_error($validation);
 					}
 				}
 			}
 		endforeach;
 
-		return ($this->error_count()==0);
+		return ($this->error_count() == 0);
 	}
 
 }

includes/librairies/notices.class.php

Braces +3 added lines, -1 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' ) ) {
 	die( __('Access is not allowed by this way', 'wpshop') );

Spacing +21 added lines, -21 removed lines

@@ -1,7 +1,7 @@ 
-<?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'));
 }
 
 /**
@@ -19,36 +19,36 @@ 
 * @package wpshop
 * @subpackage librairies
 */
-class wpshop_notices{
+class wpshop_notices {
 
 	/** Notice the user to install the plugin */
 	public static function sale_shop_notice() {
-		$plug_version = substr( WPSHOP_VERSION, 0, 5 );
+		$plug_version = substr(WPSHOP_VERSION, 0, 5);
 
 
-		$notice_display_user_option = get_user_meta( get_current_user_id(), '_wps_hide_notice_messages_indicator', true);
+		$notice_display_user_option = get_user_meta(get_current_user_id(), '_wps_hide_notice_messages_indicator', true);
 
 		$notice = '';
 		$messages_to_hide = '';
 		/* Check that the user has already choose a payment method */
-		$paymentMethod = get_option( 'wps_payment_mode' );
+		$paymentMethod = get_option('wps_payment_mode');
 		$no_payment_mode_configurated = true;
-		if ( !empty($paymentMethod ) && !empty($paymentMethod['mode']) ) {
-			foreach( $paymentMethod['mode'] as $k => $pm ) {
-				if ( !empty($pm['active'] ) ) {
+		if (!empty($paymentMethod) && !empty($paymentMethod['mode'])) {
+			foreach ($paymentMethod['mode'] as $k => $pm) {
+				if (!empty($pm['active'])) {
 					$no_payment_mode_configurated = false;
 				}
 			}
 		}
 
-		if( $no_payment_mode_configurated ) {
-			$notice .= '<li>' . __('Payment method are missing', 'wpshop') . '&nbsp;<a href="' . admin_url('options-general.php?page='.WPSHOP_URL_SLUG_OPTION.'#wpshop_payments_option') . '" class="button-primary wpshop_missing_parameters_button" >' . __('Choose a payment method', 'wpshop') . '</a></li>';
+		if ($no_payment_mode_configurated) {
+			$notice .= '<li>' . __('Payment method are missing', 'wpshop') . '&nbsp;<a href="' . admin_url('options-general.php?page=' . WPSHOP_URL_SLUG_OPTION . '#wpshop_payments_option') . '" class="button-primary wpshop_missing_parameters_button" >' . __('Choose a payment method', 'wpshop') . '</a></li>';
 		}
 
 		/* Check that the user has already choose a payment method */
 		$emails = get_option('wpshop_emails', array());
-		if(empty($emails)) {
-			$notice .= '<li>' . __('Shop emails are misssing', 'wpshop') . '&nbsp;<a href="' . admin_url('options-general.php?page='.WPSHOP_URL_SLUG_OPTION.'#wpshop_emails_option') . '" class="button-primary wpshop_missing_parameters_button" >' . __('Configure shop emails', 'wpshop') . '</a></li>';
+		if (empty($emails)) {
+			$notice .= '<li>' . __('Shop emails are misssing', 'wpshop') . '&nbsp;<a href="' . admin_url('options-general.php?page=' . WPSHOP_URL_SLUG_OPTION . '#wpshop_emails_option') . '" class="button-primary wpshop_missing_parameters_button" >' . __('Configure shop emails', 'wpshop') . '</a></li>';
 		}
 
 
@@ -58,20 +58,20 @@ 
 			$messages_to_hide .= 'SLICKSHOP,';
 		}*/
 
-		$install = !empty( $_GET[ 'install' ] ) ? sanitize_text_field( $_GET[ 'install' ] ) : '';
+		$install = !empty($_GET['install']) ? sanitize_text_field($_GET['install']) : '';
 
-		if(!empty($notice) && ( empty( $install ) ) ) {
-			$notice='<p>'.__('You configure your shop to be a sale shop. But some configuration are missing for this type of shop using', 'wpshop').'</p><ul>'.$notice.'</ul>';
-			if ( !empty($messages_to_hide) ) {
-				$notice .= '<button data-nonce="' . wp_create_nonce( 'wps_hide_notice_messages' ) . '" class="wps_hide_notice_message button-secondary" id="wps_hide_notice_message">' .__('Hide this message', 'wpshop'). '</button>';
-				$notice .= '<input type="hidden" id="hide_messages_indicator" value="' .$messages_to_hide. '"/>';
+		if (!empty($notice) && (empty($install))) {
+			$notice = '<p>' . __('You configure your shop to be a sale shop. But some configuration are missing for this type of shop using', 'wpshop') . '</p><ul>' . $notice . '</ul>';
+			if (!empty($messages_to_hide)) {
+				$notice .= '<button data-nonce="' . wp_create_nonce('wps_hide_notice_messages') . '" class="wps_hide_notice_message button-secondary" id="wps_hide_notice_message">' . __('Hide this message', 'wpshop') . '</button>';
+				$notice .= '<input type="hidden" id="hide_messages_indicator" value="' . $messages_to_hide . '"/>';
 			}
 			self::admin_notice_container($notice, 'wpshop_shop_sale_type_notice');
 		}
 	}
 
 	/**		*/
-	public static function admin_notice_container($message, $container_class = ''){
+	public static function admin_notice_container($message, $container_class = '') {
 		?>
 		<div class="updated wpshop_admin_notice <?php echo $container_class; ?>" id="<?php echo $container_class; ?>" >
 			<h3><?php _e('Configure my shop', 'wpshop') ?></h3>

includes/librairies/payments/payment.class.php

Indentation +6 added lines, -6 removed lines

@@ -218,8 +218,8 @@ 
 
 
 	/**
-	* Reduce the stock regarding the order
-	*/
+	 * Reduce the stock regarding the order
+	 */
 	function the_order_payment_is_completed($order_id, $txn_id = null) {
 		// Donnees commandes
 		$order = get_post_meta($order_id, '_order_postmeta', true);
@@ -293,8 +293,8 @@ 
 	}
 
 	/**
-	* Get payment method
-	*/
+	 * Get payment method
+	 */
 	function get_payment_method($post_id){
 		$pm = __('Nc','wpshop');
 		$order_postmeta = get_post_meta($post_id, '_order_postmeta', true);
@@ -321,8 +321,8 @@ 
 	}
 
 	/**
-	* Set payment transaction number
-	*/
+	 * Set payment transaction number
+	 */
 	function display_payment_receiver_interface($post_id) {
 		$payment_validation = '';
 		$display_button = false;

Doc Comments +10 added lines, -2 removed lines

@@ -38,6 +38,10 @@ 
 		return $url;
 	}
 
+	/**
+	 * @param string $param
+	 * @param string $value
+	 */
 	public static function construct_url_parameters($url, $param, $value) {
 		$interoguation_marker_pos = strpos($url, '?');
 		if($interoguation_marker_pos===false)
@@ -86,7 +90,7 @@ 
 	 * Display the list of payment methods available
 	 *
 	 * @param integer $order_id The order id if existing - Useful when user does not finish its order and want to validateit later
-	 * @return string The different payment method
+	 * @return string[] The different payment method
 	 */
 	function __display_payment_methods_choice_form($order_id=0, $cart_type = 'cart') {
 		$output = '';
@@ -250,6 +254,9 @@ 
 	}
 
 
+	/**
+	 * @param string|null $payment_status
+	 */
 	function setOrderPaymentStatus( $order_id, $payment_status ) {
 		/**	Get order main information	*/
 		$order = get_post_meta($order_id, '_order_postmeta', true);
@@ -377,7 +384,7 @@ 
 	 * Allows to inform customer that he would pay a partial amount on this order
 	 *
 	 * @param float $current_order_total The current order total to pay before partial amount calcul
-	 * @return array The amount to pay / A html output with amount to pay and different information
+	 * @return string The amount to pay / A html output with amount to pay and different information
 	 */
 	function partial_payment_calcul( $current_order_total, $for = 'for_all' ) {
 		$output = '';
@@ -482,6 +489,7 @@ 
 	 * @param array $order_meta The complete order meta informations
 	 * @param integer $payment_index The payment to add/update data for
 	 * @param array $params : infos sended by the bank, array structure : ('method', 'waited amount', 'status', 'author', 'payment reference', 'date', 'received amount')
+	 * @param integer $order_id
 	 * @return array The order new meta informations
 	 */
 	public static function add_new_payment_to_order( $order_id, $order_meta, $payment_index, $params, $bank_response ) {

Spacing +184 added lines, -184 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,29 +20,29 @@ 
 
 		$wpshop_paypal = new wpshop_paypal();
 		// If the CIC payment method is active
-		$wpshop_paymentMethod = get_option( 'wps_payment_mode' );
-		if(WPSHOP_PAYMENT_METHOD_CIC && ( !empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic']) && !empty($wpshop_paymentMethod['mode']['cic']['active']) ) ) {
+		$wpshop_paymentMethod = get_option('wps_payment_mode');
+		if (WPSHOP_PAYMENT_METHOD_CIC && (!empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic']) && !empty($wpshop_paymentMethod['mode']['cic']['active']))) {
 			$wpshop_cic = new wpshop_CIC();
 		}
-		wpshop_tools::create_custom_hook ('wpshop_bankserver_reponse');
+		wpshop_tools::create_custom_hook('wpshop_bankserver_reponse');
 
 	}
 
 	public static function get_success_payment_url() {
-		$url = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_payment_return_page_id') ) );
+		$url = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_payment_return_page_id')));
 		return self::construct_url_parameters($url, 'paymentResult', 'success');
 	}
 
 	public static function get_cancel_payment_url() {
-		$url = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_payment_return_nok_page_id') ) );
+		$url = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_payment_return_nok_page_id')));
 		return $url;
 	}
 
 	public static function construct_url_parameters($url, $param, $value) {
 		$interoguation_marker_pos = strpos($url, '?');
-		if($interoguation_marker_pos===false)
-			return $url.'?'.$param.'='.$value;
-		else return $url.'&'.$param.'='.$value;
+		if ($interoguation_marker_pos === false)
+			return $url . '?' . $param . '=' . $value;
+		else return $url . '&' . $param . '=' . $value;
 	}
 
 	/**
@@ -51,23 +51,23 @@ 
 	public static function wpshop_payment_result() {
 		global $wpdb;
 		$user_ID = get_current_user_id();
-		$query = $wpdb->prepare('SELECT MAX(ID) FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_ORDER, $user_ID);
-		$order_post_id = $wpdb->get_var( $query );
-		if ( !empty($order_post_id) ) {
-			$order_postmeta = get_post_meta($order_post_id , '_wpshop_order_status', true);
-			if ( !empty($order_postmeta) ) {
-				switch ( $order_postmeta ) {
+		$query = $wpdb->prepare('SELECT MAX(ID) FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_ORDER, $user_ID);
+		$order_post_id = $wpdb->get_var($query);
+		if (!empty($order_post_id)) {
+			$order_postmeta = get_post_meta($order_post_id, '_wpshop_order_status', true);
+			if (!empty($order_postmeta)) {
+				switch ($order_postmeta) {
 					case 'awaiting_payment':
-						echo __('We wait your payment.','wpshop');
+						echo __('We wait your payment.', 'wpshop');
 					break;
 					case 'completed':
-						echo __('Thank you ! Your payment has been recorded.','wpshop');
+						echo __('Thank you ! Your payment has been recorded.', 'wpshop');
 					break;
 					case 'partially_paid':
-						echo __('Thank you ! Your first payment has been recorded.','wpshop');
+						echo __('Thank you ! Your first payment has been recorded.', 'wpshop');
 					break;
 					default:
-						echo __('Your payment and your order has been cancelled.','wpshop');
+						echo __('Your payment and your order has been cancelled.', 'wpshop');
 					break;
 				}
 			}
@@ -88,56 +88,56 @@ 
 	 * @param integer $order_id The order id if existing - Useful when user does not finish its order and want to validateit later
 	 * @return string The different payment method
 	 */
-	function __display_payment_methods_choice_form($order_id=0, $cart_type = 'cart') {
+	function __display_payment_methods_choice_form($order_id = 0, $cart_type = 'cart') {
 		$output = '';
 		/**	Get available payment method	*/
 		$paymentMethod = get_option('wpshop_paymentMethod', array());
 
-		if(!empty($order_id) && is_numeric($order_id)) {
-			$output .= '<input type="hidden" name="order_id" value="'.$order_id.'" />';
+		if (!empty($order_id) && is_numeric($order_id)) {
+			$output .= '<input type="hidden" name="order_id" value="' . $order_id . '" />';
 		}
 
 		if ($cart_type == 'cart') {
 			$payment_methods = array();
-			if(!empty($paymentMethod['paypal'])) {
+			if (!empty($paymentMethod['paypal'])) {
 				$payment_methods['paypal'] = array('payment_method_name' => __('CB with Paypal', 'wpshop'),
 														'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/paypal.png',
-														'payment_method_explanation' => __('<strong>Tips</strong> : If you have a Paypal account, by choosing this payment method, you will be redirected to the secure payment site Paypal to make your payment. Debit your PayPal account, immediate booking products.','wpshop')
+														'payment_method_explanation' => __('<strong>Tips</strong> : If you have a Paypal account, by choosing this payment method, you will be redirected to the secure payment site Paypal to make your payment. Debit your PayPal account, immediate booking products.', 'wpshop')
 								 );
 			}
-			if(!empty($paymentMethod['checks'])) {
+			if (!empty($paymentMethod['checks'])) {
 				$payment_methods['check'] = array('payment_method_name' => __('Check', 'wpshop'),
 						'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/cheque.png',
-						'payment_method_explanation' => __('Reservation of products upon receipt of the check.','wpshop')
+						'payment_method_explanation' => __('Reservation of products upon receipt of the check.', 'wpshop')
 				);
 			}
-			if(!empty($paymentMethod['banktransfer'])) {
+			if (!empty($paymentMethod['banktransfer'])) {
 				$payment_methods['banktransfer'] = array('payment_method_name' => __('Bank transfer', 'wpshop'),
 						'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/cheque.png',
-						'payment_method_explanation' =>__('Reservation of product receipt of payment.','wpshop')
+						'payment_method_explanation' =>__('Reservation of product receipt of payment.', 'wpshop')
 				);
 			}
-			if(WPSHOP_PAYMENT_METHOD_CIC || !empty($paymentMethod['cic'])) {
+			if (WPSHOP_PAYMENT_METHOD_CIC || !empty($paymentMethod['cic'])) {
 				$payment_methods['cic'] = array('payment_method_name' =>__('Credit card', 'wpshop'),
 						'payment_method_icon' => WPSHOP_TEMPLATES_URL . 'wpshop/medias/cic_payment_logo.jpg',
-						'payment_method_explanation' =>__('Reservation of products upon confirmation of payment.','wpshop')
+						'payment_method_explanation' =>__('Reservation of products upon confirmation of payment.', 'wpshop')
 				);
 			}
 			$payment_methods = apply_filters('wpshop_payment_method', $payment_methods);
 
 			$payment_method_table = array();
 
-			if ( !empty( $paymentMethod['display_position'] ) ) {
+			if (!empty($paymentMethod['display_position'])) {
 				$position_determinated = false;
-				foreach ( $paymentMethod['display_position'] as $key => $position) {
-					if ( $position != null) {
+				foreach ($paymentMethod['display_position'] as $key => $position) {
+					if ($position != null) {
 						$position_determinated = true;
 					}
 				}
-				if ( $position_determinated ) {
-					for ( $i = 1; $i < count( $paymentMethod['display_position'] ) + 1; $i++) {
-						foreach ( $paymentMethod['display_position'] as $key => $position ) {
-							if ( $position == $i  && !empty($paymentMethod[$key])) {
+				if ($position_determinated) {
+					for ($i = 1; $i < count($paymentMethod['display_position']) + 1; $i++) {
+						foreach ($paymentMethod['display_position'] as $key => $position) {
+							if ($position == $i && !empty($paymentMethod[$key])) {
 								if ($key == 'checks') {
 									$key = 'check';
 								}
@@ -148,16 +148,16 @@ 
 					$payment_methods = $payment_method_table;
 				}
 			}
-			if (!empty($payment_methods) ) {
+			if (!empty($payment_methods)) {
 
-				foreach( $payment_methods as  $payment_method_identifier =>  $payment_method_def ) {
+				foreach ($payment_methods as  $payment_method_identifier =>  $payment_method_def) {
 					$tpl_component = array();
 					$checked = $active = '';
 					$payment_identifier_for_test = $payment_method_identifier;
 					if ($payment_method_identifier == 'check') {
 						$payment_identifier_for_test = 'checks';
 					}
-					if ( !empty($paymentMethod['default_method']) && $paymentMethod['default_method'] == $payment_identifier_for_test) {
+					if (!empty($paymentMethod['default_method']) && $paymentMethod['default_method'] == $payment_identifier_for_test) {
 						$checked = ' checked="checked"';
 						$active = ' active';
 
@@ -165,11 +165,11 @@ 
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_STATE_CLASS'] = $active;
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_INPUT_STATE'] = $checked;
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_IDENTIFIER'] = $payment_method_identifier;
-					if ( !empty($payment_mode['logo']) && (int)$payment_mode['logo'] != 0 ) {
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? wp_get_attachment_image( $payment_method_def['payment_method_icon'], 'thumbnail', false, array('class' => 'wps_shipping_mode_logo') ) : '';
+					if (!empty($payment_mode['logo']) && (int)$payment_mode['logo'] != 0) {
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_method_def['payment_method_icon'])) ? wp_get_attachment_image($payment_method_def['payment_method_icon'], 'thumbnail', false, array('class' => 'wps_shipping_mode_logo')) : '';
 					}
 					else {
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? '<img src="' .$payment_method_def['payment_method_icon']. '" alt="" />' : '';
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_method_def['payment_method_icon'])) ? '<img src="' . $payment_method_def['payment_method_icon'] . '" alt="" />' : '';
 					}
 					//$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = $payment_method_def['payment_method_icon'];
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = $payment_method_def['payment_method_name'];
@@ -180,32 +180,32 @@ 
 			}
 		}
 
-		return array( $output, $paymentMethod['mode'] );
+		return array($output, $paymentMethod['mode']);
 	}
 
 
-	public static function display_payment_methods_choice_form($order_id=0, $cart_type = 'cart') {
-		$payment_option = get_option( 'wps_payment_mode' );
+	public static function display_payment_methods_choice_form($order_id = 0, $cart_type = 'cart') {
+		$payment_option = get_option('wps_payment_mode');
 		$output = '';
-		if(!empty($order_id) && is_numeric($order_id)) {
-			$output .= '<input type="hidden" name="order_id" value="'.$order_id.'" />';
+		if (!empty($order_id) && is_numeric($order_id)) {
+			$output .= '<input type="hidden" name="order_id" value="' . $order_id . '" />';
 		}
-		if( $cart_type == 'cart' ) {
-			if ( !empty($payment_option) && !empty($payment_option['mode']) ) {
-				foreach( $payment_option['mode'] as $payment_id => $payment_config ) {
-					if( !empty($payment_config['active']) ) {
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_STATE_CLASS'] = ( ( !empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id ) ? ' active' : '');
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_INPUT_STATE'] = ( ( !empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id ) ? 'checked="checked"' : '');
+		if ($cart_type == 'cart') {
+			if (!empty($payment_option) && !empty($payment_option['mode'])) {
+				foreach ($payment_option['mode'] as $payment_id => $payment_config) {
+					if (!empty($payment_config['active'])) {
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_STATE_CLASS'] = ((!empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id) ? ' active' : '');
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_INPUT_STATE'] = ((!empty($payment_option['default_choice']) && $payment_option['default_choice'] == $payment_id) ? 'checked="checked"' : '');
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_IDENTIFIER'] = $payment_id;
 
-						if ( !empty($payment_config['logo']) && (int)$payment_config['logo'] != 0 ) {
-							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? wp_get_attachment_image( $payment_config['logo'], 'thumbnail', false ) : '';
+						if (!empty($payment_config['logo']) && (int)$payment_config['logo'] != 0) {
+							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_config['logo'])) ? wp_get_attachment_image($payment_config['logo'], 'thumbnail', false) : '';
 						}
 						else {
-							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? '<img src="' .$payment_config['logo']. '" alt="' .$payment_config['name']. '" />' : '';
+							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = (!empty($payment_config['logo'])) ? '<img src="' . $payment_config['logo'] . '" alt="' . $payment_config['name'] . '" />' : '';
 						}
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = ( !empty($payment_config['name']) ) ? $payment_config['name'] : '';
-						$tpl_component['CHECKOUT_PAYMENT_METHOD_EXPLANATION'] = ( !empty($payment_config['description']) ) ? $payment_config['description'] : '';
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = (!empty($payment_config['name'])) ? $payment_config['name'] : '';
+						$tpl_component['CHECKOUT_PAYMENT_METHOD_EXPLANATION'] = (!empty($payment_config['description'])) ? $payment_config['description'] : '';
 						$output .= wpshop_display::display_template_element('wpshop_checkout_page_payment_method_bloc', $tpl_component, array('type' => 'payment_method', 'id' => $payment_id));
 						unset($tpl_component);
 					}
@@ -227,13 +227,13 @@ 
 
 		$wps_message = new wps_message_ctr();
 
-		if(!empty($order) && !empty($order_info) && empty($order['order_invoice_ref'])) {
-			$email = (!empty($order_info['billing']['address']['address_user_email']) ? $order_info['billing']['address']['address_user_email'] : '' );
-			$first_name = ( !empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '' );
-			$last_name = ( !empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '' );
+		if (!empty($order) && !empty($order_info) && empty($order['order_invoice_ref'])) {
+			$email = (!empty($order_info['billing']['address']['address_user_email']) ? $order_info['billing']['address']['address_user_email'] : '');
+			$first_name = (!empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '');
+			$last_name = (!empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '');
 
 			// Envoie du message de confirmation de paiement au client
-			switch($order['payment_method']) {
+			switch ($order['payment_method']) {
 				case 'check':
 					$wps_message->wpshop_prepared_email($email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order['order_date']));
 				break;
@@ -250,24 +250,24 @@ 
 	}
 
 
-	function setOrderPaymentStatus( $order_id, $payment_status ) {
+	function setOrderPaymentStatus($order_id, $payment_status) {
 		/**	Get order main information	*/
 		$order = get_post_meta($order_id, '_order_postmeta', true);
 		$send_email = false;
 
-		if ( !empty($order) ) {
+		if (!empty($order)) {
 			/**	Change order status to given status	*/
 			$order['order_status'] = strtolower($payment_status);
 			/**	Put order status into a single meta, allowing to use it easily later	*/
 			update_post_meta($order_id, '_wpshop_order_status', $order['order_status']);
 
 			/**	In case the set status is completed, make specific treatment: add the completed date	*/
-			if ( $payment_status == 'completed' ) {
+			if ($payment_status == 'completed') {
 				/**	Read order items list, if not empty and check if each item is set to manage stock or not */
 				if (!empty($order['order_items'])) {
 					foreach ($order['order_items'] as $o) {
-						$product = wpshop_products::get_product_data( $o['item_id'] );
-						if (!empty($product) && !empty($product['manage_stock']) && __($product['manage_stock'], 'wpshop') == __('Yes', 'wpshop') ) {
+						$product = wpshop_products::get_product_data($o['item_id']);
+						if (!empty($product) && !empty($product['manage_stock']) && __($product['manage_stock'], 'wpshop') == __('Yes', 'wpshop')) {
 							wpshop_products::reduce_product_stock_qty($o['item_id'], $o['item_qty']);
 						}
 					}
@@ -281,7 +281,7 @@ 
 			}
 
 			/**	Send email to customer when specific case need it	*/
-			if ( $send_email ) {
+			if ($send_email) {
 				/**	Get information about customer that make the order	*/
 				$order_info = get_post_meta($order_id, '_order_info', true);
 				$mail_tpl_component = array('order_key' => $order['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order['order_date']);
@@ -295,25 +295,25 @@ 
 	/**
 	* Get payment method
 	*/
-	function get_payment_method($post_id){
-		$pm = __('Nc','wpshop');
+	function get_payment_method($post_id) {
+		$pm = __('Nc', 'wpshop');
 		$order_postmeta = get_post_meta($post_id, '_order_postmeta', true);
-		if ( !empty($order_postmeta['payment_method']) ) {
-			switch($order_postmeta['payment_method']){
+		if (!empty($order_postmeta['payment_method'])) {
+			switch ($order_postmeta['payment_method']) {
 				case 'check':
-					$pm = __('Check','wpshop');
+					$pm = __('Check', 'wpshop');
 				break;
 				case 'paypal':
-					$pm = __('Paypal','wpshop');
+					$pm = __('Paypal', 'wpshop');
 				break;
 				case 'banktransfer':
-					$pm = __('Bank transfer','wpshop');
+					$pm = __('Bank transfer', 'wpshop');
 				break;
 				case 'cic':
-					$pm = __('Credit card','wpshop');
+					$pm = __('Credit card', 'wpshop');
 				break;
 				default:
-					$pm = __('Nc','wpshop');
+					$pm = __('Nc', 'wpshop');
 				break;
 			}
 		}
@@ -333,38 +333,38 @@ 
 
 		$paymentMethod = $paymentMethod['mode'];
 		$payment_validation .= '
-<div id="order_payment_method_'.$post_id.'" class="wpshop_cls wpshopHide" >
-	<input type="hidden" id="used_method_payment_'.$post_id.'" value="' . (!empty($order_postmeta['payment_method']) ? $order_postmeta['payment_method'] : 'no_method') . '"/>
-	<input type="hidden" id="used_method_payment_transaction_id_'.$post_id.'" value="' . (!empty($transaction_indentifier) ? $transaction_indentifier : 0) . '"/>';
+<div id="order_payment_method_'.$post_id . '" class="wpshop_cls wpshopHide" >
+	<input type="hidden" id="used_method_payment_'.$post_id . '" value="' . (!empty($order_postmeta['payment_method']) ? $order_postmeta['payment_method'] : 'no_method') . '"/>
+	<input type="hidden" id="used_method_payment_transaction_id_'.$post_id . '" value="' . (!empty($transaction_indentifier) ? $transaction_indentifier : 0) . '"/>';
 
-		if(!empty($order_postmeta['payment_method'])){
+		if (!empty($order_postmeta['payment_method'])) {
 			$payment_validation .= sprintf(__('Selected payment method: %s', 'wpshop'), __($order_postmeta['payment_method'], 'wpshop')) . '<br/>';
 		}
 
-		if(!empty($paymentMethod['paypal']) && empty($order_postmeta['payment_method'])) {
+		if (!empty($paymentMethod['paypal']) && empty($order_postmeta['payment_method'])) {
 			$payment_validation .= '<input type="radio" class="payment_method" name="payment_method" value="paypal" id="payment_method_paypal" /><label for="payment_method_paypal" >' . __('Paypal', 'wpshop') . '</label><br/>';
 			$display_button = true;
 		}
 
-		if(!empty($paymentMethod['checks']) && empty($order_postmeta['payment_method'])) {
+		if (!empty($paymentMethod['checks']) && empty($order_postmeta['payment_method'])) {
 			$payment_validation .= '<input type="radio" class="payment_method" name="payment_method" value="check" id="payment_method_check" /><label for="payment_method_check" >' . __('Check', 'wpshop') . '</label><br/>';
 			$display_button = true;
 		}
 
-		$wpshop_paymentMethod = get_option( 'wps_payment_mode' );
-		if((WPSHOP_PAYMENT_METHOD_CIC || (!empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic'])) ) && empty($order_postmeta['payment_method'])) {
+		$wpshop_paymentMethod = get_option('wps_payment_mode');
+		if ((WPSHOP_PAYMENT_METHOD_CIC || (!empty($wpshop_paymentMethod['mode']) && !empty($wpshop_paymentMethod['mode']['cic']))) && empty($order_postmeta['payment_method'])) {
 			$payment_validation .= '<input type="radio" class="payment_method" name="payment_method" value="cb" id="payment_method_cb" /><label for="payment_method_cb" >' . __('Credit card', 'wpshop') . '</label><br/>';
 			$display_button = true;
 		}
 
-		if(empty($payment_transaction)){
-			$payment_validation .= '<hr/>' . __('Transaction number', 'wpshop') . '&nbsp;:&nbsp;<input type="text" value="" name="payment_method_transaction_number" id="payment_method_transaction_number_'.$post_id.'" />';
+		if (empty($payment_transaction)) {
+			$payment_validation .= '<hr/>' . __('Transaction number', 'wpshop') . '&nbsp;:&nbsp;<input type="text" value="" name="payment_method_transaction_number" id="payment_method_transaction_number_' . $post_id . '" />';
 			$display_button = true;
 		}
 
-		if($display_button){
+		if ($display_button) {
 			$payment_validation .= '
-		<br/><br/><a class="button payment_method_validate order_'.$post_id.' wpshop_clear" >'.__('Validate payment method', 'wpshop').'</a>';
+		<br/><br/><a class="button payment_method_validate order_'.$post_id . ' wpshop_clear" >' . __('Validate payment method', 'wpshop') . '</a>';
 		}
 
 		$payment_validation .= '
@@ -379,21 +379,21 @@ 
 	 * @param float $current_order_total The current order total to pay before partial amount calcul
 	 * @return array The amount to pay / A html output with amount to pay and different information
 	 */
-	function partial_payment_calcul( $current_order_total, $for = 'for_all' ) {
+	function partial_payment_calcul($current_order_total, $for = 'for_all') {
 		$output = '';
 		$tpl_component = array();
 
 		/**	Get current configuration	*/
 		$partial_payment_configuration = get_option('wpshop_payment_partial', array($for => array(), 'for_quotation' => array()));
-		if ( !empty($partial_payment_configuration[$for]) && (!empty($partial_payment_configuration[$for]['activate'])) && ($partial_payment_configuration[$for]['activate'] == 'on') ) {
+		if (!empty($partial_payment_configuration[$for]) && (!empty($partial_payment_configuration[$for]['activate'])) && ($partial_payment_configuration[$for]['activate'] == 'on')) {
 			$amount_of_partial_payment = 0;
-			if ( !empty($partial_payment_configuration[$for]['value']) && !empty($partial_payment_configuration[$for]['activate']) ) {
+			if (!empty($partial_payment_configuration[$for]['value']) && !empty($partial_payment_configuration[$for]['activate'])) {
 				$amount_of_partial_payment = $partial_payment_configuration[$for]['value'];
 			}
 
 			$partial_amount_to_pay = 0;
 			$type_of_partial_payment = null;
-			if (!empty($partial_payment_configuration[$for]) && !empty($partial_payment_configuration[$for]['type']) ) {
+			if (!empty($partial_payment_configuration[$for]) && !empty($partial_payment_configuration[$for]['type'])) {
 				switch ($partial_payment_configuration[$for]['type']) {
 					case 'percentage':
 						$type_of_partial_payment = '%';
@@ -453,7 +453,7 @@ 
 	function set_payment_transaction_number($order_id, $transaction_number) {
 		$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 
-		if ( !empty($order_postmeta['order_payment']['received']) ) {
+		if (!empty($order_postmeta['order_payment']['received'])) {
 			if (count($order_postmeta['order_payment']['received']) == 1) {
 				$order_postmeta['order_payment']['received'][0]['payment_reference'] = $transaction_number;
 			}
@@ -467,10 +467,10 @@ 
 	 *
 	 * @param integer $order_id
 	 */
-	function save_payment_return_data( $order_id ) {
+	function save_payment_return_data($order_id) {
 		$data = wpshop_tools::getMethode();
 
-		$current_payment_return = get_post_meta( $order_id, '_wpshop_payment_return_data', true);
+		$current_payment_return = get_post_meta($order_id, '_wpshop_payment_return_data', true);
 		$current_payment_return[] = $data;
 
 		update_post_meta($order_id, '_wpshop_payment_return_data', $current_payment_return);
@@ -484,23 +484,23 @@ 
 	 * @param array $params : infos sended by the bank, array structure : ('method', 'waited amount', 'status', 'author', 'payment reference', 'date', 'received amount')
 	 * @return array The order new meta informations
 	 */
-	public static function add_new_payment_to_order( $order_id, $order_meta, $payment_index, $params, $bank_response ) {
-
-		$order_meta['order_payment']['received'][$payment_index]['method'] = ( !empty($params['method']) ) ? $params['method'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['waited_amount'] = ( !empty($params['waited_amount']) ) ? $params['waited_amount'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['status'] = ( !empty($params['status']) ) ? $params['status'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['author'] = ( !empty($params['author']) ) ? $params['author'] : get_current_user_id();
-		$order_meta['order_payment']['received'][$payment_index]['payment_reference'] =( !empty($params['payment_reference']) ) ? $params['payment_reference'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['date'] = ( !empty($params['date']) ) ? $params['date'] : null;
-		$order_meta['order_payment']['received'][$payment_index]['received_amount'] = ( !empty($params['received_amount']) ) ? $params['received_amount'] : null;
+	public static function add_new_payment_to_order($order_id, $order_meta, $payment_index, $params, $bank_response) {
+
+		$order_meta['order_payment']['received'][$payment_index]['method'] = (!empty($params['method'])) ? $params['method'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['waited_amount'] = (!empty($params['waited_amount'])) ? $params['waited_amount'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['status'] = (!empty($params['status'])) ? $params['status'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['author'] = (!empty($params['author'])) ? $params['author'] : get_current_user_id();
+		$order_meta['order_payment']['received'][$payment_index]['payment_reference'] = (!empty($params['payment_reference'])) ? $params['payment_reference'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['date'] = (!empty($params['date'])) ? $params['date'] : null;
+		$order_meta['order_payment']['received'][$payment_index]['received_amount'] = (!empty($params['received_amount'])) ? $params['received_amount'] : null;
 		$order_meta['order_payment']['received'][$payment_index]['comment'] = '';
 
 		$order_info = get_post_meta($order_id, '_order_info', true);
-		if(!empty($order_meta) && !empty($order_info) && ($bank_response == 'completed')) {
+		if (!empty($order_meta) && !empty($order_info) && ($bank_response == 'completed')) {
 
 			/**	Generate an invoice number for the current payment. Check if the payment is complete or not	*/
-			if ( empty($order_meta['order_invoice_ref']) ) {
-				$order_meta['order_payment']['received'][$payment_index]['invoice_ref'] = wpshop_modules_billing::generate_invoice_number( $order_id );
+			if (empty($order_meta['order_invoice_ref'])) {
+				$order_meta['order_payment']['received'][$payment_index]['invoice_ref'] = wpshop_modules_billing::generate_invoice_number($order_id);
 			}
 		}
 
@@ -513,13 +513,13 @@ 
 	 * @param string $payment_method
 	 * @return integer $key : array id of [order_payment][received] in the order postmeta
 	 */
-	public static function get_order_waiting_payment_array_id ( $oid, $payment_method ) {
+	public static function get_order_waiting_payment_array_id($oid, $payment_method) {
 		$key = 0;
-		$order_meta = get_post_meta( $oid, '_order_postmeta', true);
-		if ( !empty($order_meta) ) {
-			$key = count( $order_meta['order_payment']['received'] );
-			foreach ( $order_meta['order_payment']['received'] as $k => $payment_test) {
-				if ( !array_key_exists('received_amount', $payment_test) /* && $order_meta['order_payment']['received'][$k]['method'] == $payment_method */ ) {
+		$order_meta = get_post_meta($oid, '_order_postmeta', true);
+		if (!empty($order_meta)) {
+			$key = count($order_meta['order_payment']['received']);
+			foreach ($order_meta['order_payment']['received'] as $k => $payment_test) {
+				if (!array_key_exists('received_amount', $payment_test) /* && $order_meta['order_payment']['received'][$k]['method'] == $payment_method */) {
 					$key = $k;
 				}
 			}
@@ -534,52 +534,52 @@ 
 	 * @param array $params_array
 	 * @return string
 	 */
-	public static function check_order_payment_total_amount($order_id, $params_array, $bank_response, $order_meta = array(), $save_metadata = true ) {
+	public static function check_order_payment_total_amount($order_id, $params_array, $bank_response, $order_meta = array(), $save_metadata = true) {
 		global $wpshop_payment; global $wpdb;
-		$order_meta = ( !empty($order_meta) ) ? $order_meta : get_post_meta( $order_id, '_order_postmeta', true);
+		$order_meta = (!empty($order_meta)) ? $order_meta : get_post_meta($order_id, '_order_postmeta', true);
 
 		$wps_message = new wps_message_ctr();
-		if ( !empty($order_meta) ) {
+		if (!empty($order_meta)) {
 			$order_info = get_post_meta($order_id, '_order_info', true);
-			$user_data = get_userdata( $order_meta['customer_id'] );
-			$email = ( !empty($user_data) && !empty($user_data->user_email) ) ? $user_data->user_email : '';
+			$user_data = get_userdata($order_meta['customer_id']);
+			$email = (!empty($user_data) && !empty($user_data->user_email)) ? $user_data->user_email : '';
 // 			$email = ( !empty($order_info) &&  !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_user_email']) ) ? $order_info['billing']['address']['address_user_email'] : '' ;
-			$first_name = (!empty($order_info) && !empty($order_info['billing']) &&  !empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '' );
-			$last_name = ( !empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '' );
+			$first_name = (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_first_name']) ? $order_info['billing']['address']['address_first_name'] : '');
+			$last_name = (!empty($order_info) && !empty($order_info['billing']) && !empty($order_info['billing']['address']['address_last_name']) ? $order_info['billing']['address']['address_last_name'] : '');
 
-			$key = self::get_order_waiting_payment_array_id( $order_id, $params_array['method']);
+			$key = self::get_order_waiting_payment_array_id($order_id, $params_array['method']);
 			$order_grand_total = $order_meta['order_grand_total'];
-			$total_received = ( ( !empty($params_array['status']) && ( $params_array['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($params_array['received_amount']) ) ? $params_array['received_amount'] : 0 );
-			foreach ( $order_meta['order_payment']['received'] as $received ) {
-				$total_received += ( ( !empty($received['status']) && ( $received['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($received['received_amount']) ) ? $received['received_amount'] : 0 );
+			$total_received = ((!empty($params_array['status']) && ($params_array['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($params_array['received_amount'])) ? $params_array['received_amount'] : 0);
+			foreach ($order_meta['order_payment']['received'] as $received) {
+				$total_received += ((!empty($received['status']) && ($received['status'] == 'payment_received') && ($bank_response == 'completed') && !empty($received['received_amount'])) ? $received['received_amount'] : 0);
 			}
 			$order_meta['order_amount_to_pay_now'] = $order_grand_total - $total_received;
-			$order_meta['order_payment']['received'][$key] = self::add_new_payment_to_order( $order_id, $order_meta, $key, $params_array, $bank_response );
+			$order_meta['order_payment']['received'][$key] = self::add_new_payment_to_order($order_id, $order_meta, $key, $params_array, $bank_response);
 
 			if ($bank_response == 'completed') {
 
-				if ( number_format((float)$total_received, 2, '.', '') >= number_format((float)$order_grand_total,2, '.', '') ) {
+				if (number_format((float)$total_received, 2, '.', '') >= number_format((float)$order_grand_total, 2, '.', '')) {
 					$payment_status = 'completed';
 
-					$order_meta['order_invoice_ref'] = ( empty ($order_meta['order_invoice_ref'] ) && !empty($order_meta['order_payment']['received'][$key]) && !empty($order_meta['order_payment']['received'][$key]['invoice_ref']) ) ? $order_meta['order_payment']['received'][$key]['invoice_ref'] : ( empty($order_meta['order_invoice_ref']) ? null : $order_meta['order_invoice_ref'] ) ;
+					$order_meta['order_invoice_ref'] = (empty ($order_meta['order_invoice_ref']) && !empty($order_meta['order_payment']['received'][$key]) && !empty($order_meta['order_payment']['received'][$key]['invoice_ref'])) ? $order_meta['order_payment']['received'][$key]['invoice_ref'] : (empty($order_meta['order_invoice_ref']) ? null : $order_meta['order_invoice_ref']);
 					$order_meta['order_invoice_date'] = current_time('mysql', 0);
 
 					if (!empty($order_meta['order_items'])) {
 						foreach ($order_meta['order_items'] as $item_id => $o) {
 							$pid = $o['item_id'];
-							if (strpos($item_id,'__') !== false) {
-								$product_data_id = explode( '__', $item_id );
-								$pid = ( !empty($product_data_id) && !empty($product_data_id[1]) ) ? $product_data_id[1] : $pid;
+							if (strpos($item_id, '__') !== false) {
+								$product_data_id = explode('__', $item_id);
+								$pid = (!empty($product_data_id) && !empty($product_data_id[1])) ? $product_data_id[1] : $pid;
 							}
-							$product = wpshop_products::get_product_data( $pid );
-							if ( get_post_type( $pid ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-								$parent_def = wpshop_products::get_parent_variation ( $pid );
+							$product = wpshop_products::get_product_data($pid);
+							if (get_post_type($pid) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+								$parent_def = wpshop_products::get_parent_variation($pid);
 								$parent_post = $parent_def['parent_post'];
-								$product = wpshop_products::get_product_data( $parent_post->ID );
+								$product = wpshop_products::get_product_data($parent_post->ID);
 							}
 
-							if (!empty($product) && !empty($product['manage_stock']) && strtolower( __($product['manage_stock'], 'wpshop') ) == strtolower( __('Yes', 'wpshop') ) ) {
-								wpshop_products::reduce_product_stock_qty($product['product_id'], $o['item_qty'], $pid );
+							if (!empty($product) && !empty($product['manage_stock']) && strtolower(__($product['manage_stock'], 'wpshop')) == strtolower(__('Yes', 'wpshop'))) {
+								wpshop_products::reduce_product_stock_qty($product['product_id'], $o['item_qty'], $pid);
 							}
 						}
 					}
@@ -588,15 +588,15 @@ 
 					update_post_meta($order_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '_completed_date', current_time('mysql', 0));
 
 					// Send confirmation e-mail to administrator
-					if ( empty($_SESSION['wps-pos-addon']) ) {
+					if (empty($_SESSION['wps-pos-addon'])) {
 						$email_option = get_option('wpshop_emails');
-						if(  !empty($email_option) && !empty($email_option['send_confirmation_order_message']) ){
-							wpshop_checkout::send_order_email_to_administrator( $order_id, $user_data );
+						if (!empty($email_option) && !empty($email_option['send_confirmation_order_message'])) {
+							wpshop_checkout::send_order_email_to_administrator($order_id, $user_data);
 						}
 					}
 
 					// POS Status
-					if( !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['shipping_method']) && $order_meta['order_payment']['shipping_method'] == 'default_shipping_mode_for_pos' ) {
+					if (!empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['shipping_method']) && $order_meta['order_payment']['shipping_method'] == 'default_shipping_mode_for_pos') {
 						$payment_status = 'pos';
 					}
 				}
@@ -605,27 +605,27 @@ 
 				}
 
 				$order_meta['order_status'] = $payment_status;
-				update_post_meta( $order_id, '_order_postmeta', $order_meta);
+				update_post_meta($order_id, '_order_postmeta', $order_meta);
 				$save_metadata = false;
 
-				$allow_send_invoice = get_option( 'wpshop_send_invoice' );
-				$invoice_attachment_file = ( !empty($allow_send_invoice) ) ? wpshop_modules_billing::generate_invoice_for_email( $order_id, empty( $order_meta['order_payment']['received'][$key]['invoice_ref'] ) ? $order_meta['order_invoice_ref'] : $order_meta['order_payment']['received'][$key]['invoice_ref'] ) : '';
+				$allow_send_invoice = get_option('wpshop_send_invoice');
+				$invoice_attachment_file = (!empty($allow_send_invoice)) ? wpshop_modules_billing::generate_invoice_for_email($order_id, empty($order_meta['order_payment']['received'][$key]['invoice_ref']) ? $order_meta['order_invoice_ref'] : $order_meta['order_payment']['received'][$key]['invoice_ref']) : '';
 
-				$email_option = get_option( 'wpshop_emails' );
+				$email_option = get_option('wpshop_emails');
 
-				$shipping_mode_option = get_option( 'wps_shipping_mode' );
-				$shipping_method = ( !empty($order_meta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_meta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_meta['order_payment']['shipping_method']]['name'] : ( (!empty($order_meta['order_payment']['shipping_method']) ) ? $order_meta['order_payment']['shipping_method'] : '' );
+				$shipping_mode_option = get_option('wps_shipping_mode');
+				$shipping_method = (!empty($order_meta['order_payment']['shipping_method']) && !empty($shipping_mode_option) && !empty($shipping_mode_option['modes']) && is_array($shipping_mode_option['modes']) && array_key_exists($order_meta['order_payment']['shipping_method'], $shipping_mode_option['modes'])) ? $shipping_mode_option['modes'][$order_meta['order_payment']['shipping_method']]['name'] : ((!empty($order_meta['order_payment']['shipping_method'])) ? $order_meta['order_payment']['shipping_method'] : '');
 
-				$payment_method_option = get_option( 'wps_payment_mode' );
-				$order_payment_method = ( !empty($payment_method_option) && !empty($payment_method_option['mode'])  && !empty($order_meta['order_payment']['customer_choice']['method'])  && !empty($payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']])  ) ? $payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']]['name'] : $order_meta['order_payment']['customer_choice']['method'];
+				$payment_method_option = get_option('wps_payment_mode');
+				$order_payment_method = (!empty($payment_method_option) && !empty($payment_method_option['mode']) && !empty($order_meta['order_payment']['customer_choice']['method']) && !empty($payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']])) ? $payment_method_option['mode'][$order_meta['order_payment']['customer_choice']['method']]['name'] : $order_meta['order_payment']['customer_choice']['method'];
 
-				if ( !empty( $email_option ) && !empty( $email_option['send_confirmation_order_message'] ) && $payment_status == 'completed'
-						&& ( !isset( $params_array[ 'send_received_payment_email' ] ) || ( true == $params_array[ 'send_received_payment_email' ] ) ) ) {
-					$wps_message->wpshop_prepared_email($email, 'WPSHOP_ORDER_CONFIRMATION_MESSAGE', array('order_id' => $order_id,'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_key' => ( ( !empty($order_meta['order_key']) ) ? $order_meta['order_key'] : ''),'order_date' => current_time('mysql', 0),  'order_payment_method' => $order_payment_method, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '',  'order_shipping_method' => $shipping_method ) );
+				if (!empty($email_option) && !empty($email_option['send_confirmation_order_message']) && $payment_status == 'completed'
+						&& (!isset($params_array['send_received_payment_email']) || (true == $params_array['send_received_payment_email']))) {
+					$wps_message->wpshop_prepared_email($email, 'WPSHOP_ORDER_CONFIRMATION_MESSAGE', array('order_id' => $order_id, 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'customer_email' => $email, 'order_key' => ((!empty($order_meta['order_key'])) ? $order_meta['order_key'] : ''), 'order_date' => current_time('mysql', 0), 'order_payment_method' => $order_payment_method, 'order_content' => '', 'order_addresses' => '', 'order_customer_comments' => '', 'order_billing_address' => '', 'order_shipping_address' => '', 'order_shipping_method' => $shipping_method));
 				}
 
-				if ( !isset( $params_array[ 'send_received_payment_email' ] ) || ( true == $params_array[ 'send_received_payment_email' ] ) ) {
-					$wps_message->wpshop_prepared_email( $email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'order_shipping_method' => $shipping_method), array(), $invoice_attachment_file);
+				if (!isset($params_array['send_received_payment_email']) || (true == $params_array['send_received_payment_email'])) {
+					$wps_message->wpshop_prepared_email($email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'order_shipping_method' => $shipping_method), array(), $invoice_attachment_file);
 				}
 			}
 			else {
@@ -634,13 +634,13 @@ 
 
 			$order_meta['order_status'] = $payment_status;
 
-			update_post_meta( $order_id, '_wpshop_order_status', $payment_status);
-			if( $save_metadata ) {
-				update_post_meta( $order_id, '_order_postmeta', $order_meta);
+			update_post_meta($order_id, '_wpshop_order_status', $payment_status);
+			if ($save_metadata) {
+				update_post_meta($order_id, '_order_postmeta', $order_meta);
 			}
 		}
-		do_action( 'wps_after_check_order_payment_total_amount', $order_id );
-		if ( ! $save_metadata ) {
+		do_action('wps_after_check_order_payment_total_amount', $order_id);
+		if (!$save_metadata) {
 			return $order_meta;
 		}
 	}
@@ -653,11 +653,11 @@ 
 	 * @param integer $order_id The order identifier we want to get the old transaction reference for
 	 * @return integer
 	 */
-	public static function get_payment_transaction_number_old_way($order_id){
+	public static function get_payment_transaction_number_old_way($order_id) {
 		$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 		$transaction_indentifier = 0;
-		if(!empty($order_postmeta['payment_method'])){
-			switch($order_postmeta['payment_method']){
+		if (!empty($order_postmeta['payment_method'])) {
+			switch ($order_postmeta['payment_method']) {
 				case 'check':
 					$transaction_indentifier = get_post_meta($order_id, '_order_check_number', true);
 					break;
@@ -676,26 +676,26 @@ 
 		return $transaction_indentifier;
 	}
 
-	public static function reverify_payment_invoice_ref( $order_id, $index_payment ) {
+	public static function reverify_payment_invoice_ref($order_id, $index_payment) {
 		$status = false;
-		$order_meta = get_post_meta( $order_id, '_order_postmeta', true );
-		if( !empty( $order_meta ) && !empty( $order_meta['order_payment'] ) && !empty( $order_meta['order_payment']['received'] ) && !empty( $order_meta['order_payment']['received'][$index_payment] ) && empty( $order_meta['order_payment']['received'][$index_payment]['invoice_ref'] ) ) {
+		$order_meta = get_post_meta($order_id, '_order_postmeta', true);
+		if (!empty($order_meta) && !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['received']) && !empty($order_meta['order_payment']['received'][$index_payment]) && empty($order_meta['order_payment']['received'][$index_payment]['invoice_ref'])) {
 			$order_invoice = $invoice_ref = false;
 
-			end( $order_meta['order_payment']['received'] );
-			$last_payment = key( $order_meta['order_payment']['received'] );
-			if( $last_payment == $index_payment ) {
+			end($order_meta['order_payment']['received']);
+			$last_payment = key($order_meta['order_payment']['received']);
+			if ($last_payment == $index_payment) {
 				$payments = 0;
-				foreach( $order_meta['order_payment']['received'] as $payment ) {
-					$payments += ( $payment['status'] == 'payment_received' ) ? $payment['received_amount'] : 0;
+				foreach ($order_meta['order_payment']['received'] as $payment) {
+					$payments += ($payment['status'] == 'payment_received') ? $payment['received_amount'] : 0;
 				}
-				if( $order_meta['order_grand_total'] <= $payments ) {
-					if( $order_meta['order_status'] == 'partially_paid' ) {
-						$order_status_meta = get_post_meta( $order_id, '_wpshop_order_status', true );
+				if ($order_meta['order_grand_total'] <= $payments) {
+					if ($order_meta['order_status'] == 'partially_paid') {
+						$order_status_meta = get_post_meta($order_id, '_wpshop_order_status', true);
 						$order_meta['order_status'] = 'completed';
-						$status = (bool)update_post_meta( $order_id, '_wpshop_order_status', 'completed' );
+						$status = (bool)update_post_meta($order_id, '_wpshop_order_status', 'completed');
 					}
-					if( !empty( $order_meta['order_invoice_ref'] ) ) {
+					if (!empty($order_meta['order_invoice_ref'])) {
 						$invoice_ref = $order_meta['order_invoice_ref'];
 						$status = true;
 					} else {
@@ -706,16 +706,16 @@ 
 				$status = true;
 			}
 
-			if( $status ) {
-				if( empty( $invoice_ref ) ) {
-					$invoice_ref = wpshop_modules_billing::generate_invoice_number( $order_id );
-					if( $order_invoice ) {
+			if ($status) {
+				if (empty($invoice_ref)) {
+					$invoice_ref = wpshop_modules_billing::generate_invoice_number($order_id);
+					if ($order_invoice) {
 						$order_meta['order_invoice_ref'] = $invoice_ref;
 					}
 				}
 
 				$order_meta['order_payment']['received'][$index_payment]['invoice_ref'] = $invoice_ref;
-				$status = (bool)update_post_meta( $order_id, '_order_postmeta', $order_meta );
+				$status = (bool)update_post_meta($order_id, '_order_postmeta', $order_meta);
 			}
 		}
 		return $status;

Braces +12 added lines, -12 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' ) ) {
@@ -40,9 +42,11 @@ 
 
 	public static function construct_url_parameters($url, $param, $value) {
 		$interoguation_marker_pos = strpos($url, '?');
-		if($interoguation_marker_pos===false)
-			return $url.'?'.$param.'='.$value;
-		else return $url.'&'.$param.'='.$value;
+		if($interoguation_marker_pos===false) {
+					return $url.'?'.$param.'='.$value;
+		} else {
+			return $url.'&'.$param.'='.$value;
+		}
 	}
 
 	/**
@@ -167,8 +171,7 @@ 
 					$tpl_component['CHECKOUT_PAYMENT_METHOD_IDENTIFIER'] = $payment_method_identifier;
 					if ( !empty($payment_mode['logo']) && (int)$payment_mode['logo'] != 0 ) {
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? wp_get_attachment_image( $payment_method_def['payment_method_icon'], 'thumbnail', false, array('class' => 'wps_shipping_mode_logo') ) : '';
-					}
-					else {
+					} else {
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_method_def['payment_method_icon']) ) ? '<img src="' .$payment_method_def['payment_method_icon']. '" alt="" />' : '';
 					}
 					//$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = $payment_method_def['payment_method_icon'];
@@ -200,8 +203,7 @@ 
 
 						if ( !empty($payment_config['logo']) && (int)$payment_config['logo'] != 0 ) {
 							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? wp_get_attachment_image( $payment_config['logo'], 'thumbnail', false ) : '';
-						}
-						else {
+						} else {
 							$tpl_component['CHECKOUT_PAYMENT_METHOD_ICON'] = ( !empty($payment_config['logo']) ) ? '<img src="' .$payment_config['logo']. '" alt="' .$payment_config['name']. '" />' : '';
 						}
 						$tpl_component['CHECKOUT_PAYMENT_METHOD_NAME'] = ( !empty($payment_config['name']) ) ? $payment_config['name'] : '';
@@ -599,8 +601,7 @@ 
 					if( !empty($order_meta['order_payment']) && !empty($order_meta['order_payment']['shipping_method']) && $order_meta['order_payment']['shipping_method'] == 'default_shipping_mode_for_pos' ) {
 						$payment_status = 'pos';
 					}
-				}
-				else {
+				} else {
 					$payment_status = 'partially_paid';
 				}
 
@@ -627,8 +628,7 @@ 
 				if ( !isset( $params_array[ 'send_received_payment_email' ] ) || ( true == $params_array[ 'send_received_payment_email' ] ) ) {
 					$wps_message->wpshop_prepared_email( $email, 'WPSHOP_OTHERS_PAYMENT_CONFIRMATION_MESSAGE', array('order_key' => $order_meta['order_key'], 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'order_date' => $order_meta['order_date'], 'order_shipping_method' => $shipping_method), array(), $invoice_attachment_file);
 				}
-			}
-			else {
+			} else {
 				$payment_status = $bank_response;
 			}
 

includes/librairies/payments/paypal.class.php

Indentation +2 added lines, -2 removed lines

@@ -149,8 +149,8 @@
 	}
 
 	/**
-	* Display the paypal form in order to redirect correctly to paypal
-	*/
+	 * Display the paypal form in order to redirect correctly to paypal
+	 */
 	public static function display_form($oid) {
 		global $wpdb;
 		$order = get_post_meta($oid, '_order_postmeta', true);

Braces +13 added lines, -13 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' ) ) {
@@ -45,8 +47,7 @@ 
 			if($paypalMode == 'sandbox') {
 				$fp = fsockopen ('ssl://sandbox.paypal.com', 443, $errno, $errstr, 30);
 				$host = "www.sandbox.paypal.com";
-			}
-			else {
+			} else {
 				$fp = fsockopen ('ssl://www.paypal.com', 443, $errno, $errstr, 30);
 				$host = "www.paypal.com";
 			}
@@ -84,8 +85,7 @@ 
 
 			if (!$fp){
 				echo 'HTTP ERROR!';
-			}
-			else {
+			} else {
 				fputs ($fp, $header.$req);
 				while (!feof($fp)) {
 					$res = fgets ($fp, 1024);
@@ -113,13 +113,11 @@ 
 								/*	Check if the paid amount is equal to the order amount	*/
 								if ( $amount_paid == $amount2pay ) {
 									$payment_status = 'completed';
-								}
-								else {
+								} else {
 									$payment_status = 'incorrect_amount';
 								}
 
-							}
-							else {
+							} else {
 								@mail($notify_email, 'VERIFIED DUPLICATED TRANSACTION', 'VERIFIED DUPLICATED TRANSACTION');
 								$payment_status = 'completed';
 							}
@@ -164,8 +162,11 @@ 
 			if(!empty($paypalBusinessEmail)) {
 
 				$paypalMode = get_option('wpshop_paypalMode', null);
-				if($paypalMode == 'sandbox') $paypal = 'https://www.sandbox.paypal.com/cgi-bin/webscr';
-				else $paypal = 'https://www.paypal.com/cgi-bin/webscr';
+				if($paypalMode == 'sandbox') {
+					$paypal = 'https://www.sandbox.paypal.com/cgi-bin/webscr';
+				} else {
+					$paypal = 'https://www.paypal.com/cgi-bin/webscr';
+				}
 
 				$current_currency = get_option('wpshop_shop_default_currency');
 				$query = $wpdb->prepare('SELECT code_iso FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE id =%d ', $current_currency );
@@ -202,8 +203,7 @@ 
 									<input id="quantity_'.$i.'" name="quantity_'.$i.'" type="hidden" value="1" />
 									<input id="amount_'.$i.'" name="amount_'.$i.'" type="hidden" value="'.number_format($order['order_amount_to_pay_now'], 2, '.', '').'" />
 									';
-				}
-				else {
+				} else {
 
 					$output .=	'
 									<input id="item_number_'.$i.'" name="item_number_'.$i.'" type="hidden" value="' .$order['order_key']. '" />

Spacing +64 added lines, -64 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'));
 }
 
 /**
@@ -18,38 +18,38 @@ 
 class wpshop_paypal {
 
 	public function __construct() {
-		add_filter( 'wps_payment_mode_interface_paypal', array( &$this, 'display_admin_part') );
+		add_filter('wps_payment_mode_interface_paypal', array(&$this, 'display_admin_part'));
 
 		/** Check if SystemPay is registred in Payment Main Option **/
-		$payment_option = get_option( 'wps_payment_mode' );
-		if ( !empty($payment_option) && !empty($payment_option['mode']) && !array_key_exists('paypal', $payment_option['mode']) ) {
+		$payment_option = get_option('wps_payment_mode');
+		if (!empty($payment_option) && !empty($payment_option['mode']) && !array_key_exists('paypal', $payment_option['mode'])) {
 			$payment_option['mode']['paypal']['name'] = __('Paypal', 'wpshop');
-			$payment_option['mode']['paypal']['logo'] = WPSHOP_TEMPLATES_URL.'wpshop/medias/paypal.png';
+			$payment_option['mode']['paypal']['logo'] = WPSHOP_TEMPLATES_URL . 'wpshop/medias/paypal.png';
 			$payment_option['mode']['paypal']['description'] = __('<strong>Tips</strong> : If you have a Paypal account, by choosing this payment method, you will be redirected to the secure payment site Paypal to make your payment. Debit your PayPal account, immediate booking products.', 'wpshop');
-			update_option( 'wps_payment_mode', $payment_option );
+			update_option('wps_payment_mode', $payment_option);
 		}
 
-		$payment_listener = !empty( $_GET['paymentListener'] ) ? sanitize_text_field( $_GET['paymentListener'] ) : '';
+		$payment_listener = !empty($_GET['paymentListener']) ? sanitize_text_field($_GET['paymentListener']) : '';
 
-		if(!empty($payment_listener) && $payment_listener=='paypal') {
+		if (!empty($payment_listener) && $payment_listener == 'paypal') {
 			$payment_status = 'denied';
 			// read the post from PayPal system and add 'cmd'
 			$req = 'cmd=_notify-validate';
 			// @TODO : REQUEST
-			$post = !empty($_POST) ? (array) $_POST : array();
-			foreach ( $post as $key => $value) {
+			$post = !empty($_POST) ? (array)$_POST : array();
+			foreach ($post as $key => $value) {
 				$value = urlencode(stripslashes($value));
 				$req .= "&$key=$value";
 			}
 
 			// If testing on Sandbox use:
 			$paypalMode = get_option('wpshop_paypalMode', null);
-			if($paypalMode == 'sandbox') {
-				$fp = fsockopen ('ssl://sandbox.paypal.com', 443, $errno, $errstr, 30);
+			if ($paypalMode == 'sandbox') {
+				$fp = fsockopen('ssl://sandbox.paypal.com', 443, $errno, $errstr, 30);
 				$host = "www.sandbox.paypal.com";
 			}
 			else {
-				$fp = fsockopen ('ssl://www.paypal.com', 443, $errno, $errstr, 30);
+				$fp = fsockopen('ssl://www.paypal.com', 443, $errno, $errstr, 30);
 				$host = "www.paypal.com";
 			}
 
@@ -64,45 +64,45 @@ 
 			$shipping = $_POST['mc_shipping']; // frais de livraison
 			$business = $_POST['business']; // compte pro
 			$order_id = (int)$_POST['invoice']; // num de facture
-			$receiver_email = sanitize_text_field( $_POST['receiver_email'] );
+			$receiver_email = sanitize_text_field($_POST['receiver_email']);
 			$amount_paid = $_POST['mc_gross']; // total (hors frais livraison)
 			$txn_id = $_POST['txn_id']; // num�ro de transaction
 			$payment_status = $_POST['payment_status']; // status du paiement
 			$payer_email = $_POST['payer_email']; // email du client
-			$txn_type = sanitize_text_field( $_POST['txn_type'] );
+			$txn_type = sanitize_text_field($_POST['txn_type']);
 
 			// @TODO : REQUEST
-			$post = !empty($_POST) ? (array) $_POST : array();
-			if ( !empty($post) ) {
-				foreach ( $post as $key => $value) {
-					if ( substr($key, 0, 9) == 'item_name' ) {
+			$post = !empty($_POST) ? (array)$_POST : array();
+			if (!empty($post)) {
+				foreach ($post as $key => $value) {
+					if (substr($key, 0, 9) == 'item_name') {
 						//$_POST[$key] = htmlentities($value);
 					}
 				}
 			}
 
 			/**	Save paypal return data automatically	*/
-			wpshop_payment::save_payment_return_data( $order_id );
+			wpshop_payment::save_payment_return_data($order_id);
 
 			$notify_email = get_option('wpshop_paypalEmail', null); // email address to which debug emails are sent to
 
-			if (!$fp){
+			if (!$fp) {
 				echo 'HTTP ERROR!';
 			}
 			else {
-				fputs ($fp, $header.$req);
+				fputs($fp, $header . $req);
 				while (!feof($fp)) {
-					$res = fgets ($fp, 1024);
-					if (strcmp ($res, "VERIFIED") == 0) {
+					$res = fgets($fp, 1024);
+					if (strcmp($res, "VERIFIED") == 0) {
 						$paypalBusinessEmail = get_option('wpshop_paypalEmail', null);
 
 						/**	Check if payment has been send to good paypal account	*/
 						if ($receiver_email == $paypalBusinessEmail) {
 							/**	Get the payment transaction identifier	*/
-							$paypal_txn_id = wpshop_payment::get_payment_transaction_number( $order_id,  wpshop_payment::get_order_waiting_payment_array_id( $order_id, 'paypal'));
+							$paypal_txn_id = wpshop_payment::get_payment_transaction_number($order_id, wpshop_payment::get_order_waiting_payment_array_id($order_id, 'paypal'));
 
 							/**	If no transaction reference has been saved for this order	*/
-							if ( empty($paypal_txn_id) ) {
+							if (empty($paypal_txn_id)) {
 								/**	Set the payment reference for the order	*/
 								wpshop_payment::set_payment_transaction_number($order_id, $txn_id);
 
@@ -115,7 +115,7 @@ 
 								$amount_paid = number_format(floatval($amount_paid), 2, '.', '');
 
 								/*	Check if the paid amount is equal to the order amount	*/
-								if ( $amount_paid == $amount2pay ) {
+								if ($amount_paid == $amount2pay) {
 									$payment_status = 'completed';
 								}
 								else {
@@ -130,7 +130,7 @@ 
 						}
 					}
 					// if the IPN POST was 'INVALID'...do this
-					elseif (strcmp ($res, "INVALID") == 0) {
+					elseif (strcmp($res, "INVALID") == 0) {
 						@mail($notify_email, "INVALID IPN", "$res\n $req");
 						$payment_status = 'payment_refused';
 					}
@@ -138,15 +138,15 @@ 
 				fclose($fp);
 			}
 
-			$mc_gross = !empty( $_POST['mc_gross'] ) ? (float)$_POST['mc_gross'] : 0;
+			$mc_gross = !empty($_POST['mc_gross']) ? (float)$_POST['mc_gross'] : 0;
 
 			$params_array = array('method' => 'paypal',
 					'waited_amount' => number_format((float)$order['order_amount_to_pay_now'], 2, '.', ''),
-					'status' => ( ( number_format((float)$order['order_amount_to_pay_now'], 2, '.', '') == number_format($mc_gross, 2, '.', '') ) ? 'payment_received' : 'incorrect_amount' ),
+					'status' => ((number_format((float)$order['order_amount_to_pay_now'], 2, '.', '') == number_format($mc_gross, 2, '.', '')) ? 'payment_received' : 'incorrect_amount'),
 					'author' => $order['customer_id'],
 					'payment_reference' => $txn_id,
 					'date' => current_time('mysql', 0),
-					'received_amount' => number_format($mc_gross, 2, '.', '') );
+					'received_amount' => number_format($mc_gross, 2, '.', ''));
 			wpshop_payment::check_order_payment_total_amount($order_id, $params_array, $payment_status);
 
 		}
@@ -162,25 +162,25 @@ 
 		$order = get_post_meta($oid, '_order_postmeta', true);
 
 		// If the order exist
-		if(!empty($order)) {
+		if (!empty($order)) {
 
 			$paypalBusinessEmail = get_option('wpshop_paypalEmail', null);
 
 			// Si l'email Paypal n'est pas vide
-			if(!empty($paypalBusinessEmail)) {
+			if (!empty($paypalBusinessEmail)) {
 
 				$paypalMode = get_option('wpshop_paypalMode', null);
-				if($paypalMode == 'sandbox') $paypal = 'https://www.sandbox.paypal.com/cgi-bin/webscr';
+				if ($paypalMode == 'sandbox') $paypal = 'https://www.sandbox.paypal.com/cgi-bin/webscr';
 				else $paypal = 'https://www.paypal.com/cgi-bin/webscr';
 
 				$current_currency = get_option('wpshop_shop_default_currency');
-				$query = $wpdb->prepare('SELECT code_iso FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE id =%d ', $current_currency );
+				$query = $wpdb->prepare('SELECT code_iso FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id =%d ', $current_currency);
 				$currency = $wpdb->get_var($query);
 
 				$output  = '<script type="text/javascript">jQuery(document).ready(function(){ jQuery("#paypalForm").submit(); });</script>';
 				$output .= '<div class="paypalPaymentLoading"><span>' . __('Redirecting to paypal. Please wait', 'wpshop') . '</span></div>';
 				$output .= '
-						<form action="'.$paypal.'" id="paypalForm" method="post">
+						<form action="'.$paypal . '" id="paypalForm" method="post">
 						<input id="cmd" name="cmd" type="hidden" value="_cart" />
 						<input id="upload" name="upload" type="hidden" value="1" />
 						<input id="charset" name="charset" type="hidden" value="utf-8" />
@@ -188,41 +188,41 @@ 
 						<input id="no_note" name="no_note" type="hidden" value="0" />
 						<input id="rm" name="rm" type="hidden" value="0" />
 
-						<input id="custom" name="custom" type="hidden" value="'.$order['customer_id'].'" />
-						<input id="invoice" name="invoice" type="hidden" value="'.$oid.'" /> <!-- Invoice number -->
-						<input id="business" name="business" type="hidden" value="'.$paypalBusinessEmail.'" /> <!-- Paypal business account -->
+						<input id="custom" name="custom" type="hidden" value="'.$order['customer_id'] . '" />
+						<input id="invoice" name="invoice" type="hidden" value="'.$oid . '" /> <!-- Invoice number -->
+						<input id="business" name="business" type="hidden" value="'.$paypalBusinessEmail . '" /> <!-- Paypal business account -->
 						<input id="cbt" name="cbt" type="hidden" value="' . __('Back to shop', 'wpshop') . '" />
 						<input id="lc" name="lc" type="hidden" value="FR" />
-						<input id="currency_code" name="currency_code" type="hidden" value="'.$currency.'" />
+						<input id="currency_code" name="currency_code" type="hidden" value="'.$currency . '" />
 
-						<input id="return" name="return" type="hidden" value="'.wpshop_payment::get_success_payment_url().'" />
-						<input id="cancel_return" name="cancel_return" type="hidden" value="'.wpshop_payment::get_cancel_payment_url().'" />
-						<input id="notify_url" name="notify_url" type="hidden" value="'.wpshop_payment::construct_url_parameters(trailingslashit(home_url()), 'paymentListener', 'paypal').'" />
+						<input id="return" name="return" type="hidden" value="'.wpshop_payment::get_success_payment_url() . '" />
+						<input id="cancel_return" name="cancel_return" type="hidden" value="'.wpshop_payment::get_cancel_payment_url() . '" />
+						<input id="notify_url" name="notify_url" type="hidden" value="'.wpshop_payment::construct_url_parameters(trailingslashit(home_url()), 'paymentListener', 'paypal') . '" />
 				';
 
-				$i=1;
-				if ( !empty( $order['order_partial_payment']) && !empty($order['order_partial_payment']['amount_of_partial_payment']) ) {
-					$output .=	'
-									<input id="item_number_'.$i.'" name="item_number_'.$i.'" type="hidden" value="' .$oid. '_partial_payment" />
-									<input id="item_name_'.$i.'" name="item_name_'.$i.'" type="hidden" value="'.__('Partial payment', 'wpshop').' (' .__('Order number', 'wpshop'). ' : ' .$order['order_key']. ')" />
-									<input id="quantity_'.$i.'" name="quantity_'.$i.'" type="hidden" value="1" />
-									<input id="amount_'.$i.'" name="amount_'.$i.'" type="hidden" value="'.number_format($order['order_amount_to_pay_now'], 2, '.', '').'" />
+				$i = 1;
+				if (!empty($order['order_partial_payment']) && !empty($order['order_partial_payment']['amount_of_partial_payment'])) {
+					$output .= '
+									<input id="item_number_'.$i . '" name="item_number_' . $i . '" type="hidden" value="' . $oid . '_partial_payment" />
+									<input id="item_name_'.$i . '" name="item_name_' . $i . '" type="hidden" value="' . __('Partial payment', 'wpshop') . ' (' . __('Order number', 'wpshop') . ' : ' . $order['order_key'] . ')" />
+									<input id="quantity_'.$i . '" name="quantity_' . $i . '" type="hidden" value="1" />
+									<input id="amount_'.$i . '" name="amount_' . $i . '" type="hidden" value="' . number_format($order['order_amount_to_pay_now'], 2, '.', '') . '" />
 									';
 				}
 				else {
 
-					$output .=	'
-									<input id="item_number_'.$i.'" name="item_number_'.$i.'" type="hidden" value="' .$order['order_key']. '" />
-									<input id="item_name_'.$i.'" name="item_name_'.$i.'" type="hidden" value="' .__('Current order', 'wpshop'). ' : ' .$order['order_key']. '" />
-									<input id="quantity_'.$i.'" name="quantity_'.$i.'" type="hidden" value="1" />
-									<input id="amount_'.$i.'" name="amount_'.$i.'" type="hidden" value="'.number_format($order['order_amount_to_pay_now'], 2, '.', '').'" />
+					$output .= '
+									<input id="item_number_'.$i . '" name="item_number_' . $i . '" type="hidden" value="' . $order['order_key'] . '" />
+									<input id="item_name_'.$i . '" name="item_name_' . $i . '" type="hidden" value="' . __('Current order', 'wpshop') . ' : ' . $order['order_key'] . '" />
+									<input id="quantity_'.$i . '" name="quantity_' . $i . '" type="hidden" value="1" />
+									<input id="amount_'.$i . '" name="amount_' . $i . '" type="hidden" value="' . number_format($order['order_amount_to_pay_now'], 2, '.', '') . '" />
 									';
 
 				}
 
 
 
-				$output .=	'<noscript><input type="submit" value="' . __('Checkout', 'wpshop') . '" /></noscript></form>';
+				$output .= '<noscript><input type="submit" value="' . __('Checkout', 'wpshop') . '" /></noscript></form>';
 			}
 		}
 
@@ -232,16 +232,16 @@ 
 
 	function display_admin_part() {
 		$paypalEmail = get_option('wpshop_paypalEmail');
-		$paypalMode = get_option('wpshop_paypalMode',0);
+		$paypalMode = get_option('wpshop_paypalMode', 0);
 		$output  = '<div class="wps-boxed">';
-		$output .= '<div class="wps-form-group"><label>'.__('Business email','wpshop').'</label><div class="wps-form"><input name="wpshop_paypalEmail" type="text" value="'.$paypalEmail.'" /></div></div>';
-		$output .= '<label class="simple_right">'.__('Mode','wpshop').'</label>';
+		$output .= '<div class="wps-form-group"><label>' . __('Business email', 'wpshop') . '</label><div class="wps-form"><input name="wpshop_paypalEmail" type="text" value="' . $paypalEmail . '" /></div></div>';
+		$output .= '<label class="simple_right">' . __('Mode', 'wpshop') . '</label>';
 		$output .= '<div class="wps-form"><select name="wpshop_paypalMode">';
-		$output .= '<option value="normal"'.(($paypalMode=='sandbox') ? null : ' selected="selected"').'>'.__('Production mode','wpshop').'</option>';
-		$output .= '<option value="sandbox"'.(($paypalMode=='sandbox') ? ' selected="selected"' : null).'>'.__('Sandbox mode','wpshop').'</option>';
+		$output .= '<option value="normal"' . (($paypalMode == 'sandbox') ? null : ' selected="selected"') . '>' . __('Production mode', 'wpshop') . '</option>';
+		$output .= '<option value="sandbox"' . (($paypalMode == 'sandbox') ? ' selected="selected"' : null) . '>' . __('Sandbox mode', 'wpshop') . '</option>';
 		$output .= '</select>';
 		$output .= '</div>';
-		$output .= '<a href="#" title="'.__('This checkbox allow to use Paypal in Sandbox mode (test) or production mode (real money)','wpshop').'" class="wpshop_infobulle_marker">?</a>';
+		$output .= '<a href="#" title="' . __('This checkbox allow to use Paypal in Sandbox mode (test) or production mode (real money)', 'wpshop') . '" class="wpshop_infobulle_marker">?</a>';
 		$output .= '</div>';
 		return $output;
 	}

includes/librairies/db/db_data_definition.php

Spacing +11 added lines, -11 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'));
 }
 
 /**
@@ -21,7 +21,7 @@ 
 $wpshop_db_content_update = array();
 $wpshop_db_options_add = array();
 $wpshop_db_options_update = array();
-$wpshop_db_delete= array();
+$wpshop_db_delete = array();
 $wpshop_db_version = 0;
 
 {/*	Version 0	*/
@@ -76,12 +76,12 @@ 
 	$wpshop_eav_content[$wpshop_db_version]['attributes'][] = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
 
 	/*	Default attribute group	*/
-	$wpshop_eav_content[$wpshop_db_version]['attribute_groups'][WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['default'][] = array('code' => 'important_datas', 'name' => __('Product', 'wpshop'), 'details' => array( 'product_attribute_set_id', 'barcode', 'product_price', 'tx_tva', 'manage_stock', 'product_stock', 'product_weight'), 'backend_display_type' => 'movable-tab' );
+	$wpshop_eav_content[$wpshop_db_version]['attribute_groups'][WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['default'][] = array('code' => 'important_datas', 'name' => __('Product', 'wpshop'), 'details' => array('product_attribute_set_id', 'barcode', 'product_price', 'tx_tva', 'manage_stock', 'product_stock', 'product_weight'), 'backend_display_type' => 'movable-tab');
 	$wpshop_eav_content[$wpshop_db_version]['attribute_groups'][WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['default'][] = array('code' => 'general', 'name' => __('Main information', 'wpshop'), 'details' => array('product_reference', 'cost_of_postage',));
 	$wpshop_eav_content[$wpshop_db_version]['attribute_groups'][WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['default'][] = array('code' => 'feature', 'name' => __('Feature', 'wpshop'), 'details' => array('product_height', 'product_width'));
 	$wpshop_eav_content[$wpshop_db_version]['attribute_groups'][WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['default'][] = array('code' => 'additionnal_informations', 'name' => __('Additionnal informations', 'wpshop'), 'details' => array());
 
-	$wpshop_eav_content[$wpshop_db_version]['attribute_groups'][WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['default'][] = array( 'name' => __('Prices', 'wpshop'), 'code' => 'prices', 'details' => array( 'price_ht', 'tva', ));
+	$wpshop_eav_content[$wpshop_db_version]['attribute_groups'][WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['default'][] = array('name' => __('Prices', 'wpshop'), 'code' => 'prices', 'details' => array('price_ht', 'tva',));
 
 	/*	Update attribute with default unit	*/
 	$wpshop_db_content_update[$wpshop_db_version][WPSHOP_DBT_ATTRIBUTE][] = array('datas' => array('last_update_date' => current_time('mysql', 0), '_unit_group_id' => 1, '_default_unit' => 2), 'where' => array('code' => 'product_height'));
@@ -162,7 +162,7 @@ 
 
 	/*	Add shop type	*/
 	$current_db_version = get_option('wpshop_db_options', 0);
-	if(!empty($current_db_version) && $current_db_version['db_version'] >= $wpshop_db_version){
+	if (!empty($current_db_version) && $current_db_version['db_version'] >= $wpshop_db_version) {
 		$wpshop_db_options_add[$wpshop_db_version]['wpshop_shop_type'] = 'sale';
 		$wpshop_db_options_update[$wpshop_db_version]['wpshop_db_options']['installation_state'] = 'completed';
 	}
@@ -182,7 +182,7 @@ 
 	$wpshop_db_content_update[$wpshop_db_version][WPSHOP_DBT_ATTRIBUTE_GROUP][] = array('datas' => array('last_update_date' => current_time('mysql', 0), 'used_in_shop_type' => 'sale'), 'where' => array('code' => 'shipping'));
 
 	/*	Delete useless option	*/
-	$wpshop_db_delete[$wpshop_db_version][] = $wpdb->prepare("DELETE FROM ".$wpdb->options." WHERE option_name=%s", 'wpshop_shop_currencies');
+	$wpshop_db_delete[$wpshop_db_version][] = $wpdb->prepare("DELETE FROM " . $wpdb->options . " WHERE option_name=%s", 'wpshop_shop_currencies');
 }
 
 {/*	Version 20 - Version 1.3.1.9	*/
@@ -226,10 +226,10 @@ 
 
 	$wpshop_eav_content[$wpshop_db_version]['attributes'][] = WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS;
 
-	$wpshop_eav_content[$wpshop_db_version]['attribute_groups'][WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS][__('Billing address', 'wpshop')][] = array('code' => 'billing_address', 'name' => __('Billing address', 'wpshop'), 'details' => array( 'address_title', 'civility', 'address_last_name', 'address_first_name', 'company', 'tva_intra', 'address_user_email', 'address', 'postcode', 'city', 'country', 'state', 'phone', 'longitude', 'latitude'));
+	$wpshop_eav_content[$wpshop_db_version]['attribute_groups'][WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS][__('Billing address', 'wpshop')][] = array('code' => 'billing_address', 'name' => __('Billing address', 'wpshop'), 'details' => array('address_title', 'civility', 'address_last_name', 'address_first_name', 'company', 'tva_intra', 'address_user_email', 'address', 'postcode', 'city', 'country', 'state', 'phone', 'longitude', 'latitude'));
 	$wpshop_eav_content[$wpshop_db_version]['attribute_groups'][WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS][__('Shipping address', 'wpshop')][] = array('code' => 'shipping_address', 'name' => __('Shipping address', 'wpshop'), 'details' => array('address_title', 'civility', 'address_last_name', 'address_first_name', 'company', 'address', 'postcode', 'city', 'country', 'state', 'longitude', 'latitude'));
 
-	$wpshop_eav_content[$wpshop_db_version]['attribute_groups'][WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS][__('Account', 'wpshop')][] = array('code' => 'account', 'name' => __('Account', 'wpshop'), 'details' => array( 'user_login', 'user_pass', 'last_name', 'first_name', 'user_email' ));
+	$wpshop_eav_content[$wpshop_db_version]['attribute_groups'][WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS][__('Account', 'wpshop')][] = array('code' => 'account', 'name' => __('Account', 'wpshop'), 'details' => array('user_login', 'user_pass', 'last_name', 'first_name', 'user_email'));
 }
 
 {/*	Version 40 - Version 1.3.5.4	*/
@@ -251,7 +251,7 @@ 
 {/*	Version 60 - Version 1.3.9.8	*/
 	$wpshop_db_version = 60;
 
-	$wpshop_eav_content[$wpshop_db_version]['attribute_groups'][WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['free_product'][] = array( 'name' => __('Prices', 'wpshop'), 'code' => 'prices', 'details' => array('price_ht', 'product_price', 'tx_tva', 'tva'));
+	$wpshop_eav_content[$wpshop_db_version]['attribute_groups'][WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['free_product'][] = array('name' => __('Prices', 'wpshop'), 'code' => 'prices', 'details' => array('price_ht', 'product_price', 'tx_tva', 'tva'));
 	$wpshop_eav_content[$wpshop_db_version]['attribute_groups'][WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT]['free_product'][] = array('code' => 'general', 'name' => __('Main information', 'wpshop'), 'details' => array('product_reference', 'barcode'));
 }
 

Braces +3 added lines, -1 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' ) ) {

includes/librairies/init.class.php

Indentation +2 added lines, -2 removed lines

@@ -301,8 +301,8 @@
 	}
 
 	/**
-	*	Admin javascript "header script" part definition
-	*/
+	 *	Admin javascript "header script" part definition
+	 */
 	function admin_css_head() {
 		ob_start();
 		include(WPSHOP_CSS_DIR . 'pages/wpshop_product.css');

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' ) ) {
@@ -519,7 +521,9 @@ 
 		$to_exclude=unserialize(WPSHOP_INTERNAL_TYPES_TO_EXCLUDE);
 		if(!empty($to_exclude)):
 			foreach($to_exclude as $excluded_type):
-				if(isset($wp_types[$excluded_type]))unset($wp_types[$excluded_type]);
+				if(isset($wp_types[$excluded_type])) {
+					unset($wp_types[$excluded_type]);
+				}
 			endforeach;
 		endif;
 		DEFINE('WPSHOP_INTERNAL_TYPES', serialize(array_merge($wp_types, array('users' => __('Users', 'wpshop')))));

Spacing +141 added lines, -141 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'));
 }
 
 /**
@@ -22,7 +22,7 @@ 
  * @package wpshop
  * @subpackage librairies
  */
-class wpshop_init{
+class wpshop_init {
 
 	/**
 	 *	This is the function loaded when wordpress load the different plugin
@@ -40,15 +40,15 @@ 
 		/*	Include head js	*/
 		add_action('admin_print_scripts', array('wpshop_init', 'admin_print_js'));
 
-		$page = !empty( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : '';
-		$post_type = !empty( $_GET['post_type'] ) ? sanitize_text_field( $_GET['post_type'] ) : '';
-		$action = !empty( $_GET['action'] ) ? sanitize_text_field( $_GET['action'] ) : '';
-		$post = !empty( $_GET['post'] ) ? (array) $_GET['post'] : '';
-		$taxonomy = !empty( $_GET['taxonomy'] ) ? sanitize_text_field( $_GET['taxonomy'] ) : '';
-		if((isset($page) && substr($page, 0, 7) == 'wpshop_') || (isset($page) && $page == 'wps-installer' ) || (isset($post_type) && substr($post_type, 0, 7) == 'wpshop_') || !empty($post) || (isset($page) && $page==WPSHOP_NEWTYPE_IDENTIFIER_GROUP) || (isset($taxonomy) && ($taxonomy == WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES))){
+		$page = !empty($_GET['page']) ? sanitize_text_field($_GET['page']) : '';
+		$post_type = !empty($_GET['post_type']) ? sanitize_text_field($_GET['post_type']) : '';
+		$action = !empty($_GET['action']) ? sanitize_text_field($_GET['action']) : '';
+		$post = !empty($_GET['post']) ? (array)$_GET['post'] : '';
+		$taxonomy = !empty($_GET['taxonomy']) ? sanitize_text_field($_GET['taxonomy']) : '';
+		if ((isset($page) && substr($page, 0, 7) == 'wpshop_') || (isset($page) && $page == 'wps-installer') || (isset($post_type) && substr($post_type, 0, 7) == 'wpshop_') || !empty($post) || (isset($page) && $page == WPSHOP_NEWTYPE_IDENTIFIER_GROUP) || (isset($taxonomy) && ($taxonomy == WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES))) {
 			/*	Include the different javascript	*/
 // 			add_action('admin_init', array('wpshop_init', 'admin_js'));
-			add_action( 'admin_enqueue_scripts', array('wpshop_init', 'admin_js') );
+			add_action('admin_enqueue_scripts', array('wpshop_init', 'admin_js'));
 			add_action('admin_footer', array('wpshop_init', 'admin_js_footer'));
 
 			/*	Include the different css	*/
@@ -57,28 +57,28 @@ 
 		add_action('admin_init', array('wpshop_init', 'admin_css'));
 
 		/*	Include the different css	*/
-		if ( !is_admin() ) {
+		if (!is_admin()) {
 			add_action('wp_print_styles', array('wpshop_init', 'frontend_css'));
 			add_action('wp_print_scripts', array('wpshop_init', 'frontend_js_instruction'));
 		}
 
-		if (isset($page,$action) && $page=='wpshop_doc' && $action=='edit') {
+		if (isset($page, $action) && $page == 'wpshop_doc' && $action == 'edit') {
 			add_action('admin_init', array('wpshop_doc', 'init_wysiwyg'));
 		}
 
 		// RICH TEXT EDIT INIT
-		add_action('init', array('wpshop_display','wpshop_rich_text_tags'), 9999);
-		add_action('init', array('wpshop_display','wps_hide_admin_bar_for_customers'), 9999 );
+		add_action('init', array('wpshop_display', 'wpshop_rich_text_tags'), 9999);
+		add_action('init', array('wpshop_display', 'wps_hide_admin_bar_for_customers'), 9999);
 
 		/**	Adda custom class to the admin body	*/
-		add_filter( 'admin_body_class', array( 'wpshop_init', 'admin_body_class' ) );
-		add_filter( 'site_transient_update_plugins', array( 'wpshop_init', 'site_transient_update_plugins' ) );
+		add_filter('admin_body_class', array('wpshop_init', 'admin_body_class'));
+		add_filter('site_transient_update_plugins', array('wpshop_init', 'site_transient_update_plugins'));
 	}
 
 	/**
 	 *	Admin menu creation
 	 */
-	public static function admin_menu(){
+	public static function admin_menu() {
 		global $menu;
 
 		/*	Get current plugin version	*/
@@ -86,17 +86,17 @@ 
 
 		$wpshop_catalog_menu_order = 34;
 
-		$menu[ $wpshop_catalog_menu_order-1 ] = array( '', 'read', 'separator-wpshop_dashboard', '', 'wp-menu-separator wpshop_dashboard' );
+		$menu[$wpshop_catalog_menu_order - 1] = array('', 'read', 'separator-wpshop_dashboard', '', 'wp-menu-separator wpshop_dashboard');
 
 		/*	Main menu creation	*/
 		global $wps_dashboard_ctr;
-		add_menu_page(__( 'Dashboard', 'wpshop' ), __( 'Shop', 'wpshop' ), 'wpshop_view_dashboard', WPSHOP_URL_SLUG_DASHBOARD, array( $wps_dashboard_ctr, 'display_dashboard' ), 'dashicons-admin-home', $wpshop_catalog_menu_order);
-		add_submenu_page(WPSHOP_URL_SLUG_DASHBOARD, __('Dashboard', 'wpshop' ), __('Dashboard', 'wpshop'), 'wpshop_view_dashboard', WPSHOP_URL_SLUG_DASHBOARD, array( $wps_dashboard_ctr, 'display_dashboard' ));
+		add_menu_page(__('Dashboard', 'wpshop'), __('Shop', 'wpshop'), 'wpshop_view_dashboard', WPSHOP_URL_SLUG_DASHBOARD, array($wps_dashboard_ctr, 'display_dashboard'), 'dashicons-admin-home', $wpshop_catalog_menu_order);
+		add_submenu_page(WPSHOP_URL_SLUG_DASHBOARD, __('Dashboard', 'wpshop'), __('Dashboard', 'wpshop'), 'wpshop_view_dashboard', WPSHOP_URL_SLUG_DASHBOARD, array($wps_dashboard_ctr, 'display_dashboard'));
 
 		/*	Add eav model menus	*/
-		add_menu_page(__( 'Entities', 'wpshop' ), __( 'Entities', 'wpshop' ), 'wpshop_view_dashboard', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, array('wpshop_display', 'display_page'), 'dashicons-universal-access-alt', $wpshop_catalog_menu_order + 1);
-		add_submenu_page(WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, __( 'Attributes', 'wpshop' ), __('Attributes', 'wpshop'), 'wpshop_view_attributes', WPSHOP_URL_SLUG_ATTRIBUTE_LISTING, array('wpshop_display','display_page'));
-		add_submenu_page(WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, __( 'Attributes groups', 'wpshop' ), __('Attributes groups', 'wpshop'), 'wpshop_view_attribute_set', WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING, array('wpshop_display','display_page'));
+		add_menu_page(__('Entities', 'wpshop'), __('Entities', 'wpshop'), 'wpshop_view_dashboard', WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, array('wpshop_display', 'display_page'), 'dashicons-universal-access-alt', $wpshop_catalog_menu_order + 1);
+		add_submenu_page(WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, __('Attributes', 'wpshop'), __('Attributes', 'wpshop'), 'wpshop_view_attributes', WPSHOP_URL_SLUG_ATTRIBUTE_LISTING, array('wpshop_display', 'display_page'));
+		add_submenu_page(WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, __('Attributes groups', 'wpshop'), __('Attributes groups', 'wpshop'), 'wpshop_view_attribute_set', WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING, array('wpshop_display', 'display_page'));
 
 		/*	Add messages menus	*/
 		//add_submenu_page(WPSHOP_URL_SLUG_DASHBOARD, __( 'Messages', 'wpshop' ), __( 'Messages', 'wpshop'), 'wpshop_view_messages', 'edit.php?post_type='.WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE);
@@ -105,7 +105,7 @@ 
 
 		/*	Add a menu for plugin tools	*/
 // 		if (WPSHOP_DISPLAY_TOOLS_MENU) {
-			add_management_page( __('Wpshop - Tools', 'wpshop' ), __('Wpshop - Tools', 'wpshop' ), 'wpshop_view_tools_menu', WPSHOP_URL_SLUG_TOOLS , array('wpshop_tools', 'main_page'));
+			add_management_page(__('Wpshop - Tools', 'wpshop'), __('Wpshop - Tools', 'wpshop'), 'wpshop_view_tools_menu', WPSHOP_URL_SLUG_TOOLS, array('wpshop_tools', 'main_page'));
 // 		}
 
 		/*	Add the options menu	*/
@@ -119,29 +119,29 @@ 
 		$wpshop_menu_order = array();
 
 		// Get the index of our custom separator
-		$separator = array_search( 'separator-wpshop_dashboard', $menu_order );
-		$product = array_search( 'edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, $menu_order );
-		$order = array_search( 'edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER, $menu_order );
-		$customers = array_search( 'edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $menu_order );
+		$separator = array_search('separator-wpshop_dashboard', $menu_order);
+		$product = array_search('edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, $menu_order);
+		$order = array_search('edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER, $menu_order);
+		$customers = array_search('edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $menu_order);
 		//$entities = array_search( 'admin.php?page=' . WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, $menu_order );
-		$entities = array_search( WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, $menu_order );
+		$entities = array_search(WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, $menu_order);
 
-		unset( $menu_order[$separator] );
-		unset( $menu_order[$product] );
-		unset( $menu_order[$order] );
-		unset( $menu_order[$customers] );
-		unset( $menu_order[$entities] );
+		unset($menu_order[$separator]);
+		unset($menu_order[$product]);
+		unset($menu_order[$order]);
+		unset($menu_order[$customers]);
+		unset($menu_order[$entities]);
 
 		// Loop through menu order and do some rearranging
-		foreach ( $menu_order as $index => $item ) :
-			if ( 'wpshop_dashboard' == $item ) :
+		foreach ($menu_order as $index => $item) :
+			if ('wpshop_dashboard' == $item) :
 				$wpshop_menu_order[] = 'separator-wpshop_dashboard';
 				$wpshop_menu_order[] = $item;
 				$wpshop_menu_order[] = 'edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
 				$wpshop_menu_order[] = 'edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER;
 				$wpshop_menu_order[] = 'edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS;
 				$wpshop_menu_order[] = WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES;
-			elseif ( !in_array( $item, array( 'separator-wpshop_dashboard' ) ) ) :
+			elseif (!in_array($item, array('separator-wpshop_dashboard'))) :
 				$wpshop_menu_order[] = $item;
 			endif;
 		endforeach;
@@ -151,7 +151,7 @@ 
 	}
 
 	public static function admin_custom_menu_order() {
-		return current_user_can( 'manage_options' );
+		return current_user_can('manage_options');
 	}
 
 	/**
@@ -161,18 +161,18 @@ 
 
 		/*	Désactivation de l'enregistrement automatique pour certains type de post	*/
 		global $post;
-		if ( $post && ( (get_post_type($post->ID) === WPSHOP_NEWTYPE_IDENTIFIER_ORDER) ||  (get_post_type($post->ID) === WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE)
-				|| (get_post_type($post->ID) === WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES) || (get_post_type($post->ID) === WPSHOP_NEWTYPE_IDENTIFIER_COUPON) ) ) {
+		if ($post && ((get_post_type($post->ID) === WPSHOP_NEWTYPE_IDENTIFIER_ORDER) || (get_post_type($post->ID) === WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE)
+				|| (get_post_type($post->ID) === WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES) || (get_post_type($post->ID) === WPSHOP_NEWTYPE_IDENTIFIER_COUPON))) {
 			wp_dequeue_script('autosave');
 		}
 
-		$entity_to_search = !empty( $_GET['entity_to_search'] ) ? sanitize_text_field( $_GET['entity_to_search'] ) : '';
+		$entity_to_search = !empty($_GET['entity_to_search']) ? sanitize_text_field($_GET['entity_to_search']) : '';
 //	var WPSHOP_AJAX_FILE_URL = "'.WPSHOP_AJAX_FILE_URL.'";
 		echo '
 <script type="text/javascript">
 
-	var WPSHOP_MEDIAS_ICON_URL = "'.WPSHOP_MEDIAS_ICON_URL.'";
-	var WPSHOP_PRODUCT_PRICE_PILOT = "'.WPSHOP_PRODUCT_PRICE_PILOT.'";
+	var WPSHOP_MEDIAS_ICON_URL = "'.WPSHOP_MEDIAS_ICON_URL . '";
+	var WPSHOP_PRODUCT_PRICE_PILOT = "'.WPSHOP_PRODUCT_PRICE_PILOT . '";
 	var WPSHOP_PRODUCT_PRICE_HT = "' . WPSHOP_PRODUCT_PRICE_HT . '";
 	var WPSHOP_PRODUCT_PRICE_TAX = "' . WPSHOP_PRODUCT_PRICE_TAX . '";
 	var WPSHOP_PRODUCT_PRICE_TTC = "' . WPSHOP_PRODUCT_PRICE_TTC . '";
@@ -188,16 +188,16 @@ 
 	var WPSHOP_JS_VAR_ADD_LOGO = "' . __('Upload your logo', 'wpshop') . '";
 	var WPSHOP_NEWOPTION_CREATION_NONCE = "' . wp_create_nonce("wpshop_new_option_for_attribute_creation") . '";
 
-	var WPSHOP_ADD_TEXT = "'.__('Add', 'wpshop').'";
-	var WPSHOP_CREATE_TEXT = "'.__('Create', 'wpshop').'";
-	var WPSHOP_SAVE_PRODUCT_OPTIONS_PARAMS = "'.__('Save parameters', 'wpshop').'";
+	var WPSHOP_ADD_TEXT = "'.__('Add', 'wpshop') . '";
+	var WPSHOP_CREATE_TEXT = "'.__('Create', 'wpshop') . '";
+	var WPSHOP_SAVE_PRODUCT_OPTIONS_PARAMS = "'.__('Save parameters', 'wpshop') . '";
 
-	var WPSHOP_NEW_OPTION_IN_LIST_EMPTY = "'.__('You don\'t specify all needed file', 'wpshop').'";
-	var WPSHOP_IS_NOT_ALLOWED_SHIPPING_COUNTRY = "'.__('Sorry ! You can\'t order on this shop, because we don\'t ship in your country.', 'wpshop').'";
-	var WPSHOP_CONFIRM_BEFORE_GENERATE_INVOICE = "'.__('If you generate the invoice, you will cannot modify this order later. Are you sure to do this action ?', 'wpshop').'";
-	var WPSHOP_NEW_OPTION_ALREADY_EXIST_IN_LIST = "'.__('The value you entered already exist in list', 'wpshop').'";
-	var WPSHOP_SURE_TO_DELETE_ATTR_OPTION_FROM_LIST = "'.__('Are you sure you want to delete this option from list?', 'wpshop').'";
-	var WPSHOP_DEFAULT_VALUE = "'.__('Set as default value', 'wpshop').'";
+	var WPSHOP_NEW_OPTION_IN_LIST_EMPTY = "'.__('You don\'t specify all needed file', 'wpshop') . '";
+	var WPSHOP_IS_NOT_ALLOWED_SHIPPING_COUNTRY = "'.__('Sorry ! You can\'t order on this shop, because we don\'t ship in your country.', 'wpshop') . '";
+	var WPSHOP_CONFIRM_BEFORE_GENERATE_INVOICE = "'.__('If you generate the invoice, you will cannot modify this order later. Are you sure to do this action ?', 'wpshop') . '";
+	var WPSHOP_NEW_OPTION_ALREADY_EXIST_IN_LIST = "'.__('The value you entered already exist in list', 'wpshop') . '";
+	var WPSHOP_SURE_TO_DELETE_ATTR_OPTION_FROM_LIST = "'.__('Are you sure you want to delete this option from list?', 'wpshop') . '";
+	var WPSHOP_DEFAULT_VALUE = "'.__('Set as default value', 'wpshop') . '";
 	var WPSHOP_MSG_INVOICE_QUOTATION = "' . __('Are you sure you want to charge this order? You\'ll be unable to modify the content after this operation', 'wpshop') . '";
 	var WPSHOP_MSG_IGNORE_CONFIGURATION = "' . __('If you continue without install the plugin. Your products won\'t be purchasable', 'wpshop') . '";
 	var WPSHOP_MSG_CONFIRM_THUMBNAIL_DELETION = "' . __('Are you sure you want to delete this thumbnail?', 'wpshop') . '";
@@ -206,55 +206,55 @@ 
 	var WPSHOP_CHOSEN_SELECT_FROM_LIST = "' . __('Select an Option', 'wpshop') . '";
 	var WPSHOP_AJAX_CHOSEN_KEEP_TYPING = "' . __('Keep typing for search launching', 'wpshop') . '";
 	var WPSHOP_AJAX_CHOSEN_SEARCHING = "' . __('Searching in progress for', 'wpshop') . '";
-	var WPSHOP_MSG_CONFIRM_ADDON_DEACTIVATION = "'.__('Are you sure you want to deactivate this addon?', 'wpshop').'";
-	var WPS_DELETE_SHOP_LOGO_MSG = "'.__('Are you sure you want to delete this logo?', 'wpshop').'";
+	var WPSHOP_MSG_CONFIRM_ADDON_DEACTIVATION = "'.__('Are you sure you want to deactivate this addon?', 'wpshop') . '";
+	var WPS_DELETE_SHOP_LOGO_MSG = "'.__('Are you sure you want to delete this logo?', 'wpshop') . '";
 	var WPS_DEFAULT_LOGO = "'.WPSHOP_MEDIAS_IMAGES_URL . 'no_picture.png";
 
-	var WPSHOP_NO_ATTRIBUTES_SELECT_FOR_VARIATION = "'.__('You have to select at least one attribute for creating a new variation', 'wpshop').'";
+	var WPSHOP_NO_ATTRIBUTES_SELECT_FOR_VARIATION = "'.__('You have to select at least one attribute for creating a new variation', 'wpshop') . '";
 
 	var WPSHOP_CHOSEN_ATTRS = {search_contains: true, disable_search_threshold: 5, no_results_text: WPSHOP_CHOSEN_NO_RESULT, placeholder_text_single : WPSHOP_CHOSEN_SELECT_FROM_LIST, placeholder_text_multiple : WPSHOP_CHOSEN_SELECT_FROM_MULTI_LIST};
 
-	var WPSHOP_TEMPLATES_URL = "'.WPSHOP_TEMPLATES_URL.'";
-	var WPSHOP_BUTTON_DESCRIPTION = "'.__('Insert shortcode into page content', 'wpshop').'";
-	var WPSHOP_WYSIWYG_MENU_TITLE_PRODUCT_LISTING = "'.__('Product listing', 'wpshop').'";
-	var WPSHOP_WYSIWYG_PRODUCT_LISTING_BY_PID_TITLE = "'.__('By product ID', 'wpshop').'";
-	var WPSHOP_WYSIWYG_PRODUCT_LISTING_BY_ATTRIBUTE_TITLE = "'.__('By attribute value', 'wpshop').'";
-	var WPSHOP_WYSIWYG_MENU_TITLE_CATEGORIES = "'.__('WPShop categories', 'wpshop').'";
-	var WPSHOP_WYSIWYG_MENU_TITLE_ATTRIBUTE_VALUE = "'.__('Attribute value', 'wpshop').'";
-	var WPSHOP_CUSTOM_MESSAGE_CONTENT_TITLE = "'.__('Custom message content', 'wpshop').'";
-	var WPSHOP_CUSTOM_MESSAGE_CONTENT_CUSTOMER_FIRST_NAME = "'.__('Customer first name', 'wpshop').'";
-	var WPSHOP_CUSTOM_MESSAGE_CONTENT_CUSTOMER_LAST_NAME = "'.__('Customer last name', 'wpshop').'";
-	var WPSHOP_CUSTOM_MESSAGE_CONTENT_CUSTOMER_EMAIL = "'.__('Customer email', 'wpshop').'";
-	var WPSHOP_CUSTOM_MESSAGE_CONTENT_ORDER_ID = "'.__('Order identifer', 'wpshop').'";
-	var WPSHOP_CUSTOM_MESSAGE_CONTENT_PAYPAL_TRANSACTION_ID = "'.__('Paypal transaction ID', 'wpshop').'";
-	var WPSHOP_CUSTOM_MESSAGE_CONTENT_ORDER_CONTENT = "'.__('Order content', 'wpshop').'";
-	var WPSHOP_CUSTOM_MESSAGE_CONTENT_ORDER_CUSTOMER_PERSONNAL_INFORMATIONS = "'.__('Customer personnal informations', 'wpshop').'";
-	var WPSHOP_CUSTOM_MESSAGE_CONTENT_ORDER_ADDRESSES = "'.__('Order addresses', 'wpshop').'";
-	var WPSHOP_CUSTOM_MESSAGE_CONTENT_BILLING_ORDER_ADDRESS = "'.__('Billing order address', 'wpshop').'";
-	var WPSHOP_CUSTOM_MESSAGE_CONTENT_SHIPPING_ORDER_ADDRESS = "'.__('Shipping order address', 'wpshop').'";
-	var WPSHOP_CUSTOM_MESSAGE_CONTENT_SHIPPING_METHOD = "'.__('Shipping method', 'wpshop').'";
-	var WPSHOP_CUSTOM_MESSAGE_CONTENT_ORDER_PAYMENT_METHOD = "'.__('order payment_method', 'wpshop').'";
-	var WPSHOP_CUSTOM_MESSAGE_CONTENT_CUSTOMER_COMMENT = "'.__('Order customer comment', 'wpshop').'";
-	var WPSHOP_CUSTOM_TAGS_TITLE = "'.__('Wpshop custom tags', 'wpshop').'";
-	var WPSHOP_CUSTOM_TAGS_CART = "'.__('Cart', 'wpshop').'";
-	var WPSHOP_CUSTOM_TAGS_CART_MINI = "'.__('Cart widget', 'wpshop').'";
-	var WPSHOP_CUSTOM_TAGS_CHECKOUT = "'.__('Checkout', 'wpshop').'";
-	var WPSHOP_CUSTOM_TAGS_ACCOUNT = "'.__('Customer account', 'wpshop').'";
-	var WPSHOP_CUSTOM_TAGS_SHOP = "'.__('Shop', 'wpshop').'";
-	var WPSHOP_CUSTOM_TAGS_ADVANCED_SEARCH = "'.__('Advanced search', 'wpshop').'";
-	var WPSHOP_CANCEL_ORDER_CONFIRM_MESSAGE = "'.__('Do you want to cancel this order ?', 'wpshop').'";
-	var WPSHOP_REFUND_ORDER_CONFIRM_MESSAGE = "'.__('Do you want to refund this order ?', 'wpshop').'";
-	var WPSHOP_RESEND_ORDER_CONFIRM_MESSAGE = "'.__('Do you want to resend this order to customer ?', 'wpshop').'";
-	var WPSHOP_SEARCH_IN_ORDER_EXPLAIN_MESSAGE = "'.__('You want to search in orders', 'wpshop').'";
-	var WPSHOP_SEARCH_IN_ORDER_CHOICE_CUSTOMER = "'.__('a customer', 'wpshop').'";
-	var WPSHOP_SEARCH_IN_ORDER_CHOICE_PRODUCT = "'.__('a product', 'wpshop').'";
-	var WPSHOP_SEARCH_IN_ORDER_USER_CHOICE = "'.( (!empty($entity_to_search) ) ? $entity_to_search : 'customer' ).'";
-	var WPSHOP_DELETE_ADDRESS_CONFIRMATION = "'.__( 'Do you really want to delete this address', 'wpshop' ).'";
-
-	var wps_options_shipping_weight_for_custom_fees = "'.__( 'You must enter a weight', 'wpshop' ).'";
-	var wps_options_country_choose_for_custom_fees = "'.__( 'You must a country for custom fees saving', 'wpshop' ).'";
-	var wps_options_country_postcode_choose_for_custom_fees = "'.__( 'You must choose a country or write a postcode.', 'wpshop' ).'";
-	var wps_an_error_occured = "'.__( 'An error occured', 'wpshop' ).'";
+	var WPSHOP_TEMPLATES_URL = "'.WPSHOP_TEMPLATES_URL . '";
+	var WPSHOP_BUTTON_DESCRIPTION = "'.__('Insert shortcode into page content', 'wpshop') . '";
+	var WPSHOP_WYSIWYG_MENU_TITLE_PRODUCT_LISTING = "'.__('Product listing', 'wpshop') . '";
+	var WPSHOP_WYSIWYG_PRODUCT_LISTING_BY_PID_TITLE = "'.__('By product ID', 'wpshop') . '";
+	var WPSHOP_WYSIWYG_PRODUCT_LISTING_BY_ATTRIBUTE_TITLE = "'.__('By attribute value', 'wpshop') . '";
+	var WPSHOP_WYSIWYG_MENU_TITLE_CATEGORIES = "'.__('WPShop categories', 'wpshop') . '";
+	var WPSHOP_WYSIWYG_MENU_TITLE_ATTRIBUTE_VALUE = "'.__('Attribute value', 'wpshop') . '";
+	var WPSHOP_CUSTOM_MESSAGE_CONTENT_TITLE = "'.__('Custom message content', 'wpshop') . '";
+	var WPSHOP_CUSTOM_MESSAGE_CONTENT_CUSTOMER_FIRST_NAME = "'.__('Customer first name', 'wpshop') . '";
+	var WPSHOP_CUSTOM_MESSAGE_CONTENT_CUSTOMER_LAST_NAME = "'.__('Customer last name', 'wpshop') . '";
+	var WPSHOP_CUSTOM_MESSAGE_CONTENT_CUSTOMER_EMAIL = "'.__('Customer email', 'wpshop') . '";
+	var WPSHOP_CUSTOM_MESSAGE_CONTENT_ORDER_ID = "'.__('Order identifer', 'wpshop') . '";
+	var WPSHOP_CUSTOM_MESSAGE_CONTENT_PAYPAL_TRANSACTION_ID = "'.__('Paypal transaction ID', 'wpshop') . '";
+	var WPSHOP_CUSTOM_MESSAGE_CONTENT_ORDER_CONTENT = "'.__('Order content', 'wpshop') . '";
+	var WPSHOP_CUSTOM_MESSAGE_CONTENT_ORDER_CUSTOMER_PERSONNAL_INFORMATIONS = "'.__('Customer personnal informations', 'wpshop') . '";
+	var WPSHOP_CUSTOM_MESSAGE_CONTENT_ORDER_ADDRESSES = "'.__('Order addresses', 'wpshop') . '";
+	var WPSHOP_CUSTOM_MESSAGE_CONTENT_BILLING_ORDER_ADDRESS = "'.__('Billing order address', 'wpshop') . '";
+	var WPSHOP_CUSTOM_MESSAGE_CONTENT_SHIPPING_ORDER_ADDRESS = "'.__('Shipping order address', 'wpshop') . '";
+	var WPSHOP_CUSTOM_MESSAGE_CONTENT_SHIPPING_METHOD = "'.__('Shipping method', 'wpshop') . '";
+	var WPSHOP_CUSTOM_MESSAGE_CONTENT_ORDER_PAYMENT_METHOD = "'.__('order payment_method', 'wpshop') . '";
+	var WPSHOP_CUSTOM_MESSAGE_CONTENT_CUSTOMER_COMMENT = "'.__('Order customer comment', 'wpshop') . '";
+	var WPSHOP_CUSTOM_TAGS_TITLE = "'.__('Wpshop custom tags', 'wpshop') . '";
+	var WPSHOP_CUSTOM_TAGS_CART = "'.__('Cart', 'wpshop') . '";
+	var WPSHOP_CUSTOM_TAGS_CART_MINI = "'.__('Cart widget', 'wpshop') . '";
+	var WPSHOP_CUSTOM_TAGS_CHECKOUT = "'.__('Checkout', 'wpshop') . '";
+	var WPSHOP_CUSTOM_TAGS_ACCOUNT = "'.__('Customer account', 'wpshop') . '";
+	var WPSHOP_CUSTOM_TAGS_SHOP = "'.__('Shop', 'wpshop') . '";
+	var WPSHOP_CUSTOM_TAGS_ADVANCED_SEARCH = "'.__('Advanced search', 'wpshop') . '";
+	var WPSHOP_CANCEL_ORDER_CONFIRM_MESSAGE = "'.__('Do you want to cancel this order ?', 'wpshop') . '";
+	var WPSHOP_REFUND_ORDER_CONFIRM_MESSAGE = "'.__('Do you want to refund this order ?', 'wpshop') . '";
+	var WPSHOP_RESEND_ORDER_CONFIRM_MESSAGE = "'.__('Do you want to resend this order to customer ?', 'wpshop') . '";
+	var WPSHOP_SEARCH_IN_ORDER_EXPLAIN_MESSAGE = "'.__('You want to search in orders', 'wpshop') . '";
+	var WPSHOP_SEARCH_IN_ORDER_CHOICE_CUSTOMER = "'.__('a customer', 'wpshop') . '";
+	var WPSHOP_SEARCH_IN_ORDER_CHOICE_PRODUCT = "'.__('a product', 'wpshop') . '";
+	var WPSHOP_SEARCH_IN_ORDER_USER_CHOICE = "'.((!empty($entity_to_search)) ? $entity_to_search : 'customer') . '";
+	var WPSHOP_DELETE_ADDRESS_CONFIRMATION = "'.__('Do you really want to delete this address', 'wpshop') . '";
+
+	var wps_options_shipping_weight_for_custom_fees = "'.__('You must enter a weight', 'wpshop') . '";
+	var wps_options_country_choose_for_custom_fees = "'.__('You must a country for custom fees saving', 'wpshop') . '";
+	var wps_options_country_postcode_choose_for_custom_fees = "'.__('You must choose a country or write a postcode.', 'wpshop') . '";
+	var wps_an_error_occured = "'.__('An error occured', 'wpshop') . '";
 </script>';
 	}
 
@@ -269,8 +269,8 @@ 
 		ob_end_clean();
 
 		echo '<script type="text/javascript">
-			var wp_version = "'.$wp_version.'";
-			'.$wpshop_product_js.'
+			var wp_version = "'.$wp_version . '";
+			'.$wpshop_product_js . '
 		</script>';
 	}
 
@@ -286,21 +286,21 @@ 
 		wp_enqueue_script('jquery-ui-dialog');
 		wp_enqueue_script('jquery-form');
 		wp_enqueue_script('jquery-ui-slider');
-		wp_enqueue_script( 'jquery-ui-autocomplete' );
+		wp_enqueue_script('jquery-ui-autocomplete');
 		wp_enqueue_script('wpshop_main_function_js', WPSHOP_JS_URL . 'main_function.js', '', WPSHOP_VERSION);
 		wp_enqueue_script('wpshop_main_js', WPSHOP_JS_URL . 'main.js', '', WPSHOP_VERSION);
 		wp_enqueue_script('wpshop_jq_datatable', WPSHOP_JS_URL . 'jquery-libs/jquery.dataTables.min.js', '', WPSHOP_VERSION);
-		wp_enqueue_script('wpshop_jquery_chosen',  WPSHOP_JS_URL . 'jquery-libs/chosen.jquery.min.js', '', WPSHOP_VERSION);
+		wp_enqueue_script('wpshop_jquery_chosen', WPSHOP_JS_URL . 'jquery-libs/chosen.jquery.min.js', '', WPSHOP_VERSION);
 		wp_enqueue_script('jquery-effects-core');
 		wp_enqueue_script('jquery-effects-highlight');
 
-		$page = !empty( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : '';
+		$page = !empty($_GET['page']) ? sanitize_text_field($_GET['page']) : '';
 
 		/*	Include specific js file for the current page if existing	*/
-		if(isset($page) && is_file(WPSHOP_JS_DIR . 'pages/' . $page . '.js')){
+		if (isset($page) && is_file(WPSHOP_JS_DIR . 'pages/' . $page . '.js')) {
 			wp_enqueue_script($page . '_js', WPSHOP_JS_URL . 'pages/' . $page . '.js', '', WPSHOP_VERSION);
 		}
-		if((isset($page) && ($page == 'wpshop_dashboard'))) {
+		if ((isset($page) && ($page == 'wpshop_dashboard'))) {
 			wp_enqueue_script($page . '_js', WPSHOP_JS_URL . 'pages/' . WPSHOP_URL_SLUG_OPTION . '.js', '', WPSHOP_VERSION);
 			wp_register_style($page . '_css', WPSHOP_CSS_URL . 'pages/' . WPSHOP_URL_SLUG_OPTION . '.css', '', WPSHOP_VERSION);
 			wp_enqueue_style($page . '_css');
@@ -327,12 +327,12 @@ 
 	 * @param array $classes
 	 * @return string
 	 */
-	public static function admin_body_class( $classes ) {
+	public static function admin_body_class($classes) {
 		global $post;
 
-		if ( !empty($post->ID) ) {
-			$post_type = get_post_type( $post->ID );
-			if ( is_admin() && in_array( $post_type, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, WPSHOP_NEWTYPE_IDENTIFIER_ORDER, WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE, WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, WPSHOP_NEWTYPE_IDENTIFIER_COUPON, WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS) ) ) {
+		if (!empty($post->ID)) {
+			$post_type = get_post_type($post->ID);
+			if (is_admin() && in_array($post_type, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION, WPSHOP_NEWTYPE_IDENTIFIER_ORDER, WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE, WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, WPSHOP_NEWTYPE_IDENTIFIER_COUPON, WPSHOP_NEWTYPE_IDENTIFIER_ADDRESS))) {
 				$classes .= ' wpshop-admin-body wpshop-admin-post-type-' . $post_type;
 			}
 		}
@@ -360,8 +360,8 @@ 
 		wp_enqueue_style('wpshop_chosen_css');
 
 		/*	Include specific css file for the current page if existing	*/
-		$page = !empty( $_GET['page'] ) ? sanitize_text_field( $_GET['page'] ) : '';
-		if(isset($page) && is_file(WPSHOP_CSS_DIR . 'pages/' . $page . '.css')){
+		$page = !empty($_GET['page']) ? sanitize_text_field($_GET['page']) : '';
+		if (isset($page) && is_file(WPSHOP_CSS_DIR . 'pages/' . $page . '.css')) {
 			wp_register_style($page . '_css', WPSHOP_CSS_URL . 'pages/' . $page . '.css', '', WPSHOP_VERSION);
 			wp_enqueue_style($page . '_css');
 		}
@@ -403,8 +403,8 @@ 
 		wp_register_style('wpshop_default_wps_style_css', WPSHOP_TEMPLATES_URL . 'wpshop/css/wps_style.css', '', WPSHOP_VERSION);
 		wp_enqueue_style('wpshop_default_wps_style_css');
 
-		if( file_exists( get_stylesheet_directory().'/wpshop/css/wps_style.css' ) ) {
-			wp_deregister_style( 'wpshop_default_wps_style_css' );
+		if (file_exists(get_stylesheet_directory() . '/wpshop/css/wps_style.css')) {
+			wp_deregister_style('wpshop_default_wps_style_css');
 			wp_register_style('wps_style_css', wpshop_display::get_template_file('wps_style.css', WPSHOP_TEMPLATES_URL, 'wpshop/css', 'output', true), '', WPSHOP_VERSION);
 			wp_enqueue_style('wps_style_css', 11);
 		}
@@ -416,7 +416,7 @@ 
 		wp_register_style('wps_owl_caroussel_transitions', wpshop_display::get_template_file('owl.transitions.css', WPSHOP_TEMPLATES_URL, 'wpshop/css', 'output'), '', WPSHOP_VERSION);
 		wp_enqueue_style('wps_owl_caroussel_transitions');
 
-			wp_enqueue_style( 'dashicons' );
+			wp_enqueue_style('dashicons');
 	}
 
 	/**
@@ -434,7 +434,7 @@ 
 		wp_enqueue_script('jquery-ui-slider');
 		wp_enqueue_script('wpshop_frontend_main_js', wpshop_display::get_template_file('frontend_main.js', WPSHOP_TEMPLATES_URL, 'wpshop/js', 'output'), '', WPSHOP_VERSION, true);
 // 		wp_enqueue_script('wpshop_jquery_jqzoom_core_js', wpshop_display::get_template_file('jquery.jqzoom-core.js', WPSHOP_TEMPLATES_URL, 'wpshop/js', 'output'), '', WPSHOP_VERSION, true);
-		wp_enqueue_script('fancyboxmousewheel',WPSHOP_JS_URL . 'fancybox/jquery.mousewheel-3.0.4.pack.js', '', WPSHOP_VERSION, true);
+		wp_enqueue_script('fancyboxmousewheel', WPSHOP_JS_URL . 'fancybox/jquery.mousewheel-3.0.4.pack.js', '', WPSHOP_VERSION, true);
 		wp_enqueue_script('fancybox', WPSHOP_JS_URL . 'fancybox/jquery.fancybox-1.3.4.pack.js', '', WPSHOP_VERSION, true);
 		wp_enqueue_script('jquery_address', WPSHOP_JS_URL . 'jquery-libs/jquery.address-1.5.min.js', '', WPSHOP_VERSION);
 		wp_enqueue_script('wps_api', wpshop_display::get_template_file('wps-api.js', WPSHOP_TEMPLATES_URL, 'wpshop/js', 'output'), '', WPSHOP_VERSION, true);
@@ -457,7 +457,7 @@ 
 	var WPSHOP_MUST_CHOOSE_SHIPPING_MODE = "<?php _e('You must to choose a shipping mode', 'wpshop'); ?>";
 	var WPSHOP_NO_SHIPPING_MODE_AVAILABLE = "<?php _e('You can\'t order because no shipping mode is available.', 'wpshop'); ?>";
 	var WPSHOP_LOADER_ICON_JQUERY_ADDRESS = "<img src=\"<?php echo WPSHOP_LOADING_ICON; ?>\" alt=\"Loading...\" />";
-	var WPSHOP_CONFIRM_DELETE_ADDRESS = "<?php _e( 'Do you really want to delete this address ?', 'wpshop' ); ?>";
+	var WPSHOP_CONFIRM_DELETE_ADDRESS = "<?php _e('Do you really want to delete this address ?', 'wpshop'); ?>";
 	var wps_speed_slideUpDown = 200;
 	var MODAL_URL = '<?php echo WPSHOP_TEMPLATES_URL; ?>wpshop/modal.php';
 </script>
@@ -495,7 +495,7 @@ 
 		$product_class = new wpshop_products();
 		add_action('save_post', array($product_class, 'save_product_custom_informations'));
 		/*	Modification des paramètres de variation quand ils ne sont pas configurés individuellement	*/
-		add_filter('pre_update_option_' . 'wpshop_catalog_product_option', array('wpshop_products', 'update_wpshop_catalog_product_option'), 10, 2 );
+		add_filter('pre_update_option_' . 'wpshop_catalog_product_option', array('wpshop_products', 'update_wpshop_catalog_product_option'), 10, 2);
 
 		/*	Add wpshop product category term	*/
 		wpshop_categories::create_product_categories();
@@ -503,14 +503,14 @@ 
 		/*	Add wpshop message term	*/
 
 
-		if ( $wpshop_shop_type == 'sale' ) {
+		if ($wpshop_shop_type == 'sale') {
 			/*	Add wpshop orders term	*/
 			wpshop_orders::create_orders_type();
 			add_action('add_meta_boxes', array('wpshop_orders', 'add_meta_boxes'));
-			add_action('manage_'.WPSHOP_NEWTYPE_IDENTIFIER_ORDER.'_posts_custom_column',  array('wpshop_orders', 'orders_custom_columns'), 10, 2);
-			add_filter('manage_edit-'.WPSHOP_NEWTYPE_IDENTIFIER_ORDER.'_columns', array('wpshop_orders', 'orders_edit_columns'));
-			add_action('restrict_manage_posts', array('wpshop_orders', 'list_table_filters') );
-			add_filter('parse_query', array('wpshop_orders', 'list_table_filter_parse_query') );
+			add_action('manage_' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '_posts_custom_column', array('wpshop_orders', 'orders_custom_columns'), 10, 2);
+			add_filter('manage_edit-' . WPSHOP_NEWTYPE_IDENTIFIER_ORDER . '_columns', array('wpshop_orders', 'orders_edit_columns'));
+			add_action('restrict_manage_posts', array('wpshop_orders', 'list_table_filters'));
+			add_filter('parse_query', array('wpshop_orders', 'list_table_filter_parse_query'));
 		}
 
 		$args = array(
@@ -520,14 +520,14 @@ 
 		$output = 'objects'; // names or objects, note names is the default
 		$operator = 'or'; // 'and' or 'or'
 
-		$wp_types_original=get_post_types($args,$output,$operator);
+		$wp_types_original = get_post_types($args, $output, $operator);
 		foreach ($wp_types_original as $type => $type_definition):
 			$wp_types[$type] = $type_definition->labels->name;
 		endforeach;
-		$to_exclude=unserialize(WPSHOP_INTERNAL_TYPES_TO_EXCLUDE);
-		if(!empty($to_exclude)):
-			foreach($to_exclude as $excluded_type):
-				if(isset($wp_types[$excluded_type]))unset($wp_types[$excluded_type]);
+		$to_exclude = unserialize(WPSHOP_INTERNAL_TYPES_TO_EXCLUDE);
+		if (!empty($to_exclude)):
+			foreach ($to_exclude as $excluded_type):
+				if (isset($wp_types[$excluded_type]))unset($wp_types[$excluded_type]);
 			endforeach;
 		endif;
 		DEFINE('WPSHOP_INTERNAL_TYPES', serialize(array_merge($wp_types, array('users' => __('Users', 'wpshop')))));
@@ -536,29 +536,29 @@ 
 	/**
 	 * Send mail when new version is available
 	 */
-	public static function site_transient_update_plugins( $option ) {
-		if ( isset( $option->response[ WPSHOP_PLUGIN_NAME ] ) ) {
+	public static function site_transient_update_plugins($option) {
+		if (isset($option->response[WPSHOP_PLUGIN_NAME])) {
 			global $wpdb;
 			$message_mdl = new wps_message_mdl();
-			$admin_new_version_message = get_option( 'WPSHOP_NEW_VERSION_ADMIN_MESSAGE', null );
-			$shop_admin_email_option = get_option( 'wpshop_emails' );
-			$shop_admin_id = $wpdb->get_var( $wpdb->prepare( 'SELECT ID FROM ' . $wpdb->users . ' WHERE user_email = %s', $shop_admin_email_option['contact_email'] ) );
-			if ( ! is_null( $shop_admin_id ) && ! is_null( $admin_new_version_message ) ) {
-				$messages_histo = $message_mdl->get_messages_histo( $admin_new_version_message, $shop_admin_id );
-				if ( ! empty( $messages_histo ) ) {
-					foreach ( $messages_histo as $messages_histo_group ) {
-						foreach ( $messages_histo_group as $messages_histo ) {
-							if ( strpos( $messages_histo['mess_title'], $option->response[ WPSHOP_PLUGIN_NAME ]->new_version ) !== false
-							|| strpos( $messages_histo['mess_message'], $option->response[ WPSHOP_PLUGIN_NAME ]->new_version ) !== false ) {
+			$admin_new_version_message = get_option('WPSHOP_NEW_VERSION_ADMIN_MESSAGE', null);
+			$shop_admin_email_option = get_option('wpshop_emails');
+			$shop_admin_id = $wpdb->get_var($wpdb->prepare('SELECT ID FROM ' . $wpdb->users . ' WHERE user_email = %s', $shop_admin_email_option['contact_email']));
+			if (!is_null($shop_admin_id) && !is_null($admin_new_version_message)) {
+				$messages_histo = $message_mdl->get_messages_histo($admin_new_version_message, $shop_admin_id);
+				if (!empty($messages_histo)) {
+					foreach ($messages_histo as $messages_histo_group) {
+						foreach ($messages_histo_group as $messages_histo) {
+							if (strpos($messages_histo['mess_title'], $option->response[WPSHOP_PLUGIN_NAME]->new_version) !== false
+							|| strpos($messages_histo['mess_message'], $option->response[WPSHOP_PLUGIN_NAME]->new_version) !== false) {
 								return $option;
 							}
 						}
 					}
 				}
 				$wps_message = new wps_message_ctr();
-				$wps_message->wpshop_prepared_email( $shop_admin_email_option['contact_email'], 'WPSHOP_NEW_VERSION_ADMIN_MESSAGE', array(
-					'wpshop_version' => $option->response[ WPSHOP_PLUGIN_NAME ]->new_version,
-				) );
+				$wps_message->wpshop_prepared_email($shop_admin_email_option['contact_email'], 'WPSHOP_NEW_VERSION_ADMIN_MESSAGE', array(
+					'wpshop_version' => $option->response[WPSHOP_PLUGIN_NAME]->new_version,
+				));
 			}
 		}
 		return $option;

includes/librairies/HTML2PDF/_tcpdf_5.0.002/unicode_data.php

Spacing +14 added lines, -14 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 //============================================================+
 // File name   : unicode_data.php
 // Begin       : 2008-01-01
@@ -17855,7 +17855,7 @@ 
  * at http://www.unicode.org/unicode/reports/tr9/
  */
 global $unicode_mirror;
-$unicode_mirror = array (
+$unicode_mirror = array(
 0x0028=>0x0029,
 0x0029=>0x0028,
 0x003C=>0x003E,
@@ -18298,7 +18298,7 @@ 
  * char code=>isolated, final, initial, medial
  */
 global $laa_array;
-$laa_array = array (
+$laa_array = array(
 1570 =>array(65269, 65270, 65269, 65270),
 1571 =>array(65271, 65272, 65271, 65272),
 1573 =>array(65273, 65274, 65273, 65274),
@@ -18312,7 +18312,7 @@ 
  * second NSM char code=>substitution char
  */
 global $diacritics;
-$diacritics = array (
+$diacritics = array(
 1612=>64606, # Shadda + Dammatan
 1613=>64607, # Shadda + Kasratan
 1614=>64608, # Shadda + Fatha
@@ -18324,23 +18324,23 @@ 
  * Array of character substitutions from UTF-8 unicode to latin1
  */
 global $utf8tolatin;
-$utf8tolatin = array (
+$utf8tolatin = array(
 8364=>128, # Euro1
-338=>140,  # OE
-352=>138,  # Scaron
-376=>159,  # Ydieresis
-381=>142,  # Zcaron2
+338=>140, # OE
+352=>138, # Scaron
+376=>159, # Ydieresis
+381=>142, # Zcaron2
 8226=>149, # bullet3
-710=>136,  # circumflex
+710=>136, # circumflex
 8224=>134, # dagger
 8225=>135, # daggerdbl
 8230=>133, # ellipsis
 8212=>151, # emdash
 8211=>150, # endash
-402=>131,  # florin
+402=>131, # florin
 8249=>139, # guilsinglleft
 8250=>155, # guilsinglright
-339=>156,  # oe
+339=>156, # oe
 8240=>137, # perthousand
 8222=>132, # quotedblbase
 8220=>147, # quotedblleft
@@ -18348,8 +18348,8 @@ 
 8216=>145, # quoteleft
 8217=>146, # quoteright
 8218=>130, # quotesinglbase
-353=>154,  # scaron
-732=>152,  # tilde
+353=>154, # scaron
+732=>152, # tilde
 8482=>153, # trademark
 382=>158   # zcaron2
 );

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 //============================================================+
 // File name   : unicode_data.php
 // Begin       : 2008-01-01

includes/librairies/HTML2PDF/_tcpdf_5.0.002/config/lang/ger.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 //============================================================+
 // File name   : eng.php
 // Begin       : 2004-03-03

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 //============================================================+
 // File name   : eng.php
 // Begin       : 2004-03-03