Eoxia / wpshop

core/wps_utils/wps_utils.php

Doc Comments +5 added lines, -4 removed lines

@@ -95,7 +95,7 @@ 
 	 *	Return a variable with some basic treatment
 	 *
 	 *	@param mixed $varToSanitize The variable we want to treat for future use
-	 *	@param mixed $varDefaultValue The default value to set to the variable if the different test are not successfull
+	 *	@param string $varDefaultValue The default value to set to the variable if the different test are not successfull
 	 *	@param string $varType optionnal The type of the var for better verification
 	 *
 	 *	@return mixed $sanitizedVar The var after treatment
@@ -223,6 +223,7 @@ 
 	 * Return unit sigle
 	 * @param unknown_type $code
 	 * @param unknown_type $column_to_return
+	 * @return string
 	 */
 	public static function wpshop_get_sigle($code, $column_to_return = "unit") {
 		$tmp_code = (int)$code;
@@ -253,7 +254,7 @@ 
 	/**
 	 * Check if string have phone number structure
 	 * @param   string	phone number
-	 * @return  boolean
+	 * @return  integer
 	 */
 	public static function is_phone( $phone ) {
 		return preg_match( '/(?=.*[0-9])([ 0-9\-\+\(\)]+)/', $phone );
@@ -262,7 +263,7 @@ 
 	/**
 	 * Check if string have postcode valid structure
 	 * @param   string	postcode
-	 * @return  boolean
+	 * @return  integer
 	 */
 	public static function is_postcode( $postcode ) {
 		return preg_match( '/(?=.*[0-9A-Za-z])([ \-A-Za-z0-9]+)/', $postcode );
@@ -321,7 +322,7 @@ 
 	 *	Transform a given text with a specific pattern, send by the second parameter
 	 *
 	 *	@param string $toSlugify The string we want to "clean" for future use
-	 *	@param array|string $slugifyType The type of cleaning we are going to do on the input text
+	 *	@param string[] $slugifyType The type of cleaning we are going to do on the input text
 	 *
 	 *	@return string $slugified The input string that was slugified with the selected method
 	 */

Spacing +109 added lines, -109 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Main controller file for product mass modification module
  *
@@ -30,56 +30,56 @@ 
 	 *
 	 * @return string The template file path to use
 	 */
-	public static function get_template_part( $plugin_dir_name, $main_template_dir, $side, $slug, $name=null, $debug = null ) {
+	public static function get_template_part($plugin_dir_name, $main_template_dir, $side, $slug, $name = null, $debug = null) {
 		$path = '';
 
 		$templates = array();
 		$name = (string)$name;
-		if ( '' !== $name )
+		if ('' !== $name)
 			$templates[] = "{$side}/{$slug}-{$name}.php";
 		$templates[] = "{$side}/{$slug}.php";
 
 		/**	Check if required template exists into current theme	*/
 		$check_theme_template = array();
-		foreach ( $templates as $template ) {
+		foreach ($templates as $template) {
 			$check_theme_template = $plugin_dir_name . "/" . $template;
-			$path = locate_template( $check_theme_template, false );
-			if( !empty($path) ) {
+			$path = locate_template($check_theme_template, false);
+			if (!empty($path)) {
 				break;
 			}
 		}
 
 		/**	Allow debugging	*/
-		if ( !empty( $debug ) ) {
+		if (!empty($debug)) {
 			echo '--- Debug mode ON - Start ---<br/>';
 			echo __FILE__ . '<br/>';
 			echo 'Debug for display method<br/>';
 			echo 'Asked path ' . $path . '<br/>';
 		}
 
-		if ( empty( $path ) ) {
-			foreach ( (array) $templates as $template_name ) {
-				if ( !$template_name )
+		if (empty($path)) {
+			foreach ((array)$templates as $template_name) {
+				if (!$template_name)
 					continue;
 
-				if ( !empty( $debug ) ) {
+				if (!empty($debug)) {
 					echo __LINE__ . ' - ' . $main_template_dir . $template_name . '<hr/>';
 				}
 
-				$file_exists = file_exists( $main_template_dir . $template_name );
-				if ( $file_exists ) {
+				$file_exists = file_exists($main_template_dir . $template_name);
+				if ($file_exists) {
 					$path = $main_template_dir . $template_name;
 					break;
 				}
 
-				if ( !empty( $debug ) ) {
+				if (!empty($debug)) {
 					echo __LINE__ . ' - ' . (bool)$file_exists . '<hr/>';
 				}
 			}
 		}
 
 		/**	Allow debugging	*/
-		if ( !empty( $debug ) ) {
+		if (!empty($debug)) {
 			echo '--- Debug mode ON - END ---<br/><br/>';
 		}
 
@@ -103,7 +103,7 @@ 
 	 *	@return mixed $sanitizedVar The var after treatment
 	 */
 	public static function varSanitizer($varToSanitize, $varDefaultValue = '', $varType = '') {
-		$sanitizedVar = is_string( $varToSanitize ) && (trim(strip_tags(stripslashes($varToSanitize))) != '') ? trim(strip_tags(stripslashes(($varToSanitize)))) : $varDefaultValue ;
+		$sanitizedVar = is_string($varToSanitize) && (trim(strip_tags(stripslashes($varToSanitize))) != '') ? trim(strip_tags(stripslashes(($varToSanitize)))) : $varDefaultValue;
 
 		return $sanitizedVar;
 	}
@@ -116,7 +116,7 @@ 
 	public static function forceDownload($Fichier_a_telecharger, $delete_after_download = false) {
 
 		$nom_fichier = basename($Fichier_a_telecharger);
-		switch(strrchr($nom_fichier, ".")) {
+		switch (strrchr($nom_fichier, ".")) {
 			case ".gz": $type = "application/x-gzip"; break;
 			case ".tgz": $type = "application/x-gzip"; break;
 			case ".zip": $type = "application/zip"; break;
@@ -133,14 +133,14 @@ 
 		header("Content-disposition: attachment; filename=$nom_fichier");
 		header("Content-Type: application/force-download");
 		header("Content-Transfer-Encoding: $type\n"); // Surtout ne pas enlever le \n
-		header("Content-Length: ".filesize($Fichier_a_telecharger));
+		header("Content-Length: " . filesize($Fichier_a_telecharger));
 		header("Pragma: no-cache");
 		header("Cache-Control: must-revalidate, post-check=0, pre-check=0, public");
 		header("Expires: 0");
 		ob_end_clean();
 		readfile($Fichier_a_telecharger);
-		if ( $delete_after_download ) {
-			unlink( $Fichier_a_telecharger );
+		if ($delete_after_download) {
+			unlink($Fichier_a_telecharger);
 		}
 		exit;
 	}
@@ -150,7 +150,7 @@ 
 	 * @return boolean
 	 */
 	public static function is_sendsms_actived() {
-		if(is_plugin_active('wordpress-send-sms/Send-SMS.php')) {
+		if (is_plugin_active('wordpress-send-sms/Send-SMS.php')) {
 			$configOption = get_option('sendsms_config', '');
 			$ligne = unserialize($configOption);
 			$nicOVH = $ligne['nicOVH'];
@@ -167,7 +167,7 @@ 
 	 * @param unknown_type $input
 	 * @return Ambigous <multitype:, multitype:multitype:unknown  >
 	 */
-	public static function search_all_possibilities( $input ) {
+	public static function search_all_possibilities($input) {
 		$result = array();
 
 		while (list($key, $values) = each($input)) {
@@ -176,17 +176,17 @@ 
 			}
 
 			if (empty($result)) {
-				foreach($values as $value) {
+				foreach ($values as $value) {
 					$result[] = array($key => $value);
 				}
 			}
 			else {
 				$append = array();
-				foreach($result as &$product) {
+				foreach ($result as &$product) {
 					$product[$key] = array_shift($values);
 					$copy = $product;
 
-					foreach($values as $item) {
+					foreach ($values as $item) {
 						$copy[$key] = $item;
 						$append[] = $copy;
 					}
@@ -206,16 +206,16 @@ 
 	 * @param boolean $code : false return sigle, true return code (€ or EUR)
 	 * @return string currency code or sigle
 	 */
-	public static function wpshop_get_currency($code=false) {
+	public static function wpshop_get_currency($code = false) {
 		// Currency
-		if( is_null( self::$currency_cache ) ) {
+		if (is_null(self::$currency_cache)) {
 			global $wpdb;
 			$current_currency = get_option('wpshop_shop_default_currency');
-			$query = $wpdb->prepare('SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE id =%d ', $current_currency );
-			self::$currency_cache = $wpdb->get_row( $query );
+			$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id =%d ', $current_currency);
+			self::$currency_cache = $wpdb->get_row($query);
 		}
-		if ( !empty(self::$currency_cache) ) {
-			$code = ($code) ?  self::$currency_cache->name : self::$currency_cache->unit;
+		if (!empty(self::$currency_cache)) {
+			$code = ($code) ? self::$currency_cache->name : self::$currency_cache->unit;
 			return $code;
 		}
 		else {
@@ -231,11 +231,11 @@ 
 	public static function wpshop_get_sigle($code, $column_to_return = "unit") {
 		$tmp_code = (int)$code;
 		$key_to_get = 'name';
-		if ( is_int($tmp_code) && !empty($tmp_code) ) {
+		if (is_int($tmp_code) && !empty($tmp_code)) {
 			$key_to_get = 'id';
 		}
 		$old_way_currencies = unserialize(WPSHOP_SHOP_CURRENCIES);
-		if ( array_key_exists( $code, $old_way_currencies)) {
+		if (array_key_exists($code, $old_way_currencies)) {
 			$code = $old_way_currencies[$code];
 			$key_to_get = 'name';
 		}
@@ -250,7 +250,7 @@ 
 	 * @param string $var : variable to clean
 	 * @return string
 	 */
-	public static function wpshop_clean( $var ) {
+	public static function wpshop_clean($var) {
 		return trim(strip_tags(stripslashes($var)));
 	}
 
@@ -259,8 +259,8 @@ 
 	 * @param   string	phone number
 	 * @return  boolean
 	 */
-	public static function is_phone( $phone ) {
-		return preg_match( '/(?=.*[0-9])([ 0-9\-\+\(\)]+)/', $phone );
+	public static function is_phone($phone) {
+		return preg_match('/(?=.*[0-9])([ 0-9\-\+\(\)]+)/', $phone);
 	}
 
 	/**
@@ -268,8 +268,8 @@ 
 	 * @param   string	postcode
 	 * @return  boolean
 	 */
-	public static function is_postcode( $postcode ) {
-		return preg_match( '/(?=.*[0-9A-Za-z])([ \-A-Za-z0-9]+)/', $postcode );
+	public static function is_postcode($postcode) {
+		return preg_match('/(?=.*[0-9A-Za-z])([ \-A-Za-z0-9]+)/', $postcode);
 	}
 
 	/**
@@ -279,14 +279,14 @@ 
 	 *
 	 *	@return string $type The form input type to use for the given field
 	 */
-	public static function defineFieldType($dataFieldType, $input_type, $frontend_verification){
+	public static function defineFieldType($dataFieldType, $input_type, $frontend_verification) {
 		$type = 'text';
 
-		if ( $dataFieldType == 'datetime' ) {
+		if ($dataFieldType == 'datetime') {
 			$type = 'text';
 		}
 		else {
-			switch ( $frontend_verification ) {
+			switch ($frontend_verification) {
 				case 'phone':
 					$type = 'tel';
 					break;
@@ -306,7 +306,7 @@ 
 	 *
 	 * @return array The different element send by request method
 	 */
-	public static function getMethode(){
+	public static function getMethode() {
 		$request_method = null;
 		if ($_SERVER["REQUEST_METHOD"] == "GET") {
 			$request_method = (array)$_GET;
@@ -315,7 +315,7 @@ 
 			$request_method = (array)$_POST;
 		}
 
-		if ( null === $request_method ) {
+		if (null === $request_method) {
 			die ('Invalid REQUEST_METHOD (not GET, not POST).');
 		}
 		else {
@@ -331,36 +331,36 @@ 
 	 *
 	 *	@return string $slugified The input string that was slugified with the selected method
 	 */
-	public static function slugify($toSlugify, $slugifyType){
+	public static function slugify($toSlugify, $slugifyType) {
 		$slugified = '';
 
-		if($toSlugify != '')
+		if ($toSlugify != '')
 		{
 			$slugified = $toSlugify;
-			foreach($slugifyType as $type)
+			foreach ($slugifyType as $type)
 			{
-				if($type == 'noAccent')
+				if ($type == 'noAccent')
 				{
-					$pattern = array("/&eacute;/", "/&egrave;/", "/&ecirc;/", "/&ccedil;/", "/&agrave;/", "/&acirc;/", "/&icirc;/", "/&iuml;/", "/&ucirc;/", "/&ocirc;/", "/&Egrave;/", "/&Eacute;/", "/&Ecirc;/", "/&Euml;/", "/&Igrave;/", "/&Iacute;/", "/&Icirc;/", "/&Iuml;/", "/&Ouml;/", "/&Ugrave;/", "/&Ucirc;/", "/&Uuml;/","/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/");
-					$rep_pat = array("e", "e", "e", "c", "a", "a", "i", "i", "u", "o", "E", "E", "E", "E", "I", "I", "I", "I", "O", "U", "U", "U","e", "e", "e", "c", "a", "a", "i", "i", "u", "o", "E", "E", "E", "E", "I", "I", "I", "I", "O", "U", "U", "U");
+					$pattern = array("/&eacute;/", "/&egrave;/", "/&ecirc;/", "/&ccedil;/", "/&agrave;/", "/&acirc;/", "/&icirc;/", "/&iuml;/", "/&ucirc;/", "/&ocirc;/", "/&Egrave;/", "/&Eacute;/", "/&Ecirc;/", "/&Euml;/", "/&Igrave;/", "/&Iacute;/", "/&Icirc;/", "/&Iuml;/", "/&Ouml;/", "/&Ugrave;/", "/&Ucirc;/", "/&Uuml;/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/");
+					$rep_pat = array("e", "e", "e", "c", "a", "a", "i", "i", "u", "o", "E", "E", "E", "E", "I", "I", "I", "I", "O", "U", "U", "U", "e", "e", "e", "c", "a", "a", "i", "i", "u", "o", "E", "E", "E", "E", "I", "I", "I", "I", "O", "U", "U", "U");
 				}
-				elseif($type == 'noSpaces')
+				elseif ($type == 'noSpaces')
 				{
 					$pattern = array('/\s/');
 					$rep_pat = array('_');
 					$slugified = trim($slugified);
 				}
-				elseif($type == 'lowerCase')
+				elseif ($type == 'lowerCase')
 				{
 					$slugified = strtolower($slugified);
 				}
-				elseif($type == 'noPunctuation')
+				elseif ($type == 'noPunctuation')
 				{
 					$pattern = array("/#/", "/\{/", "/\[/", "/\(/", "/\)/", "/\]/", "/\}/", "/&/", "/~/", "/�/", "/`/", "/\^/", "/@/", "/=/", "/�/", "/�/", "/%/", "/�/", "/!/", "/�/", "/:/", "/\$/", "/;/", "/\./", "/,/", "/\?/", "/\\\/", "/\//");
 					$rep_pat = array("_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_");
 				}
 
-				if(is_array($pattern) && is_array($rep_pat))
+				if (is_array($pattern) && is_array($rep_pat))
 				{
 					$slugified = preg_replace($pattern, $rep_pat, utf8_decode($slugified));
 				}
@@ -379,17 +379,17 @@ 
 	 *	@return string $string The output string that was trunk if necessary
 	 */
 	public static function trunk($string, $maxlength) {
-		if(strlen($string)>$maxlength+3)
-			return substr($string,0,$maxlength).'...';
+		if (strlen($string) > $maxlength + 3)
+			return substr($string, 0, $maxlength) . '...';
 		else return $string;
 	}
 
 	/**
 	 * Run a safe redirect in javascript
 	 */
-	public static function wpshop_safe_redirect($url='') {
-		$url = empty($url) ? admin_url('admin.php?page='.WPSHOP_URL_SLUG_DASHBOARD) : $url;
-		echo '<script type="text/javascript">window.top.location.href = "'.$url.'"</script>';
+	public static function wpshop_safe_redirect($url = '') {
+		$url = empty($url) ? admin_url('admin.php?page=' . WPSHOP_URL_SLUG_DASHBOARD) : $url;
+		echo '<script type="text/javascript">window.top.location.href = "' . $url . '"</script>';
 		exit;
 	}
 
@@ -399,9 +399,9 @@ 
 	 * @param array $args : Hook arguments
 	 * @return string
 	 */
-	public static function create_custom_hook ($hook_name, $args = '') {
+	public static function create_custom_hook($hook_name, $args = '') {
 		ob_start();
-		if ( !empty($args) ) {
+		if (!empty($args)) {
 			do_action($hook_name, $args);
 		}
 		else {
@@ -420,16 +420,16 @@ 
 	 */
 	public static function get_plugin_validation_code($plugin_name, $encrypt_base_attribute) {
 		$code = '';
-		if ( !function_exists( 'get_plugin_data') )
-			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-		$plug = get_plugin_data( WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/wpshop.php' );
+		if (!function_exists('get_plugin_data'))
+			require_once(ABSPATH . 'wp-admin/includes/plugin.php');
+		$plug = get_plugin_data(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/wpshop.php');
 		$code_part = array();
-		$code_part[] = substr(hash ( "sha256" , $plugin_name ), WPSHOP_ADDONS_KEY_IS, 5);
-		$code_part[] = substr(hash ( "sha256" , $plug['Name'] ), WPSHOP_ADDONS_KEY_IS, 5);
-		$code_part[] = substr(hash ( "sha256" , 'addons' ), WPSHOP_ADDONS_KEY_IS, 5);
+		$code_part[] = substr(hash("sha256", $plugin_name), WPSHOP_ADDONS_KEY_IS, 5);
+		$code_part[] = substr(hash("sha256", $plug['Name']), WPSHOP_ADDONS_KEY_IS, 5);
+		$code_part[] = substr(hash("sha256", 'addons'), WPSHOP_ADDONS_KEY_IS, 5);
 		$code = $code_part[1] . '-' . $code_part[2] . '-' . $code_part[0];
 		$att = $encrypt_base_attribute;
-		$code .= '-' . substr(hash ( "sha256" , $att ),  WPSHOP_ADDONS_KEY_IS, 5);
+		$code .= '-' . substr(hash("sha256", $att), WPSHOP_ADDONS_KEY_IS, 5);
 
 		return $code;
 	}
@@ -440,15 +440,15 @@ 
 	 * @param string $encrypt_base_attribute
 	 * @return boolean
 	 */
-	public static function check_plugin_activation_code( $plugin_name, $encrypt_base_attribute, $from = 'file') {
+	public static function check_plugin_activation_code($plugin_name, $encrypt_base_attribute, $from = 'file') {
 		$is_valid = false;
 		$valid_activation_code = self::get_plugin_validation_code($plugin_name, $encrypt_base_attribute);
-		$activation_code_filename = WP_PLUGIN_DIR .'/'. $plugin_name.'/encoder.txt';
-		if ( is_file($activation_code_filename) ) {
-			$activation_code_file = fopen($activation_code_filename, 'r' );
-			if ( $activation_code_file !== false) {
-				$activation_code = fread( $activation_code_file, filesize($activation_code_filename));
-				if ( $activation_code == $valid_activation_code ) {
+		$activation_code_filename = WP_PLUGIN_DIR . '/' . $plugin_name . '/encoder.txt';
+		if (is_file($activation_code_filename)) {
+			$activation_code_file = fopen($activation_code_filename, 'r');
+			if ($activation_code_file !== false) {
+				$activation_code = fread($activation_code_file, filesize($activation_code_filename));
+				if ($activation_code == $valid_activation_code) {
 					$is_valid = true;
 				}
 			}
@@ -461,12 +461,12 @@ 
 	 * @param unknown_type $number
 	 * @return string
 	 */
-	public static function formate_number( $number ) {
-		$number = number_format( $number, 2, '.', '' );
-		$exploded_number = explode( '.', $number );
+	public static function formate_number($number) {
+		$number = number_format($number, 2, '.', '');
+		$exploded_number = explode('.', $number);
 		$number = $exploded_number[0];
-		if( $exploded_number[1] != '00' ) {
-			$number .= '<span class="wps_number_cents">,' . $exploded_number[1]. '</span>';
+		if ($exploded_number[1] != '00') {
+			$number .= '<span class="wps_number_cents">,' . $exploded_number[1] . '</span>';
 		}
 		return $number;
 	}
@@ -476,12 +476,12 @@ 
 	 * @param int $page_id
 	 * @return int
 	 */
-	public static function get_page_id( $page_id ) {
-		if( !empty($page_id) ) {
-			if ( function_exists( 'icl_object_id' ) && defined('ICL_LANGUAGE_CODE') ) {
-				$element_post_type = get_post_type( $page_id );
-				$translated_element_id = icl_object_id( $page_id, $element_post_type, true, ICL_LANGUAGE_CODE );
-				if( !empty($translated_element_id) ) {
+	public static function get_page_id($page_id) {
+		if (!empty($page_id)) {
+			if (function_exists('icl_object_id') && defined('ICL_LANGUAGE_CODE')) {
+				$element_post_type = get_post_type($page_id);
+				$translated_element_id = icl_object_id($page_id, $element_post_type, true, ICL_LANGUAGE_CODE);
+				if (!empty($translated_element_id)) {
 					$page_id = $translated_element_id;
 				}
 			}
@@ -489,65 +489,65 @@ 
 		return $page_id;
 	}
 
-	public static function minutes_to_time( $minutes, $format = '%hh %imin' ) {
-		$dtF = new \DateTime( '@0' );
-		$dtT = new \DateTime( '@' . ( $minutes * 60 ) );
-		return $dtF->diff($dtT)->format( $format );
+	public static function minutes_to_time($minutes, $format = '%hh %imin') {
+		$dtF = new \DateTime('@0');
+		$dtT = new \DateTime('@' . ($minutes * 60));
+		return $dtF->diff($dtT)->format($format);
 	}
 
 	public static function number_format_hack($n) {
 		return number_format($n, 5, '.', '');
 	}
-	public static function is_serialized( $data, $strict = true ) {
-		if ( ! is_string( $data ) ) {
+	public static function is_serialized($data, $strict = true) {
+		if (!is_string($data)) {
 			return false;
 		}
-		$data = trim( $data );
-		if ( 'N;' == $data ) {
+		$data = trim($data);
+		if ('N;' == $data) {
 			return true;
 		}
-		if ( strlen( $data ) < 4 ) {
+		if (strlen($data) < 4) {
 			return false;
 		}
-		if ( ':' !== $data[1] ) {
+		if (':' !== $data[1]) {
 			return false;
 		}
-		if ( $strict ) {
-			$lastc = substr( $data, -1 );
-			if ( ';' !== $lastc && '}' !== $lastc ) {
+		if ($strict) {
+			$lastc = substr($data, -1);
+			if (';' !== $lastc && '}' !== $lastc) {
 				return false;
 			}
 		} else {
-			$semicolon = strpos( $data, ';' );
-			$brace = strpos( $data, '}' );
-			if ( false === $semicolon && false === $brace ) {
+			$semicolon = strpos($data, ';');
+			$brace = strpos($data, '}');
+			if (false === $semicolon && false === $brace) {
 				return false;
 			}
-			if ( false !== $semicolon && $semicolon < 3 ) {
+			if (false !== $semicolon && $semicolon < 3) {
 				return false;
 			}
-			if ( false !== $brace && $brace < 4 ) {
+			if (false !== $brace && $brace < 4) {
 				return false;
 			}
 		}
 		$token = $data[0];
-		switch ( $token ) {
+		switch ($token) {
 			case 's' :
-				if ( $strict ) {
-					if ( '"' !== substr( $data, -2, 1 ) ) {
+				if ($strict) {
+					if ('"' !== substr($data, -2, 1)) {
 						return false;
 					}
-				} elseif ( false === strpos( $data, '"' ) ) {
+				} elseif (false === strpos($data, '"')) {
 					return false;
 				}
 			case 'a' :
 			case 'O' :
-				return (bool) preg_match( "/^{$token}:[0-9]+:/s", $data );
+				return (bool)preg_match("/^{$token}:[0-9]+:/s", $data);
 			case 'b' :
 			case 'i' :
 			case 'd' :
 				$end = $strict ? '$' : '';
-				return (bool) preg_match( "/^{$token}:[0-9.E-]+;$end/", $data );
+				return (bool)preg_match("/^{$token}:[0-9.E-]+;$end/", $data);
 		}
 		return false;
 	}

Braces +25 added lines, -26 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Main controller file for product mass modification module
  *
@@ -35,8 +37,9 @@ 
 
 		$templates = array();
 		$name = (string)$name;
-		if ( '' !== $name )
-			$templates[] = "{$side}/{$slug}-{$name}.php";
+		if ( '' !== $name ) {
+					$templates[] = "{$side}/{$slug}-{$name}.php";
+		}
 		$templates[] = "{$side}/{$slug}.php";
 
 		/**	Check if required template exists into current theme	*/
@@ -59,8 +62,9 @@ 
 
 		if ( empty( $path ) ) {
 			foreach ( (array) $templates as $template_name ) {
-				if ( !$template_name )
-					continue;
+				if ( !$template_name ) {
+									continue;
+				}
 
 				if ( !empty( $debug ) ) {
 					echo __LINE__ . ' - ' . $main_template_dir . $template_name . '<hr/>';
@@ -179,8 +183,7 @@ 
 				foreach($values as $value) {
 					$result[] = array($key => $value);
 				}
-			}
-			else {
+			} else {
 				$append = array();
 				foreach($result as &$product) {
 					$product[$key] = array_shift($values);
@@ -217,8 +220,7 @@ 
 		if ( !empty(self::$currency_cache) ) {
 			$code = ($code) ?  self::$currency_cache->name : self::$currency_cache->unit;
 			return $code;
-		}
-		else {
+		} else {
 			return '';
 		}
 	}
@@ -284,8 +286,7 @@ 
 
 		if ( $dataFieldType == 'datetime' ) {
 			$type = 'text';
-		}
-		else {
+		} else {
 			switch ( $frontend_verification ) {
 				case 'phone':
 					$type = 'tel';
@@ -317,8 +318,7 @@ 
 
 		if ( null === $request_method ) {
 			die ('Invalid REQUEST_METHOD (not GET, not POST).');
-		}
-		else {
+		} else {
 			return $request_method;
 		}
 	}
@@ -343,18 +343,15 @@ 
 				{
 					$pattern = array("/&eacute;/", "/&egrave;/", "/&ecirc;/", "/&ccedil;/", "/&agrave;/", "/&acirc;/", "/&icirc;/", "/&iuml;/", "/&ucirc;/", "/&ocirc;/", "/&Egrave;/", "/&Eacute;/", "/&Ecirc;/", "/&Euml;/", "/&Igrave;/", "/&Iacute;/", "/&Icirc;/", "/&Iuml;/", "/&Ouml;/", "/&Ugrave;/", "/&Ucirc;/", "/&Uuml;/","/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/");
 					$rep_pat = array("e", "e", "e", "c", "a", "a", "i", "i", "u", "o", "E", "E", "E", "E", "I", "I", "I", "I", "O", "U", "U", "U","e", "e", "e", "c", "a", "a", "i", "i", "u", "o", "E", "E", "E", "E", "I", "I", "I", "I", "O", "U", "U", "U");
-				}
-				elseif($type == 'noSpaces')
+				} elseif($type == 'noSpaces')
 				{
 					$pattern = array('/\s/');
 					$rep_pat = array('_');
 					$slugified = trim($slugified);
-				}
-				elseif($type == 'lowerCase')
+				} elseif($type == 'lowerCase')
 				{
 					$slugified = strtolower($slugified);
-				}
-				elseif($type == 'noPunctuation')
+				} elseif($type == 'noPunctuation')
 				{
 					$pattern = array("/#/", "/\{/", "/\[/", "/\(/", "/\)/", "/\]/", "/\}/", "/&/", "/~/", "/�/", "/`/", "/\^/", "/@/", "/=/", "/�/", "/�/", "/%/", "/�/", "/!/", "/�/", "/:/", "/\$/", "/;/", "/\./", "/,/", "/\?/", "/\\\/", "/\//");
 					$rep_pat = array("_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_");
@@ -379,9 +376,11 @@ 
 	 *	@return string $string The output string that was trunk if necessary
 	 */
 	public static function trunk($string, $maxlength) {
-		if(strlen($string)>$maxlength+3)
-			return substr($string,0,$maxlength).'...';
-		else return $string;
+		if(strlen($string)>$maxlength+3) {
+					return substr($string,0,$maxlength).'...';
+		} else {
+			return $string;
+		}
 	}
 
 	/**
@@ -403,8 +402,7 @@ 
 		ob_start();
 		if ( !empty($args) ) {
 			do_action($hook_name, $args);
-		}
-		else {
+		} else {
 			do_action($hook_name);
 		}
 		$content = ob_get_contents();
@@ -420,8 +418,9 @@ 
 	 */
 	public static function get_plugin_validation_code($plugin_name, $encrypt_base_attribute) {
 		$code = '';
-		if ( !function_exists( 'get_plugin_data') )
-			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+		if ( !function_exists( 'get_plugin_data') ) {
+					require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+		}
 		$plug = get_plugin_data( WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/wpshop.php' );
 		$code_part = array();
 		$code_part[] = substr(hash ( "sha256" , $plugin_name ), WPSHOP_ADDONS_KEY_IS, 5);

includes/modules/wps_shipping/controller/wps_shipping_ctr.php

Doc Comments +1 added lines, -1 removed lines

@@ -204,7 +204,7 @@
 	 * Return s custom shipping cost for a cart

 	 * @param string $dest Shipping area zone

 	 * @param array $data

-	 * @param array $fees

+	 * @param string $fees

 	 * @return number|boolean|Ambigous <number, unknown>

 	 */

 	function calculate_custom_shipping_cost($dest='', $data, $fees, $shipping_method = false) {

Spacing +108 added lines, -108 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;

+<?php if (!defined('ABSPATH')) exit;

 class wps_shipping {

 	function __construct() {

 

@@ -11,41 +11,41 @@ 
 	 */

 	function shipping_fees_string_2_array($fees_string) {

 		$data = array();

-		if(!empty($fees_string) && !is_array($fees_string) ) {

-			if(preg_match_all('#{[^{]+}#', $fees_string, $cont)){

-				foreach($cont[0] as $c) {

+		if (!empty($fees_string) && !is_array($fees_string)) {

+			if (preg_match_all('#{[^{]+}#', $fees_string, $cont)) {

+				foreach ($cont[0] as $c) {

 					preg_match_all('#([a-z]+) ?: ?"(.+)"#', $c, $atts);

 					$temp_data = array();

 					$country_code = '';

-					foreach($atts[1] as $key => $value) {

-						$temp_data[$value] =  $atts[2][$key];

-						if($value=='destination') {

+					foreach ($atts[1] as $key => $value) {

+						$temp_data[$value] = $atts[2][$key];

+						if ($value == 'destination') {

 							$country_code = $atts[2][$key];

 						}

-						elseif($value=='fees') {

+						elseif ($value == 'fees') {

 							$fees_data = array();

 							$fees = explode(',', $atts[2][$key]);

-							foreach($fees as $fee){

+							foreach ($fees as $fee) {

 								$fee_element = explode(':', $fee);

-								$fees_data[trim($fee_element[0])] =  trim($fee_element[1]);

+								$fees_data[trim($fee_element[0])] = trim($fee_element[1]);

 							}

 							$number = count($fees_data);

 

 							$fees_data_1 = array();

 							preg_match_all('#([0-9]+\.?[0-9]?+) ?: ?([0-9]+\.?[0-9]?+)#', $atts[2][$key], $fees);

-							foreach($fees[1] as $_key => $_value) {

-								$fees_data_1[$_value] =  $fees[2][$_key];

+							foreach ($fees[1] as $_key => $_value) {

+								$fees_data_1[$_value] = $fees[2][$_key];

 							}

 							$number_1 = count($fees_data_1);

 							if ($number == $number_1) {

-								$temp_data[$value] =  $fees_data;

+								$temp_data[$value] = $fees_data;

 							}

 							else {

-								$temp_data[$value] =  $fees_data_1;

+								$temp_data[$value] = $fees_data_1;

 							}

 						}

 					}

-					if(!empty($country_code)) {

+					if (!empty($country_code)) {

 						$data[$country_code] = $temp_data;

 					}

 				}

@@ -62,21 +62,21 @@ 
 	 */

 	function shipping_fees_array_2_string($fees_array) {

 		$string = '';

-		if(!empty($fees_array)) {

-			foreach($fees_array as $d) {

-				$string .= '{'."\n";

-				foreach($d as $att => $value) {

+		if (!empty($fees_array)) {

+			foreach ($fees_array as $d) {

+				$string .= '{' . "\n";

+				foreach ($d as $att => $value) {

 					$val = '';

-					if($att=='fees') {

-						foreach($value as $_k=>$_value) $val .= $_k.':'.$_value.', ';

-						$val = substr($val,0,-2);

+					if ($att == 'fees') {

+						foreach ($value as $_k=>$_value) $val .= $_k . ':' . $_value . ', ';

+						$val = substr($val, 0, -2);

 					} else $val = $value;

-					$string .= $att.': "'.$val.'",'."\n";

+					$string .= $att . ': "' . $val . '",' . "\n";

 				}

-				$string = substr($string,0,-2)."\n";

-				$string .= '},'."\n";

+				$string = substr($string, 0, -2) . "\n";

+				$string .= '},' . "\n";

 			}

-			$string = substr($string,0,-2);

+			$string = substr($string, 0, -2);

 			return $string;

 		}

 		else return false;

@@ -92,23 +92,23 @@ 
 	 *

 	 * @return number|string The sipping cost for the current cart

 	 */

-	 function get_shipping_cost( $nb_of_items, $total_cart, $total_shipping_cost, $total_weight, $selected_method = '' ) {

+	 function get_shipping_cost($nb_of_items, $total_cart, $total_shipping_cost, $total_weight, $selected_method = '') {

  		global $wpdb;

 

  		$shipping_cost = 0;

 

- 		$shipping_mode_state = get_option( 'wpshop_shipping_address_choice' );

- 		if ( ! empty( $shipping_mode_state ) && isset( $shipping_mode_state['activate'] ) && ( 'on' === $shipping_mode_state['activate'] ) ) {

- 			$shipping_mode_option = get_option( 'wps_shipping_mode' );

- 			if( ( !empty($selected_method) || isset( $_SESSION['shipping_address'] ) && empty( $_SESSION['shipping_method'] ) ) ) {

- 				if( !empty($selected_method) ) {

+ 		$shipping_mode_state = get_option('wpshop_shipping_address_choice');

+ 		if (!empty($shipping_mode_state) && isset($shipping_mode_state['activate']) && ('on' === $shipping_mode_state['activate'])) {

+ 			$shipping_mode_option = get_option('wps_shipping_mode');

+ 			if ((!empty($selected_method) || isset($_SESSION['shipping_address']) && empty($_SESSION['shipping_method']))) {

+ 				if (!empty($selected_method)) {

  					$chosen_shipping_mode = $selected_method;

  				} else {

  					$ship_mod = new wps_shipping_mode_ctr();

- 					$shipping_modes = $ship_mod->get_shipping_mode_for_address( $_SESSION['shipping_address'] );

- 					if( !empty( $shipping_modes ) ) {

+ 					$shipping_modes = $ship_mod->get_shipping_mode_for_address($_SESSION['shipping_address']);

+ 					if (!empty($shipping_modes)) {

  						$shipping_modes = $shipping_modes['modes'];

- 						foreach( $shipping_modes as $key => $shipping_mode ) {

+ 						foreach ($shipping_modes as $key => $shipping_mode) {

  							$chosen_shipping_mode = $key;

  							break;

  						}

@@ -118,37 +118,37 @@ 
  				}

  			}

  			else {

- 				if( !empty( $_SESSION['shipping_method'] ) ) {

- 					$chosen_shipping_mode = wpshop_tools::varSanitizer( $_SESSION['shipping_method'] );

+ 				if (!empty($_SESSION['shipping_method'])) {

+ 					$chosen_shipping_mode = wpshop_tools::varSanitizer($_SESSION['shipping_method']);

  				} else {

  					$chosen_shipping_mode = 'default_choice';

  				}

  			}

 

- 			$default_weight_unity = get_option( 'wpshop_shop_default_weight_unity' );

- 			if ( !empty($default_weight_unity) ) {

- 				$query = $wpdb->prepare('SELECT unit FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE id = %d', $default_weight_unity);

- 				$weight_unity = $wpdb->get_var( $query );

+ 			$default_weight_unity = get_option('wpshop_shop_default_weight_unity');

+ 			if (!empty($default_weight_unity)) {

+ 				$query = $wpdb->prepare('SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id = %d', $default_weight_unity);

+ 				$weight_unity = $wpdb->get_var($query);

 

- 				if ( !empty($weight_unity) && $weight_unity == 'kg' ) {

+ 				if (!empty($weight_unity) && $weight_unity == 'kg') {

 

  					$total_weight = $total_weight * 1000;

  				}

  			}

 

- 			if ( ( !empty($_SESSION['shipping_method']) && $_SESSION['shipping_method'] == 'shipping-partners' ) || !empty( $_SESSION['wps-pos-addon']) ) {

+ 			if ((!empty($_SESSION['shipping_method']) && $_SESSION['shipping_method'] == 'shipping-partners') || !empty($_SESSION['wps-pos-addon'])) {

  				return 0;

  			}

 

  			/** Take the selected shipping mode **/

- 			if( $chosen_shipping_mode == 'default_choice' ) {

- 				if( !empty( $shipping_mode_option['modes'][ $shipping_mode_option['default_choice'] ]) ) {

- 					$selected_shipping_mode_config = $shipping_mode_option['modes'][ $shipping_mode_option['default_choice'] ];

+ 			if ($chosen_shipping_mode == 'default_choice') {

+ 				if (!empty($shipping_mode_option['modes'][$shipping_mode_option['default_choice']])) {

+ 					$selected_shipping_mode_config = $shipping_mode_option['modes'][$shipping_mode_option['default_choice']];

  				} else {

  					$selected_shipping_mode_config = '';

  				}

  			} else {

- 				if( !empty( $shipping_mode_option['modes'][$chosen_shipping_mode]) ) {

+ 				if (!empty($shipping_mode_option['modes'][$chosen_shipping_mode])) {

  					$selected_shipping_mode_config = $shipping_mode_option['modes'][$chosen_shipping_mode];

  				} else {

  					$selected_shipping_mode_config = '';

@@ -157,41 +157,41 @@ 
  			$shipping_cost = $total_shipping_cost;

 

  			/** Free Shipping **/

- 			if ( ( !empty($selected_shipping_mode_config) && !empty($selected_shipping_mode_config['free_shipping']) ) || ( $selected_method == 'is_downloadable_' ) ) {

+ 			if ((!empty($selected_shipping_mode_config) && !empty($selected_shipping_mode_config['free_shipping'])) || ($selected_method == 'is_downloadable_')) {

  				$shipping_cost = 0;

  			}

  			/** Free Shipping From **/

- 			elseif( !empty($selected_shipping_mode_config) && !empty($selected_shipping_mode_config['free_from']) && $selected_shipping_mode_config['free_from'] >= 0 && $selected_shipping_mode_config['free_from'] <= number_format( $total_cart, 2, '.', '') ) {

+ 			elseif (!empty($selected_shipping_mode_config) && !empty($selected_shipping_mode_config['free_from']) && $selected_shipping_mode_config['free_from'] >= 0 && $selected_shipping_mode_config['free_from'] <= number_format($total_cart, 2, '.', '')) {

  				$shipping_cost = 0;

  			}

  			else {

  				/** Check Custom Shipping Cost **/

 

- 				if ( !empty($selected_shipping_mode_config['custom_shipping_rules']) && !empty($selected_shipping_mode_config['custom_shipping_rules']['active']) ) {

+ 				if (!empty($selected_shipping_mode_config['custom_shipping_rules']) && !empty($selected_shipping_mode_config['custom_shipping_rules']['active'])) {

  					$address_infos = '';

- 					if( !empty( $_SESSION['shipping_address'] ) ) {

- 						$address_infos = get_post_meta($_SESSION['shipping_address'],'_wpshop_address_metadata', true);

+ 					if (!empty($_SESSION['shipping_address'])) {

+ 						$address_infos = get_post_meta($_SESSION['shipping_address'], '_wpshop_address_metadata', true);

  					}

- 					$country = ( !empty($address_infos['country']) ) ? $address_infos['country'] : '';

+ 					$country = (!empty($address_infos['country'])) ? $address_infos['country'] : '';

  					/** Check Active Postcode option **/

- 					if ( !empty($selected_shipping_mode_config['custom_shipping_rules']['active_cp']) ) {

+ 					if (!empty($selected_shipping_mode_config['custom_shipping_rules']['active_cp'])) {

  						$postcode = $address_infos['postcode'];

- 						if ( array_key_exists($country.'-'.$postcode, $selected_shipping_mode_config['custom_shipping_rules']['fees']) ) {

- 							$country = $country.'-'.$postcode;

+ 						if (array_key_exists($country . '-' . $postcode, $selected_shipping_mode_config['custom_shipping_rules']['fees'])) {

+ 							$country = $country . '-' . $postcode;

  						}

- 						elseif( array_key_exists($country.'-OTHERS', $selected_shipping_mode_config['custom_shipping_rules']['fees']) ) {

- 							$country = $country.'-OTHERS';

+ 						elseif (array_key_exists($country . '-OTHERS', $selected_shipping_mode_config['custom_shipping_rules']['fees'])) {

+ 							$country = $country . '-OTHERS';

  						}

  					}

- 					$shipping_cost += $this->calculate_custom_shipping_cost($country, array('weight'=>$total_weight,'price'=> $total_cart), $selected_shipping_mode_config['custom_shipping_rules']['fees'], $chosen_shipping_mode);

+ 					$shipping_cost += $this->calculate_custom_shipping_cost($country, array('weight'=>$total_weight, 'price'=> $total_cart), $selected_shipping_mode_config['custom_shipping_rules']['fees'], $chosen_shipping_mode);

  				}

 

  				/** Min- Max config **/

- 				if ( !empty($selected_shipping_mode_config['min_max']) && !empty($selected_shipping_mode_config['min_max']['activate']) ) {

- 					if ( !empty($selected_shipping_mode_config['min_max']['min']) && $shipping_cost < $selected_shipping_mode_config['min_max']['min'] ) {

+ 				if (!empty($selected_shipping_mode_config['min_max']) && !empty($selected_shipping_mode_config['min_max']['activate'])) {

+ 					if (!empty($selected_shipping_mode_config['min_max']['min']) && $shipping_cost < $selected_shipping_mode_config['min_max']['min']) {

  						$shipping_cost = $selected_shipping_mode_config['min_max']['min'];

  					}

- 					elseif( !empty($selected_shipping_mode_config['min_max']['max']) &&$shipping_cost > $selected_shipping_mode_config['min_max']['max']) {

+ 					elseif (!empty($selected_shipping_mode_config['min_max']['max']) && $shipping_cost > $selected_shipping_mode_config['min_max']['max']) {

  						$shipping_cost = $selected_shipping_mode_config['min_max']['max'];

  					}

 

@@ -209,40 +209,40 @@ 
 	 * @param array $fees

 	 * @return number|boolean|Ambigous <number, unknown>

 	 */

-	function calculate_custom_shipping_cost($dest='', $data, $fees, $shipping_method = false) {

+	function calculate_custom_shipping_cost($dest = '', $data, $fees, $shipping_method = false) {

 		$fees_table = array();

 		$key = ''; $price = 0;

 

-		if ( !empty($_SESSION['shipping_partner_id']) ) {

+		if (!empty($_SESSION['shipping_partner_id'])) {

 			return 0;

 		}

 

-		if($shipping_method === false) {

+		if ($shipping_method === false) {

 			$shipping_method = $_SESSION['shipping_method'];

 		}

 

-		if(!empty($fees) || !empty($dest) ) {

-			$custom_shipping_option = get_option( 'wpshop_custom_shipping', true );

-			$shipping_modes = get_option( 'wps_shipping_mode' );

+		if (!empty($fees) || !empty($dest)) {

+			$custom_shipping_option = get_option('wpshop_custom_shipping', true);

+			$shipping_modes = get_option('wps_shipping_mode');

 

-			if ( !empty($shipping_method) ) {

-				if ( !empty($shipping_modes) && !empty($shipping_modes['modes']) && !empty($shipping_modes['modes'][ $shipping_method ]) ) {

-					$custom_shipping_option = $shipping_modes['modes'][ $shipping_method ]['custom_shipping_rules'];

+			if (!empty($shipping_method)) {

+				if (!empty($shipping_modes) && !empty($shipping_modes['modes']) && !empty($shipping_modes['modes'][$shipping_method])) {

+					$custom_shipping_option = $shipping_modes['modes'][$shipping_method]['custom_shipping_rules'];

 				}

 			}

 			$found_active_cp_rule = $found_active_departement_rule = false;

-			$shipping_address_def = get_post_meta( $_SESSION['shipping_address'], '_wpshop_address_metadata', true );

+			$shipping_address_def = get_post_meta($_SESSION['shipping_address'], '_wpshop_address_metadata', true);

 			$postcode = '';

-			if ( !empty($shipping_address_def) ) {

+			if (!empty($shipping_address_def)) {

 				$postcode = $shipping_address_def['postcode'];

 			}

 

 			/** Search Postcode custom fees **/

-			if ( !empty($custom_shipping_option) && !empty($custom_shipping_option['active_cp']) ) {

-				$key = $dest.'-'.$postcode;

-				if ( array_key_exists($key, $fees) ) {

+			if (!empty($custom_shipping_option) && !empty($custom_shipping_option['active_cp'])) {

+				$key = $dest . '-' . $postcode;

+				if (array_key_exists($key, $fees)) {

 					foreach ($fees[$key]['fees'] as $k => $shipping_price) {

-						if ( $data['weight'] <= $k) {

+						if ($data['weight'] <= $k) {

 							break;

 						}

 					}

@@ -251,13 +251,13 @@ 
 			}

 

 			/** Search Department custom fees **/

-			if( !empty($custom_shipping_option) && !empty($custom_shipping_option['active_department']) && !$found_active_cp_rule ) {

-				$department = substr( $postcode, 0,2 );

-				$key = $dest.'-'.$department;

+			if (!empty($custom_shipping_option) && !empty($custom_shipping_option['active_department']) && !$found_active_cp_rule) {

+				$department = substr($postcode, 0, 2);

+				$key = $dest . '-' . $department;

 				/** Check if a rule exists **/

-				if ( array_key_exists($key, $fees) ) {

+				if (array_key_exists($key, $fees)) {

 					foreach ($fees[$key]['fees'] as $k => $shipping_price) {

-						if ( $data['weight'] <= $k) {

+						if ($data['weight'] <= $k) {

 							break;

 						}

 					}

@@ -266,11 +266,11 @@ 
 			}

 

 			/** Search general custom fees **/

-			if( !$found_active_cp_rule && !$found_active_departement_rule ){

-				if ( array_key_exists($dest, $fees) ) {

+			if (!$found_active_cp_rule && !$found_active_departement_rule) {

+				if (array_key_exists($dest, $fees)) {

 					$key = $dest;

 				}

-				elseif( array_key_exists( 'OTHERS', $fees) ) {

+				elseif (array_key_exists('OTHERS', $fees)) {

 					$key = 'OTHERS';

 				}

 				else {

@@ -279,10 +279,10 @@ 
 			}

 

 			//Search fees

-			if ( !empty($key) ) {

-				ksort( $fees[$key]['fees'] );

+			if (!empty($key)) {

+				ksort($fees[$key]['fees']);

 				foreach ($fees[$key]['fees'] as $k => $shipping_price) {

-					if ( $data['weight'] <= $k) {

+					if ($data['weight'] <= $k) {

 						$price = $shipping_price;

 						break;

 					}

@@ -304,14 +304,14 @@ 
 	 * @param array $cart_items

 	 * @return number

 	 */

-	function calcul_cart_items_shipping_cost( $cart_items ) {

+	function calcul_cart_items_shipping_cost($cart_items) {

 		$shipping_cost = 0;

-		if( !empty($cart_items) ) {

-			foreach( $cart_items as $cart_item ) {

-				$product_data = get_post_meta( $cart_item['item_id'], '_wpshop_product_metadata', true );

+		if (!empty($cart_items)) {

+			foreach ($cart_items as $cart_item) {

+				$product_data = get_post_meta($cart_item['item_id'], '_wpshop_product_metadata', true);

 

-				if ( !empty( $product_data ) && !empty( $product_data['cost_of_postage'] ) ) {

-					$shipping_cost += ( $product_data['cost_of_postage'] * $cart_item['item_qty'] );

+				if (!empty($product_data) && !empty($product_data['cost_of_postage'])) {

+					$shipping_cost += ($product_data['cost_of_postage'] * $cart_item['item_qty']);

 				}

 			}

 		}

@@ -324,32 +324,32 @@ 
 	 * @param array $cart_items

 	 * @return number

 	 */

-	function calcul_cart_weight( $cart_items ) {

+	function calcul_cart_weight($cart_items) {

 		$cart_weight = 0;

-		if ( !empty( $cart_items) ) {

-			foreach( $cart_items as $id_item => $cart_item ) {

+		if (!empty($cart_items)) {

+			foreach ($cart_items as $id_item => $cart_item) {

 				$id_item = wpshop_products::get_id_variation($id_item);

-				if ( get_post_type($id_item) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {

-					$product_data = get_post_meta( $id_item, '_wpshop_product_metadata', true );

-					if ( !empty($product_data) && !empty($product_data['product_weight']) ) {

-						$cart_weight += ( $product_data['product_weight'] * $cart_item['item_qty'] );

+				if (get_post_type($id_item) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {

+					$product_data = get_post_meta($id_item, '_wpshop_product_metadata', true);

+					if (!empty($product_data) && !empty($product_data['product_weight'])) {

+						$cart_weight += ($product_data['product_weight'] * $cart_item['item_qty']);

 					}

 					else {

-						$parent_def = wpshop_products::get_parent_variation( $id_item );

-						if ( !empty($parent_def) && !empty( $parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['product_weight']) ) {

-							$cart_weight += ( $parent_def['parent_post_meta']['product_weight'] * $cart_item['item_qty'] );

+						$parent_def = wpshop_products::get_parent_variation($id_item);

+						if (!empty($parent_def) && !empty($parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['product_weight'])) {

+							$cart_weight += ($parent_def['parent_post_meta']['product_weight'] * $cart_item['item_qty']);

 						}

 					}

 				}

 				else {

-					$product_data = get_post_meta( $cart_item['item_id'], '_wpshop_product_metadata', true );

-					if ( !empty($product_data) && !empty($product_data['product_weight']) && !empty($cart_item['item_qty'])  ) {

-						$cart_weight += ( $product_data['product_weight'] * $cart_item['item_qty'] );

+					$product_data = get_post_meta($cart_item['item_id'], '_wpshop_product_metadata', true);

+					if (!empty($product_data) && !empty($product_data['product_weight']) && !empty($cart_item['item_qty'])) {

+						$cart_weight += ($product_data['product_weight'] * $cart_item['item_qty']);

 					}

 				}

 			}

 		}

-		$cart_weight = apply_filters( 'extra_cart_weight_calcul', $cart_weight, $cart_items );

+		$cart_weight = apply_filters('extra_cart_weight_calcul', $cart_weight, $cart_items);

 		return $cart_weight;

 	}

 

Braces +23 added lines, -27 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;

+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_shipping {

 	function __construct() {

 

@@ -21,8 +23,7 @@ 
 						$temp_data[$value] =  $atts[2][$key];

 						if($value=='destination') {

 							$country_code = $atts[2][$key];

-						}

-						elseif($value=='fees') {

+						} elseif($value=='fees') {

 							$fees_data = array();

 							$fees = explode(',', $atts[2][$key]);

 							foreach($fees as $fee){

@@ -39,8 +40,7 @@ 
 							$number_1 = count($fees_data_1);

 							if ($number == $number_1) {

 								$temp_data[$value] =  $fees_data;

-							}

-							else {

+							} else {

 								$temp_data[$value] =  $fees_data_1;

 							}

 						}

@@ -68,9 +68,13 @@ 
 				foreach($d as $att => $value) {

 					$val = '';

 					if($att=='fees') {

-						foreach($value as $_k=>$_value) $val .= $_k.':'.$_value.', ';

+						foreach($value as $_k=>$_value) {
+							$val .= $_k.':'.$_value.', ';
+						}
 						$val = substr($val,0,-2);

-					} else $val = $value;

+					} else {
+						$val = $value;
+					}
 					$string .= $att.': "'.$val.'",'."\n";

 				}

 				$string = substr($string,0,-2)."\n";

@@ -78,8 +82,9 @@ 
 			}

 			$string = substr($string,0,-2);

 			return $string;

-		}

-		else return false;

+		} else {
+			return false;
+		}
 	}

 

 	/**

@@ -116,8 +121,7 @@ 
  						$chosen_shipping_mode = 'default_choice';

  					}

  				}

- 			}

- 			else {

+ 			} else {

  				if( !empty( $_SESSION['shipping_method'] ) ) {

  					$chosen_shipping_mode = wpshop_tools::varSanitizer( $_SESSION['shipping_method'] );

  				} else {

@@ -163,8 +167,7 @@ 
  			/** Free Shipping From **/

  			elseif( !empty($selected_shipping_mode_config) && !empty($selected_shipping_mode_config['free_from']) && $selected_shipping_mode_config['free_from'] >= 0 && $selected_shipping_mode_config['free_from'] <= number_format( $total_cart, 2, '.', '') ) {

  				$shipping_cost = 0;

- 			}

- 			else {

+ 			} else {

  				/** Check Custom Shipping Cost **/

 

  				if ( !empty($selected_shipping_mode_config['custom_shipping_rules']) && !empty($selected_shipping_mode_config['custom_shipping_rules']['active']) ) {

@@ -178,8 +181,7 @@ 
  						$postcode = $address_infos['postcode'];

  						if ( array_key_exists($country.'-'.$postcode, $selected_shipping_mode_config['custom_shipping_rules']['fees']) ) {

  							$country = $country.'-'.$postcode;

- 						}

- 						elseif( array_key_exists($country.'-OTHERS', $selected_shipping_mode_config['custom_shipping_rules']['fees']) ) {

+ 						} elseif( array_key_exists($country.'-OTHERS', $selected_shipping_mode_config['custom_shipping_rules']['fees']) ) {

  							$country = $country.'-OTHERS';

  						}

  					}

@@ -190,8 +192,7 @@ 
  				if ( !empty($selected_shipping_mode_config['min_max']) && !empty($selected_shipping_mode_config['min_max']['activate']) ) {

  					if ( !empty($selected_shipping_mode_config['min_max']['min']) && $shipping_cost < $selected_shipping_mode_config['min_max']['min'] ) {

  						$shipping_cost = $selected_shipping_mode_config['min_max']['min'];

- 					}

- 					elseif( !empty($selected_shipping_mode_config['min_max']['max']) &&$shipping_cost > $selected_shipping_mode_config['min_max']['max']) {

+ 					} elseif( !empty($selected_shipping_mode_config['min_max']['max']) &&$shipping_cost > $selected_shipping_mode_config['min_max']['max']) {

  						$shipping_cost = $selected_shipping_mode_config['min_max']['max'];

  					}

 

@@ -269,11 +270,9 @@ 
 			if( !$found_active_cp_rule && !$found_active_departement_rule ){

 				if ( array_key_exists($dest, $fees) ) {

 					$key = $dest;

-				}

-				elseif( array_key_exists( 'OTHERS', $fees) ) {

+				} elseif( array_key_exists( 'OTHERS', $fees) ) {

 					$key = 'OTHERS';

-				}

-				else {

+				} else {

 					return false;

 				}

 			}

@@ -290,8 +289,7 @@ 
 						$price = $shipping_price;

 					}

 				}

-			}

-			else {

+			} else {

 				return false;

 			}

 			return $price;

@@ -333,15 +331,13 @@ 
 					$product_data = get_post_meta( $id_item, '_wpshop_product_metadata', true );

 					if ( !empty($product_data) && !empty($product_data['product_weight']) ) {

 						$cart_weight += ( $product_data['product_weight'] * $cart_item['item_qty'] );

-					}

-					else {

+					} else {

 						$parent_def = wpshop_products::get_parent_variation( $id_item );

 						if ( !empty($parent_def) && !empty( $parent_def['parent_post_meta']) && !empty($parent_def['parent_post_meta']['product_weight']) ) {

 							$cart_weight += ( $parent_def['parent_post_meta']['product_weight'] * $cart_item['item_qty'] );

 						}

 					}

-				}

-				else {

+				} else {

 					$product_data = get_post_meta( $cart_item['item_id'], '_wpshop_product_metadata', true );

 					if ( !empty($product_data) && !empty($product_data['product_weight']) && !empty($cart_item['item_qty'])  ) {

 						$cart_weight += ( $product_data['product_weight'] * $cart_item['item_qty'] );

includes/modules/wps_barcode/controller/wps_barcode.ctr.php

Braces +17 added lines, -25 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_barcode {
 	public function __construct() {
 		global $post_ID;
@@ -80,22 +82,18 @@ 
 													$conf['normal_country_code'],
 													'enterprise' =>
 													$conf['normal_enterprise_code'],'ID' => $ref);
-										}
-										else if ( $conf['type'] === 'internal' ) {
+										} else if ( $conf['type'] === 'internal' ) {
 											$pDate = new DateTime($post->post_date);
 											$date = $pDate->format('my');
 
 											if ($post->post_type === WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ||
 													$post->post_type === WPSHOP_IDENTIFIER_PRODUCT) {
 												$type = $conf['internal_product'];
-											}
-											else if ($post->post_type === WPSHOP_NEWTYPE_IDENTIFIER_ORDER) {
+											} else if ($post->post_type === WPSHOP_NEWTYPE_IDENTIFIER_ORDER) {
 												$type = $conf['internal_invoice_client'];
-											}
-											else if ($post->post_type === WPSHOP_NEWTYPE_IDENTIFIER_COUPON) {
+											} else if ($post->post_type === WPSHOP_NEWTYPE_IDENTIFIER_COUPON) {
 												$type = $conf['internal_coupons'];
-											}
-											else {
+											} else {
 												$type = '000';
 											}
 
@@ -149,15 +147,13 @@ 
 								$conf['normal_country_code'],
 								'enterprise' =>
 								$conf['normal_enterprise_code'],'ID' => $ref);
-					}
-					else if ( $conf['type'] === 'internal' ) {
+					} else if ( $conf['type'] === 'internal' ) {
 						$pDate = new DateTime($post->post_date);
 						$date = $pDate->format('my');
 
 						if ($post->post_type === WPSHOP_NEWTYPE_IDENTIFIER_COUPON) {
 							$type = $conf['internal_coupons'];
-						}
-						else {
+						} else {
 							$type = '000';
 						}
 
@@ -187,8 +183,9 @@ 
 	 * @param string $post_ID Ident of post
 	 */
 	public function insert_barcode( $post_ID, $post, $update ) {
-		if ( wp_is_post_revision( $post_ID ) )
-			return;
+		if ( wp_is_post_revision( $post_ID ) ) {
+					return;
+		}
 
 		global $wpdb;
 
@@ -222,21 +219,17 @@ 
 					'enterprise' 	=> $conf['normal_enterprise_code'],
 					'ID' 			=> $ref,
 				);
-			}
-			else if ( $conf['type'] === 'internal' ) {
+			} else if ( $conf['type'] === 'internal' ) {
 				$pDate = new DateTime($post->post_date);
 				$date = $pDate->format('my');
 
 				if ($post->post_type === WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT || $post->post_type === WPSHOP_IDENTIFIER_PRODUCT) {
 					$type = $conf['internal_product'];
-				}
-				else if ($post->post_type === WPSHOP_NEWTYPE_IDENTIFIER_ORDER) {
+				} else if ($post->post_type === WPSHOP_NEWTYPE_IDENTIFIER_ORDER) {
 					$type = $conf['internal_invoice_client'];
-				}
-				else if ($post->post_type === WPSHOP_NEWTYPE_IDENTIFIER_COUPON) {
+				} else if ($post->post_type === WPSHOP_NEWTYPE_IDENTIFIER_COUPON) {
 					$type = $conf['internal_coupons'];
-				}
-				else {
+				} else {
 					$type = '000';
 				}
 
@@ -318,8 +311,7 @@ 
 
 			$id = $array['normal']['ID'];
 
-		}
-		else if ( array_key_exists('internal', $array) ) {
+		} else if ( array_key_exists('internal', $array) ) {
 			$code.= $array['internal']['type'];
 			$code .= $array['internal']['date'];
 			$code .= $array['internal']['ID'];

Spacing +56 added lines, -56 removed lines

@@ -1,10 +1,10 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_barcode {
 	public function __construct() {
 		global $post_ID;
 
 		$this->install();
-		add_action( 'save_post', array($this, 'insert_barcode' ), 10, 3 );
+		add_action('save_post', array($this, 'insert_barcode'), 10, 3);
 	}
 
 	/**
@@ -16,7 +16,7 @@ 
 		/*Create config informations*/
 		$conf = get_option('wps_barcode');
 
-		if ( empty($conf) ) {
+		if (empty($conf)) {
 			$conf['generate_barcode'] = false;
 			$conf['type'] = 'internal';
 			$conf['internal_client'] = '040';
@@ -35,20 +35,20 @@ 
 			add_option('wps_barcode', $conf);
 
 			/*Adding barcode for existing products*/
-			$posts = get_posts( array('posts_per_page' => -1 ,'post_type' => 'wpshop_product'));
-			foreach ( $posts as $post ) {
+			$posts = get_posts(array('posts_per_page' => -1, 'post_type' => 'wpshop_product'));
+			foreach ($posts as $post) {
 				$meta = get_post_meta($post->ID);
 
 				$attr = wpshop_attributes_set::getAttributeSetDetails($meta['_wpshop_product_attribute_set_id']);
 				$output_order = array();
 
-				if ( count($attr) > 0 ) {
-					if (!empty($attr) ) {
-						foreach ( $attr as $product_attr_group_id =>
+				if (count($attr) > 0) {
+					if (!empty($attr)) {
+						foreach ($attr as $product_attr_group_id =>
 								$product_attr_group_detail) {
-							foreach ( $product_attr_group_detail['attribut']
+							foreach ($product_attr_group_detail['attribut']
 									as $position => $attribute_def) {
-								if ( !empty($attribute_def->code)
+								if (!empty($attribute_def->code)
 										AND $attribute_def->code === 'barcode') {
 
 									$types_with_barcode = array(
@@ -59,14 +59,14 @@ 
 											WPSHOP_NEWTYPE_IDENTIFIER_ORDER,
 									);
 
-									if ( !empty( $post->post_type ) &&
-											in_array( $post->post_type,
-											$types_with_barcode ) ) {
+									if (!empty($post->post_type) &&
+											in_array($post->post_type,
+											$types_with_barcode)) {
 
 										$ref = '';
 
-										if ( strlen($post->ID) < 5 ) {
-											$length = 5-strlen($post->ID);
+										if (strlen($post->ID) < 5) {
+											$length = 5 - strlen($post->ID);
 											for ($i = 0; $i < $length; $i++) {
 												$ref .= '0';
 											}
@@ -74,13 +74,13 @@ 
 
 										$ref .= strval($post->ID);
 
-										if ( $conf['type'] === 'normal' ) {
+										if ($conf['type'] === 'normal') {
 											$array['normal'] = array('country' =>
 													$conf['normal_country_code'],
 													'enterprise' =>
-													$conf['normal_enterprise_code'],'ID' => $ref);
+													$conf['normal_enterprise_code'], 'ID' => $ref);
 										}
-										else if ( $conf['type'] === 'internal' ) {
+										else if ($conf['type'] === 'internal') {
 											$pDate = new DateTime($post->post_date);
 											$date = $pDate->format('my');
 
@@ -109,10 +109,10 @@ 
 												'entity_id' => $post->ID,
 												'user_id' => $post->post_author,
 												'value' => $barcode,
-												'creation_date_value' => date( 'Y-m-d H:i:s' ));
+												'creation_date_value' => date('Y-m-d H:i:s'));
 
 
-										$query = $wpdb->prepare( "
+										$query = $wpdb->prepare("
 											SELECT *
 											FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_VARCHAR . "
 											WHERE entity_id = %d
@@ -120,15 +120,15 @@ 
 													SELECT id
 													FROM " . WPSHOP_DBT_ATTRIBUTE . "
 													WHERE code = %s
-												)" , $post->ID, 'barcode' );
-											$result = $wpdb->get_results( $query, ARRAY_A );
+												)" , $post->ID, 'barcode');
+											$result = $wpdb->get_results($query, ARRAY_A);
 
-										if ( empty($result) ) {
-											$wpdb->insert($table_prefix.
+										if (empty($result)) {
+											$wpdb->insert($table_prefix .
 													'wpshop__attribute_value_varchar', $data);
-										} elseif( empty( $result[0]['value'] ) ) {
-											$wpdb->update($table_prefix.
-													'wpshop__attribute_value_varchar', $data, array( 'value_id' => $result[0]['value_id'] ) );
+										} elseif (empty($result[0]['value'])) {
+											$wpdb->update($table_prefix .
+													'wpshop__attribute_value_varchar', $data, array('value_id' => $result[0]['value_id']));
 										}
 									}
 								}
@@ -139,17 +139,17 @@ 
 			}
 
 			/*Adding barcode for existing coupon*/
-			$posts = get_posts( array('posts_per_page' => -1 ,'post_type' => 'wpshop_shop_coupon') );
-			foreach ( $posts as $post ) {
+			$posts = get_posts(array('posts_per_page' => -1, 'post_type' => 'wpshop_shop_coupon'));
+			foreach ($posts as $post) {
 				$meta = get_post_meta($post->ID);
-				if ( empty($meta['wpshop_coupon_barcode']) ) {
-					if ( $conf['type'] === 'normal' ) {
+				if (empty($meta['wpshop_coupon_barcode'])) {
+					if ($conf['type'] === 'normal') {
 						$array['normal'] = array('country' =>
 								$conf['normal_country_code'],
 								'enterprise' =>
-								$conf['normal_enterprise_code'],'ID' => $ref);
+								$conf['normal_enterprise_code'], 'ID' => $ref);
 					}
-					else if ( $conf['type'] === 'internal' ) {
+					else if ($conf['type'] === 'internal') {
 						$pDate = new DateTime($post->post_date);
 						$date = $pDate->format('my');
 
@@ -161,8 +161,8 @@ 
 						}
 
 						$ref = '';
-						if ( strlen($post->ID) < 5 ) {
-							$length = 5-strlen($post->ID);
+						if (strlen($post->ID) < 5) {
+							$length = 5 - strlen($post->ID);
 							for ($i = 0; $i < $length; $i++) {
 								$ref .= '0';
 							}
@@ -184,8 +184,8 @@ 
 	 * Verifty post identifier and run a barcode generator
 	 * @param string $post_ID Ident of post
 	 */
-	public function insert_barcode( $post_ID, $post, $update ) {
-		if ( wp_is_post_revision( $post_ID ) )
+	public function insert_barcode($post_ID, $post, $update) {
+		if (wp_is_post_revision($post_ID))
 			return;
 
 		global $wpdb;
@@ -199,14 +199,14 @@ 
 		);
 
 		/** Si c'est un type qui est dans le tableau $types_with_barcode */
-		if ( !empty( $post->post_type ) && in_array( $post->post_type,
-				$types_with_barcode ) ) {
+		if (!empty($post->post_type) && in_array($post->post_type,
+				$types_with_barcode)) {
 
 			$conf = get_option('wps_barcode');
 			$ref = '';
 
-			if ( strlen($post_ID) < 5 ) {
-				$length = 5-strlen($post_ID);
+			if (strlen($post_ID) < 5) {
+				$length = 5 - strlen($post_ID);
 				for ($i = 0; $i < $length; $i++) {
 					$ref .= '0';
 				}
@@ -214,14 +214,14 @@ 
 
 			$ref .= strval($post_ID);
 
-			if ( $conf['type'] === 'normal' ) {
+			if ($conf['type'] === 'normal') {
 				$array['normal'] = array(
 					'country' 		=> $conf['normal_country_code'],
 					'enterprise' 	=> $conf['normal_enterprise_code'],
 					'ID' 			=> $ref,
 				);
 			}
-			else if ( $conf['type'] === 'internal' ) {
+			else if ($conf['type'] === 'internal') {
 				$pDate = new DateTime($post->post_date);
 				$date = $pDate->format('my');
 
@@ -247,9 +247,9 @@ 
 
 			//$barcode = $this->wps_generate_barcode($array);
 			/** For add a product */
-			$_REQUEST['wpshop_product_attribute']['varchar']['barcode'] = !empty( $_REQUEST['wpshop_product_attribute']['varchar']['barcode'] ) ? sanitize_text_field( $_REQUEST['wpshop_product_attribute']['varchar']['barcode'] ) : null;
-			if( !isset($_REQUEST['wpshop_product_attribute']['varchar']['barcode']) ) {
-				\eoxia\log_class::exec( 'wps_barcode', 'wps_barcode', sprintf( __('Adding barcode: %s for %s object ID', 'wps_barcode'), '<b>'.$_REQUEST['wpshop_product_attribute']['varchar']['barcode'].'</b>', '<b>'.$post_ID.'</b>'), array( 'object_id' 	=> $post_ID ), 0 );
+			$_REQUEST['wpshop_product_attribute']['varchar']['barcode'] = !empty($_REQUEST['wpshop_product_attribute']['varchar']['barcode']) ? sanitize_text_field($_REQUEST['wpshop_product_attribute']['varchar']['barcode']) : null;
+			if (!isset($_REQUEST['wpshop_product_attribute']['varchar']['barcode'])) {
+				\eoxia\log_class::exec('wps_barcode', 'wps_barcode', sprintf(__('Adding barcode: %s for %s object ID', 'wps_barcode'), '<b>' . $_REQUEST['wpshop_product_attribute']['varchar']['barcode'] . '</b>', '<b>' . $post_ID . '</b>'), array('object_id' 	=> $post_ID), 0);
 
 				$_REQUEST['wpshop_product_attribute']['varchar']['barcode'] = $this->wps_generate_barcode($array);
 			}
@@ -273,7 +273,7 @@ 
 
 		$conf = get_option('wps_barcode');
 
-		if ( array_key_exists('normal', $array) ) {
+		if (array_key_exists('normal', $array)) {
 			$code .= $array['normal']['country'];
 			$code .= $array['normal']['enterprise'];
 			$code .= $array['normal']['ID'];
@@ -281,8 +281,8 @@ 
 			$id = $array['normal']['ID'];
 
 		}
-		else if ( array_key_exists('internal', $array) ) {
-			$code.= $array['internal']['type'];
+		else if (array_key_exists('internal', $array)) {
+			$code .= $array['internal']['type'];
 			$code .= $array['internal']['date'];
 			$code .= $array['internal']['ID'];
 
@@ -291,15 +291,15 @@ 
 
 		$gencode = $barcode->checksum($code);
 
-		$barcode->writeLog( sprintf( __("Checksum generate: %s from %s <br />",
-		'wps_barcode'), '<b>'.$gencode.'</b>',
-		'<b>'.$code.'</b>') );
+		$barcode->writeLog(sprintf(__("Checksum generate: %s from %s <br />",
+		'wps_barcode'), '<b>' . $gencode . '</b>',
+		'<b>' . $code . '</b>'));
 
-		$message = sprintf( __("Log generated by wps_barcodegen for add/update product: <br /> %s",
-				'wps_barcode'), $barcode->getLog() );
+		$message = sprintf(__("Log generated by wps_barcodegen for add/update product: <br /> %s",
+				'wps_barcode'), $barcode->getLog());
 
-		if ( class_exists('wpeologs_ctr') ) {
-			\eoxia\log_class::exec( 'wps_barcode', 'wps_barcode', $message, array( 'object_id' => $id ), 0 );
+		if (class_exists('wpeologs_ctr')) {
+			\eoxia\log_class::exec('wps_barcode', 'wps_barcode', $message, array('object_id' => $id), 0);
 		}
 
 		return $gencode;

includes/modules/wps_product/modules/wps_product_variation_interface/wps_product_variation_interface.php

Spacing +8 added lines, -8 removed lines

@@ -1,18 +1,18 @@
 <?php
-if ( !defined( 'ABSPATH' ) ) exit;
+if (!defined('ABSPATH')) exit;
 
-DEFINE( 'WPSPDTVARIATION_INTERFACE_VERSION', 1.0 );
-DEFINE( 'WPSPDTVARIATION_INTERFACE_DIR', basename( dirname( __FILE__ ) ) );
-DEFINE( 'WPSPDTVARIATION_INTERFACE_PATH', str_replace( "\\", "/", plugin_dir_path( __FILE__ ) ) );
-DEFINE( 'WPSPDTVARIATION_INTERFACE_URL', str_replace( str_replace( "\\", "/", ABSPATH), site_url() . '/', WPSPDTVARIATION_INTERFACE_PATH ) );
+DEFINE('WPSPDTVARIATION_INTERFACE_VERSION', 1.0);
+DEFINE('WPSPDTVARIATION_INTERFACE_DIR', basename(dirname(__FILE__)));
+DEFINE('WPSPDTVARIATION_INTERFACE_PATH', str_replace("\\", "/", plugin_dir_path(__FILE__)));
+DEFINE('WPSPDTVARIATION_INTERFACE_URL', str_replace(str_replace("\\", "/", ABSPATH), site_url() . '/', WPSPDTVARIATION_INTERFACE_PATH));
 
 /**	Définition du chemin absolu vers les templates / Define the templates absolute directories	*/
-DEFINE( 'WPSPDTVARIATION_INTERFACE_TEMPLATES_MAIN_DIR', WPSPDTVARIATION_INTERFACE_PATH . '/templates/');
-DEFINE( 'WPSPDTVARIATION_INTERFACE_ASSETS_MAIN_DIR', WPSPDTVARIATION_INTERFACE_URL . '/assets/');
+DEFINE('WPSPDTVARIATION_INTERFACE_TEMPLATES_MAIN_DIR', WPSPDTVARIATION_INTERFACE_PATH . '/templates/');
+DEFINE('WPSPDTVARIATION_INTERFACE_ASSETS_MAIN_DIR', WPSPDTVARIATION_INTERFACE_URL . '/assets/');
 
 
 /** Inclusion des différents composants / Include plugin components */
-require_once( WPSPDTVARIATION_INTERFACE_PATH . 'controller/wps_product_variation_interface.ctr.php' );
+require_once(WPSPDTVARIATION_INTERFACE_PATH . 'controller/wps_product_variation_interface.ctr.php');
 /**	Instanciation du controlleur principal / Main controller instanciation	*/
 $wps_product_variation_interface = new wps_product_variation_interface();
 

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if ( !defined( 'ABSPATH' ) ) exit;
+if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 DEFINE( 'WPSPDTVARIATION_INTERFACE_VERSION', 1.0 );
 DEFINE( 'WPSPDTVARIATION_INTERFACE_DIR', basename( dirname( __FILE__ ) ) );

includes/modules/wps_product/modules/wps_product_quick_add/controller/wps_product_quick_add.ctr.php

Spacing +40 added lines, -40 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Fichier du controlleur principal du module de création de produit rapide / Controller file for quick product creation
  *
@@ -19,9 +19,9 @@ 
 	 */
 	public function __construct() {
 		/**	Affiche un formulaire permettant de créer un produit / Display a form allowing to add a new product	*/
-		add_action( 'wp_ajax_wps-product-quick-creation', array( $this, 'product_creation' ) );
-		add_action( 'wp_ajax_wps-product-quick-add-reload-attribute-list', array( $this, 'attribute_list_reload' ) );
-		add_action( 'wp_ajax_wps-product-quick-add', array( $this, 'create_product' ) );
+		add_action('wp_ajax_wps-product-quick-creation', array($this, 'product_creation'));
+		add_action('wp_ajax_wps-product-quick-add-reload-attribute-list', array($this, 'attribute_list_reload'));
+		add_action('wp_ajax_wps-product-quick-add', array($this, 'create_product'));
 	}
 
 	/**
@@ -29,19 +29,19 @@ 
 	 *
 	 * @param integer $chosen_set Le groupe d'attribut dont on veut afficher les champs / Attribute set we want display input for
 	 */
-	function display_attribute( $chosen_set = 0 ) {
-		require_once( wpshop_tools::get_template_part( WPSPDTQUICK_DIR, WPSPDTQUICK_TEMPLATES_MAIN_DIR, "backend", "attribute", "list" ) );
+	function display_attribute($chosen_set = 0) {
+		require_once(wpshop_tools::get_template_part(WPSPDTQUICK_DIR, WPSPDTQUICK_TEMPLATES_MAIN_DIR, "backend", "attribute", "list"));
 	}
 
 	/**
 	 * AJAX - Charge le fomulaire d'ajout rapide d'un produit / Load the form for new product quick add
 	 */
 	function product_creation() {
-		$_wpnonce = !empty( $_POST['wps-nonce'] ) ? sanitize_text_field( $_POST['wps-nonce'] ) : '';
-		if ( !wp_verify_nonce( $_wpnonce, 'wps-product-quick-nonce' ) )
+		$_wpnonce = !empty($_POST['wps-nonce']) ? sanitize_text_field($_POST['wps-nonce']) : '';
+		if (!wp_verify_nonce($_wpnonce, 'wps-product-quick-nonce'))
 			wp_die();
 
-		require_once( wpshop_tools::get_template_part( WPSPDTQUICK_DIR, WPSPDTQUICK_TEMPLATES_MAIN_DIR, "backend", "product_creation" ) );
+		require_once(wpshop_tools::get_template_part(WPSPDTQUICK_DIR, WPSPDTQUICK_TEMPLATES_MAIN_DIR, "backend", "product_creation"));
 		wp_die( );
 	}
 
@@ -49,13 +49,13 @@ 
 	 * AJAX - Recharge la liste des attributs du groupe sélectionné par l'administratuer pour la création du nouveau produit / Reload attribute list for the selected attribute set, choosen by administrator for new product creation
 	 */
 	function attribute_list_reload() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'attribute_list_reload' ) )
+		if (!wp_verify_nonce($_wpnonce, 'attribute_list_reload'))
 			wp_die();
 
-		$attribute_set = !empty( $_POST['attribute_set'] ) ? (int) $_POST['attribute_set'] : 0;
-		$this->display_attribute( $attribute_set );
+		$attribute_set = !empty($_POST['attribute_set']) ? (int)$_POST['attribute_set'] : 0;
+		$this->display_attribute($attribute_set);
 		wp_die( );
 	}
 
@@ -63,9 +63,9 @@ 
 	 * AJAX - Création d'un nouveau produit / Create a new product
 	 */
 	function create_product() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'create_product' ) )
+		if (!wp_verify_nonce($_wpnonce, 'create_product'))
 			wp_die();
 
 		global $wpdb;
@@ -75,51 +75,51 @@ 
 			'pid' => -1,
 		);
 
-		$post_title = ( !empty($_POST['post_title']) ) ? sanitize_text_field( $_POST['post_title'] ) : -1;
-		$post_content = ( !empty($_POST['post_content']) ) ? sanitize_text_field( $_POST['post_content'] ) : '';
-		$attributes = ( !empty($_POST['attribute']) ) ? (array)$_POST['attribute'] : array();
-		$id_attribute_set = ( !empty($_POST['wps-product-attribute-set']) ) ? (int) $_POST['wps-product-attribute-set'] : -1;
+		$post_title = (!empty($_POST['post_title'])) ? sanitize_text_field($_POST['post_title']) : -1;
+		$post_content = (!empty($_POST['post_content'])) ? sanitize_text_field($_POST['post_content']) : '';
+		$attributes = (!empty($_POST['attribute'])) ? (array)$_POST['attribute'] : array();
+		$id_attribute_set = (!empty($_POST['wps-product-attribute-set'])) ? (int)$_POST['wps-product-attribute-set'] : -1;
 
 		$post_type = WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT;
-		$attribute_set_list = wpshop_attributes_set::get_attribute_set_list_for_entity( wpshop_entities::get_entity_identifier_from_code( 'wpshop_product' ) );
-		foreach( $attribute_set_list as $attribute_set ) {
-			if( $id_attribute_set == $attribute_set->id && $attribute_set->slug == 'free_product' ) {
+		$attribute_set_list = wpshop_attributes_set::get_attribute_set_list_for_entity(wpshop_entities::get_entity_identifier_from_code('wpshop_product'));
+		foreach ($attribute_set_list as $attribute_set) {
+			if ($id_attribute_set == $attribute_set->id && $attribute_set->slug == 'free_product') {
 				$post_type = 'free_product';
 			}
 		}
 
-		if( ( -1 != $post_title ) && ( -1 != $id_attribute_set ) ) {
-			$new_product_id = wp_insert_post( array(
+		if (( -1 != $post_title ) && ( -1 != $id_attribute_set )) {
+			$new_product_id = wp_insert_post(array(
 				'post_type' => $post_type,
 				'post_status' => 'publish',
 				'post_title' => $post_title,
 				'post_content' => $post_content,
-			) );
+			));
 
-			if( !is_wp_error( $new_product_id ) ) {
-				update_post_meta( $new_product_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id', $id_attribute_set );
-				$data_to_save['post_ID'] = $data_to_save['product_id'] = intval( $new_product_id );
-				$data_to_save['wpshop_product_attribute'] = ( !empty($attributes) ) ? $attributes : array();
+			if (!is_wp_error($new_product_id)) {
+				update_post_meta($new_product_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id', $id_attribute_set);
+				$data_to_save['post_ID'] = $data_to_save['product_id'] = intval($new_product_id);
+				$data_to_save['wpshop_product_attribute'] = (!empty($attributes)) ? $attributes : array();
 				$data_to_save['user_ID'] = get_current_user_id();
 				$data_to_save['action'] = 'editpost';
-				$response[ 'pid' ] = $new_product_id;
-				$response[ 'status' ] = false;
-				$response[ 'output' ] = __('Product created partially!', 'wpshop');
-				if( !empty( $new_product_id ) && !empty( $data_to_save['user_ID'] ) ) {
+				$response['pid'] = $new_product_id;
+				$response['status'] = false;
+				$response['output'] = __('Product created partially!', 'wpshop');
+				if (!empty($new_product_id) && !empty($data_to_save['user_ID'])) {
 					$product_class = new wpshop_products();
-					$product_class->save_product_custom_informations( $new_product_id, $data_to_save );
-					$response[ 'status' ] = true;
-					$response[ 'output' ] = __('Product created successfully.', 'wpshop');
+					$product_class->save_product_custom_informations($new_product_id, $data_to_save);
+					$response['status'] = true;
+					$response['output'] = __('Product created successfully.', 'wpshop');
 				}
 
-				$wps_quick_creation_hook = do_action( 'wps-new-product-quick-created', $new_product_id );
-				if ( !empty( $wps_quick_creation_hook ) ) {
-					$response[ '' ] = $wps_quick_creation_hook;
+				$wps_quick_creation_hook = do_action('wps-new-product-quick-created', $new_product_id);
+				if (!empty($wps_quick_creation_hook)) {
+					$response[''] = $wps_quick_creation_hook;
 				}
 			}
 		}
 
-		wp_die( json_encode( $response ) );
+		wp_die(json_encode($response));
 	}
 
 }

Braces +12 added lines, -7 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier du controlleur principal du module de création de produit rapide / Controller file for quick product creation
  *
@@ -38,8 +40,9 @@ 
 	 */
 	function product_creation() {
 		$_wpnonce = !empty( $_POST['wps-nonce'] ) ? sanitize_text_field( $_POST['wps-nonce'] ) : '';
-		if ( !wp_verify_nonce( $_wpnonce, 'wps-product-quick-nonce' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps-product-quick-nonce' ) ) {
+					wp_die();
+		}
 
 		require_once( wpshop_tools::get_template_part( WPSPDTQUICK_DIR, WPSPDTQUICK_TEMPLATES_MAIN_DIR, "backend", "product_creation" ) );
 		wp_die( );
@@ -51,8 +54,9 @@ 
 	function attribute_list_reload() {
 		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'attribute_list_reload' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'attribute_list_reload' ) ) {
+					wp_die();
+		}
 
 		$attribute_set = !empty( $_POST['attribute_set'] ) ? (int) $_POST['attribute_set'] : 0;
 		$this->display_attribute( $attribute_set );
@@ -65,8 +69,9 @@ 
 	function create_product() {
 		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'create_product' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'create_product' ) ) {
+					wp_die();
+		}
 
 		global $wpdb;
 		$response = array(

includes/modules/wps_product/modules/wps_product_mass_interface/templates/backend/quick_add_interface.php

Spacing +10 added lines, -10 removed lines

@@ -1,25 +1,25 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 ?>
 <div class="wrap">
-	<h2><span class="dashicons dashicons-update" style="font-size : 30px; width : 30px; height : 30px"></span> <?php _e( 'Mass edit products interface', 'wpshop')?><button class="add-new-h2" data-nonce="<?php echo wp_create_nonce( 'wps_mass_interface_new_product_creation' ); ?>" id="wps-mass-interface-button-new-product"><i class="wps-icon-pencil"></i> <?php _e( 'Create a new product', 'wpshop'); ?></button></h2>
+	<h2><span class="dashicons dashicons-update" style="font-size : 30px; width : 30px; height : 30px"></span> <?php _e('Mass edit products interface', 'wpshop')?><button class="add-new-h2" data-nonce="<?php echo wp_create_nonce('wps_mass_interface_new_product_creation'); ?>" id="wps-mass-interface-button-new-product"><i class="wps-icon-pencil"></i> <?php _e('Create a new product', 'wpshop'); ?></button></h2>
 
 
 <div class="wps-boxed">
 	<div class="wps-row wps-gridwrapper3-padded">
 		<div>
 			<div class="wps-form-group">
-			<?php if( !empty($products_attributes_groups) ): ?>
-				<?php if ( 1 < count( $products_attributes_groups ) ) : ?>
-				<label><?php _e( 'Products Attributes groups', 'wpshop' ); ?> : </label>
+			<?php if (!empty($products_attributes_groups)): ?>
+				<?php if (1 < count($products_attributes_groups)) : ?>
+				<label><?php _e('Products Attributes groups', 'wpshop'); ?> : </label>
 				<div class="wps-form">
 					<select id="wps_mass_edit_products_default_attributes_set" name="wps_mass_edit_products_default_attributes_set" >
-						<?php foreach( $products_attributes_groups as $products_attributes_group ) : ?>
-						<option value="<?php echo $products_attributes_group->id; ?>" <?php echo ( (!empty($products_attributes_group->default_set) && $products_attributes_group->default_set == 'yes' ) ? 'selected="selected"' : '' ); ?> ><?php echo $products_attributes_group->name; ?></option>
+						<?php foreach ($products_attributes_groups as $products_attributes_group) : ?>
+						<option value="<?php echo $products_attributes_group->id; ?>" <?php echo ((!empty($products_attributes_group->default_set) && $products_attributes_group->default_set == 'yes') ? 'selected="selected"' : ''); ?> ><?php echo $products_attributes_group->name; ?></option>
 						<?php endforeach; ?>
 					</select>
 				</div>
 				<?php else: ?>
-					<input type="hidden" id="wps_mass_edit_products_default_attributes_set"  name="wps_mass_edit_products_default_attributes_set" value="<?php echo $products_attributes_groups[ 0 ]->id; ?>" />
+					<input type="hidden" id="wps_mass_edit_products_default_attributes_set"  name="wps_mass_edit_products_default_attributes_set" value="<?php echo $products_attributes_groups[0]->id; ?>" />
 				<?php endif; ?>
 			<?php endif; ?>
 			</div>
@@ -29,7 +29,7 @@ 
 		<div>&nbsp;</div>
 
 		<div>
-			<div style="width : 100%; margin-top : 20px" class="alignright"><button class="button-primary alignright wps-mass-interface-button-save"><i class="wps-icon-save"></i> <?php _e( 'Save selected products', 'wpshop' ); ?> </button></div>
+			<div style="width : 100%; margin-top : 20px" class="alignright"><button class="button-primary alignright wps-mass-interface-button-save"><i class="wps-icon-save"></i> <?php _e('Save selected products', 'wpshop'); ?> </button></div>
 		</div>
 
 	</div>
@@ -38,7 +38,7 @@ 
 <div style="display : none" class="wps-alert-error"></div>
 <div style="display : none" class="wps-alert-success"></div>
 
-<div id="wps_mass_products_edit_tab_container" data-nonce="<?php echo wp_create_nonce( 'wps_mass_edit_change_page' ); ?>">
+<div id="wps_mass_products_edit_tab_container" data-nonce="<?php echo wp_create_nonce('wps_mass_edit_change_page'); ?>">
 
 <?php echo $product_list_interface; ?>
 

Braces +8 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 ?>
 <div class="wrap">
 	<h2><span class="dashicons dashicons-update" style="font-size : 30px; width : 30px; height : 30px"></span> <?php _e( 'Mass edit products interface', 'wpshop')?><button class="add-new-h2" data-nonce="<?php echo wp_create_nonce( 'wps_mass_interface_new_product_creation' ); ?>" id="wps-mass-interface-button-new-product"><i class="wps-icon-pencil"></i> <?php _e( 'Create a new product', 'wpshop'); ?></button></h2>
@@ -18,8 +20,11 @@ 
 						<?php endforeach; ?>
 					</select>
 				</div>
-				<?php else: ?>
-					<input type="hidden" id="wps_mass_edit_products_default_attributes_set"  name="wps_mass_edit_products_default_attributes_set" value="<?php echo $products_attributes_groups[ 0 ]->id; ?>" />
+				<?php else {
+	: ?>
+					<input type="hidden" id="wps_mass_edit_products_default_attributes_set"  name="wps_mass_edit_products_default_attributes_set" value="<?php echo $products_attributes_groups[ 0 ]->id;
+}
+?>" />
 				<?php endif; ?>
 			<?php endif; ?>
 			</div>

includes/modules/wps_classic_checkout/templates/frontend/classic-checkout-step-five.php

Spacing +12 added lines, -12 removed lines

@@ -1,32 +1,32 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit; ?>

-<form id="wps-checkout-valid-step-five-form" method="post" action="<?php echo admin_url( 'admin-ajax.php' ); ?>" class="wps-checkout-wrapper">

+<?php if (!defined('ABSPATH')) exit; ?>

+<form id="wps-checkout-valid-step-five-form" method="post" action="<?php echo admin_url('admin-ajax.php'); ?>" class="wps-checkout-wrapper">

 	<div class="wps-sidebar-resume">

 		<input type="hidden" name="action" value="wps-checkout_valid_step_five"/>

-		<?php wp_nonce_field( 'wps_checkout_valid_step_five' ); ?>

-		<?php echo do_shortcode( '[wps_resume_cart]' ); ?>

+		<?php wp_nonce_field('wps_checkout_valid_step_five'); ?>

+		<?php echo do_shortcode('[wps_resume_cart]'); ?>

 	</div>

 	<div class="wps-checkout-content">

 

-		<?php echo do_shortcode('[wps_payment]' ); ?>

+		<?php echo do_shortcode('[wps_payment]'); ?>

 

 		<div class="wps-form-group wps-comment-box">

-			<label><?php _e( 'Customer comment', 'wpshop'); ?> : </label>

+			<label><?php _e('Customer comment', 'wpshop'); ?> : </label>

 			<div class="wps-form">

 				<textarea name="wps-customer-comment" id="wps-customer-comment"></textarea>

 			</div>

 		</div>

 

 		<!-- Terms of sale -->

-		<?php $terms_page_id = get_option( 'wpshop_terms_of_sale_page_id' );

-		if(0 != $terms_page_id): ?>

-			<div class="wps-cgv-line"><label for="terms_of_sale"><input type="hidden" name="terms_of_sale_indicator" value="1" /><input id="terms_of_sale" type="checkbox" value="1" name="terms_of_sale"> <?php printf( __('I have read and I accept the %sterms of sale%s.', 'wpshop'), '<a href="' . get_permalink( wpshop_tools::get_page_id( get_option('wpshop_terms_of_sale_page_id') ) ) . '" target="_blank">', '</a>'); ?></label></div>

+		<?php $terms_page_id = get_option('wpshop_terms_of_sale_page_id');

+		if (0 != $terms_page_id): ?>

+			<div class="wps-cgv-line"><label for="terms_of_sale"><input type="hidden" name="terms_of_sale_indicator" value="1" /><input id="terms_of_sale" type="checkbox" value="1" name="terms_of_sale"> <?php printf(__('I have read and I accept the %sterms of sale%s.', 'wpshop'), '<a href="' . get_permalink(wpshop_tools::get_page_id(get_option('wpshop_terms_of_sale_page_id'))) . '" target="_blank">', '</a>'); ?></label></div>

 		<?php endif; ?>

 

 		<div id="wps-checkout-step-errors"></div>

-		<?php if( !empty( $_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation' ) : ?>

-		<div class="wps"><button class="wps-bton-first-alignRight-rounded" id="wps-checkout-valid-step-five"><?php _e( 'Validate my quotation', 'wpshop' ); ?></button></div>

+		<?php if (!empty($_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation') : ?>

+		<div class="wps"><button class="wps-bton-first-alignRight-rounded" id="wps-checkout-valid-step-five"><?php _e('Validate my quotation', 'wpshop'); ?></button></div>

 		<?php else : ?>

-		<div class="wps"><button class="wps-bton-first-alignRight-rounded" id="wps-checkout-valid-step-five"><?php _e( 'Order', 'wpshop' ); ?></button></div>

+		<div class="wps"><button class="wps-bton-first-alignRight-rounded" id="wps-checkout-valid-step-five"><?php _e('Order', 'wpshop'); ?></button></div>

 		<?php endif; ?>

 	</div>

 </form>

Braces +9 added lines, -3 removed lines

@@ -1,4 +1,7 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit; ?>

+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
+?>

 <form id="wps-checkout-valid-step-five-form" method="post" action="<?php echo admin_url( 'admin-ajax.php' ); ?>" class="wps-checkout-wrapper">

 	<div class="wps-sidebar-resume">

 		<input type="hidden" name="action" value="wps-checkout_valid_step_five"/>

@@ -25,8 +28,11 @@ 
 		<div id="wps-checkout-step-errors"></div>

 		<?php if( !empty( $_SESSION) && !empty($_SESSION['cart']) && !empty($_SESSION['cart']['cart_type']) && $_SESSION['cart']['cart_type'] == 'quotation' ) : ?>

 		<div class="wps"><button class="wps-bton-first-alignRight-rounded" id="wps-checkout-valid-step-five"><?php _e( 'Validate my quotation', 'wpshop' ); ?></button></div>

-		<?php else : ?>

-		<div class="wps"><button class="wps-bton-first-alignRight-rounded" id="wps-checkout-valid-step-five"><?php _e( 'Order', 'wpshop' ); ?></button></div>

+		<?php else {
+	: ?>

+		<div class="wps"><button class="wps-bton-first-alignRight-rounded" id="wps-checkout-valid-step-five"><?php _e( 'Order', 'wpshop' );
+}
+?></button></div>

 		<?php endif; ?>

 	</div>

 </form>

includes/modules/wps_classic_checkout/templates/frontend/confirmation/confirmation-summary.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 $order_meta = get_post_meta($_SESSION['order_id'], '_order_postmeta', true);
-if( !empty( $order_meta ) ) {
+if (!empty($order_meta)) {
 	?>
 	<div style="text-align: center;">
 		<script>
@@ -25,9 +25,9 @@ 
 			});
 		</script>
 		<a class="wps-bton-first" role="button" href="<?php echo get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))); ?>"><?php echo __('My account', 'wpshop'); ?></a>
-		<button data-nonce="<?php echo wp_create_nonce( 'wps_orders_load_details' ); ?>" class="wps-bton-second wps-orders-details-opener" id="wps-order-details-opener-<?php echo $_SESSION['order_id']; ?>"><?php _e( 'Order details', 'wpshop' ); ?></button>
-		<?php if ( !empty( $order_meta ) && !empty( $order_meta[ 'order_invoice_ref' ] ) ) : ?>
-			<a href="<?php echo admin_url( 'admin-post.php?action=wps_invoice&order_id='.$_SESSION['order_id'].'&invoice_ref='.$order_meta[ 'order_invoice_ref' ].'&mode=pdf' ); ?>" target="_blank" class="wps-bton-third" role="button"><?php _e( 'Download invoice', 'wpshop' ); ?></a>
+		<button data-nonce="<?php echo wp_create_nonce('wps_orders_load_details'); ?>" class="wps-bton-second wps-orders-details-opener" id="wps-order-details-opener-<?php echo $_SESSION['order_id']; ?>"><?php _e('Order details', 'wpshop'); ?></button>
+		<?php if (!empty($order_meta) && !empty($order_meta['order_invoice_ref'])) : ?>
+			<a href="<?php echo admin_url('admin-post.php?action=wps_invoice&order_id=' . $_SESSION['order_id'] . '&invoice_ref=' . $order_meta['order_invoice_ref'] . '&mode=pdf'); ?>" target="_blank" class="wps-bton-third" role="button"><?php _e('Download invoice', 'wpshop'); ?></a>
 		<?php endif; ?>
 	</div>
 <?php } ?>

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 $order_meta = get_post_meta($_SESSION['order_id'], '_order_postmeta', true);
 if( !empty( $order_meta ) ) {
 	?>

includes/modules/wps-pos-addon/templates/backend/customers/metabox-selected-customer.php

Braces +9 added lines, -3 removed lines

@@ -1,4 +1,7 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit; ?>

+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
+?>

 <div class="wpspos-customer-selected" >

 	<?php if ( !empty( $customer_infos ) ) : ?>

 		<div class="customer_info wps-boxed">

@@ -68,7 +71,10 @@ 
 			?>

 		</div>

 

-	<?php else : ?>

-		<?php _e( 'Nothing was found for selected customer. Please check this customer account before continuing', 'wps-pos-i18n' ); ?>

+	<?php else {
+	: ?>

+		<?php _e( 'Nothing was found for selected customer. Please check this customer account before continuing', 'wps-pos-i18n' );
+}
+?>

 	<?php endif; ?>

 </div>

Spacing +19 added lines, -19 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit; ?>

+<?php if (!defined('ABSPATH')) exit; ?>

 <div class="wpspos-customer-selected" >

-	<?php if ( !empty( $customer_infos ) ) : ?>

+	<?php if (!empty($customer_infos)) : ?>

 		<div class="customer_info wps-boxed">

-			<span class="wps-h4"><?php _e( 'Account', 'wpshop' ); ?></span>

+			<span class="wps-h4"><?php _e('Account', 'wpshop'); ?></span>

 			<div class="wps-form-group"><?php _e('Customer last name', 'wps-pos-i18n')?> : <?php echo $customer_infos->last_name; ?></div>

 			<div class="wps-form-group"><?php _e('Customer first name', 'wps-pos-i18n')?> : <?php echo $customer_infos->first_name; ?></div>

 			<div class="wps-form-group"><?php _e('Customer email', 'wps-pos-i18n')?> : <?php echo $customer_infos->user_email; ?></div>

@@ -10,14 +10,14 @@ 
 		</div>

 

 		<div class="customer_address wps-boxed">

-			<span class="wps-h4"><?php _e( 'Billing address', 'wpshop' ); ?></span>

+			<span class="wps-h4"><?php _e('Billing address', 'wpshop'); ?></span>

 			<?php

-				$billing_option = get_option( 'wpshop_billing_address' );

-				$addresses_customer = wps_address::get_addresses_list_no_hidden_attributes( $customer_id );

-				if( !empty($addresses_customer[$billing_option['choice']]) ) {

+				$billing_option = get_option('wpshop_billing_address');

+				$addresses_customer = wps_address::get_addresses_list_no_hidden_attributes($customer_id);

+				if (!empty($addresses_customer[$billing_option['choice']])) {

 					$billing = reset($addresses_customer[$billing_option['choice']]);

 					//echo '<strong>' . $billing['address_title']['value'] . '</strong>' . '' . '<br>';

-					echo isset($billing['civility']) ? __( wpshop_attributes::get_attribute_type_select_option_info($billing['civility']['value'], 'label', 'custom') ): '';

+					echo isset($billing['civility']) ? __(wpshop_attributes::get_attribute_type_select_option_info($billing['civility']['value'], 'label', 'custom')) : '';

 					echo ' <strong>' . (isset($billing['address_first_name']) ? $billing['address_first_name']['value'] : '') . ' ' . (isset($billing['address_last_name']) ? $billing['address_last_name']['value'] : '') . '</strong><br>';

 					echo (isset($billing['address']) ? $billing['address']['value'] : '') . '<br>';

 					echo (isset($billing['city']) ? $billing['city']['value'] . ' ' : '') . (isset($billing['postcode']) ? $billing['postcode']['value'] . ' ' : '') . (isset($billing['country']) ? $billing['country']['value'] : '') . '<br>';

@@ -27,35 +27,35 @@ 
 

 		<div class="order_historic wps-boxed">

 			<a href="#" class="toggle-historic dashicons dashicons-arrow-down alignright"></a>

-			<span class="wps-h4"><?php _e( 'Historic', 'wpshop' ); ?></span>

+			<span class="wps-h4"><?php _e('Historic', 'wpshop'); ?></span>

 			<?php

-				foreach( $this->get_orders_customer( 3, $customer_id ) as $order ) {

+				foreach ($this->get_orders_customer(3, $customer_id) as $order) {

 			?>

 			<div class="wps-form-group toggle-historic-group">

-				<a href="#" class="lnk_load_order" data-display-nonce="<?php echo wp_create_nonce( 'wps_pos_order_content' ); ?>" data-finish-nonce="<?php echo wp_create_nonce( 'wps_pos_process_checkout' ); ?>" data-oid="<?php echo $order->ID; ?>" data-cid="<?php echo $customer_id; ?>">

+				<a href="#" class="lnk_load_order" data-display-nonce="<?php echo wp_create_nonce('wps_pos_order_content'); ?>" data-finish-nonce="<?php echo wp_create_nonce('wps_pos_process_checkout'); ?>" data-oid="<?php echo $order->ID; ?>" data-cid="<?php echo $customer_id; ?>">

 					<?php

-					if( $order->_order_postmeta['order_key'] ) {

-						if( $order->_order_postmeta['order_invoice_ref'] ) {

+					if ($order->_order_postmeta['order_key']) {

+						if ($order->_order_postmeta['order_invoice_ref']) {

 							$link = $order->_order_postmeta['order_invoice_ref'];

 						} else {

 							$link = $order->_order_postmeta['order_key'];

 						}

 					} else {

-						$link = __( 'Order summary ', 'wpshop' );

+						$link = __('Order summary ', 'wpshop');

 					}

 					echo $link;

 					?>

 				</a>

-				<span class="price_order"><?php echo number_format( round($order->_order_postmeta['order_grand_total'], 2), 2, '.', '') . ' ' . wpshop_tools::wpshop_get_currency( false ); ?></span>

-				<span class="date_order"><?php echo date("d/m/Y | H:i:s", strtotime( $order->_order_postmeta['order_date'] ) ); ?></span>

+				<span class="price_order"><?php echo number_format(round($order->_order_postmeta['order_grand_total'], 2), 2, '.', '') . ' ' . wpshop_tools::wpshop_get_currency(false); ?></span>

+				<span class="date_order"><?php echo date("d/m/Y | H:i:s", strtotime($order->_order_postmeta['order_date'])); ?></span>

 				<?php

-					if( $order->_order_postmeta['order_invoice_ref'] ) {

+					if ($order->_order_postmeta['order_invoice_ref']) {

 					?>

 				<span class="invoice_order">

 					<a href="" target="_blank" role="button">

 						<i class="dashicons dashicons-welcome-view-site"></i>

 					</a>

-					<a href="<?php echo admin_url( 'admin-post.php?action=wps_invoice&mode=pdf&order_id=' . $order->ID . '&invoice_ref='.$order->_order_postmeta['order_invoice_ref']); ?>" target="_blank" role="button">

+					<a href="<?php echo admin_url('admin-post.php?action=wps_invoice&mode=pdf&order_id=' . $order->ID . '&invoice_ref=' . $order->_order_postmeta['order_invoice_ref']); ?>" target="_blank" role="button">

 						<i class="dashicons dashicons-download"></i>

 					</a>

 				</span>

@@ -69,6 +69,6 @@ 
 		</div>

 

 	<?php else : ?>

-		<?php _e( 'Nothing was found for selected customer. Please check this customer account before continuing', 'wps-pos-i18n' ); ?>

+		<?php _e('Nothing was found for selected customer. Please check this customer account before continuing', 'wps-pos-i18n'); ?>

 	<?php endif; ?>

 </div>