Eoxia / wpshop

includes/librairies/display/form.class.php

Indentation +61 added lines, -61 removed lines

@@ -23,15 +23,15 @@ 
 class wpshop_form {
 
 	/**
-	*	Create The complete form by defining the form open and close and call the different function that allows to create the different type of input
-	*
-	*	@param string $name The name of the form
-	*	@param array $input_list The list build by the database class' function that get the type of a table
-	*	@param string $method The default method for the form Default is set to post
-	*	@param string $action The default action for the form Default is set to empty
-	*
-	*	@return mixed $the_form The complete html output of the form
-	*/
+	 *	Create The complete form by defining the form open and close and call the different function that allows to create the different type of input
+	 *
+	 *	@param string $name The name of the form
+	 *	@param array $input_list The list build by the database class' function that get the type of a table
+	 *	@param string $method The default method for the form Default is set to post
+	 *	@param string $action The default action for the form Default is set to empty
+	 *
+	 *	@return mixed $the_form The complete html output of the form
+	 */
 	function form($name, $input_list, $method = 'post', $action = ''){
 		$the_form_content_hidden = $the_form_content = '';
 		foreach ($input_list as $input_key => $input_def) {
@@ -68,12 +68,12 @@ 
 	}
 
 	/**
-	*	Check the input type
-	*
-	*	@param array $input_def The input definition
-	*
-	*	@return string $the_input
-	*/
+	 *	Check the input type
+	 *
+	 *	@param array $input_def The input definition
+	 *
+	 *	@return string $the_input
+	 */
 	public static function check_input_type($input_def, $input_domain = '') {
 
 		$input_option = '';
@@ -122,15 +122,15 @@ 
 	}
 
 	/**
-	*	Create an input type text or hidden or password
-	*
-	*	@param string $name The name of the field given by the database
-	*	@param mixed $value The default value for the field Default is empty
-	*	@param string $type The input type Could be: text or hidden or passowrd
-	*	@param string $option Allows to define options for the input Could be readonly or disabled or style
-	*
-	*	@return mixed The output code to add to the form
-	*/
+	 *	Create an input type text or hidden or password
+	 *
+	 *	@param string $name The name of the field given by the database
+	 *	@param mixed $value The default value for the field Default is empty
+	 *	@param string $type The input type Could be: text or hidden or passowrd
+	 *	@param string $option Allows to define options for the input Could be readonly or disabled or style
+	 *
+	 *	@return mixed The output code to add to the form
+	 */
 	public static function form_input($name, $id, $value = '', $type = 'text', $option = '', $input_label = ''){
 		$allowedType = array('text', 'hidden', 'password', 'file');
 		if(in_array($type, $allowedType))
@@ -146,29 +146,29 @@ 
 	}
 
 	/**
-	*	Create an textarea
-	*
-	*	@param string $name The name of the field given by the database
-	*	@param mixed $value The default value for the field Default is empty
-	*	@param string $option Allows to define options for the input Could be maxlength or style
-	*
-	*	@return mixed The output code to add to the form
-	*/
+	 *	Create an textarea
+	 *
+	 *	@param string $name The name of the field given by the database
+	 *	@param mixed $value The default value for the field Default is empty
+	 *	@param string $option Allows to define options for the input Could be maxlength or style
+	 *
+	 *	@return mixed The output code to add to the form
+	 */
 	public static function form_input_textarea($name, $id, $value = '', $option = '')
 	{
 		return '<textarea name="' . $name.'" id="' . $id . '" ' . $option . ' rows="4" cols="10" >' . $value . '</textarea>';
 	}
 
 	/**
-	*	Create a combo box input regarding to the type of content given in parameters could be an array or a wordpress database object
-	*
-	*	@param string $name The name of the field given by the database
-	*	@param mixed $content The list of element to put inot the combo box Could be an array or a wordpress database object with id and nom as field
-	*	@param mixed $value The selected value for the field Default is empty
-	*	@param string $option Allows to define options for the input Could be onchange
-	*
-	*	@return mixed $output The output code to add to the form
-	*/
+	 *	Create a combo box input regarding to the type of content given in parameters could be an array or a wordpress database object
+	 *
+	 *	@param string $name The name of the field given by the database
+	 *	@param mixed $content The list of element to put inot the combo box Could be an array or a wordpress database object with id and nom as field
+	 *	@param mixed $value The selected value for the field Default is empty
+	 *	@param string $option Allows to define options for the input Could be onchange
+	 *
+	 *	@return mixed $output The output code to add to the form
+	 */
 	public static function form_input_select($name, $id, $content, $value = '', $option = '', $optionValue = ''){
 		global $comboxOptionToHide;
 
@@ -208,15 +208,15 @@ 
 	}
 
 	/**
-	*	Create a combo box input regarding to the type of content given in parameters could be an array or a wordpress database object
-	*
-	*	@param string $name The name of the field given by the database
-	*	@param mixed $content The list of element to put inot the combo box Could be an array or a wordpress database object with id and nom as field
-	*	@param mixed $value The selected value for the field Default is empty
-	*	@param string $option Allows to define options for the input Could be onchange
-	*
-	*	@return mixed $output The output code to add to the form
-	*/
+	 *	Create a combo box input regarding to the type of content given in parameters could be an array or a wordpress database object
+	 *
+	 *	@param string $name The name of the field given by the database
+	 *	@param mixed $content The list of element to put inot the combo box Could be an array or a wordpress database object with id and nom as field
+	 *	@param mixed $value The selected value for the field Default is empty
+	 *	@param string $option Allows to define options for the input Could be onchange
+	 *
+	 *	@return mixed $output The output code to add to the form
+	 */
 	public static function form_input_multiple_select($name, $id, $content, $value = array(), $option = '', $optionValue = '') {
 		global $comboxOptionToHide;
 		$values = array();
@@ -249,17 +249,17 @@ 
 	}
 
 	/**
-	*	Create a checkbox input
-	*
-	*	@param string $name The name of the field given by the database
-	*	@param string $id The identifier of the field
-	*	@param string $type The input type Could be checkbox or radio
-	*	@param mixed $content The list of element to put inot the combo box Could be an array or a wordpress database object with id and nom as field
-	*	@param mixed $value The selected value for the field Default is empty
-	*	@param string $option Allows to define options for the input Could be onchange
-	*
-	*	@return mixed $output The output code to add to the form
-	*/
+	 *	Create a checkbox input
+	 *
+	 *	@param string $name The name of the field given by the database
+	 *	@param string $id The identifier of the field
+	 *	@param string $type The input type Could be checkbox or radio
+	 *	@param mixed $content The list of element to put inot the combo box Could be an array or a wordpress database object with id and nom as field
+	 *	@param mixed $value The selected value for the field Default is empty
+	 *	@param string $option Allows to define options for the input Could be onchange
+	 *
+	 *	@return mixed $output The output code to add to the form
+	 */
 	public static function form_input_check($name, $id, $content, $value = '', $type = 'checkbox', $option = '', $optionValue = '', $input_label=''){
 		$output = '';
 		$allowedType = array('checkbox', 'radio');

Spacing +61 added lines, -61 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'));
 }
 
 /**
@@ -32,7 +32,7 @@ 
 	*
 	*	@return mixed $the_form The complete html output of the form
 	*/
-	function form($name, $input_list, $method = 'post', $action = ''){
+	function form($name, $input_list, $method = 'post', $action = '') {
 		$the_form_content_hidden = $the_form_content = '';
 		foreach ($input_list as $input_key => $input_def) {
 			$the_input = self::check_input_type($input_def);
@@ -40,10 +40,10 @@ 
 			$input_value = $input_def['value'];
 			$input_type = $input_def['type'];
 
-			if($input_type != 'hidden')
+			if ($input_type != 'hidden')
 			{
 				$label = 'for="' . $input_name . '"';
-				if(($input_type == 'radio') || ($input_type == 'checkbox'))
+				if (($input_type == 'radio') || ($input_type == 'checkbox'))
 				{
 					$label = '';
 				}
@@ -77,45 +77,45 @@ 
 	public static function check_input_type($input_def, $input_domain = '') {
 
 		$input_option = '';
-		if(!empty($input_def['option']) && $input_def['option'])
+		if (!empty($input_def['option']) && $input_def['option'])
 			$input_option = $input_def['option'];
 
 		$valueToPut = '';
-		if(!empty($input_def['valueToPut']) && $input_def['valueToPut'])
+		if (!empty($input_def['valueToPut']) && $input_def['valueToPut'])
 			$valueToPut = $input_def['valueToPut'];
 
 		$input_id = $input_def['name'];
-		if(!empty($input_def['id']))
+		if (!empty($input_def['id']))
 			$input_id = $input_def['id'];
 
 		$input_name = $input_def['name'];
-		if($input_domain != '')
+		if ($input_domain != '')
 			$input_name = $input_domain . '[' . $input_def['name'] . ']';
 		/**	Format data for saving without special chars	*/
-		if(!empty($input_def['value']) && !is_array($input_def['value']) && preg_match("/^-?(?:\d+|\d*\.\d+)$/", $input_def['value']))
-			$input_value = str_replace('.',',',$input_def['value']/* /1 */); // format francais avec virgule
+		if (!empty($input_def['value']) && !is_array($input_def['value']) && preg_match("/^-?(?:\d+|\d*\.\d+)$/", $input_def['value']))
+			$input_value = str_replace('.', ',', $input_def['value']/* /1 */); // format francais avec virgule
 		else $input_value = (!empty($input_def['value']) ? $input_def['value'] : '');
 
 		$input_type = $input_def['type'];
 		$the_input = '';
 
-		if( ( $input_type == 'text' ) || ( $input_type == 'email' ) || ( $input_type == 'tel' ) )
-			$the_input .= self::form_input( $input_name, $input_id, $input_value, 'text', $input_option, (!empty($input_def['options_label']) ? $input_def['options_label'] : '') );
-		elseif($input_type == 'password')
+		if (($input_type == 'text') || ($input_type == 'email') || ($input_type == 'tel'))
+			$the_input .= self::form_input($input_name, $input_id, $input_value, 'text', $input_option, (!empty($input_def['options_label']) ? $input_def['options_label'] : ''));
+		elseif ($input_type == 'password')
 			$the_input .= self::form_input($input_name, $input_id, $input_value, 'password', $input_option);
-		elseif($input_type == 'textarea')
+		elseif ($input_type == 'textarea')
 			$the_input .= self::form_input_textarea($input_name, $input_id, $input_value, $input_option);
-		elseif($input_type == 'hidden')
+		elseif ($input_type == 'hidden')
 			$the_input .= self::form_input($input_name, $input_id, $input_value, 'hidden', $input_option);
-		elseif($input_type == 'select')
-			$the_input .= self::form_input_select($input_name, $input_id, ( !empty($input_def['possible_value']) ? $input_def['possible_value'] : array() ), $input_value, $input_option, $valueToPut);
-		elseif($input_type == 'multiple-select')
-			$the_input .= self::form_input_multiple_select($input_name, $input_id, ( !empty($input_def['possible_value']) ? $input_def['possible_value'] : array() ), $input_value, $input_option, $valueToPut);
-		elseif(($input_type == 'radio') || ($input_type == 'checkbox'))
-			$the_input .= self::form_input_check($input_name, $input_id, ( !empty($input_def['possible_value']) ? $input_def['possible_value'] : array() ), $input_value, $input_type, $input_option, $valueToPut, (!empty($input_def['options_label']) ? $input_def['options_label'] : ''));
-		elseif($input_type == 'file')
+		elseif ($input_type == 'select')
+			$the_input .= self::form_input_select($input_name, $input_id, (!empty($input_def['possible_value']) ? $input_def['possible_value'] : array()), $input_value, $input_option, $valueToPut);
+		elseif ($input_type == 'multiple-select')
+			$the_input .= self::form_input_multiple_select($input_name, $input_id, (!empty($input_def['possible_value']) ? $input_def['possible_value'] : array()), $input_value, $input_option, $valueToPut);
+		elseif (($input_type == 'radio') || ($input_type == 'checkbox'))
+			$the_input .= self::form_input_check($input_name, $input_id, (!empty($input_def['possible_value']) ? $input_def['possible_value'] : array()), $input_value, $input_type, $input_option, $valueToPut, (!empty($input_def['options_label']) ? $input_def['options_label'] : ''));
+		elseif ($input_type == 'file')
 			$the_input .= self::form_input($input_name, $input_id, $input_value, 'file', $input_option);
-		elseif($input_type == 'gallery')
+		elseif ($input_type == 'gallery')
 			$the_input .= self::form_input($input_name, $input_id, $input_value, 'text', 'readonly = "readonly"') . 'Gallery field to check';
 
 		return $the_input;
@@ -131,17 +131,17 @@ 
 	*
 	*	@return mixed The output code to add to the form
 	*/
-	public static function form_input($name, $id, $value = '', $type = 'text', $option = '', $input_label = ''){
+	public static function form_input($name, $id, $value = '', $type = 'text', $option = '', $input_label = '') {
 		$allowedType = array('text', 'hidden', 'password', 'file');
-		if(in_array($type, $allowedType))
+		if (in_array($type, $allowedType))
 		{
-			$output = '<input type="' . $type . '" name="' . $name . '" id="' . $id . '" value="' . $value . '" ' . $option . ' />' ;
+			$output = '<input type="' . $type . '" name="' . $name . '" id="' . $id . '" value="' . $value . '" ' . $option . ' />';
 		}
 		else
 		{
 			return sprintf(__('Input type not allowed here in %s at line %s', 'wpshop'), __FILE__, __LINE__);
 		}
-		$output.=(is_array($input_label) && !empty($input_label['custom']) ? '<label for="' . $id . '">'.$input_label['custom'].'</label> ':'');
+		$output .= (is_array($input_label) && !empty($input_label['custom']) ? '<label for="' . $id . '">' . $input_label['custom'] . '</label> ' : '');
 		return $output;
 	}
 
@@ -156,7 +156,7 @@ 
 	*/
 	public static function form_input_textarea($name, $id, $value = '', $option = '')
 	{
-		return '<textarea name="' . $name.'" id="' . $id . '" ' . $option . ' rows="4" cols="10" >' . $value . '</textarea>';
+		return '<textarea name="' . $name . '" id="' . $id . '" ' . $option . ' rows="4" cols="10" >' . $value . '</textarea>';
 	}
 
 	/**
@@ -169,38 +169,38 @@ 
 	*
 	*	@return mixed $output The output code to add to the form
 	*/
-	public static function form_input_select($name, $id, $content, $value = '', $option = '', $optionValue = ''){
+	public static function form_input_select($name, $id, $content, $value = '', $option = '', $optionValue = '') {
 		global $comboxOptionToHide;
 
 		$output = '<select id="' . $id . '" name="' . $name . '" ' . $option . ' data-placeholder="' . __('Select an Option', 'wpshop') . '" >';
 
-		if(is_array($content) && (count($content) > 0)){
-			foreach($content as $index => $datas){
-				if(is_object($datas) && (!is_array($comboxOptionToHide) || !in_array($datas->id, $comboxOptionToHide))){
+		if (is_array($content) && (count($content) > 0)) {
+			foreach ($content as $index => $datas) {
+				if (is_object($datas) && (!is_array($comboxOptionToHide) || !in_array($datas->id, $comboxOptionToHide))) {
 
 					$selected = ($value == $datas->id) ? ' selected="selected" ' : '';
 
-					$dataText = __('Nothing to output' ,'wpshop');
-					if(isset($datas->name))
-						$dataText = __($datas->name ,'wpshop');
-					elseif(isset($datas->code))
-						$dataText = __($datas->code ,'wpshop');
+					$dataText = __('Nothing to output', 'wpshop');
+					if (isset($datas->name))
+						$dataText = __($datas->name, 'wpshop');
+					elseif (isset($datas->code))
+						$dataText = __($datas->code, 'wpshop');
 
-					$output .= '<option value="' . $datas->id . '" ' . $selected . ' >' . $dataText. '</option>';
+					$output .= '<option value="' . $datas->id . '" ' . $selected . ' >' . $dataText . '</option>';
 				}
-				elseif(!is_array($comboxOptionToHide) || !in_array($datas, $comboxOptionToHide)){
+				elseif (!is_array($comboxOptionToHide) || !in_array($datas, $comboxOptionToHide)) {
 					$valueToPut = $datas;
 					$selected = ($value == $datas) ? ' selected="selected" ' : '';
-					if($optionValue == 'index'){
+					if ($optionValue == 'index') {
 						$valueToPut = $index;
 						$selected = ($value == $index) ? ' selected="selected" ' : '';
 					}
-					$output .= '<option value="' . $valueToPut . '" ' . $selected . ' >' . __($datas ,'wpshop') . '</option>';
+					$output .= '<option value="' . $valueToPut . '" ' . $selected . ' >' . __($datas, 'wpshop') . '</option>';
 				}
 			}
 		}
 		else
-			$output .= '<option value="" >'.__('Nothing found here...', 'wpshop').'</option>';
+			$output .= '<option value="" >' . __('Nothing found here...', 'wpshop') . '</option>';
 
 			$output .= '</select>';
 
@@ -222,7 +222,7 @@ 
 		$values = array();
 
 		if (!empty($value) && (is_array($value))) {
-			foreach($value as $v) {
+			foreach ($value as $v) {
 				$values[] = $v->value;
 			}
 		}
@@ -234,8 +234,8 @@ 
 		if (is_array($content) && (count($content) > 0)) {
 			$output = '<select id="' . $id . '" name="' . $name . '[]" ' . $option . ' multiple size="4" data-placeholder="' . __('Select values from list', 'wpshop') . '" >';
 
-			foreach($content as $index => $datas) {
-				if ( !empty($datas) && !empty($index) ) {
+			foreach ($content as $index => $datas) {
+				if (!empty($datas) && !empty($index)) {
 					$selected = in_array($index, $values) ? ' selected="selected" ' : '';
 
 					$output .= '<option value="' . $index . '" ' . $selected . ' >' . $datas . '</option>';
@@ -260,41 +260,41 @@ 
 	*
 	*	@return mixed $output The output code to add to the form
 	*/
-	public static function form_input_check($name, $id, $content, $value = '', $type = 'checkbox', $option = '', $optionValue = '', $input_label=''){
+	public static function form_input_check($name, $id, $content, $value = '', $type = 'checkbox', $option = '', $optionValue = '', $input_label = '') {
 		$output = '';
 		$allowedType = array('checkbox', 'radio');
 		$container_start = (isset($input_label['container']) && $input_label['container'] ? '<div class="wpshop_input_' . $type . ' wpshop_input_' . $type . '_' . $id . '" >' : '');
 		$container_end = (isset($input_label['container']) && $input_label['container'] ? '</div>' : '');
 
-		if(in_array($type, $allowedType)){
-			if(is_array($content) && (count($content) > 0)){
-				foreach($content as $index => $datas){
-					if(is_object($datas)){
+		if (in_array($type, $allowedType)) {
+			if (is_array($content) && (count($content) > 0)) {
+				foreach ($content as $index => $datas) {
+					if (is_object($datas)) {
 						$id = $name . '_' . sanitize_title($datas->nom);
 						$checked = ($value == $datas->id) ? ' checked="checked" ' : '';
 					}
-					else{
+					else {
 
 						$valueToPut = $datas;
-						$checked = ( ($value == $datas) || (is_array($value) && in_array($valueToPut, $value))) ? ' checked="checked" ' : '';
-						if($optionValue == 'index'){
+						$checked = (($value == $datas) || (is_array($value) && in_array($valueToPut, $value))) ? ' checked="checked" ' : '';
+						if ($optionValue == 'index') {
 							$valueToPut = $index;
-							$checked = ( ($value == $index) || (is_array($value) && in_array($valueToPut, $value))) ? ' checked="checked" ' : '';
+							$checked = (($value == $index) || (is_array($value) && in_array($valueToPut, $value))) ? ' checked="checked" ' : '';
 						}
 
 						$id = $id . '_' . sanitize_title($datas);
 // 						$checked = ( ($value == $datas) || (is_array($value) && in_array($valueToPut, $value))) ? ' checked="checked" ' : '';
-						$output .= $container_start . '<input type="' . $type . '" name="' . $name . '" id="' . $id . '" value="' . $valueToPut . '" ' . $checked . ' ' . $option . ' />'.(!empty($input_label['original'])?'<label for="' . $id . '">'.__($datas,'wpshop').'</label>&nbsp;':'')  . $container_end ;
+						$output .= $container_start . '<input type="' . $type . '" name="' . $name . '" id="' . $id . '" value="' . $valueToPut . '" ' . $checked . ' ' . $option . ' />' . (!empty($input_label['original']) ? '<label for="' . $id . '">' . __($datas, 'wpshop') . '</label>&nbsp;' : '') . $container_end;
 					}
 				}
 			}
-			else{
+			else {
 				$checked = (($value != '') && ($value == $content)) ? ' checked="checked" ' : '';
-				$output .= $container_start . '<input type="' . $type . '" name="' . $name . '" id="' . $id . '" value="' . $content . '" ' . $checked . ' ' . $option . ' />' . $container_start ;
+				$output .= $container_start . '<input type="' . $type . '" name="' . $name . '" id="' . $id . '" value="' . $content . '" ' . $checked . ' ' . $option . ' />' . $container_start;
 			}
-			$output.=(is_array($input_label) && !empty($input_label['custom']) ? '<label for="' . $id . '">'.$input_label['custom'].'</label> ':'');
+			$output .= (is_array($input_label) && !empty($input_label['custom']) ? '<label for="' . $id . '">' . $input_label['custom'] . '</label> ' : '');
 
-			if ( isset($input_label['container']) && $input_label['container'] ) $output .= '<div class="wpshop_cls" ></div>';
+			if (isset($input_label['container']) && $input_label['container']) $output .= '<div class="wpshop_cls" ></div>';
 			return $output;
 		}
 		else

Braces +59 added lines, -51 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' ) ) {
@@ -52,8 +54,7 @@ 
 	<label ' . $label . ' >' . __($input_name, 'wpshop') . '</label>&nbsp;:&nbsp;
 	' . $the_input . '
 </div>';
-			}
-			else
+			} else
 			{
 				$the_form_content_hidden .= '
 	' . $the_input;
@@ -77,46 +78,55 @@ 
 	public static function check_input_type($input_def, $input_domain = '') {
 
 		$input_option = '';
-		if(!empty($input_def['option']) && $input_def['option'])
-			$input_option = $input_def['option'];
+		if(!empty($input_def['option']) && $input_def['option']) {
+					$input_option = $input_def['option'];
+		}
 
 		$valueToPut = '';
-		if(!empty($input_def['valueToPut']) && $input_def['valueToPut'])
-			$valueToPut = $input_def['valueToPut'];
+		if(!empty($input_def['valueToPut']) && $input_def['valueToPut']) {
+					$valueToPut = $input_def['valueToPut'];
+		}
 
 		$input_id = $input_def['name'];
-		if(!empty($input_def['id']))
-			$input_id = $input_def['id'];
+		if(!empty($input_def['id'])) {
+					$input_id = $input_def['id'];
+		}
 
 		$input_name = $input_def['name'];
-		if($input_domain != '')
-			$input_name = $input_domain . '[' . $input_def['name'] . ']';
+		if($input_domain != '') {
+					$input_name = $input_domain . '[' . $input_def['name'] . ']';
+		}
 		/**	Format data for saving without special chars	*/
-		if(!empty($input_def['value']) && !is_array($input_def['value']) && preg_match("/^-?(?:\d+|\d*\.\d+)$/", $input_def['value']))
-			$input_value = str_replace('.',',',$input_def['value']/* /1 */); // format francais avec virgule
-		else $input_value = (!empty($input_def['value']) ? $input_def['value'] : '');
+		if(!empty($input_def['value']) && !is_array($input_def['value']) && preg_match("/^-?(?:\d+|\d*\.\d+)$/", $input_def['value'])) {
+					$input_value = str_replace('.',',',$input_def['value']/* /1 */);
+		}
+		// format francais avec virgule
+		else {
+			$input_value = (!empty($input_def['value']) ? $input_def['value'] : '');
+		}
 
 		$input_type = $input_def['type'];
 		$the_input = '';
 
-		if( ( $input_type == 'text' ) || ( $input_type == 'email' ) || ( $input_type == 'tel' ) )
-			$the_input .= self::form_input( $input_name, $input_id, $input_value, 'text', $input_option, (!empty($input_def['options_label']) ? $input_def['options_label'] : '') );
-		elseif($input_type == 'password')
-			$the_input .= self::form_input($input_name, $input_id, $input_value, 'password', $input_option);
-		elseif($input_type == 'textarea')
-			$the_input .= self::form_input_textarea($input_name, $input_id, $input_value, $input_option);
-		elseif($input_type == 'hidden')
-			$the_input .= self::form_input($input_name, $input_id, $input_value, 'hidden', $input_option);
-		elseif($input_type == 'select')
-			$the_input .= self::form_input_select($input_name, $input_id, ( !empty($input_def['possible_value']) ? $input_def['possible_value'] : array() ), $input_value, $input_option, $valueToPut);
-		elseif($input_type == 'multiple-select')
-			$the_input .= self::form_input_multiple_select($input_name, $input_id, ( !empty($input_def['possible_value']) ? $input_def['possible_value'] : array() ), $input_value, $input_option, $valueToPut);
-		elseif(($input_type == 'radio') || ($input_type == 'checkbox'))
-			$the_input .= self::form_input_check($input_name, $input_id, ( !empty($input_def['possible_value']) ? $input_def['possible_value'] : array() ), $input_value, $input_type, $input_option, $valueToPut, (!empty($input_def['options_label']) ? $input_def['options_label'] : ''));
-		elseif($input_type == 'file')
-			$the_input .= self::form_input($input_name, $input_id, $input_value, 'file', $input_option);
-		elseif($input_type == 'gallery')
-			$the_input .= self::form_input($input_name, $input_id, $input_value, 'text', 'readonly = "readonly"') . 'Gallery field to check';
+		if( ( $input_type == 'text' ) || ( $input_type == 'email' ) || ( $input_type == 'tel' ) ) {
+					$the_input .= self::form_input( $input_name, $input_id, $input_value, 'text', $input_option, (!empty($input_def['options_label']) ? $input_def['options_label'] : '') );
+		} elseif($input_type == 'password') {
+					$the_input .= self::form_input($input_name, $input_id, $input_value, 'password', $input_option);
+		} elseif($input_type == 'textarea') {
+					$the_input .= self::form_input_textarea($input_name, $input_id, $input_value, $input_option);
+		} elseif($input_type == 'hidden') {
+					$the_input .= self::form_input($input_name, $input_id, $input_value, 'hidden', $input_option);
+		} elseif($input_type == 'select') {
+					$the_input .= self::form_input_select($input_name, $input_id, ( !empty($input_def['possible_value']) ? $input_def['possible_value'] : array() ), $input_value, $input_option, $valueToPut);
+		} elseif($input_type == 'multiple-select') {
+					$the_input .= self::form_input_multiple_select($input_name, $input_id, ( !empty($input_def['possible_value']) ? $input_def['possible_value'] : array() ), $input_value, $input_option, $valueToPut);
+		} elseif(($input_type == 'radio') || ($input_type == 'checkbox')) {
+					$the_input .= self::form_input_check($input_name, $input_id, ( !empty($input_def['possible_value']) ? $input_def['possible_value'] : array() ), $input_value, $input_type, $input_option, $valueToPut, (!empty($input_def['options_label']) ? $input_def['options_label'] : ''));
+		} elseif($input_type == 'file') {
+					$the_input .= self::form_input($input_name, $input_id, $input_value, 'file', $input_option);
+		} elseif($input_type == 'gallery') {
+					$the_input .= self::form_input($input_name, $input_id, $input_value, 'text', 'readonly = "readonly"') . 'Gallery field to check';
+		}
 
 		return $the_input;
 	}
@@ -136,8 +146,7 @@ 
 		if(in_array($type, $allowedType))
 		{
 			$output = '<input type="' . $type . '" name="' . $name . '" id="' . $id . '" value="' . $value . '" ' . $option . ' />' ;
-		}
-		else
+		} else
 		{
 			return sprintf(__('Input type not allowed here in %s at line %s', 'wpshop'), __FILE__, __LINE__);
 		}
@@ -181,14 +190,14 @@ 
 					$selected = ($value == $datas->id) ? ' selected="selected" ' : '';
 
 					$dataText = __('Nothing to output' ,'wpshop');
-					if(isset($datas->name))
-						$dataText = __($datas->name ,'wpshop');
-					elseif(isset($datas->code))
-						$dataText = __($datas->code ,'wpshop');
+					if(isset($datas->name)) {
+											$dataText = __($datas->name ,'wpshop');
+					} elseif(isset($datas->code)) {
+											$dataText = __($datas->code ,'wpshop');
+					}
 
 					$output .= '<option value="' . $datas->id . '" ' . $selected . ' >' . $dataText. '</option>';
-				}
-				elseif(!is_array($comboxOptionToHide) || !in_array($datas, $comboxOptionToHide)){
+				} elseif(!is_array($comboxOptionToHide) || !in_array($datas, $comboxOptionToHide)){
 					$valueToPut = $datas;
 					$selected = ($value == $datas) ? ' selected="selected" ' : '';
 					if($optionValue == 'index'){
@@ -198,9 +207,9 @@ 
 					$output .= '<option value="' . $valueToPut . '" ' . $selected . ' >' . __($datas ,'wpshop') . '</option>';
 				}
 			}
+		} else {
+					$output .= '<option value="" >'.__('Nothing found here...', 'wpshop').'</option>';
 		}
-		else
-			$output .= '<option value="" >'.__('Nothing found here...', 'wpshop').'</option>';
 
 			$output .= '</select>';
 
@@ -225,8 +234,7 @@ 
 			foreach($value as $v) {
 				$values[] = $v->value;
 			}
-		}
-		else {
+		} else {
 			$values = (array)$value;
 		}
 
@@ -272,8 +280,7 @@ 
 					if(is_object($datas)){
 						$id = $name . '_' . sanitize_title($datas->nom);
 						$checked = ($value == $datas->id) ? ' checked="checked" ' : '';
-					}
-					else{
+					} else{
 
 						$valueToPut = $datas;
 						$checked = ( ($value == $datas) || (is_array($value) && in_array($valueToPut, $value))) ? ' checked="checked" ' : '';
@@ -287,18 +294,19 @@ 
 						$output .= $container_start . '<input type="' . $type . '" name="' . $name . '" id="' . $id . '" value="' . $valueToPut . '" ' . $checked . ' ' . $option . ' />'.(!empty($input_label['original'])?'<label for="' . $id . '">'.__($datas,'wpshop').'</label>&nbsp;':'')  . $container_end ;
 					}
 				}
-			}
-			else{
+			} else{
 				$checked = (($value != '') && ($value == $content)) ? ' checked="checked" ' : '';
 				$output .= $container_start . '<input type="' . $type . '" name="' . $name . '" id="' . $id . '" value="' . $content . '" ' . $checked . ' ' . $option . ' />' . $container_start ;
 			}
 			$output.=(is_array($input_label) && !empty($input_label['custom']) ? '<label for="' . $id . '">'.$input_label['custom'].'</label> ':'');
 
-			if ( isset($input_label['container']) && $input_label['container'] ) $output .= '<div class="wpshop_cls" ></div>';
+			if ( isset($input_label['container']) && $input_label['container'] ) {
+				$output .= '<div class="wpshop_cls" ></div>';
+			}
 			return $output;
+		} else {
+					return sprintf(__('Input type not allowed here in %s at line %s', 'wpshop'), __FILE__, __LINE__);
 		}
-		else
-			return sprintf(__('Input type not allowed here in %s at line %s', 'wpshop'), __FILE__, __LINE__);
 	}
 
 }
\ No newline at end of file

includes/librairies/display/display.class.php

Indentation +23 added lines, -23 removed lines

@@ -17,39 +17,39 @@
 class wpshop_display {
 
 	/**
-	*	Returns the header display of a classical HTML page.
-	*
-	*	@see afficherFinPage
-	*
-	*	@param string $pageTitle Title of the page.
-	*	@param string $pageIcon Path of the icon.
-	*	@param string $iconTitle Title attribute of the icon.
-	*	@param string $iconAlt Alt attribute of the icon.
-	*	@param boolean $hasAddButton Define if there must be a "add" button for this page
-	*	@param string $actionInformationMessage A message to display in case of action is send
-	*
-	*	@return string Html code composing the page header
-	*/
+	 *	Returns the header display of a classical HTML page.
+	 *
+	 *	@see afficherFinPage
+	 *
+	 *	@param string $pageTitle Title of the page.
+	 *	@param string $pageIcon Path of the icon.
+	 *	@param string $iconTitle Title attribute of the icon.
+	 *	@param string $iconAlt Alt attribute of the icon.
+	 *	@param boolean $hasAddButton Define if there must be a "add" button for this page
+	 *	@param string $actionInformationMessage A message to display in case of action is send
+	 *
+	 *	@return string Html code composing the page header
+	 */
 	public static function displayPageHeader($pageTitle, $pageIcon, $iconTitle, $iconAlt, $hasAddButton = true, $addButtonLink = '', $actionInformationMessage = '', $current_page_slug = ''){
 		include(WPSHOP_TEMPLATES_DIR.'admin/admin_page_header.tpl.php');
 	}
 
 	/**
-	*	Returns the end of a classical page
-	*
-	*	@see displayPageHeader
-	*
-	*	@return string Html code composing the page footer
-	*/
+	 *	Returns the end of a classical page
+	 *
+	 *	@see displayPageHeader
+	 *
+	 *	@return string Html code composing the page footer
+	 */
 	public static function displayPageFooter($formActionButton){
 		include(WPSHOP_TEMPLATES_DIR.'admin/admin_page_footer.tpl.php');
 	}
 
 	/**
-	*	Return The complete output page code
-	*
-	*	@return string The complete html page output
-	*/
+	 *	Return The complete output page code
+	 *
+	 *	@return string The complete html page output
+	 */
 	public static function display_page(){
 
 		$pageAddButton = false;

Braces +29 added lines, -24 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' ) ) {
@@ -111,8 +113,7 @@ 
 
 			if($outputType == 'listing'){
 				$pageContent = $objectType->elementList();
-			}
-			elseif($outputType == 'adding'){
+			} elseif($outputType == 'adding'){
 				$pageAddButton = false;
 
 				$pageFormButton = $objectType->getPageFormButton($objectToEdit);
@@ -124,8 +125,7 @@ 
 			$pageMessage = $objectType->pageMessage;
 			if ( in_array( $objectType->getEditionSlug(), array(WPSHOP_URL_SLUG_ATTRIBUTE_LISTING, WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING) ) ) {
 				$addButtonLink = admin_url('admin.php?page=' . $objectType->getEditionSlug() . '&amp;action=add');
-			}
-			else {
+			} else {
 				$addButtonLink = admin_url('edit.php?post_type='.WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES.'&amp;page=' . $objectType->getEditionSlug() . '&amp;action=add');
 			}
 		}
@@ -287,8 +287,7 @@ 
 				$default_dir = get_stylesheet_directory();
 			}
 			$file_path = $default_dir . '/' . $the_file;
-		}
-		else if ( !$check_only_custom ) {
+		} else if ( !$check_only_custom ) {
 			$file_path = $default_dir . $the_file;
 		}
 
@@ -480,13 +479,17 @@ 
 		/*	Get custom admin template	*/
 		if ( is_file(get_stylesheet_directory() . '/admin/main_elements.tpl.php') ) {
 			require_once(get_stylesheet_directory() . '/admin/main_elements.tpl.php');
-			if (!empty($tpl_element))
-				$wpshop_template['admin']['custom'] = ($tpl_element);unset($tpl_element);
+			if (!empty($tpl_element)) {
+							$wpshop_template['admin']['custom'] = ($tpl_element);
+			}
+			unset($tpl_element);
 		}
 		if ( is_file(get_stylesheet_directory() . '/admin/wpshop_elements_template.tpl.php') ) {
 			require_once(get_stylesheet_directory() . '/admin/wpshop_elements_template.tpl.php');
-			if (!empty($tpl_element))
-				$wpshop_template['admin']['custom'] = ($tpl_element);unset($tpl_element);
+			if (!empty($tpl_element)) {
+							$wpshop_template['admin']['custom'] = ($tpl_element);
+			}
+			unset($tpl_element);
 		}
 		/*	Get default frontend template	*/
 		require_once(WPSHOP_TEMPLATES_DIR . 'wpshop/main_elements.tpl.php');
@@ -494,13 +497,17 @@ 
 		/*	Get custom frontend template	*/
 		if ( is_file(get_stylesheet_directory() . '/wpshop/main_elements.tpl.php') ) {
 			require_once(get_stylesheet_directory() . '/wpshop/main_elements.tpl.php');
-			if (!empty($tpl_element))
-				$wpshop_template['wpshop']['custom'] = ($tpl_element);unset($tpl_element);
+			if (!empty($tpl_element)) {
+							$wpshop_template['wpshop']['custom'] = ($tpl_element);
+			}
+			unset($tpl_element);
 		}
 		if ( is_file(get_stylesheet_directory() . '/wpshop/wpshop_elements_template.tpl.php') ) {
 			require_once(get_stylesheet_directory() . '/wpshop/wpshop_elements_template.tpl.php');
-			if (!empty($tpl_element))
-				$wpshop_template['wpshop']['custom'] = ($tpl_element);unset($tpl_element);
+			if (!empty($tpl_element)) {
+							$wpshop_template['wpshop']['custom'] = ($tpl_element);
+			}
+			unset($tpl_element);
 		}
 		foreach ( $wpshop_template as $site_side => $types ) {
 			foreach ( $types as $type => $tpl_component ) {
@@ -557,8 +564,7 @@ 
 
 		if ( !empty($extras_args['type']) && !empty($extras_args['id']) && !empty( $template[$default_template_dir][$part]) && !empty($extras_args['page']) && !empty( $template[$default_template_dir][$part][$extras_args['page']] ) && !empty( $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']]) && !empty( $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']] ) && !empty( $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']][$template_part] ) ) {
 			$tpl_element_to_return = $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']][$template_part];
-		}
-		elseif ( !empty($extras_args['type']) && !empty($extras_args['id']) && !empty( $template[$default_template_dir][$part][$extras_args['type']]) && !empty( $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']] ) && !empty( $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']][$template_part] ) ) {
+		} elseif ( !empty($extras_args['type']) && !empty($extras_args['id']) && !empty( $template[$default_template_dir][$part][$extras_args['type']]) && !empty( $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']] ) && !empty( $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']][$template_part] ) ) {
 			$tpl_element_to_return = $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']][$template_part];
 		}
 		/**	Check if the file have been duplicated into theme directory for customization	*/
@@ -591,7 +597,9 @@ 
 				$template_to_fill = str_replace('{WPSHOP_'.$element.'}', $value, $template_to_fill);
 			}
 		}
-		if (WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE) $template_to_fill = '<!-- Available keys : ' . implode(' / ', $available_key) . ' -->' . $template_to_fill;
+		if (WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE) {
+			$template_to_fill = '<!-- Available keys : ' . implode(' / ', $available_key) . ' -->' . $template_to_fill;
+		}
 
 		return $template_to_fill;
 	}
@@ -655,8 +663,7 @@ 
 		/*	Enable shortcodes in category, taxonomy, tag descriptions */
 		if(function_exists('term_description')) {
 			add_filter('term_description', 'do_shortcode');
-		}
-		else {
+		} else {
 			add_filter('category_description', 'do_shortcode');
 		}
 	}
@@ -686,8 +693,7 @@ 
 		if( in_array($pagenow, array('edit-tags.php')) ) {
 			$editor_id = 'tag_description';
 			$editor_selector = 'description';
-		}
-		else {
+		} else {
 			$editor_id = $editor_selector = 'category_description';
 		}
 
@@ -749,8 +755,7 @@ 
 
 		if (!empty($wp_query->queried_object) && !empty($wp_query->queried_object->post_type) && ($wp_query->queried_object->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT)) {
 			return wpshop_products::product_complete_sheet_output($content, $wp_query->post->ID);
-		}
-		else {
+		} else {
 			return $content;
 		}
 	}

Spacing +128 added lines, -128 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'));
 }
 
 /**
@@ -30,8 +30,8 @@ 
 	*
 	*	@return string Html code composing the page header
 	*/
-	public static function displayPageHeader($pageTitle, $pageIcon, $iconTitle, $iconAlt, $hasAddButton = true, $addButtonLink = '', $actionInformationMessage = '', $current_page_slug = ''){
-		include(WPSHOP_TEMPLATES_DIR.'admin/admin_page_header.tpl.php');
+	public static function displayPageHeader($pageTitle, $pageIcon, $iconTitle, $iconAlt, $hasAddButton = true, $addButtonLink = '', $actionInformationMessage = '', $current_page_slug = '') {
+		include(WPSHOP_TEMPLATES_DIR . 'admin/admin_page_header.tpl.php');
 	}
 
 	/**
@@ -41,8 +41,8 @@ 
 	*
 	*	@return string Html code composing the page footer
 	*/
-	public static function displayPageFooter($formActionButton){
-		include(WPSHOP_TEMPLATES_DIR.'admin/admin_page_footer.tpl.php');
+	public static function displayPageFooter($formActionButton) {
+		include(WPSHOP_TEMPLATES_DIR . 'admin/admin_page_footer.tpl.php');
 	}
 
 	/**
@@ -50,7 +50,7 @@ 
 	*
 	*	@return string The complete html page output
 	*/
-	public static function display_page(){
+	public static function display_page() {
 
 		$pageAddButton = false;
 		$pageMessage = $addButtonLink = $pageFormButton = $pageIcon = $pageIconTitle = $pageIconAlt = $objectType = '';
@@ -60,13 +60,13 @@ 
 		$action = isset($_REQUEST['action']) ? wpshop_tools::varSanitizer($_REQUEST['action']) : '';
 
 		/*	Select the content to add to the page looking for the parameter	*/
-		switch($pageSlug){
+		switch ($pageSlug) {
 			case WPSHOP_URL_SLUG_ATTRIBUTE_LISTING:
 				$objectType = new wpshop_attributes();
 				$current_user_can_edit = current_user_can('wpshop_edit_attributes');
 				$current_user_can_add = current_user_can('wpshop_add_attributes');
 				$current_user_can_delete = current_user_can('wpshop_delete_attributes');
-				if(current_user_can('wpshop_add_attributes')){
+				if (current_user_can('wpshop_add_attributes')) {
 					$pageAddButton = true;
 				}
 			break;
@@ -75,7 +75,7 @@ 
 				$current_user_can_edit = current_user_can('wpshop_edit_attribute_set');
 				$current_user_can_add = current_user_can('wpshop_add_attribute_set');
 				$current_user_can_delete = current_user_can('wpshop_delete_attribute_set');
-				if(current_user_can('wpshop_add_attribute_set')){
+				if (current_user_can('wpshop_add_attribute_set')) {
 					$pageAddButton = true;
 				}
 			break;
@@ -88,20 +88,20 @@ 
 				$pageAddButton = false;
 				$objectType = new wpshop_messages();
 				$current_user_can_edit = true;
-				$mid = !empty( $_GET['mid'] ) ? sanitize_text_field( $_GET['mid'] ) : '';
-				if(!empty($mid)){
+				$mid = !empty($_GET['mid']) ? sanitize_text_field($_GET['mid']) : '';
+				if (!empty($mid)) {
 					$action = 'edit';
 				}
 			break;
 			default:{
-				$pageTitle = sprintf(__('You have to add this page into %s at line %s', 'wpshop'), __FILE__, (__LINE__ - 4));
+				$pageTitle = sprintf(__('You have to add this page into %s at line %s', 'wpshop'), __FILE__, (__LINE__ -4));
 				$pageAddButton = false;
 			}
 			break;
 		}
 
-		if($objectType != ''){
-			if(($action != '') && ((($action == 'edit') && $current_user_can_edit) || (($action == 'add') && $current_user_can_add) || (($action == 'delete') && $current_user_can_delete))){
+		if ($objectType != '') {
+			if (($action != '') && ((($action == 'edit') && $current_user_can_edit) || (($action == 'add') && $current_user_can_add) || (($action == 'delete') && $current_user_can_delete))) {
 				$outputType = 'adding';
 			}
 			$objectType->elementAction();
@@ -110,10 +110,10 @@ 
 			$pageIconTitle = self::getPageIconInformation('title', $objectType);
 			$pageIconAlt = self::getPageIconInformation('alt', $objectType);
 
-			if($outputType == 'listing'){
+			if ($outputType == 'listing') {
 				$pageContent = $objectType->elementList();
 			}
-			elseif($outputType == 'adding'){
+			elseif ($outputType == 'adding') {
 				$pageAddButton = false;
 
 				$pageFormButton = $objectType->getPageFormButton($objectToEdit);
@@ -123,11 +123,11 @@ 
 
 			$pageTitle = $objectType->pageTitle();
 			$pageMessage = $objectType->pageMessage;
-			if ( in_array( $objectType->getEditionSlug(), array(WPSHOP_URL_SLUG_ATTRIBUTE_LISTING, WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING) ) ) {
+			if (in_array($objectType->getEditionSlug(), array(WPSHOP_URL_SLUG_ATTRIBUTE_LISTING, WPSHOP_URL_SLUG_ATTRIBUTE_SET_LISTING))) {
 				$addButtonLink = admin_url('admin.php?page=' . $objectType->getEditionSlug() . '&amp;action=add');
 			}
 			else {
-				$addButtonLink = admin_url('edit.php?post_type='.WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES.'&amp;page=' . $objectType->getEditionSlug() . '&amp;action=add');
+				$addButtonLink = admin_url('edit.php?post_type=' . WPSHOP_NEWTYPE_IDENTIFIER_ENTITIES . '&amp;page=' . $objectType->getEditionSlug() . '&amp;action=add');
 			}
 		}
 
@@ -149,37 +149,37 @@ 
 	 *
 	 * @return string The output builded from selected type
 	 */
-	public static function custom_page_output_builder($content, $output_type='tab') {
+	public static function custom_page_output_builder($content, $output_type = 'tab') {
 		$output_custom_layout = '';
 
-		switch ( $output_type ) {
+		switch ($output_type) {
 			case 'separated_bloc':
-				foreach ( $content as $element_type => $element_type_details ) {
-					$output_custom_layout.='
-	<div class="wpshop_separated_bloc wpshop_separated_bloc_'.$element_type.'" >';
-					foreach ( $element_type_details as $element_type_key => $element_type_content ) {
-						$output_custom_layout.='
-		<div class="wpshop_admin_box wpshop_admin_box_'.$element_type.' wpshop_admin_box_'.$element_type.'_'.$element_type_key.'" >
+				foreach ($content as $element_type => $element_type_details) {
+					$output_custom_layout .= '
+	<div class="wpshop_separated_bloc wpshop_separated_bloc_'.$element_type . '" >';
+					foreach ($element_type_details as $element_type_key => $element_type_content) {
+						$output_custom_layout .= '
+		<div class="wpshop_admin_box wpshop_admin_box_'.$element_type . ' wpshop_admin_box_' . $element_type . '_' . $element_type_key . '" >
 			<h3>' . $element_type_content['title'] . '</h3>' . $element_type_content['content'] . '
 		</div>';
 					}
-					$output_custom_layout.='
+					$output_custom_layout .= '
 	</div>';
 				}
 			break;
 			case 'tab':
-				$tab_list=$tab_content_list='';
-				foreach ( $content as $element_type => $element_type_details ) {
-					foreach ( $element_type_details as $element_type_key => $element_type_content ) {
-						$tab_list.='
-		<li><a href="#wpshop_'.$element_type.'_'.$element_type_key.'" >'.$element_type_content['title'].'</a></li>';
-						$tab_content_list.='
-		<div id="wpshop_'.$element_type.'_'.$element_type_key.'" class="wpshop_admin_box wpshop_admin_box_'.$element_type.' wpshop_admin_box_'.$element_type.'_'.$element_type_key.'" >'.$element_type_content['content'].'
+				$tab_list = $tab_content_list = '';
+				foreach ($content as $element_type => $element_type_details) {
+					foreach ($element_type_details as $element_type_key => $element_type_content) {
+						$tab_list .= '
+		<li><a href="#wpshop_'.$element_type . '_' . $element_type_key . '" >' . $element_type_content['title'] . '</a></li>';
+						$tab_content_list .= '
+		<div id="wpshop_'.$element_type . '_' . $element_type_key . '" class="wpshop_admin_box wpshop_admin_box_' . $element_type . ' wpshop_admin_box_' . $element_type . '_' . $element_type_key . '" >' . $element_type_content['content'] . '
 		</div>';
 					}
 				}
-				$output_custom_layout.='
-	<div id="wpshopFormManagementContainer" class="wpshop_tabs wpshop_full_page_tabs wpshop_'.$element_type.'_tabs" >
+				$output_custom_layout .= '
+	<div id="wpshopFormManagementContainer" class="wpshop_tabs wpshop_full_page_tabs wpshop_'.$element_type . '_tabs" >
 		<ul>' . $tab_list . '</ul>' . $tab_content_list . '
 	</div>';
 					break;
@@ -201,21 +201,21 @@ 
 	 *
 	 *	@return string $table The html code of the table to output
 	 */
-	public static function getTable($tableId, $tableTitles, $tableRows, $tableClasses, $tableRowsId, $tableSummary = '', $withFooter = true){
+	public static function getTable($tableId, $tableTitles, $tableRows, $tableClasses, $tableRowsId, $tableSummary = '', $withFooter = true) {
 		$tableTitleBar = $tableBody = '';
 
 		/*	Create the header and footer row	*/
-		for($i=0; $i<count($tableTitles); $i++){
+		for ($i = 0; $i < count($tableTitles); $i++) {
 			$tableTitleBar .= '
 				<th class="' . $tableClasses[$i] . '" scope="col" >' . $tableTitles[$i] . '</th>';
 		}
 
 		/*	Create each table row	*/
-		for($lineNumber=0; $lineNumber<count($tableRows); $lineNumber++){
+		for ($lineNumber = 0; $lineNumber < count($tableRows); $lineNumber++) {
 			$tableRow = $tableRows[$lineNumber];
 			$tableBody .= '
 		<tr id="' . $tableRowsId[$lineNumber] . '" class="tableRow" >';
-			for($i=0; $i<count($tableRow); $i++){
+			for ($i = 0; $i < count($tableRow); $i++) {
 				$tableBody .= '
 			<td class="' . $tableClasses[$i] . ' ' . $tableRow[$i]['class'] . '" >' . $tableRow[$i]['value'] . '</td>';
 			}
@@ -226,13 +226,13 @@ 
 		/*	Create the table output	*/
 		$table = '
 <table id="' . $tableId . '" cellspacing="0" cellpadding="0" class="widefat post fixed" >';
-		if($tableTitleBar != ''){
+		if ($tableTitleBar != '') {
 			$table .= '
 	<thead>
 			<tr class="tableTitleHeader" >' . $tableTitleBar . '
 			</tr>
 	</thead>';
-			if($withFooter){
+			if ($withFooter) {
 				$table .= '
 	<tfoot>
 			<tr class="tableTitleFooter" >' . $tableTitleBar . '
@@ -255,8 +255,8 @@ 
 	 *
 	 * @return string $pageIconInformation The information to output in the page
 	 */
-	public static function getPageIconInformation($infoType, $object){
-		switch($infoType){
+	public static function getPageIconInformation($infoType, $object) {
+		switch ($infoType) {
 			case 'path':
 				$pageIconInformation = $object->pageIcon;
 			break;
@@ -278,18 +278,18 @@ 
 	 *
 	 * @return string $file_path The good filepath to include
 	 */
-	public static function get_template_file($file_name, $default_dir = WPSHOP_TEMPLATES_DIR, $dir_name = 'wpshop', $usage_type = 'include', $check_only_custom = false){
+	public static function get_template_file($file_name, $default_dir = WPSHOP_TEMPLATES_DIR, $dir_name = 'wpshop', $usage_type = 'include', $check_only_custom = false) {
 		$file_path = '';
 		$the_file = $dir_name . '/' . $file_name;
 
 		if (is_file(get_stylesheet_directory() . '/' . $the_file)) {
 			$default_dir = str_replace(WP_CONTENT_DIR, WP_CONTENT_URL, get_stylesheet_directory());
-			if($usage_type == 'include'){
+			if ($usage_type == 'include') {
 				$default_dir = get_stylesheet_directory();
 			}
 			$file_path = $default_dir . '/' . $the_file;
 		}
-		else if ( !$check_only_custom ) {
+		else if (!$check_only_custom) {
 			$file_path = $default_dir . $the_file;
 		}
 
@@ -312,124 +312,124 @@ 
 		$custom_template_part = get_stylesheet_directory() . '/' . $default_template_dir . '/';
 
 		/** Let support the old way of template managing	*/
-		switch ( $template_part ) {
+		switch ($template_part) {
 			case 'category_mini_list':
 					$old_file_to_take_care_url = 'category-mini-list.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'category_mini_grid':
 					$old_file_to_take_care_url = 'category-mini-grid.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_complete_tpl':
 					$old_file_to_take_care_url = 'product.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_mini_list':
 					$old_file_to_take_care_url = 'product-mini-list.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_mini_grid':
 					$old_file_to_take_care_url = 'product-mini-grid.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_listing_sorting':
 					$old_file_to_take_care_url = 'product_listing_sorting.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'unavailable_product_button':
 					$old_file_to_take_care_url = 'not_available_product_button.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'add_to_cart_button':
 					$old_file_to_take_care_url = 'available_product_button.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'ask_quotation_button':
 					$old_file_to_take_care_url = 'quotation_button.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'mini_cart_content':
 					$old_file_to_take_care_url = 'wpshop_mini_cart.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_is_new_sticker':
 					$old_file_to_take_care_url = 'product-is-new.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_is_featured_sticker':
 					$old_file_to_take_care_url = 'product-is-featured.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attribute_container':
 					$old_file_to_take_care_url = 'product-attribute-front-display-main-container.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attribute_tabs':
 					$old_file_to_take_care_url = 'product-attribute-front-display-tabs.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attribute_tabs_detail':
 					$old_file_to_take_care_url = 'product-attribute-front-display-tabs-content.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attachment_picture_galery':
 					$old_file_to_take_care_url = 'product_picture_galery.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attachment_galery':
 					$old_file_to_take_care_url = 'product_document_library.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attachment_item_picture':
 					$old_file_to_take_care_url = 'product_attachment_picture_line.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_attachment_item_document':
 					$old_file_to_take_care_url = 'product_attachment_document_line.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
 			case 'product_added_to_cart_message':
 					$old_file_to_take_care_url = 'product_added_to_cart_message.tpl.php';
-					if ( is_file($custom_template_part . $old_file_to_take_care_url ) ) :
+					if (is_file($custom_template_part . $old_file_to_take_care_url)) :
 						$old_file_to_take_care = true;
 					endif;
 				break;
@@ -459,13 +459,13 @@ 
 	 */
 	public static function display_template_element($template_part, $template_part_component, $extras_args = array(), $default_template_dir = 'wpshop') {
 		/**	Set the template element to return by default before checking if custom exists in order to be sure to return something	*/
-		$default_template_element = wpshop_display::check_template_to_display( 'default', $template_part, $extras_args, $default_template_dir );
+		$default_template_element = wpshop_display::check_template_to_display('default', $template_part, $extras_args, $default_template_dir);
 
 		/**	Check in custom template if there is not a custom element to display for current 	*/
-		$custom_template_element = wpshop_display::check_template_to_display( 'custom', $template_part, $extras_args, $default_template_dir );
+		$custom_template_element = wpshop_display::check_template_to_display('custom', $template_part, $extras_args, $default_template_dir);
 		$tpl_element_to_return = !empty($custom_template_element) ? $custom_template_element : $default_template_element;
 
-		$template_part_component = apply_filters( 'wps_filter_display_' . $template_part, $template_part_component, $extras_args, $default_template_dir );
+		$template_part_component = apply_filters('wps_filter_display_' . $template_part, $template_part_component, $extras_args, $default_template_dir);
 
 		return self::feed_template($tpl_element_to_return, $template_part_component);
 	}
@@ -477,44 +477,44 @@ 
 		/*	Load template component	*/
 		/*	Get default admin template	*/
 		require_once(WPSHOP_TEMPLATES_DIR . 'admin/main_elements.tpl.php');
-		$wpshop_template['admin']['default'] = ($tpl_element);unset($tpl_element);
+		$wpshop_template['admin']['default'] = ($tpl_element); unset($tpl_element);
 		/*	Get custom admin template	*/
-		if ( is_file(get_stylesheet_directory() . '/admin/main_elements.tpl.php') ) {
+		if (is_file(get_stylesheet_directory() . '/admin/main_elements.tpl.php')) {
 			require_once(get_stylesheet_directory() . '/admin/main_elements.tpl.php');
 			if (!empty($tpl_element))
-				$wpshop_template['admin']['custom'] = ($tpl_element);unset($tpl_element);
+				$wpshop_template['admin']['custom'] = ($tpl_element); unset($tpl_element);
 		}
-		if ( is_file(get_stylesheet_directory() . '/admin/wpshop_elements_template.tpl.php') ) {
+		if (is_file(get_stylesheet_directory() . '/admin/wpshop_elements_template.tpl.php')) {
 			require_once(get_stylesheet_directory() . '/admin/wpshop_elements_template.tpl.php');
 			if (!empty($tpl_element))
-				$wpshop_template['admin']['custom'] = ($tpl_element);unset($tpl_element);
+				$wpshop_template['admin']['custom'] = ($tpl_element); unset($tpl_element);
 		}
 		/*	Get default frontend template	*/
 		require_once(WPSHOP_TEMPLATES_DIR . 'wpshop/main_elements.tpl.php');
-		$wpshop_template['wpshop']['default'] = ($tpl_element);unset($tpl_element);
+		$wpshop_template['wpshop']['default'] = ($tpl_element); unset($tpl_element);
 		/*	Get custom frontend template	*/
-		if ( is_file(get_stylesheet_directory() . '/wpshop/main_elements.tpl.php') ) {
+		if (is_file(get_stylesheet_directory() . '/wpshop/main_elements.tpl.php')) {
 			require_once(get_stylesheet_directory() . '/wpshop/main_elements.tpl.php');
 			if (!empty($tpl_element))
-				$wpshop_template['wpshop']['custom'] = ($tpl_element);unset($tpl_element);
+				$wpshop_template['wpshop']['custom'] = ($tpl_element); unset($tpl_element);
 		}
-		if ( is_file(get_stylesheet_directory() . '/wpshop/wpshop_elements_template.tpl.php') ) {
+		if (is_file(get_stylesheet_directory() . '/wpshop/wpshop_elements_template.tpl.php')) {
 			require_once(get_stylesheet_directory() . '/wpshop/wpshop_elements_template.tpl.php');
 			if (!empty($tpl_element))
-				$wpshop_template['wpshop']['custom'] = ($tpl_element);unset($tpl_element);
+				$wpshop_template['wpshop']['custom'] = ($tpl_element); unset($tpl_element);
 		}
-		foreach ( $wpshop_template as $site_side => $types ) {
-			foreach ( $types as $type => $tpl_component ) {
-				foreach ( $tpl_component as $tpl_key => $tpl_content ) {
+		foreach ($wpshop_template as $site_side => $types) {
+			foreach ($types as $type => $tpl_component) {
+				foreach ($tpl_component as $tpl_key => $tpl_content) {
 					$wpshop_template[$site_side][$type][$tpl_key] = str_replace("
 ", '', $tpl_content);
 				}
 			}
 		}
 
-		$wpshop_template = apply_filters( 'wpshop_custom_template', $wpshop_template);
+		$wpshop_template = apply_filters('wpshop_custom_template', $wpshop_template);
 
-		DEFINE( 'WPSHOP_TEMPLATE', serialize($wpshop_template) );
+		DEFINE('WPSHOP_TEMPLATE', serialize($wpshop_template));
 	}
 
 	/**
@@ -525,12 +525,12 @@ 
 	 *
 	 * @return array The new array with all elment, internal and module templates
 	 */
-	public static function add_modules_template_to_internal( $tpl_element, $templates ) {
-		if ( !empty($tpl_element) ) {
-			foreach ( $tpl_element as $template_part => $template_part_content) {
-				if ( !empty($template_part_content) && is_array($template_part_content) ) {
-					foreach ( $template_part_content as $template_type => $template_type_content) {
-						foreach ( $template_type_content as $template_key => $template) {
+	public static function add_modules_template_to_internal($tpl_element, $templates) {
+		if (!empty($tpl_element)) {
+			foreach ($tpl_element as $template_part => $template_part_content) {
+				if (!empty($template_part_content) && is_array($template_part_content)) {
+					foreach ($template_part_content as $template_type => $template_type_content) {
+						foreach ($template_type_content as $template_key => $template) {
 							$templates[$template_part][$template_type][$template_key] = $template;
 						}
 					}
@@ -550,20 +550,20 @@ 
 	 *
 	 * @return string The good template to take in care, regarding on the given parameters
 	 */
-	public static function check_template_to_display( $part, $template_part, $extras_args, $default_template_dir  ) {
+	public static function check_template_to_display($part, $template_part, $extras_args, $default_template_dir) {
 		$tpl_element_to_return = '';
 
 		/**	Get the defined template	*/
 		$template = defined("WPSHOP_TEMPLATE") ? unserialize(WPSHOP_TEMPLATE) : array();
 
-		if ( !empty($extras_args['type']) && !empty($extras_args['id']) && !empty( $template[$default_template_dir][$part]) && !empty($extras_args['page']) && !empty( $template[$default_template_dir][$part][$extras_args['page']] ) && !empty( $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']]) && !empty( $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']] ) && !empty( $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']][$template_part] ) ) {
+		if (!empty($extras_args['type']) && !empty($extras_args['id']) && !empty($template[$default_template_dir][$part]) && !empty($extras_args['page']) && !empty($template[$default_template_dir][$part][$extras_args['page']]) && !empty($template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']]) && !empty($template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']]) && !empty($template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']][$template_part])) {
 			$tpl_element_to_return = $template[$default_template_dir][$part][$extras_args['page']][$extras_args['type']][$extras_args['id']][$template_part];
 		}
-		elseif ( !empty($extras_args['type']) && !empty($extras_args['id']) && !empty( $template[$default_template_dir][$part][$extras_args['type']]) && !empty( $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']] ) && !empty( $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']][$template_part] ) ) {
+		elseif (!empty($extras_args['type']) && !empty($extras_args['id']) && !empty($template[$default_template_dir][$part][$extras_args['type']]) && !empty($template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']]) && !empty($template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']][$template_part])) {
 			$tpl_element_to_return = $template[$default_template_dir][$part][$extras_args['type']][$extras_args['id']][$template_part];
 		}
 		/**	Check if the file have been duplicated into theme directory for customization	*/
-		elseif ( !empty( $template[$default_template_dir][$part] ) && !empty( $template[$default_template_dir][$part][$template_part] ) ) {
+		elseif (!empty($template[$default_template_dir][$part]) && !empty($template[$default_template_dir][$part][$template_part])) {
 			$tpl_element_to_return = $template[$default_template_dir][$part][$template_part];
 		}
 
@@ -583,13 +583,13 @@ 
 		$feed['CURRENCY'] = wpshop_tools::wpshop_get_currency();
 		$feed['CURRENCY_CHOOSEN'] = wpshop_tools::wpshop_get_currency();
 		$feed['CURRENCY_SELECTOR'] = wpshop_attributes_unit::wpshop_shop_currency_list_field();
-		$feed['CART_LINK'] = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_cart_page_id') ) );
+		$feed['CART_LINK'] = get_permalink(wpshop_tools::get_page_id(get_option('wpshop_cart_page_id')));
 
 		$available_key = array();
 		foreach ($feed as $element => $value) {
-			$available_key[] = '{WPSHOP_'.$element.'}';
-			if ( !is_array($value) ) {
-				$template_to_fill = str_replace('{WPSHOP_'.$element.'}', $value, $template_to_fill);
+			$available_key[] = '{WPSHOP_' . $element . '}';
+			if (!is_array($value)) {
+				$template_to_fill = str_replace('{WPSHOP_' . $element . '}', $value, $template_to_fill);
 			}
 		}
 		if (WPSHOP_DISPLAY_AVAILABLE_KEYS_FOR_TEMPLATE) $template_to_fill = '<!-- Available keys : ' . implode(' / ', $available_key) . ' -->' . $template_to_fill;
@@ -602,11 +602,11 @@ 
 	 *
 	 * @param boolean $force_replacement Define if we overwrite in all case or just if it not exist
 	 */
-	public static function check_template_file( $force_replacement = false ) {
+	public static function check_template_file($force_replacement = false) {
 		$wpshop_directory = get_stylesheet_directory() . '/wpshop';
 
 		/*	Add different file template	*/
-		if(!is_dir($wpshop_directory)){
+		if (!is_dir($wpshop_directory)) {
 			@mkdir($wpshop_directory, 0755, true);
 		}
 		/* On s'assure que le dossier principal est bien en 0755	*/
@@ -614,12 +614,12 @@ 
 		$upload_dir = wp_upload_dir();
 
 		/*	Add the category template	*/
-		if(!is_file(get_stylesheet_directory() . '/taxonomy-wpshop_product_category.php') || ($force_replacement)){
+		if (!is_file(get_stylesheet_directory() . '/taxonomy-wpshop_product_category.php') || ($force_replacement)) {
 			@copy(WPSHOP_TEMPLATES_DIR . 'taxonomy-wpshop_product_category.php', get_stylesheet_directory() . '/taxonomy-wpshop_product_category.php');
 		}
 
 		/*	Add the product template	*/
-		if(!is_file(get_stylesheet_directory() . '/single-wpshop_product.php') || ($force_replacement)){
+		if (!is_file(get_stylesheet_directory() . '/single-wpshop_product.php') || ($force_replacement)) {
 			@copy(WPSHOP_TEMPLATES_DIR . 'single-wpshop_product.php', get_stylesheet_directory() . '/single-wpshop_product.php');
 		}
 	}
@@ -637,31 +637,31 @@ 
 		/*	Check if user is on taxonomy edition page	*/
 		if ($pagenow == 'edit-tags.php') {
 
-			if(!user_can_richedit()) { return; }
+			if (!user_can_richedit()) { return; }
 
 			$taxonomies = get_taxonomies();
 
 			foreach ($taxonomies as $tax) {
-				if ( in_array($tax, array(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES)) ) {
-					add_action($tax . '_edit_form_fields', array('wpshop_display','wpshop_add_form'));
-					add_action($tax . '_add_form_fields', array('wpshop_display','wpshop_add_form'));
+				if (in_array($tax, array(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES))) {
+					add_action($tax . '_edit_form_fields', array('wpshop_display', 'wpshop_add_form'));
+					add_action($tax . '_add_form_fields', array('wpshop_display', 'wpshop_add_form'));
 				}
 			}
-			$action = !empty( $_REQUEST['action'] ) ? sanitize_text_field( $_REQUEST['action'] ) : '';
-			$taxonomy = !empty( $_REQUEST['taxonomy'] ) ? sanitize_text_field( $_REQUEST['taxonomy'] ) : '';
+			$action = !empty($_REQUEST['action']) ? sanitize_text_field($_REQUEST['action']) : '';
+			$taxonomy = !empty($_REQUEST['taxonomy']) ? sanitize_text_field($_REQUEST['taxonomy']) : '';
 
 			if ($pagenow == 'edit-tags.php' && isset($action) && $action == 'edit' && empty($taxonomy)) {
-				add_action('edit_term',array('wpshop_display','wpshop_rt_taxonomy_save'));
+				add_action('edit_term', array('wpshop_display', 'wpshop_rt_taxonomy_save'));
 			}
 
-			foreach ( array( 'pre_term_description', 'pre_link_description', 'pre_link_notes', 'pre_user_description' ) as $filter ) {
-				remove_filter( $filter, 'wp_filter_kses' );
+			foreach (array('pre_term_description', 'pre_link_description', 'pre_link_notes', 'pre_user_description') as $filter) {
+				remove_filter($filter, 'wp_filter_kses');
 			}
 
 		}
 
 		/*	Enable shortcodes in category, taxonomy, tag descriptions */
-		if(function_exists('term_description')) {
+		if (function_exists('term_description')) {
 			add_filter('term_description', 'do_shortcode');
 		}
 		else {
@@ -677,8 +677,8 @@ 
 
 		$a = array('description');
 		foreach ($a as $v) {
-			$term = (array) $_POST[$v];
-			wp_update_term($tag_ID,$v,$term);
+			$term = (array)$_POST[$v];
+			wp_update_term($tag_ID, $v, $term);
 		}
 	}
 
@@ -690,9 +690,9 @@ 
 	public static function wpshop_add_form($object = '') {
 		global $pagenow;
 
-		$content = is_object($object) && isset($object->description) ? ( html_entity_decode( $object->description, ENT_COMPAT | ENT_HTML401, 'UTF-8' ) ) : '';
+		$content = is_object($object) && isset($object->description) ? (html_entity_decode($object->description, ENT_COMPAT | ENT_HTML401, 'UTF-8')) : '';
 
-		if( in_array($pagenow, array('edit-tags.php')) ) {
+		if (in_array($pagenow, array('edit-tags.php'))) {
 			$editor_id = 'tag_description';
 			$editor_selector = 'description';
 		}
@@ -722,8 +722,8 @@ 
 
 	public static function wps_hide_admin_bar_for_customers() {
 		$wpshop_hide_admin_bar_option = get_option('wpshop_display_option');
-		if ( !empty($wpshop_hide_admin_bar_option) && !empty($wpshop_hide_admin_bar_option['wpshop_hide_admin_bar']) && ! current_user_can( 'manage_options' ) ) {
-			show_admin_bar( false );
+		if (!empty($wpshop_hide_admin_bar_option) && !empty($wpshop_hide_admin_bar_option['wpshop_hide_admin_bar']) && !current_user_can('manage_options')) {
+			show_admin_bar(false);
 		}
 	}
 
@@ -737,7 +737,7 @@ 
 	 * @param string $content The content of a post
 	 * @return Ambigous <mixed, string>|unknown
 	 */
-	public static function products_page( $content = '' ) {
+	public static function products_page($content = '') {
 		global $wp_query;
 
 		if (!empty($wp_query->queried_object) && !empty($wp_query->queried_object->post_type) && ($wp_query->queried_object->post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT)) {
@@ -756,15 +756,15 @@ 
 	 *
 	 * @return string The formated value
 	 */
-	public static function format_field_output( $output_type, $value ) {
+	public static function format_field_output($output_type, $value) {
 		$formated_value = $value;
 
-		if ( !empty($value) ) {
-			switch ( $output_type ) {
+		if (!empty($value)) {
+			switch ($output_type) {
 				case 'wpshop_product_price':
-					$formated_value = (is_numeric($value) ) ? number_format($value, 2, ',', '') : $value;
+					$formated_value = (is_numeric($value)) ? number_format($value, 2, ',', '') : $value;
 					$formated_value_content = explode(',', $formated_value);
-					if ( !empty($formated_value_content) && !empty($formated_value_content[1]) && $formated_value_content[1] <= 0 ) {
+					if (!empty($formated_value_content) && !empty($formated_value_content[1]) && $formated_value_content[1] <= 0) {
 						$formated_value = $formated_value_content[0];
 					}
 				break;

includes/librairies/display/widgets/categories.widget.php

Indentation +13 added lines, -13 removed lines

@@ -33,10 +33,10 @@ 
 	}
 
 	/**
-	*	Define the content for the widget
-	*
-	*	@param mixed $instance The current widget instance
-	*/
+	 *	Define the content for the widget
+	 *
+	 *	@param mixed $instance The current widget instance
+	 */
 	function form($instance){
 		$instance = wp_parse_args((array) $instance, array(
 			'title' => '',
@@ -72,11 +72,11 @@ 
 	}
 
 	/**
-	* Widget Output
-	*
-	* @param array $args
-	* @param array $instance Widget values.
-	*/
+	 * Widget Output
+	 *
+	 * @param array $args
+	 * @param array $instance Widget values.
+	 */
 	function widget($args, $instance){
 		$widget_content = '';
 
@@ -96,10 +96,10 @@ 
 	}
 
 	/**
-	*	Get the sub categories of a given category
-	*
-	*	@param integer $parent_category The main category we want to have the sub categories for
-	*/
+	 *	Get the sub categories of a given category
+	 *
+	 *	@param integer $parent_category The main category we want to have the sub categories for
+	 */
 	function category_tree_selector_output($category_id = 0, $wpshop_widget_categories, $instance){
 		$category_tree_output = '';
 

Spacing +19 added lines, -19 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
 * WpShop categories menu widget management
 *
@@ -22,14 +22,14 @@ 
 	 * Widget Constructor
 	 */
 	public function __construct() {
-		add_action('widgets_init', create_function('', 'return register_widget("WP_Widget_Wpshop_Product_categories");' ) );
+		add_action('widgets_init', create_function('', 'return register_widget("WP_Widget_Wpshop_Product_categories");'));
 		
 		$params = array(
 			'classname' => 'widget_wpshop_pdt_categories',
 			'description' => __('Wpshop product categories widget', 'wpshop')
 		);
 		
-		parent::__construct( 'wpshop_pdt_categories', __('• Wpshop Categories', 'wpshop'), $params );
+		parent::__construct('wpshop_pdt_categories', __('• Wpshop Categories', 'wpshop'), $params);
 	}
 
 	/**
@@ -37,36 +37,36 @@ 
 	*
 	*	@param mixed $instance The current widget instance
 	*/
-	function form($instance){
-		$instance = wp_parse_args((array) $instance, array(
+	function form($instance) {
+		$instance = wp_parse_args((array)$instance, array(
 			'title' => '',
 			'show_product' => '',
 			'show_all_cat' => '',
 			'wpshop_widget_categories' => ''
 		));
 
-		$title    		= esc_attr($instance['title']);
+		$title = esc_attr($instance['title']);
 		$show_all_cat	= esc_attr($instance['show_all_cat']);
 		$show_product	= esc_attr($instance['show_product']);
-		if ( !isset( $instance['wpshop_widget_categories'] ) ){
+		if (!isset($instance['wpshop_widget_categories'])) {
 			$categories = get_terms(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, array('hide_empty' => '0', 'parent' => 0));
-			if(!empty($categories)){
-				foreach($categories as $category){
+			if (!empty($categories)) {
+				foreach ($categories as $category) {
 					$instance['wpshop_widget_categories'][$category->term_id] = 'on';
 				}
 			}
 		}
-		$wpshop_widget_categories	= esc_attr($instance['wpshop_widget_categories']);
+		$wpshop_widget_categories = esc_attr($instance['wpshop_widget_categories']);
 		$checked = (($show_product != '') && ($show_product == 'yes')) ? 'checked="checked"' : '';
 ?>
 		<p>
-			<label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title', 'wpshop' ); ?></label>
-			<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
+			<label for="<?php echo $this->get_field_id('title'); ?>"><?php _e('Title', 'wpshop'); ?></label>
+			<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo $title; ?>" />
 		</p>
 		<p>
-			<input id="<?php echo $this->get_field_id( 'show_all_cat' ); ?>" class="wpshop-widget-all-cat" name="<?php echo $this->get_field_name( 'show_all_cat' ); ?>" type="hidden" value="yes" />
-			<input <?php echo $checked; ?> id="<?php echo $this->get_field_id( 'show_product' ); ?>" name="<?php echo $this->get_field_name( 'show_product' ); ?>" type="checkbox" value="yes" />
-			<label for="<?php echo $this->get_field_id( 'show_product' ); ?>" ><?php _e( 'Show product', 'wpshop' ); ?></label>
+			<input id="<?php echo $this->get_field_id('show_all_cat'); ?>" class="wpshop-widget-all-cat" name="<?php echo $this->get_field_name('show_all_cat'); ?>" type="hidden" value="yes" />
+			<input <?php echo $checked; ?> id="<?php echo $this->get_field_id('show_product'); ?>" name="<?php echo $this->get_field_name('show_product'); ?>" type="checkbox" value="yes" />
+			<label for="<?php echo $this->get_field_id('show_product'); ?>" ><?php _e('Show product', 'wpshop'); ?></label>
 		</p>
 <?php
 	}
@@ -77,7 +77,7 @@ 
 	* @param array $args
 	* @param array $instance Widget values.
 	*/
-	function widget($args, $instance){
+	function widget($args, $instance) {
 		$widget_content = '';
 
 		/*	Get the default args from wordpress	*/
@@ -100,12 +100,12 @@ 
 	*
 	*	@param integer $parent_category The main category we want to have the sub categories for
 	*/
-	function category_tree_selector_output($category_id = 0, $wpshop_widget_categories, $instance){
+	function category_tree_selector_output($category_id = 0, $wpshop_widget_categories, $instance) {
 		$category_tree_output = '';
 
 		$categories = get_terms(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, array('hide_empty' => '0', 'parent' => $category_id));
-		if(count($categories) > 0){
-			foreach($categories as $category){
+		if (count($categories) > 0) {
+			foreach ($categories as $category) {
 				$checked = (is_array($instance['wpshop_widget_categories']) && in_array($category->term_id, $instance['wpshop_widget_categories'])) ? ' checked="checked" ' : '';
 				$category_main_class = ($category_id > 0) ? 'class="wpshop_categories_children"' : '';
 				$category_tree_output .= '

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
 * WpShop categories menu widget management
 *

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;

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/cic.class.php

Indentation +16 added lines, -16 removed lines

@@ -198,22 +198,22 @@
 // ----------------------------------------------------------------------------
 function HtmlEncode ($data)
 {
-    $SAFE_OUT_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890._-";
-    $encoded_data = "";
-    $result = "";
-    for ($i=0; $i<strlen($data); $i++)
-    {
-        if (strchr($SAFE_OUT_CHARS, $data{$i})) {
-            $result .= $data{$i};
-        }
-        else if (($var = bin2hex(substr($data,$i,1))) <= "7F"){
-            $result .= "&#x" . $var . ";";
-        }
-        else
-            $result .= $data{$i};
-
-    }
-    return $result;
+	$SAFE_OUT_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890._-";
+	$encoded_data = "";
+	$result = "";
+	for ($i=0; $i<strlen($data); $i++)
+	{
+		if (strchr($SAFE_OUT_CHARS, $data{$i})) {
+			$result .= $data{$i};
+		}
+		else if (($var = bin2hex(substr($data,$i,1))) <= "7F"){
+			$result .= "&#x" . $var . ";";
+		}
+		else
+			$result .= $data{$i};
+
+	}
+	return $result;
 }
 
 class wpshop_CIC {

Braces +18 added lines, -16 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' ) ) {
@@ -81,9 +83,10 @@ 
 
 	private function _checkTpeParams($aConstants) {
 
-		for ($i = 0; $i < count($aConstants); $i++)
-			if (!defined($aConstants[$i]))
+		for ($i = 0; $i < count($aConstants); $i++) {
+					if (!defined($aConstants[$i]))
 				die ("Erreur param�tre " . $aConstants[$i] . " ind�fini");
+		}
 	}
 
 }
@@ -126,13 +129,14 @@ 
 
 		$cca0=ord($hexFinal);
 
-		if ($cca0>70 && $cca0<97)
-			$hexStrKey .= chr($cca0-23) . substr($hexFinal, 1, 1);
-		else {
-			if (substr($hexFinal, 1, 1)=="M")
-				$hexStrKey .= substr($hexFinal, 0, 1) . "0";
-			else
-				$hexStrKey .= substr($hexFinal, 0, 2);
+		if ($cca0>70 && $cca0<97) {
+					$hexStrKey .= chr($cca0-23) . substr($hexFinal, 1, 1);
+		} else {
+			if (substr($hexFinal, 1, 1)=="M") {
+							$hexStrKey .= substr($hexFinal, 0, 1) . "0";
+			} else {
+							$hexStrKey .= substr($hexFinal, 0, 2);
+			}
 		}
 
 		return pack("H*", $hexStrKey);
@@ -205,12 +209,11 @@ 
     {
         if (strchr($SAFE_OUT_CHARS, $data{$i})) {
             $result .= $data{$i};
-        }
-        else if (($var = bin2hex(substr($data,$i,1))) <= "7F"){
+        } else if (($var = bin2hex(substr($data,$i,1))) <= "7F"){
             $result .= "&#x" . $var . ";";
+        } else {
+                    $result .= $data{$i};
         }
-        else
-            $result .= $data{$i};
 
     }
     return $result;
@@ -329,8 +332,7 @@ 
 			wpshop_payment::check_order_payment_total_amount($CMCIC_bruteVars['reference'], $params_array, $payment_status);
 
 			$receipt = CMCIC_CGI2_MACOK;
-		}
-		else {
+		} else {
 			// your code if the HMAC doesn't match
 			$receipt = CMCIC_CGI2_MACNOTOK.$cgi2_fields;
 		}

Spacing +81 added lines, -81 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'));
 }
 
 
@@ -13,11 +13,11 @@ 
 ***************************************************************************************/
 
 
-define("CMCIC_CTLHMAC","V1.04.sha1.php--[CtlHmac%s%s]-%s");
+define("CMCIC_CTLHMAC", "V1.04.sha1.php--[CtlHmac%s%s]-%s");
 define("CMCIC_CTLHMACSTR", "CtlHmac%s%s");
-define("CMCIC_CGI2_RECEIPT","version=2\ncdr=%s");
-define("CMCIC_CGI2_MACOK","0");
-define("CMCIC_CGI2_MACNOTOK","1\n");
+define("CMCIC_CGI2_RECEIPT", "version=2\ncdr=%s");
+define("CMCIC_CGI2_MACOK", "0");
+define("CMCIC_CGI2_MACNOTOK", "1\n");
 define("CMCIC_CGI2_FIELDS", "%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*");
 define("CMCIC_CGI1_FIELDS", "%s*%s*%s%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s*%s");
 define("CMCIC_URLPAIEMENT", "paiement.cgi");
@@ -25,15 +25,15 @@ 
 class CMCIC_Tpe {
 
 
-	public $sVersion;	// Version du TPE - TPE Version (Ex : 3.0)
-	public $sNumero;	// Numero du TPE - TPE Number (Ex : 1234567)
-	public $sCodeSociete;	// Code Societe - Company code (Ex : companyname)
-	public $sLangue;	// Langue - Language (Ex : FR, DE, EN, ..)
-	public $sUrlOK;		// Url de retour OK - Return URL OK
-	public $sUrlKO;		// Url de retour KO - Return URL KO
-	public $sUrlPaiement;	// Url du serveur de paiement - Payment Server URL (Ex : https://paiement.creditmutuel.fr/paiement.cgi)
+	public $sVersion; // Version du TPE - TPE Version (Ex : 3.0)
+	public $sNumero; // Numero du TPE - TPE Number (Ex : 1234567)
+	public $sCodeSociete; // Code Societe - Company code (Ex : companyname)
+	public $sLangue; // Langue - Language (Ex : FR, DE, EN, ..)
+	public $sUrlOK; // Url de retour OK - Return URL OK
+	public $sUrlKO; // Url de retour KO - Return URL KO
+	public $sUrlPaiement; // Url du serveur de paiement - Payment Server URL (Ex : https://paiement.creditmutuel.fr/paiement.cgi)
 
-	private $_sCle;		// La cl� - The Key
+	private $_sCle; // La cl� - The Key
 
 
 	// Constructeur / Constructor
@@ -52,8 +52,8 @@ 
 		$this->sCodeSociete = CMCIC_CODESOCIETE;
 		$this->sLangue = $sLangue;
 
-		$this->sUrlOK = wpshop_payment::get_success_payment_url();;
-		$this->sUrlKO = wpshop_payment::get_cancel_payment_url();;
+		$this->sUrlOK = wpshop_payment::get_success_payment_url(); ;
+		$this->sUrlKO = wpshop_payment::get_cancel_payment_url(); ;
 
 	}
 
@@ -97,7 +97,7 @@ 
 
 class CMCIC_Hmac {
 
-	private $_sUsableKey;	// La cl� du TPE en format op�rationnel / The usable TPE key
+	private $_sUsableKey; // La cl� du TPE en format op�rationnel / The usable TPE key
 
 	// ----------------------------------------------------------------------------
 	//
@@ -119,17 +119,17 @@ 
 	//
 	// ----------------------------------------------------------------------------
 
-	private function _getUsableKey($oTpe){
+	private function _getUsableKey($oTpe) {
 
 		$hexStrKey  = substr($oTpe->getCle(), 0, 38);
 		$hexFinal   = "" . substr($oTpe->getCle(), 38, 2) . "00";
 
-		$cca0=ord($hexFinal);
+		$cca0 = ord($hexFinal);
 
-		if ($cca0>70 && $cca0<97)
-			$hexStrKey .= chr($cca0-23) . substr($hexFinal, 1, 1);
+		if ($cca0 > 70 && $cca0 < 97)
+			$hexStrKey .= chr($cca0 - 23) . substr($hexFinal, 1, 1);
 		else {
-			if (substr($hexFinal, 1, 1)=="M")
+			if (substr($hexFinal, 1, 1) == "M")
 				$hexStrKey .= substr($hexFinal, 0, 1) . "0";
 			else
 				$hexStrKey .= substr($hexFinal, 0, 2);
@@ -170,17 +170,17 @@ 
 	//
 	// ----------------------------------------------------------------------------
 
-	public function hmac_sha1 ($key, $data) {
+	public function hmac_sha1($key, $data) {
 
 		$length = 64; // block length for SHA1
-		if (strlen($key) > $length) { $key = pack("H*",sha1($key)); }
+		if (strlen($key) > $length) { $key = pack("H*", sha1($key)); }
 		$key  = str_pad($key, $length, chr(0x00));
 		$ipad = str_pad('', $length, chr(0x36));
 		$opad = str_pad('', $length, chr(0x5c));
-		$k_ipad = $key ^ $ipad ;
+		$k_ipad = $key ^ $ipad;
 		$k_opad = $key ^ $opad;
 
-		return sha1($k_opad  . pack("H*",sha1($k_ipad . $data)));
+		return sha1($k_opad . pack("H*", sha1($k_ipad . $data)));
 	}
 
 }
@@ -196,17 +196,17 @@ 
 //                           ********************
 //              Encodage des caract�res sp�ciaux au format HTML
 // ----------------------------------------------------------------------------
-function HtmlEncode ($data)
+function HtmlEncode($data)
 {
     $SAFE_OUT_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890._-";
     $encoded_data = "";
     $result = "";
-    for ($i=0; $i<strlen($data); $i++)
+    for ($i = 0; $i < strlen($data); $i++)
     {
         if (strchr($SAFE_OUT_CHARS, $data{$i})) {
             $result .= $data{$i};
         }
-        else if (($var = bin2hex(substr($data,$i,1))) <= "7F"){
+        else if (($var = bin2hex(substr($data, $i, 1))) <= "7F") {
             $result .= "&#x" . $var . ";";
         }
         else
@@ -220,21 +220,21 @@ 
 
 	public function __construct() {
 		global $wpshop;
-		$cic_option = get_option( 'wpshop_addons' );
-		if ( !empty($cic_option) && !empty($cic_option['WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC']) ) {
+		$cic_option = get_option('wpshop_addons');
+		if (!empty($cic_option) && !empty($cic_option['WPSHOP_ADDONS_PAYMENT_GATEWAY_CB_CIC'])) {
 			/** 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('cic', $payment_option['mode']) ) {
+			$payment_option = get_option('wps_payment_mode');
+			if (!empty($payment_option) && !empty($payment_option['mode']) && !array_key_exists('cic', $payment_option['mode'])) {
 				$payment_option['mode']['cic']['name'] = __('CIC', 'wpshop');
-				$payment_option['mode']['cic']['logo'] = WPSHOP_TEMPLATES_URL.'wpshop/medias/cic_payment_logo.jpg';
+				$payment_option['mode']['cic']['logo'] = WPSHOP_TEMPLATES_URL . 'wpshop/medias/cic_payment_logo.jpg';
 				$payment_option['mode']['cic']['description'] = __('Reservation of products upon confirmation of payment.', 'wpshop');
-				update_option( 'wps_payment_mode', $payment_option );
+				update_option('wps_payment_mode', $payment_option);
 			}
 		}
 
-		$paymentListener = !empty( $_GET['paymentListener'] ) ? sanitize_text_field( $_GET['paymentListener'] ) : '';
+		$paymentListener = !empty($_GET['paymentListener']) ? sanitize_text_field($_GET['paymentListener']) : '';
 
-		if(!empty($paymentListener) && $paymentListener=='cic') {
+		if (!empty($paymentListener) && $paymentListener == 'cic') {
 			header("Pragma: no-cache");
 			header("Content-type: text/plain");
 			self::display_response();
@@ -278,7 +278,7 @@ 
 		if ($oHmac->computeHmac($cgi2_fields) == strtolower($CMCIC_bruteVars['MAC'])) {
 			wpshop_payment::save_payment_return_data($CMCIC_bruteVars['reference']);
 			$payment_status = 'denied';
-			switch($CMCIC_bruteVars['code-retour']) {
+			switch ($CMCIC_bruteVars['code-retour']) {
 				case "Annulation" :
 					// Attention : an autorization may still be delivered for this payment
 					//wpshop_payment::setOrderPaymentStatus($CMCIC_bruteVars['reference'], 'denied');
@@ -319,15 +319,15 @@ 
 				break;
 			}
 
-			$order_meta = get_post_meta( $CMCIC_bruteVars['reference'], '_order_postmeta', true);
+			$order_meta = get_post_meta($CMCIC_bruteVars['reference'], '_order_postmeta', true);
 			$params_array = array(
 				'method' => 'cic',
-				'waited_amount' => number_format( (float)$order_meta['order_amount_to_pay_now'], 2, '.', ''),
-				'status' => (($payment_status == 'completed') ? ( ( number_format( (float)$order_meta['order_amount_to_pay_now'], 2, '.', '') == number_format( (float)substr($CMCIC_bruteVars['montant'], 0, -3), 2, '.', '' ) ) ? 'payment_received' : 'incorrect_amount' ) : $payment_status),
+				'waited_amount' => number_format((float)$order_meta['order_amount_to_pay_now'], 2, '.', ''),
+				'status' => (($payment_status == 'completed') ? ((number_format((float)$order_meta['order_amount_to_pay_now'], 2, '.', '') == number_format((float)substr($CMCIC_bruteVars['montant'], 0, -3), 2, '.', '')) ? 'payment_received' : 'incorrect_amount') : $payment_status),
 				'author' => $order_meta['customer_id'],
 				'payment_reference' => $CMCIC_bruteVars['numauto'],
 				'date' => current_time('mysql', 0),
-				'received_amount' => number_format( (float)substr($CMCIC_bruteVars['montant'], 0, -3), 2, '.', '' )
+				'received_amount' => number_format((float)substr($CMCIC_bruteVars['montant'], 0, -3), 2, '.', '')
 			);
 			wpshop_payment::check_order_payment_total_amount($CMCIC_bruteVars['reference'], $params_array, $payment_status);
 
@@ -335,11 +335,11 @@ 
 		}
 		else {
 			// your code if the HMAC doesn't match
-			$receipt = CMCIC_CGI2_MACNOTOK.$cgi2_fields;
+			$receipt = CMCIC_CGI2_MACNOTOK . $cgi2_fields;
 		}
 
 		// Send receipt to CMCIC server
-		printf (CMCIC_CGI2_RECEIPT, $receipt);
+		printf(CMCIC_CGI2_RECEIPT, $receipt);
 	}
 
 	public static function display_form($oid) {
@@ -349,10 +349,10 @@ 
 		$order_customer_info = get_post_meta($oid, '_order_info', true);
 		//$currency_code = wpshop_tools::wpshop_get_currency($code=true);
 		$current_currency = get_option('wpshop_shop_default_currency');
-		$query = $wpdb->prepare('SELECT code_iso FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE id =%d ', $current_currency );
-		$currency_code = $wpdb->get_var( $query );
+		$query = $wpdb->prepare('SELECT code_iso FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id =%d ', $current_currency);
+		$currency_code = $wpdb->get_var($query);
 
-		if(!empty($order) && !empty($currency_code)) {
+		if (!empty($order) && !empty($currency_code)) {
 
 			$sOptions = "";
 			// ----------------------------------------------------------------------------
@@ -360,12 +360,12 @@ 
 			//  That's your job to set actual order fields. Here is a stub.
 			// -----------------------------------------------------------------------------
 			$sReference = $oid; // Reference: unique, alphaNum (A-Z a-z 0-9), 12 characters max
-			$sMontant = number_format($order['order_grand_total'],2,'.',''); // Amount : format  "xxxxx.yy" (no spaces)
+			$sMontant = number_format($order['order_grand_total'], 2, '.', ''); // Amount : format  "xxxxx.yy" (no spaces)
 			$sDevise  = $currency_code; // Currency : ISO 4217 compliant
 			$sTexteLibre = ""; // free texte : a bigger reference, session context for the return on the merchant website
 			$sDate = date("d/m/Y:H:i:s"); // transaction date : format d/m/y:h:m:s
 			$sLangue = "FR"; // Language of the company code
-			$sEmail = $order_customer_info['billing']['address']['address_user_email'];//"dev@eoxia.com"; // customer email
+			$sEmail = $order_customer_info['billing']['address']['address_user_email']; //"dev@eoxia.com"; // customer email
 			///////////////////////////////////////////////////////////////////////////////////////////
 			$sNbrEch = ""; //$sNbrEch = "4"; // between 2 and 4
 			$sDateEcheance1 = ""; // date echeance 1 - format dd/mm/yyyy //$sDateEcheance1 = date("d/m/Y");
@@ -386,7 +386,7 @@ 
 			$CtlHmac = sprintf(CMCIC_CTLHMAC, $oTpe->sVersion, $oTpe->sNumero, $oHmac->computeHmac(sprintf(CMCIC_CTLHMACSTR, $oTpe->sVersion, $oTpe->sNumero)));
 
 			// Data to certify
-			$PHP1_FIELDS = sprintf(CMCIC_CGI1_FIELDS,     $oTpe->sNumero,
+			$PHP1_FIELDS = sprintf(CMCIC_CGI1_FIELDS, $oTpe->sNumero,
 															$sDate,
 															$sMontant,
 															$sDevise,
@@ -413,30 +413,30 @@ 
 		?>
 		<script type="text/javascript">jQuery(document).ready(function(){ jQuery('#PaymentRequest_cic').submit(); });</script>
 		<div class="paypalPaymentLoading"><span><?php _e('Redirect to the CIC site in progress, please wait...', 'wpshop'); ?></span></div>
-		<form action="<?php echo $oTpe->sUrlPaiement;?>" method="post" id="PaymentRequest_cic">
-			<input type="hidden" name="version"             id="version"        value="<?php echo $oTpe->sVersion;?>" />
-			<input type="hidden" name="TPE"                 id="TPE"            value="<?php echo $oTpe->sNumero;?>" />
-			<input type="hidden" name="date"                id="date"           value="<?php echo $sDate;?>" />
-			<input type="hidden" name="montant"             id="montant"        value="<?php echo $sMontant . $sDevise;?>" />
-			<input type="hidden" name="reference"           id="reference"      value="<?php echo $sReference;?>" />
-			<input type="hidden" name="MAC"                 id="MAC"            value="<?php echo $sMAC;?>" />
-			<input type="hidden" name="url_retour"          id="url_retour"     value="<?php echo $oTpe->sUrlKO;?>" />
-			<input type="hidden" name="url_retour_ok"       id="url_retour_ok"  value="<?php echo $oTpe->sUrlOK;?>" />
-			<input type="hidden" name="url_retour_err"      id="url_retour_err" value="<?php echo $oTpe->sUrlKO;?>" />
-			<input type="hidden" name="lgue"                id="lgue"           value="<?php echo $oTpe->sLangue;?>" />
-			<input type="hidden" name="societe"             id="societe"        value="<?php echo $oTpe->sCodeSociete;?>" />
-			<input type="hidden" name="texte-libre"         id="texte-libre"    value="<?php echo HtmlEncode($sTexteLibre);?>" />
-			<input type="hidden" name="mail"                id="mail"           value="<?php echo $sEmail;?>" />
+		<form action="<?php echo $oTpe->sUrlPaiement; ?>" method="post" id="PaymentRequest_cic">
+			<input type="hidden" name="version"             id="version"        value="<?php echo $oTpe->sVersion; ?>" />
+			<input type="hidden" name="TPE"                 id="TPE"            value="<?php echo $oTpe->sNumero; ?>" />
+			<input type="hidden" name="date"                id="date"           value="<?php echo $sDate; ?>" />
+			<input type="hidden" name="montant"             id="montant"        value="<?php echo $sMontant . $sDevise; ?>" />
+			<input type="hidden" name="reference"           id="reference"      value="<?php echo $sReference; ?>" />
+			<input type="hidden" name="MAC"                 id="MAC"            value="<?php echo $sMAC; ?>" />
+			<input type="hidden" name="url_retour"          id="url_retour"     value="<?php echo $oTpe->sUrlKO; ?>" />
+			<input type="hidden" name="url_retour_ok"       id="url_retour_ok"  value="<?php echo $oTpe->sUrlOK; ?>" />
+			<input type="hidden" name="url_retour_err"      id="url_retour_err" value="<?php echo $oTpe->sUrlKO; ?>" />
+			<input type="hidden" name="lgue"                id="lgue"           value="<?php echo $oTpe->sLangue; ?>" />
+			<input type="hidden" name="societe"             id="societe"        value="<?php echo $oTpe->sCodeSociete; ?>" />
+			<input type="hidden" name="texte-libre"         id="texte-libre"    value="<?php echo HtmlEncode($sTexteLibre); ?>" />
+			<input type="hidden" name="mail"                id="mail"           value="<?php echo $sEmail; ?>" />
 			<!-- Uniquement pour le Paiement fractionn� -->
-			<input type="hidden" name="nbrech"              id="nbrech"         value="<?php echo $sNbrEch;?>" />
-			<input type="hidden" name="dateech1"            id="dateech1"       value="<?php echo $sDateEcheance1;?>" />
-			<input type="hidden" name="montantech1"         id="montantech1"    value="<?php echo $sMontantEcheance1;?>" />
-			<input type="hidden" name="dateech2"            id="dateech2"       value="<?php echo $sDateEcheance2;?>" />
-			<input type="hidden" name="montantech2"         id="montantech2"    value="<?php echo $sMontantEcheance2;?>" />
-			<input type="hidden" name="dateech3"            id="dateech3"       value="<?php echo $sDateEcheance3;?>" />
-			<input type="hidden" name="montantech3"         id="montantech3"    value="<?php echo $sMontantEcheance3;?>" />
-			<input type="hidden" name="dateech4"            id="dateech4"       value="<?php echo $sDateEcheance4;?>" />
-			<input type="hidden" name="montantech4"         id="montantech4"    value="<?php echo $sMontantEcheance4;?>" />
+			<input type="hidden" name="nbrech"              id="nbrech"         value="<?php echo $sNbrEch; ?>" />
+			<input type="hidden" name="dateech1"            id="dateech1"       value="<?php echo $sDateEcheance1; ?>" />
+			<input type="hidden" name="montantech1"         id="montantech1"    value="<?php echo $sMontantEcheance1; ?>" />
+			<input type="hidden" name="dateech2"            id="dateech2"       value="<?php echo $sDateEcheance2; ?>" />
+			<input type="hidden" name="montantech2"         id="montantech2"    value="<?php echo $sMontantEcheance2; ?>" />
+			<input type="hidden" name="dateech3"            id="dateech3"       value="<?php echo $sDateEcheance3; ?>" />
+			<input type="hidden" name="montantech3"         id="montantech3"    value="<?php echo $sMontantEcheance3; ?>" />
+			<input type="hidden" name="dateech4"            id="dateech4"       value="<?php echo $sDateEcheance4; ?>" />
+			<input type="hidden" name="montantech4"         id="montantech4"    value="<?php echo $sMontantEcheance4; ?>" />
 			<!-- -->
 			<noscript><input type="submit" name="bouton"              id="bouton"         value="Connexion / Connection" /></noscript>
 		</form>
@@ -447,16 +447,16 @@ 
 		return $output;
 	}
 
-	public static function display_admin_part( $k ) {
+	public static function display_admin_part($k) {
 		$cmcic_params = get_option('wpshop_cmcic_params', array());
 		$output = '';
-		$output .= '<h2>' .__('CIC configurations', 'wpshop'). '</h2>';
+		$output .= '<h2>' . __('CIC configurations', 'wpshop') . '</h2>';
 		$output .= '<div class="wps_shipping_mode_configuration_part">';
-		$output .= '<label class="simple_right">'.__('Key', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[cle]" type="text" value="'. ( !empty( $cmcic_params ) && !empty( $cmcic_params[ 'cle' ] ) ? $cmcic_params['cle'] : '' ).'" /><br />';
-		$output .= '<label class="simple_right">'.__('TPE', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[tpe]" type="text" value="'. ( !empty( $cmcic_params ) && !empty( $cmcic_params[ 'tpe' ] ) ? $cmcic_params['tpe']: '' ).'" /><br />';
-		$output .= '<label class="simple_right">'.__('Version', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[version]" type="text" value="'. ( !empty( $cmcic_params ) && !empty( $cmcic_params[ 'version' ] ) ? $cmcic_params['version']: '' ).'" /> => 3.0<br />';
-		$output .= '<label class="simple_right">'.__('Serveur', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[serveur]" type="text" value="'. ( !empty( $cmcic_params ) && !empty( $cmcic_params[ 'serveur' ] ) ? $cmcic_params['serveur']: '' ).'" /><br />';
-		$output .= '<label class="simple_right">'.__('Company code', 'wpshop').'</label><br/><input name="wpshop_cmcic_params[codesociete]" type="text" value="'. ( !empty( $cmcic_params ) && !empty( $cmcic_params[ 'codesociete' ] ) ? $cmcic_params['codesociete']: '' ).'" /><br />';
+		$output .= '<label class="simple_right">' . __('Key', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[cle]" type="text" value="' . (!empty($cmcic_params) && !empty($cmcic_params['cle']) ? $cmcic_params['cle'] : '') . '" /><br />';
+		$output .= '<label class="simple_right">' . __('TPE', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[tpe]" type="text" value="' . (!empty($cmcic_params) && !empty($cmcic_params['tpe']) ? $cmcic_params['tpe'] : '') . '" /><br />';
+		$output .= '<label class="simple_right">' . __('Version', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[version]" type="text" value="' . (!empty($cmcic_params) && !empty($cmcic_params['version']) ? $cmcic_params['version'] : '') . '" /> => 3.0<br />';
+		$output .= '<label class="simple_right">' . __('Serveur', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[serveur]" type="text" value="' . (!empty($cmcic_params) && !empty($cmcic_params['serveur']) ? $cmcic_params['serveur'] : '') . '" /><br />';
+		$output .= '<label class="simple_right">' . __('Company code', 'wpshop') . '</label><br/><input name="wpshop_cmcic_params[codesociete]" type="text" value="' . (!empty($cmcic_params) && !empty($cmcic_params['codesociete']) ? $cmcic_params['codesociete'] : '') . '" /><br />';
 		$output .= '</div>';
 
 		return $output;

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/database.class.php

Indentation +36 added lines, -36 removed lines

@@ -24,12 +24,12 @@ 
 {
 
 	/**
-	*	Get the field list into a database table
-	*
-	*	@param string $table_name The name of the table we want to retrieve field list for
-	*
-	*	@return object $field_list A wordpress database object containing the different field of the table
-	*/
+	 *	Get the field list into a database table
+	 *
+	 *	@param string $table_name The name of the table we want to retrieve field list for
+	 *
+	 *	@return object $field_list A wordpress database object containing the different field of the table
+	 */
 	public static function get_field_list($table_name){
 		global $wpdb;
 
@@ -39,12 +39,12 @@ 
 		return $field_list;
 	}
 	/**
-	*	Get a field defintion into a database table
-	*
-	*	@param string $table_name The name of the table we want to retrieve field list for
-	*
-	*	@return object $field A wordpress database object containing the field definition into the database table
-	*/
+	 *	Get a field defintion into a database table
+	 *
+	 *	@param string $table_name The name of the table we want to retrieve field list for
+	 *
+	 *	@return object $field A wordpress database object containing the field definition into the database table
+	 */
 	function get_field_definition($table_name, $field){
 		global $wpdb;
 
@@ -55,12 +55,12 @@ 
 	}
 
 	/**
-	*	Make a translation of the different database field type into a form input type
-	*
-	*	@param string $table_name The name of the table we want to retrieve field input type for
-	*
-	*	@return array $field_to_form An array with the list of field with its type, name and value
-	*/
+	 *	Make a translation of the different database field type into a form input type
+	 *
+	 *	@param string $table_name The name of the table we want to retrieve field input type for
+	 *
+	 *	@return array $field_to_form An array with the list of field with its type, name and value
+	 */
 	public static function fields_to_input($table_name){
 		$list_of_field_to_convert = wpshop_database::get_field_list($table_name);
 
@@ -70,12 +70,12 @@ 
 	}
 
 	/**
-	*	Transform the database table definition into an array for building a input for users
-	*
-	*	@param array $list_of_field_to_convert The list of field we want to have the types for
-	*
-	*	@return array $field_to_form The field stored into an array
-	*/
+	 *	Transform the database table definition into an array for building a input for users
+	 *
+	 *	@param array $list_of_field_to_convert The list of field we want to have the types for
+	 *
+	 *	@return array $field_to_form The field stored into an array
+	 */
 	public static function fields_type($list_of_field_to_convert){
 		$field_to_form = array();
 		$i = 0;
@@ -117,12 +117,12 @@ 
 
 
 	/**
-	*	Save a new attribute in database
-	*
-	*	@param array $informationsToSet An array with the different information we want to set
-	*
-	*	@return string $requestResponse A message that allows to know if the creation has been done correctly or not
-	*/
+	 *	Save a new attribute in database
+	 *
+	 *	@param array $informationsToSet An array with the different information we want to set
+	 *
+	 *	@return string $requestResponse A message that allows to know if the creation has been done correctly or not
+	 */
 	public static function save($informationsToSet, $dataBaseTable){
 		global $wpdb;
 		$requestResponse = '';
@@ -138,12 +138,12 @@ 
 		return $requestResponse;
 	}
 	/**
-	*	Update an existing attribute in database
-	*
-	*	@param array $informationsToSet An array with the different information we want to set
-	*
-	*	@return string $requestResponse A message that allows to know if the update has been done correctly or not
-	*/
+	 *	Update an existing attribute in database
+	 *
+	 *	@param array $informationsToSet An array with the different information we want to set
+	 *
+	 *	@return string $requestResponse A message that allows to know if the update has been done correctly or not
+	 */
 	public static function update($informationsToSet, $id, $dataBaseTable){
 		global $wpdb;
 		$requestResponse = '';

Spacing +27 added lines, -27 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'));
 }
 
 /**
@@ -30,7 +30,7 @@ 
 	*
 	*	@return object $field_list A wordpress database object containing the different field of the table
 	*/
-	public static function get_field_list($table_name){
+	public static function get_field_list($table_name) {
 		global $wpdb;
 
 		$query = "SHOW COLUMNS FROM " . $table_name;
@@ -45,7 +45,7 @@ 
 	*
 	*	@return object $field A wordpress database object containing the field definition into the database table
 	*/
-	function get_field_definition($table_name, $field){
+	function get_field_definition($table_name, $field) {
 		global $wpdb;
 
 		$query = $wpdb->prepare("SHOW COLUMNS FROM " . $table_name . " WHERE Field = %s", $field);
@@ -61,7 +61,7 @@ 
 	*
 	*	@return array $field_to_form An array with the list of field with its type, name and value
 	*/
-	public static function fields_to_input($table_name){
+	public static function fields_to_input($table_name) {
 		$list_of_field_to_convert = wpshop_database::get_field_list($table_name);
 
 		$field_to_form = self::fields_type($list_of_field_to_convert);
@@ -76,32 +76,32 @@ 
 	*
 	*	@return array $field_to_form The field stored into an array
 	*/
-	public static function fields_type($list_of_field_to_convert){
+	public static function fields_type($list_of_field_to_convert) {
 		$field_to_form = array();
 		$i = 0;
-		foreach ($list_of_field_to_convert as $Key => $field_definition){
+		foreach ($list_of_field_to_convert as $Key => $field_definition) {
 			$field_to_form[$i]['name'] = $field_definition->Field;
 			$field_to_form[$i]['value'] = $field_definition->Default;
 
 			$type = 'text';
-			if(($field_definition->Key == 'PRI') || ($field_definition->Field == 'creation_date') || ($field_definition->Field == 'last_update_date')){
-				$type =  'hidden';
+			if (($field_definition->Key == 'PRI') || ($field_definition->Field == 'creation_date') || ($field_definition->Field == 'last_update_date')) {
+				$type = 'hidden';
 			}
-			else{
-				$fieldtype = explode('(',$field_definition->Type);
-				if(!empty($fieldtype[1]))$fieldtype[1] = str_replace(')','',$fieldtype[1]);
+			else {
+				$fieldtype = explode('(', $field_definition->Type);
+				if (!empty($fieldtype[1]))$fieldtype[1] = str_replace(')', '', $fieldtype[1]);
 
-				if(($fieldtype[0] == 'char') || ($fieldtype[0] == 'varchar') || ($fieldtype[0] == 'int'))
+				if (($fieldtype[0] == 'char') || ($fieldtype[0] == 'varchar') || ($fieldtype[0] == 'int'))
 					$type = 'text';
-				elseif($fieldtype[0] == 'text')
+				elseif ($fieldtype[0] == 'text')
 					$type = 'textarea';
-				elseif($fieldtype[0] == 'enum')
+				elseif ($fieldtype[0] == 'enum')
 				{
-					$fieldtype[1] = str_replace("'","",$fieldtype[1]);
-					$possible_value = explode(",",$fieldtype[1]);
+					$fieldtype[1] = str_replace("'", "", $fieldtype[1]);
+					$possible_value = explode(",", $fieldtype[1]);
 
 					$type = 'radio';
-					if(count($possible_value) > 1)
+					if (count($possible_value) > 1)
 						$type = 'select';
 
 					$field_to_form[$i]['possible_value'] = $possible_value;
@@ -123,15 +123,15 @@ 
 	*
 	*	@return string $requestResponse A message that allows to know if the creation has been done correctly or not
 	*/
-	public static function save($informationsToSet, $dataBaseTable){
+	public static function save($informationsToSet, $dataBaseTable) {
 		global $wpdb;
 		$requestResponse = '';
 
 		$updateResult = $wpdb->insert($dataBaseTable, $informationsToSet, '%s');
-		if( $updateResult != false ){
+		if ($updateResult != false) {
 			$requestResponse = 'done';
 		}
-		else{
+		else {
 			$requestResponse = 'error';
 		}
 
@@ -144,19 +144,19 @@ 
 	*
 	*	@return string $requestResponse A message that allows to know if the update has been done correctly or not
 	*/
-	public static function update($informationsToSet, $id, $dataBaseTable){
+	public static function update($informationsToSet, $id, $dataBaseTable) {
 		global $wpdb;
 		$requestResponse = '';
 
-		$updateResult = $wpdb->update($dataBaseTable, $informationsToSet , array( 'id' => $id ), '%s', array('%d') );
+		$updateResult = $wpdb->update($dataBaseTable, $informationsToSet, array('id' => $id), '%s', array('%d'));
 
-		if( $updateResult == 1 ){
+		if ($updateResult == 1) {
 			$requestResponse = 'done';
 		}
-		elseif( $updateResult == 0 ){
+		elseif ($updateResult == 0) {
 			$requestResponse = 'nothingToUpdate';
 		}
-		elseif( $updateResult == false ){
+		elseif ($updateResult == false) {
 			$requestResponse = 'error';
 		}
 

Braces +18 added lines, -17 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' ) ) {
@@ -86,23 +88,25 @@ 
 			$type = 'text';
 			if(($field_definition->Key == 'PRI') || ($field_definition->Field == 'creation_date') || ($field_definition->Field == 'last_update_date')){
 				$type =  'hidden';
-			}
-			else{
+			} else{
 				$fieldtype = explode('(',$field_definition->Type);
-				if(!empty($fieldtype[1]))$fieldtype[1] = str_replace(')','',$fieldtype[1]);
+				if(!empty($fieldtype[1])) {
+					$fieldtype[1] = str_replace(')','',$fieldtype[1]);
+				}
 
-				if(($fieldtype[0] == 'char') || ($fieldtype[0] == 'varchar') || ($fieldtype[0] == 'int'))
-					$type = 'text';
-				elseif($fieldtype[0] == 'text')
-					$type = 'textarea';
-				elseif($fieldtype[0] == 'enum')
+				if(($fieldtype[0] == 'char') || ($fieldtype[0] == 'varchar') || ($fieldtype[0] == 'int')) {
+									$type = 'text';
+				} elseif($fieldtype[0] == 'text') {
+									$type = 'textarea';
+				} elseif($fieldtype[0] == 'enum')
 				{
 					$fieldtype[1] = str_replace("'","",$fieldtype[1]);
 					$possible_value = explode(",",$fieldtype[1]);
 
 					$type = 'radio';
-					if(count($possible_value) > 1)
-						$type = 'select';
+					if(count($possible_value) > 1) {
+											$type = 'select';
+					}
 
 					$field_to_form[$i]['possible_value'] = $possible_value;
 				}
@@ -130,8 +134,7 @@ 
 		$updateResult = $wpdb->insert($dataBaseTable, $informationsToSet, '%s');
 		if( $updateResult != false ){
 			$requestResponse = 'done';
-		}
-		else{
+		} else{
 			$requestResponse = 'error';
 		}
 
@@ -152,11 +155,9 @@ 
 
 		if( $updateResult == 1 ){
 			$requestResponse = 'done';
-		}
-		elseif( $updateResult == 0 ){
+		} elseif( $updateResult == 0 ){
 			$requestResponse = 'nothingToUpdate';
-		}
-		elseif( $updateResult == false ){
+		} elseif( $updateResult == false ){
 			$requestResponse = 'error';
 		}