Eoxia / wpshop

wpshop.php

Spacing +20 added lines, -20 removed lines

@@ -20,18 +20,18 @@ 
 ini_set('memory_limit', '512M');
 
 /**	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'ABSPATH' ) ) {
-	die( 'Access is not allowed by this way' );
+if (!defined('ABSPATH')) {
+	die('Access is not allowed by this way');
 }
 
 /**	Allows to refresh css and js file in final user browser	*/
 DEFINE('WPSHOP_VERSION', '1.4.1.6');
 
 /**	Allows to avoid problem with theme not supporting thumbnail for post	*/
-add_theme_support( 'post-thumbnails' );
-add_image_size( 'wpshop-product-galery', 270, 270, true );
-add_image_size( 'wps-categorie-mini-display', 80, 80, true );
-add_image_size( 'wps-categorie-display', 480, 340, true );
+add_theme_support('post-thumbnails');
+add_image_size('wpshop-product-galery', 270, 270, true);
+add_image_size('wps-categorie-mini-display', 80, 80, true);
+add_image_size('wps-categorie-display', 480, 340, true);
 
 /**	First thing we define the main directory for our plugin in a super global var	*/
 DEFINE('WPSHOP_PLUGIN_DIR', basename(dirname(__FILE__)));
@@ -39,26 +39,26 @@ 
 /**	Get the current language to translate the different text in plugin	*/
 $locale = get_locale();
 global $wpdb;
-if ( defined("ICL_LANGUAGE_CODE") ) {
+if (defined("ICL_LANGUAGE_CODE")) {
 	$query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", ICL_LANGUAGE_CODE);
 	$local = $wpdb->get_var($query);
 	$locale = !empty($local) ? $local : $locale;
 }
 DEFINE('WPSHOP_CURRENT_LOCALE', $locale);
 /**	Load plugin translation	*/
-load_plugin_textdomain( 'wpshop', false,  dirname( plugin_basename( __FILE__ ) ) . '/languages/');
+load_plugin_textdomain('wpshop', false, dirname(plugin_basename(__FILE__)) . '/languages/');
 
 /**	Include the config file	*/
 require(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/includes/config.php');
 
 /** Allow to get errors back when debug mode is set to true	*/
-if ( WPSHOP_DEBUG_MODE && (in_array(long2ip(ip2long($_SERVER['REMOTE_ADDR'])), unserialize(WPSHOP_DEBUG_MODE_ALLOWED_IP)) ) ) {
+if (WPSHOP_DEBUG_MODE && (in_array(long2ip(ip2long($_SERVER['REMOTE_ADDR'])), unserialize(WPSHOP_DEBUG_MODE_ALLOWED_IP)))) {
 	ini_set('display_errors', true);
 	error_reporting(E_ALL);
 }
 
 include_once(WPSHOP_LIBRAIRIES_DIR . 'init.class.php');
-$current_installation_step = get_option( 'wps-installation-current-step', 1 );
+$current_installation_step = get_option('wps-installation-current-step', 1);
 
 /**	Get current plugin version	*/
 $current_db_version = get_option('wpshop_db_options', 0);
@@ -76,32 +76,32 @@ 
 
 /**	Call function to create the main left menu	*/
 //if ( ( WPSINSTALLER_STEPS_COUNT <= $current_installation_step ) || ( !empty( $current_db_version ) && !empty( $current_db_version[ 'db_version' ] ) && ( 51 < $current_db_version[ 'db_version' ] ) ) || ( !empty( $_GET ) && !empty( $_GET[ 'installation_state' ] ) && ( "ignored" == $_GET[ 'installation_state' ] ) ) ) {
-	add_action('admin_menu', array( 'wpshop_init', 'admin_menu' ) );
-	add_action( 'menu_order', array( 'wpshop_init', 'admin_menu_order' ) );
-	add_action( 'custom_menu_order', array( 'wpshop_init', 'admin_custom_menu_order' ) );
+	add_action('admin_menu', array('wpshop_init', 'admin_menu'));
+	add_action('menu_order', array('wpshop_init', 'admin_menu_order'));
+	add_action('custom_menu_order', array('wpshop_init', 'admin_custom_menu_order'));
 
 	/*	Call function for new wordpress element creating [term (product_category) / post (product)]	*/
-	add_action( 'init', array( 'wpshop_init', 'add_new_wp_type' ) );
+	add_action('init', array('wpshop_init', 'add_new_wp_type'));
 
 	/*	Call function allowing to change element front output	*/
-	add_action( 'the_content', array( 'wpshop_display', 'products_page' ), 1 );
+	add_action('the_content', array('wpshop_display', 'products_page'), 1);
 	// add_action('archive_template', array('wpshop_categories', 'category_template_switcher'));
 //}
 
 /**	On plugin activation create the default parameters to use the ecommerce	*/
-register_activation_hook( __FILE__ , array('wpshop_install', 'install_on_activation') );
+register_activation_hook(__FILE__, array('wpshop_install', 'install_on_activation'));
 
 /**	On plugin deactivation call the function to clean the wordpress installation	*/
-register_deactivation_hook( __FILE__ , array('wpshop_install', 'uninstall_wpshop') );
+register_deactivation_hook(__FILE__, array('wpshop_install', 'uninstall_wpshop'));
 
 /**	Get current plugin version	*/
 $current_db_version = get_option('wpshop_db_options', 0);
 
 /**	Add the database content	*/
 add_action('admin_init', array('wpshop_install', 'update_wpshop'));
-if ( ( defined( 'WPSINSTALLER_STEPS_COUNT' ) && ( WPSINSTALLER_STEPS_COUNT <= $current_installation_step ) ) || ( !empty( $current_db_version ) && !empty( $current_db_version[ 'db_version' ] ) && ( 51 < $current_db_version[ 'db_version' ] ) ) || ( !empty( $current_db_version ) && !empty( $current_db_version[ 'installation_state' ] ) && ( "ignore" == $current_db_version[ 'installation_state' ] ) ) ) {
-	if ( in_array( long2ip( ip2long($_SERVER['REMOTE_ADDR'] ) ), unserialize( WPSHOP_DEBUG_MODE_ALLOWED_IP ) ) ) {
-		add_action( 'admin_init', array( 'wpshop_install', 'update_wpshop_dev' ) );
+if ((defined('WPSINSTALLER_STEPS_COUNT') && (WPSINSTALLER_STEPS_COUNT <= $current_installation_step)) || (!empty($current_db_version) && !empty($current_db_version['db_version']) && (51 < $current_db_version['db_version'])) || (!empty($current_db_version) && !empty($current_db_version['installation_state']) && ("ignore" == $current_db_version['installation_state']))) {
+	if (in_array(long2ip(ip2long($_SERVER['REMOTE_ADDR'])), unserialize(WPSHOP_DEBUG_MODE_ALLOWED_IP))) {
+		add_action('admin_init', array('wpshop_install', 'update_wpshop_dev'));
 	}
 }
 

templates/taxonomy-wpshop_product_category.php

Spacing +14 added lines, -14 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * The template for displaying Archive pages.
  *
@@ -23,7 +23,7 @@ 
 	 * We reset this later so we can run the loop
 	 * properly with a call to rewind_posts().
 	 */
-	if ( have_posts() )
+	if (have_posts())
 		the_post();
 
 
@@ -34,14 +34,14 @@ 
 	$category_has_content = false;
 	$category_has_sub_content = false;
 	/*	Check what must be outputed on the page (Defined in plugin option)	*/
-	if(!is_array($wpshop_display_option['wpshop_display_cat_sheet_output']) || in_array('category_description', $wpshop_display_option['wpshop_display_cat_sheet_output'])):
+	if (!is_array($wpshop_display_option['wpshop_display_cat_sheet_output']) || in_array('category_description', $wpshop_display_option['wpshop_display_cat_sheet_output'])):
 		$category_has_content = true;
 
 		$taxonomy_informations = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $wp_query->queried_object->term_id);
-		if ( !empty($taxonomy_informations['wpshop_category_picture']) ) {
-			$image_post = wp_get_attachment_image( $taxonomy_informations['wpshop_category_picture'], 'wps-categorie-mini-display', false, array('class' => 'category_thumbnail_preview') );
+		if (!empty($taxonomy_informations['wpshop_category_picture'])) {
+			$image_post = wp_get_attachment_image($taxonomy_informations['wpshop_category_picture'], 'wps-categorie-mini-display', false, array('class' => 'category_thumbnail_preview'));
 		}
-		$category_thumbnail_preview = ( !empty($image_post) ) ? $image_post : '';
+		$category_thumbnail_preview = (!empty($image_post)) ? $image_post : '';
 ?>
 			<div class="wps-taxonomy-wrapper">
 					<?php echo do_shortcode('[wpshop_filter_search]'); ?>
@@ -50,7 +50,7 @@ 
 							<div class="wps-entry-thumbnail"><?php echo $category_thumbnail_preview; ?></div>
 							<div class="wps-entry-caption">
 								<h1 class="wps-entry-title"><?php echo $wp_query->queried_object->name; ?></h1>
-								<p class="wps-entry-description"><?php echo do_shortcode( wp_trim_words( $wp_query->queried_object->description, 30, ' [...]' ) ); ?></p>
+								<p class="wps-entry-description"><?php echo do_shortcode(wp_trim_words($wp_query->queried_object->description, 30, ' [...]')); ?></p>
 							</div>
 						</header><!-- .entry-header -->
 	<?php
@@ -59,9 +59,9 @@ 
 					<div class="wps-categorie-wrapper" >
 	<?php
 			/*	Check what must be outputed on the page (Defined in plugin option)	*/
-			if(!is_array($wpshop_display_option['wpshop_display_cat_sheet_output']) || in_array('category_subcategory', $wpshop_display_option['wpshop_display_cat_sheet_output'])):
+			if (!is_array($wpshop_display_option['wpshop_display_cat_sheet_output']) || in_array('category_subcategory', $wpshop_display_option['wpshop_display_cat_sheet_output'])):
 					$category_tree = wpshop_categories::category_tree($wp_query->queried_object->term_id);
-					if(is_array($category_tree) && (count($category_tree) > 0)):
+					if (is_array($category_tree) && (count($category_tree) > 0)):
 						$category_has_content = true;
 						$category_has_sub_content = true;
 	?>
@@ -69,7 +69,7 @@ 
 						<div class="wps-categorie-content <?php echo $wpshop_display_option['wpshop_display_list_type'] ?>wrapper<?php echo $wpshop_display_option['wpshop_display_grid_element_number'] ?>" >
 							<!-- <h2 class="category_content_part_title" ><?php _e('Category\'s sub-category list', 'wpshop'); ?></h2> -->
 	<?php
-						foreach($category_tree as $sub_category_id => $sub_category_content){
+						foreach ($category_tree as $sub_category_id => $sub_category_content) {
 							$sub_category_definition = get_term($sub_category_id, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
 							echo wpshop_categories::category_mini_output($sub_category_definition, $output_type);
 						}
@@ -82,13 +82,13 @@ 
 						<?php
 
 								/*	Check what must be outputed on the page (Defined in plugin option)	*/
-								if(!is_array($wpshop_display_option['wpshop_display_cat_sheet_output']) || in_array('category_subproduct', $wpshop_display_option['wpshop_display_cat_sheet_output'])):
-									if ( count( wpshop_categories::get_product_of_category( $wp_query->queried_object->term_taxonomy_id ) ) > 0 ) :
+								if (!is_array($wpshop_display_option['wpshop_display_cat_sheet_output']) || in_array('category_subproduct', $wpshop_display_option['wpshop_display_cat_sheet_output'])):
+									if (count(wpshop_categories::get_product_of_category($wp_query->queried_object->term_taxonomy_id)) > 0) :
 										$category_has_content = true;
 										$category_has_sub_content = true;
-										echo do_shortcode('[wpshop_products cid="'.$wp_query->queried_object->term_id.'" type="'.$output_type.'"]');
+										echo do_shortcode('[wpshop_products cid="' . $wp_query->queried_object->term_id . '" type="' . $output_type . '"]');
 									endif;
-								elseif(is_array($wpshop_display_option['wpshop_display_cat_sheet_output']) && !in_array('category_subproduct', $wpshop_display_option['wpshop_display_cat_sheet_output'])):
+								elseif (is_array($wpshop_display_option['wpshop_display_cat_sheet_output']) && !in_array('category_subproduct', $wpshop_display_option['wpshop_display_cat_sheet_output'])):
 									$category_has_sub_content = true;
 								endif;
 						?>

Braces +6 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * The template for displaying Archive pages.
  *
@@ -23,8 +25,9 @@ 
 	 * We reset this later so we can run the loop
 	 * properly with a call to rewind_posts().
 	 */
-	if ( have_posts() )
-		the_post();
+	if ( have_posts() ) {
+			the_post();
+	}
 
 
 	//$wpshop_display_option = get_option('wpshop_display_option');

templates/invoice.php

Spacing +11 added lines, -11 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 	/*	Wordpress - Ajax functionnality activation	*/
 	DEFINE('DOING_AJAX', true);
@@ -12,21 +12,21 @@ 
 	$mode = (!empty($_GET['mode'])) ? wpshop_tools::varSanitizer($_GET['mode']) : 'html';
 	$is_credit_slip = (!empty($_GET['credit_slip'])) ? wpshop_tools::varSanitizer($_GET['credit_slip']) : null;
 	$user_id = get_current_user_id();
-	if ( !empty($order_id) && $user_id != 0 ) {
+	if (!empty($order_id) && $user_id != 0) {
 		/**	Order reading	*/
 		$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
 
 		/**	Start invoice display	*/
-		if ( !empty( $is_credit_slip) ) {
-			$html_content =  wpshop_modules_billing::generate_html_invoice($order_id, $invoice_ref, 'credit_slip');
+		if (!empty($is_credit_slip)) {
+			$html_content = wpshop_modules_billing::generate_html_invoice($order_id, $invoice_ref, 'credit_slip');
 		}
 		else {
-			$html_content =  wpshop_modules_billing::generate_html_invoice($order_id, $invoice_ref);
+			$html_content = wpshop_modules_billing::generate_html_invoice($order_id, $invoice_ref);
 			
 		}
 
-		if ( $mode == 'pdf') {
-			require_once(WPSHOP_LIBRAIRIES_DIR.'HTML2PDF/html2pdf.class.php');
+		if ($mode == 'pdf') {
+			require_once(WPSHOP_LIBRAIRIES_DIR . 'HTML2PDF/html2pdf.class.php');
 			try {
 				//$html_content = wpshop_display::display_template_element('invoice_print_page_content_css', array(), array(), 'common') . '<page>' . $html_content . '</page>';
 				$html_content = wpshop_display::display_template_element('invoice_page_content_css', array(), array(), 'common') . '<page>' . $html_content . '</page>';
@@ -35,7 +35,7 @@ 
 				$html2pdf->setDefaultFont('Arial');
 				$html2pdf->writeHTML($html_content);
 
-				$html2pdf->Output('order_' .$order_id. '.pdf', 'D');
+				$html2pdf->Output('order_' . $order_id . '.pdf', 'D');
 			}
 			catch (HTML2PDF_exception $e) {
 				echo $e;
@@ -43,10 +43,10 @@ 
 			}
 		}
 		else {
-			$order_invoice_ref = ( !empty($order_postmeta['order_invoice_ref']) ) ? $order_postmeta['order_invoice_ref'] : '';
-			$tpl_component['INVOICE_CSS'] =  wpshop_display::display_template_element('invoice_page_content_css', array(), array(), 'common');
+			$order_invoice_ref = (!empty($order_postmeta['order_invoice_ref'])) ? $order_postmeta['order_invoice_ref'] : '';
+			$tpl_component['INVOICE_CSS'] = wpshop_display::display_template_element('invoice_page_content_css', array(), array(), 'common');
 			$tpl_component['INVOICE_MAIN_PAGE'] = $html_content;
-			$tpl_component['INVOICE_TITLE_PAGE'] = sprintf( __('Invoice %1$s for order %3$s (#%2$s)', 'wpshop'), $order_invoice_ref, $order_id, $order_postmeta['order_key']);
+			$tpl_component['INVOICE_TITLE_PAGE'] = sprintf(__('Invoice %1$s for order %3$s (#%2$s)', 'wpshop'), $order_invoice_ref, $order_id, $order_postmeta['order_key']);
 			echo wpshop_display::display_template_element('invoice_page', $tpl_component, array(), 'common');
 		}
 	}
\ No newline at end of file

Braces +6 added lines, -7 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 	/*	Wordpress - Ajax functionnality activation	*/
 	DEFINE('DOING_AJAX', true);
@@ -19,8 +21,7 @@ 
 		/**	Start invoice display	*/
 		if ( !empty( $is_credit_slip) ) {
 			$html_content =  wpshop_modules_billing::generate_html_invoice($order_id, $invoice_ref, 'credit_slip');
-		}
-		else {
+		} else {
 			$html_content =  wpshop_modules_billing::generate_html_invoice($order_id, $invoice_ref);
 			
 		}
@@ -36,13 +37,11 @@ 
 				$html2pdf->writeHTML($html_content);
 
 				$html2pdf->Output('order_' .$order_id. '.pdf', 'D');
-			}
-			catch (HTML2PDF_exception $e) {
+			} catch (HTML2PDF_exception $e) {
 				echo $e;
 				exit;
 			}
-		}
-		else {
+		} else {
 			$order_invoice_ref = ( !empty($order_postmeta['order_invoice_ref']) ) ? $order_postmeta['order_invoice_ref'] : '';
 			$tpl_component['INVOICE_CSS'] =  wpshop_display::display_template_element('invoice_page_content_css', array(), array(), 'common');
 			$tpl_component['INVOICE_MAIN_PAGE'] = $html_content;

templates/product_sheet.php

Braces +4 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /*	Wordpress - Ajax functionnality activation	*/
 DEFINE('DOING_AJAX', true);
 /*	Wordpress - Main bootstrap file that load wordpress basic files	*/
@@ -19,8 +21,7 @@ 
 		$html2pdf->setDefaultFont('Arial');
 		$html2pdf->writeHTML($html_content);
 		$html2pdf->Output('product-' .$_GET['pid'].'-'.$product_post->post_name.'.pdf', 'D');
-	}
-	catch (HTML2PDF_exception $e) {
+	} catch (HTML2PDF_exception $e) {
 		echo $e;
 		exit;
 	}

Spacing +7 added lines, -7 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /*	Wordpress - Ajax functionnality activation	*/
 DEFINE('DOING_AJAX', true);
 /*	Wordpress - Main bootstrap file that load wordpress basic files	*/
@@ -6,19 +6,19 @@ 
 /*	Wordpress - Admin page that define some needed vars and include file	*/
 require_once(ABSPATH . 'wp-admin/includes/admin.php');
 
-$product_id = ( !empty($_GET['pid']) ) ? (int) $_GET['pid'] : null;
+$product_id = (!empty($_GET['pid'])) ? (int)$_GET['pid'] : null;
 $user_id = get_current_user_id();
-if( !empty($product_id) && get_post_type( $product_id ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT && $user_id != 0 && current_user_can( 'manage_options' ) ) {
+if (!empty($product_id) && get_post_type($product_id) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT && $user_id != 0 && current_user_can('manage_options')) {
 	$wps_product_administration_ctr = new wps_product_administration_ctr();
-	$html_content = $wps_product_administration_ctr->generate_product_sheet_datas( $product_id );
-	$product_post = get_post( $product_id );
-	require_once(WPSHOP_LIBRAIRIES_DIR.'HTML2PDF/html2pdf.class.php');
+	$html_content = $wps_product_administration_ctr->generate_product_sheet_datas($product_id);
+	$product_post = get_post($product_id);
+	require_once(WPSHOP_LIBRAIRIES_DIR . 'HTML2PDF/html2pdf.class.php');
 	try {
 		$html2pdf = new HTML2PDF('P', 'A4', 'fr');
 		$html2pdf->pdf->SetDisplayMode('fullpage');
 		$html2pdf->setDefaultFont('Arial');
 		$html2pdf->writeHTML($html_content);
-		$html2pdf->Output('product-' .$product_id.'-'.$product_post->post_name.'.pdf', 'D');
+		$html2pdf->Output('product-' . $product_id . '-' . $product_post->post_name . '.pdf', 'D');
 	}
 	catch (HTML2PDF_exception $e) {
 		echo $e;

templates/admin/wpshop_shortcodes_wysiwyg_dialog.php

Spacing +14 added lines, -14 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /*	Wordpress - Main bootstrap file that load wordpress basic files	*/
 require_once('../../../../../wp-load.php');
 header('Content-Type: text/html; charset=' . get_bloginfo('charset'));
@@ -10,7 +10,7 @@ 
 $display_option_display_type = true;
 $display_option_grouped = true;
 $display_search_form = true;
-if ( !empty($type) ) {
+if (!empty($type)) {
 	switch ($type) {
 		case 'attribute_value':
 				$display_option_grouped = false;
@@ -37,8 +37,8 @@ 
 		case 'product':
 				$query = $wpdb->prepare("SELECT COUNT(ID) as WPSHOP_PRODUCT_NB FROM " . $wpdb->posts . " WHERE post_type=%s AND post_status=%s", WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, 'publish');
 				$wpshop_product_nb = $wpdb->get_var($query);
-				$content = sprintf(__('Due to product number, you have to search for product or click on "%s" button', 'wpshop'), __('View all element','wpshop'));
-				if ( $wpshop_product_nb <= 100 ) {
+				$content = sprintf(__('Due to product number, you have to search for product or click on "%s" button', 'wpshop'), __('View all element', 'wpshop'));
+				if ($wpshop_product_nb <= 100) {
 					$content = wpshop_products::product_list(true);
 				}
 				$wpshop_wysiwyg_shortcode_inserter_shortcode_main_identifier = 'wpshop_products pid';
@@ -64,30 +64,30 @@ 
 	<script type="text/javascript" src="<?php echo bloginfo('url'); ?>/wp-includes/js/tinymce/tiny_mce_popup.js"></script>
 	<script type="text/javascript" src="<?php echo bloginfo('url'); ?>/wp-includes/js/jquery/jquery.js"></script>
 	<?php wpshop_init::admin_print_js(); ?>
-	<script type="text/javascript" src="<?php echo WPSHOP_JS_URL; ?>pages/wpshop_wysiwyg.js?v=<?php echo WPSHOP_VERSION;?>" ></script>
-	<script type="text/javascript" src="<?php echo WPSHOP_JS_URL; ?>jquery-libs/chosen.jquery.min.js?v=<?php echo WPSHOP_VERSION;?>" ></script>
+	<script type="text/javascript" src="<?php echo WPSHOP_JS_URL; ?>pages/wpshop_wysiwyg.js?v=<?php echo WPSHOP_VERSION; ?>" ></script>
+	<script type="text/javascript" src="<?php echo WPSHOP_JS_URL; ?>jquery-libs/chosen.jquery.min.js?v=<?php echo WPSHOP_VERSION; ?>" ></script>
 	<script type="text/javascript">
 		var WPSHOP_AJAX_FILE_URL = "<?php echo admin_url('admin-ajax.php'); ?>";
 		var wpshop_wysiwyg_shortcode_insertion_search = "<?php echo wp_create_nonce('wpshop_element_search'); ?>";
 		var WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT = "<?php echo WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT; ?>";
 	</script>
 
-	<?php wp_admin_css( 'wp-admin', true ); ?>
-	<link rel='stylesheet' href="<?php echo WPSHOP_CSS_URL; ?>pages/wpshop_wysiwyg_dialog.css?v=<?php echo WPSHOP_VERSION;?>" type="text/css" media="all" />
-	<link rel='stylesheet' href="<?php echo WPSHOP_CSS_URL; ?>jquery-libs/chosen.css?v=<?php echo WPSHOP_VERSION;?>" type="text/css" media="all" />
+	<?php wp_admin_css('wp-admin', true); ?>
+	<link rel='stylesheet' href="<?php echo WPSHOP_CSS_URL; ?>pages/wpshop_wysiwyg_dialog.css?v=<?php echo WPSHOP_VERSION; ?>" type="text/css" media="all" />
+	<link rel='stylesheet' href="<?php echo WPSHOP_CSS_URL; ?>jquery-libs/chosen.css?v=<?php echo WPSHOP_VERSION; ?>" type="text/css" media="all" />
 </head>
 <body>
 	<form onsubmit="wpShop_Dialog_Action.insert();" action="#">
 		<input type="hidden" value="<?php echo $wpshop_wysiwyg_shortcode_inserter_shortcode_main_identifier; ?>" id="wpshop_wysiwyg_shortcode_inserter_shortcode_main_identifier" />
 		<input type="hidden" value="<?php echo $type; ?>" id="wpshop_wysiwyg_shortcode_inserter_type" />
-<?php if ( !empty($type) ) : ?>
+<?php if (!empty($type)) : ?>
 <?php
 		if ($display_search_form) {
 ?>
 		<div class="search_element_container" >
-			<input type="text" value="" placeholder="<?php _e('Search...','wpshop'); ?>"  id="search_element_text" />
-			<button type="button" name="search_element_button" id="search_element_button" ><?php _e('Search','wpshop'); ?></button>
-			<button type="button" name="view_all_element_button" id="view_all_element_button" ><?php _e('View all element','wpshop'); ?></button>
+			<input type="text" value="" placeholder="<?php _e('Search...', 'wpshop'); ?>"  id="search_element_text" />
+			<button type="button" name="search_element_button" id="search_element_button" ><?php _e('Search', 'wpshop'); ?></button>
+			<button type="button" name="view_all_element_button" id="view_all_element_button" ><?php _e('View all element', 'wpshop'); ?></button>
 		</div>
 <?php
 		}
@@ -106,7 +106,7 @@ 
 
 		if ($display_option_display_type) {
 ?>
-			<?php if ( !empty($specific_options) ) : ?><p><?php _e('Generic options', 'wpshop'); ?></p><?php endif; ?>
+			<?php if (!empty($specific_options)) : ?><p><?php _e('Generic options', 'wpshop'); ?></p><?php endif; ?>
 			<div class="wpshop_wysiwyg_shortcode_display_type_container" >
 				<?php _e('Display as', 'wpshop'); ?>
 				<input type="radio" name="wpshop_wysiwyg_shortcode_display_type" id="wpshop_wysiwyg_shortcode_display_type_grid" class="wpshop_wysiwyg_shortcode_display_option wpshop_wysiwyg_shortcode_display_type" value="grid" checked > <label for="wpshop_wysiwyg_shortcode_display_type_grid" ><?php _e('Grid', 'wpshop'); ?></label>

Braces +8 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /*	Wordpress - Main bootstrap file that load wordpress basic files	*/
 require_once('../../../../../wp-load.php');
 header('Content-Type: text/html; charset=' . get_bloginfo('charset'));
@@ -140,8 +142,11 @@ 
 				<input type="button" id="insert" name="insert" value="{#insert}" onclick="wpShop_Dialog_Action.insert();" />
 			</div>
 		</div>
-<?php else: ?>
-		<span class="wpshop_wysiwyg_error_msg" ><?php _e('You are not allowed to continue here', 'wpshop'); ?></span>
+<?php else {
+	: ?>
+		<span class="wpshop_wysiwyg_error_msg" ><?php _e('You are not allowed to continue here', 'wpshop');
+}
+?></span>
 <?php endif; ?>
 	</form>
 </body>

templates/bank_deposit.php

Braces +4 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 	/*	Wordpress - Ajax functionnality activation	*/
 	DEFINE('DOING_AJAX', true);
@@ -216,8 +218,7 @@ 
 			$html2pdf->writeHTML($html_content);
 	
 			$html2pdf->Output( __('Bank deposit', 'wpshop') . ' - ' . mysql2date( get_option( 'date_format' ), $_GET['fromdate'] ) . '.pdf', 'D');
-		}
-		catch (HTML2PDF_exception $e) {
+		} catch (HTML2PDF_exception $e) {
 			echo $e;
 			exit;
 		}

Spacing +41 added lines, -41 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 	/*	Wordpress - Ajax functionnality activation	*/
 	DEFINE('DOING_AJAX', true);
@@ -7,23 +7,23 @@ 
 	/*	Wordpress - Admin page that define some needed vars and include file	*/
 	require_once(ABSPATH . 'wp-admin/includes/admin.php');
 
-	$fromdate = empty( $fromdate ) ? date( 'Y-m-d' ) : sanitize_text_field( $_GET['fromdate'] );
-	$method = empty( $_GET['method'] ) ? 'all' : sanitize_text_field( $_GET['method'] );
-	$mode = !empty( $_GET['mode'] ) ? sanitize_text_field( $_GET['mode'] ) : '';
+	$fromdate = empty($fromdate) ? date('Y-m-d') : sanitize_text_field($_GET['fromdate']);
+	$method = empty($_GET['method']) ? 'all' : sanitize_text_field($_GET['method']);
+	$mode = !empty($_GET['mode']) ? sanitize_text_field($_GET['mode']) : '';
 
 	$valid_dates = array();
 	$valid_dates['relation'] = 'OR';
 
-	$from_to = !empty( $_GET['todate'] ) : sanitize_text_field( $_GET['todate'] ) : date( 'Y-m-d' );
+	$from_to = !empty($_GET['todate']) : sanitize_text_field($_GET['todate']) : date('Y-m-d');
 
-	$fromdate = DateTime::createFromFormat( 'Y-m-d', $fromdate );
-	$todate = DateTime::createFromFormat( 'Y-m-d', ($from_to) ? $from_to : $fromdate );
-	$datePeriod = new DatePeriod( $fromdate, new DateInterval('P1D'), $todate->modify('+1 day') );
+	$fromdate = DateTime::createFromFormat('Y-m-d', $fromdate);
+	$todate = DateTime::createFromFormat('Y-m-d', ($from_to) ? $from_to : $fromdate);
+	$datePeriod = new DatePeriod($fromdate, new DateInterval('P1D'), $todate->modify('+1 day'));
 
-	foreach($datePeriod as $date) {
+	foreach ($datePeriod as $date) {
 		$valid_dates[] = array(
 			'key'			=> '_order_postmeta',
-			'value' 		=> serialize( 'date' ) . 's:19:"' . $date->format( 'Y-m-d' ),
+			'value' 		=> serialize('date') . 's:19:"' . $date->format('Y-m-d'),
 			'compare' 		=> 'LIKE',
 		);
 	}
@@ -36,30 +36,30 @@ 
 			'relation' 			=> 'AND',
 			array(
 					'key'			=> '_order_postmeta',
-					'value' 		=> serialize( 'order_status' ) . serialize( 'pos' ),
+					'value' 		=> serialize('order_status') . serialize('pos'),
 					'compare' 		=> 'LIKE',
 			),
 			$valid_dates,
 		),
 	);
-	if( $method != 'all' ) {
+	if ($method != 'all') {
 		$args['meta_query'][] = array(
 				'key'			=> '_order_postmeta',
-				'value' 		=> serialize( 'method' ) . serialize( $method ),
+				'value' 		=> serialize('method') . serialize($method),
 				'compare' 		=> 'LIKE',
 		);
 	}
-	$query = new WP_Query( $args );
+	$query = new WP_Query($args);
 
 	$orders = $query->posts;
 	$orders_date = array();
 
-	foreach( $orders as $order ) {
-		$order->_order_postmeta = get_post_meta( $order->ID, '_order_postmeta', true );
-		foreach( $order->_order_postmeta['order_payment']['received'] as $payment_received ) {
-			if( $payment_received['status'] == 'payment_received' ) {
+	foreach ($orders as $order) {
+		$order->_order_postmeta = get_post_meta($order->ID, '_order_postmeta', true);
+		foreach ($order->_order_postmeta['order_payment']['received'] as $payment_received) {
+			if ($payment_received['status'] == 'payment_received') {
 				$payment_received['order'] = $order;
-				if( !isset( $orders_date[$payment_received['method']] ) ) { $orders_date[$payment_received['method']]['amount_total'] = 0; }
+				if (!isset($orders_date[$payment_received['method']])) { $orders_date[$payment_received['method']]['amount_total'] = 0; }
 				@$orders_date[$payment_received['method']]['amount_total'] += $payment_received['received_amount'];
 				@$orders_date[$payment_received['method']]['list'][] = $payment_received;
 				@$orders_date['all']['amount_total'] += $payment_received['received_amount'];
@@ -143,18 +143,18 @@ 
 				<td class="width-15"><?php echo $company['company_street']; ?></td>
 				<td class="valign-top width-075"><?php _e('Date', 'wpshop'); ?>:</td>
 				<td class="align-right width-075">
-				<?php if( $from_to ) { ?>
-					<span class="force-one-line"><?php echo __( 'From', 'wpshop' ) . ' ' . mysql2date( get_option( 'date_format' ), $fromdate, true ); ?></span>
-					<span class="force-one-line"><?php echo __( 'to', 'wpshop' ) . ' ' . mysql2date( get_option( 'date_format' ), $from_to, true ); ?></span>
+				<?php if ($from_to) { ?>
+					<span class="force-one-line"><?php echo __('From', 'wpshop') . ' ' . mysql2date(get_option('date_format'), $fromdate, true); ?></span>
+					<span class="force-one-line"><?php echo __('to', 'wpshop') . ' ' . mysql2date(get_option('date_format'), $from_to, true); ?></span>
 				<?php } else { ?>
-					<span class="force-one-line"><?php echo mysql2date( get_option( 'date_format' ), $fromdate, true ); ?></span>
+					<span class="force-one-line"><?php echo mysql2date(get_option('date_format'), $fromdate, true); ?></span>
 				<?php } ?>
 				</td>
 			</tr>
 			<tr>
 				<td class="width-15"><?php echo $company['company_postcode'] . ' ' . $company['company_country']; ?></td>
-				<td class="width-075"><?php _e('Method', 'wpshop' ); ?>:</td>
-				<td class="align-right width-075"><?php _e( $method, 'wpshop' ); ?></td>
+				<td class="width-075"><?php _e('Method', 'wpshop'); ?>:</td>
+				<td class="align-right width-075"><?php _e($method, 'wpshop'); ?></td>
 			</tr>
 		</table>
 		<br>
@@ -162,40 +162,40 @@ 
 			<thead class="border">
 				<tr>
 					<th class="margin-sides"><?php _e('Invoice', 'wps-pos-i18n'); ?></th>
-					<th class="margin-sides"><?php echo ( $from_to ) ? __('Date', 'wps-pos-i18n') : __('Hour', 'wpshop'); ?></th>
+					<th class="margin-sides"><?php echo ($from_to) ? __('Date', 'wps-pos-i18n') : __('Hour', 'wpshop'); ?></th>
 					<th class="margin-sides"><?php _e('Order', 'wpshop'); ?></th>
 					<th class="width-100"><?php _e('Products', 'wpshop'); ?></th>
 					<th class="margin-sides"><?php _e('Amount', 'wps-pos-i18n'); ?></th>
 			 	</tr>
 			</thead>
 			<tbody class="border">
-				<?php if( empty( $orders_date[$method] ) ) { $orders_date[$method] = array(); $orders_date[$method]['list'] = array(); $orders_date[$method]['amount_total'] = 0; } ?>
-			 	<?php foreach( $orders_date[$method]['list'] as $payment_received ) : ?>
+				<?php if (empty($orders_date[$method])) { $orders_date[$method] = array(); $orders_date[$method]['list'] = array(); $orders_date[$method]['amount_total'] = 0; } ?>
+			 	<?php foreach ($orders_date[$method]['list'] as $payment_received) : ?>
 			    <tr>
-					<td class="margin-sides"><?php echo ( !empty($payment_received['invoice_ref']) ) ? $payment_received['invoice_ref'] : ''; ?></td>
-					<td class="force-one-line margin-sides"><?php echo ( !empty($payment_received['date']) ) ? ( $from_to ) ? mysql2date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $payment_received['date'], true ) : mysql2date( get_option( 'time_format' ), $payment_received['date'], true ) : ''; ?></td>
-					<td class="margin-sides"><?php echo ( !empty($payment_received['order']->_order_postmeta['order_key']) ) ? $payment_received['order']->_order_postmeta['order_key'] : ''; ?></td>
+					<td class="margin-sides"><?php echo (!empty($payment_received['invoice_ref'])) ? $payment_received['invoice_ref'] : ''; ?></td>
+					<td class="force-one-line margin-sides"><?php echo (!empty($payment_received['date'])) ? ($from_to) ? mysql2date(get_option('date_format') . ' ' . get_option('time_format'), $payment_received['date'], true) : mysql2date(get_option('time_format'), $payment_received['date'], true) : ''; ?></td>
+					<td class="margin-sides"><?php echo (!empty($payment_received['order']->_order_postmeta['order_key'])) ? $payment_received['order']->_order_postmeta['order_key'] : ''; ?></td>
 					<td class="max-width align-center force-one-line"><?php
-						if( !empty($payment_received['order']->_order_postmeta['order_items']) ) {
+						if (!empty($payment_received['order']->_order_postmeta['order_items'])) {
 							$first = true;
-							foreach( $payment_received['order']->_order_postmeta['order_items'] as $item ) {
-								if( $first ) {
+							foreach ($payment_received['order']->_order_postmeta['order_items'] as $item) {
+								if ($first) {
 									$first = !$first;
 									echo $item['item_name'];
 								} else {
-									echo ', ' .$item['item_name'];
+									echo ', ' . $item['item_name'];
 								}
 							}
 						}
 					?></td>
-					<td class="align-right margin-sides"><?php echo ( !empty($payment_received['received_amount']) ) ?  number_format( $payment_received['received_amount'], 2, '.', '' ) : ''; ?><?php echo wpshop_tools::wpshop_get_currency(); ?></td>
+					<td class="align-right margin-sides"><?php echo (!empty($payment_received['received_amount'])) ? number_format($payment_received['received_amount'], 2, '.', '') : ''; ?><?php echo wpshop_tools::wpshop_get_currency(); ?></td>
 				</tr>
 		   	 	<?php endforeach; ?>
 		   	 </tbody>
 		   	 <tfoot class="border">
 		   	 	<tr>
 		   	 		<td colspan="4" class="margin-sides bold"><?php _e('Bank deposit sum', 'wpshop'); ?></td>
-		   	 		<td class="align-right border margin-sides bold"><?php echo number_format( $orders_date[$method]['amount_total'], 2, '.', '' ) . wpshop_tools::wpshop_get_currency(); ?></td>
+		   	 		<td class="align-right border margin-sides bold"><?php echo number_format($orders_date[$method]['amount_total'], 2, '.', '') . wpshop_tools::wpshop_get_currency(); ?></td>
 		   	 	</tr>
 		   	 </tfoot>
 		</table>
@@ -203,8 +203,8 @@ 
 	$content = ob_get_contents();
 	ob_end_clean();
 
-	if ( !empty( $mode ) && $mode == 'pdf') {
-		require_once(WPSHOP_LIBRAIRIES_DIR.'HTML2PDF/html2pdf.class.php');
+	if (!empty($mode) && $mode == 'pdf') {
+		require_once(WPSHOP_LIBRAIRIES_DIR . 'HTML2PDF/html2pdf.class.php');
 		try {
 			$html_content = $content_css . '<page>' . $content . '</page>';
 			$html2pdf = new HTML2PDF('P', 'A4', 'fr');
@@ -212,7 +212,7 @@ 
 			$html2pdf->setDefaultFont('Arial');
 			$html2pdf->writeHTML($html_content);
 
-			$html2pdf->Output( __('Bank deposit', 'wpshop') . ' - ' . mysql2date( get_option( 'date_format' ), $fromdate ) . '.pdf', 'D');
+			$html2pdf->Output(__('Bank deposit', 'wpshop') . ' - ' . mysql2date(get_option('date_format'), $fromdate) . '.pdf', 'D');
 		}
 		catch (HTML2PDF_exception $e) {
 			echo $e;
@@ -228,7 +228,7 @@ 
 <!--<![endif]-->
 	<head>
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-		<title><?php _e('Bank deposit', 'wpshop'); ?> - <?php echo mysql2date( get_option( 'date_format' ), $fromdate ); ?></title>
+		<title><?php _e('Bank deposit', 'wpshop'); ?> - <?php echo mysql2date(get_option('date_format'), $fromdate); ?></title>
 		<?php echo $content_css; ?>
 	</head>
 	<body>

templates/credit_slip.php

Spacing +8 added lines, -8 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /*	Wordpress - Ajax functionnality activation	*/
 DEFINE('DOING_AJAX', true);
 /*	Wordpress - Main bootstrap file that load wordpress basic files	*/
@@ -11,13 +11,13 @@ 
 $mode = (!empty($_GET['mode'])) ? wpshop_tools::varSanitizer($_GET['mode']) : 'html';
 // $is_credit_slip = (!empty($_GET['credit_slip'])) ? wpshop_tools::varSanitizer($_GET['credit_slip']) : null;
 
-if ( !empty($order_id) ) {
+if (!empty($order_id)) {
 // 	/**	Order reading	*/
 	$order_postmeta = get_post_meta($order_id, '_order_postmeta', true);
-	$html_content = wps_credit::generate_credit_slip($order_id, $invoice_ref );
+	$html_content = wps_credit::generate_credit_slip($order_id, $invoice_ref);
 
-	if ( $mode == 'pdf') {
-		require_once(WPSHOP_LIBRAIRIES_DIR.'HTML2PDF/html2pdf.class.php');
+	if ($mode == 'pdf') {
+		require_once(WPSHOP_LIBRAIRIES_DIR . 'HTML2PDF/html2pdf.class.php');
 		try {
 			$html_content = wpshop_display::display_template_element('invoice_page_content_css', array(), array(), 'common') . '<page>' . $html_content . '</page>';
 			$html2pdf = new HTML2PDF('P', 'A4', 'fr');
@@ -25,7 +25,7 @@ 
 			$html2pdf->setDefaultFont('Arial');
 			$html2pdf->writeHTML($html_content);
 
-			$html2pdf->Output('order_' .$order_id. '.pdf', 'D');
+			$html2pdf->Output('order_' . $order_id . '.pdf', 'D');
 		}
 		catch (HTML2PDF_exception $e) {
 			echo $e;
@@ -33,9 +33,9 @@ 
 		}
 	}
 	else {
-		$tpl_component['INVOICE_CSS'] =  wpshop_display::display_template_element('invoice_page_content_css', array(), array(), 'common');
+		$tpl_component['INVOICE_CSS'] = wpshop_display::display_template_element('invoice_page_content_css', array(), array(), 'common');
 		$tpl_component['INVOICE_MAIN_PAGE'] = $html_content;
-		$tpl_component['INVOICE_TITLE_PAGE'] = sprintf( __('Credit slip #%s for Order #%s', 'wpshop'), $invoice_ref, $order_postmeta['order_key']);
+		$tpl_component['INVOICE_TITLE_PAGE'] = sprintf(__('Credit slip #%s for Order #%s', 'wpshop'), $invoice_ref, $order_postmeta['order_key']);
 		echo wpshop_display::display_template_element('invoice_page', $tpl_component, array(), 'common');
 	}
 }
\ No newline at end of file

Braces +5 added lines, -5 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /*	Wordpress - Ajax functionnality activation	*/
 DEFINE('DOING_AJAX', true);
 /*	Wordpress - Main bootstrap file that load wordpress basic files	*/
@@ -26,13 +28,11 @@ 
 			$html2pdf->writeHTML($html_content);
 
 			$html2pdf->Output('order_' .$order_id. '.pdf', 'D');
-		}
-		catch (HTML2PDF_exception $e) {
+		} catch (HTML2PDF_exception $e) {
 			echo $e;
 			exit;
 		}
-	}
-	else {
+	} else {
 		$tpl_component['INVOICE_CSS'] =  wpshop_display::display_template_element('invoice_page_content_css', array(), array(), 'common');
 		$tpl_component['INVOICE_MAIN_PAGE'] = $html_content;
 		$tpl_component['INVOICE_TITLE_PAGE'] = sprintf( __('Credit slip #%s for Order #%s', 'wpshop'), $invoice_ref, $order_postmeta['order_key']);

assets/datas/default_datas_string.php

Spacing +72 added lines, -72 removed lines

@@ -1,95 +1,95 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
-__('Account creation confirmation', 'wpshop' );
-__('Hello [customer_first_name] [customer_last_name], this email confirms that your account has just been created. Thank you for your loyalty. Have a good day.', 'wpshop' );
-__( 'User account creation confirmation message', 'wpshop' );
+<?php if (!defined('ABSPATH')) exit;
+__('Account creation confirmation', 'wpshop');
+__('Hello [customer_first_name] [customer_last_name], this email confirms that your account has just been created. Thank you for your loyalty. Have a good day.', 'wpshop');
+__('User account creation confirmation message', 'wpshop');
 
-__('Renewal of password', 'wpshop' );
-__('Hello [customer_first_name] [customer_last_name], <br />Somebody has asked a renewal of password for your account.<br/><br/>To renew your password, click on this link : [forgot_password_link].<br/>If you are not at the origin of this request, please ignore this message.', 'wpshop' );
-__('Send to customer a link to renew its password', 'wpshop' );
+__('Renewal of password', 'wpshop');
+__('Hello [customer_first_name] [customer_last_name], <br />Somebody has asked a renewal of password for your account.<br/><br/>To renew your password, click on this link : [forgot_password_link].<br/>If you are not at the origin of this request, please ignore this message.', 'wpshop');
+__('Send to customer a link to renew its password', 'wpshop');
 
-__('Order payment confirmation (Paypal id [paypal_order_key])', 'wpshop' );
-__('Hello [customer_first_name] [customer_last_name], this email confirms that your payment about your recent order on our website has been completed (order date : [order_date]). Thank you for your loyalty. Have a good day.', 'wpshop' );
-__('User paypal payment reception confirmation', 'wpshop' );
+__('Order payment confirmation (Paypal id [paypal_order_key])', 'wpshop');
+__('Hello [customer_first_name] [customer_last_name], this email confirms that your payment about your recent order on our website has been completed (order date : [order_date]). Thank you for your loyalty. Have a good day.', 'wpshop');
+__('User paypal payment reception confirmation', 'wpshop');
 
-__('Pay and finalize your order', 'wpshop' );
-__('Hello [customer_first_name] [customer_last_name], <br />An order is available for you on our website.<br/>You can click on this link to pay and finalize this order : [direct_payment_link]<br/><br/>[order_content]<br /><br />Thank you for your loyalty. Have a good day.', 'wpshop' );
-__('Send a link for finalize its order directly', 'wpshop' );
+__('Pay and finalize your order', 'wpshop');
+__('Hello [customer_first_name] [customer_last_name], <br />An order is available for you on our website.<br/>You can click on this link to pay and finalize this order : [direct_payment_link]<br/><br/>[order_content]<br /><br />Thank you for your loyalty. Have a good day.', 'wpshop');
+__('Send a link for finalize its order directly', 'wpshop');
 
-__('Your payment has been received', 'wpshop' );
-__('Hello [customer_first_name] [customer_last_name], this email confirms that your payment regarding your order ([order_key]) has just been received (order date : [order_date]). Thank you for your loyalty. Have a good day.', 'wpshop' );
-__('User payment reception confirmation', 'wpshop' );
+__('Your payment has been received', 'wpshop');
+__('Hello [customer_first_name] [customer_last_name], this email confirms that your payment regarding your order ([order_key]) has just been received (order date : [order_date]). Thank you for your loyalty. Have a good day.', 'wpshop');
+__('User payment reception confirmation', 'wpshop');
 
-__('Your order has been shipped', 'wpshop' );
-__('Hello [customer_first_name] [customer_last_name], this email confirms that your order ([order_key]) has just been shipped (order date : [order_date], tracking number : [order_trackingNumber]). Thank you for your loyalty. Have a good day.', 'wpshop' );
-__('Order shipping message', 'wpshop' );
+__('Your order has been shipped', 'wpshop');
+__('Hello [customer_first_name] [customer_last_name], this email confirms that your order ([order_key]) has just been shipped (order date : [order_date], tracking number : [order_trackingNumber]). Thank you for your loyalty. Have a good day.', 'wpshop');
+__('Order shipping message', 'wpshop');
 
-__('Your order has been recorded', 'wpshop' );
-__('Hello [customer_first_name] [customer_last_name], this email confirms that your order has been recorded (order date : [order_date]). Thank you for your loyalty. Have a good day.', 'wpshop' );
-__('User order confirmation', 'wpshop' );
+__('Your order has been recorded', 'wpshop');
+__('Hello [customer_first_name] [customer_last_name], this email confirms that your order has been recorded (order date : [order_date]). Thank you for your loyalty. Have a good day.', 'wpshop');
+__('User order confirmation', 'wpshop');
 
-__('Your order has been updated', 'wpshop' );
-__('Hello [customer_first_name] [customer_last_name], your order ([order_key]) has just been updated. Please login to your account to view details. Thank you for your loyalty. Have a good day.', 'wpshop' );
-__('Notify a customer when order is updated', 'wpshop' );
+__('Your order has been updated', 'wpshop');
+__('Hello [customer_first_name] [customer_last_name], your order ([order_key]) has just been updated. Please login to your account to view details. Thank you for your loyalty. Have a good day.', 'wpshop');
+__('Notify a customer when order is updated', 'wpshop');
 
-__('Your order has been canceled', 'wpshop' );
-__('Hello [customer_first_name] [customer_last_name], <br />this email confirms your order ( Order key : [order_key] - Date : [order_date] ) has been canceled.<br /><br /> Thank you for your loyalty. Have a good day.', 'wpshop' );
-__('Notify a customer when order is canceled', 'wpshop' );
+__('Your order has been canceled', 'wpshop');
+__('Hello [customer_first_name] [customer_last_name], <br />this email confirms your order ( Order key : [order_key] - Date : [order_date] ) has been canceled.<br /><br /> Thank you for your loyalty. Have a good day.', 'wpshop');
+__('Notify a customer when order is canceled', 'wpshop');
 
-__('A comment has been added to your order', 'wpshop' );
-__('Your order has been updated', 'wpshop' );
-__('Hello [customer_first_name] [customer_last_name], your order ([order_key]) has just been updated. A comment has been added:<br/><br/>[message].<br/><br/> Thank you for your loyalty. Have a good day.', 'wpshop' );
-__('Hello [customer_first_name] [customer_last_name], your order ([order_key]) has just been updated. A comment has been added:[message]. Thank you for your loyalty. Have a good day.', 'wpshop' );
-__('Private update on an order', 'wpshop' );
+__('A comment has been added to your order', 'wpshop');
+__('Your order has been updated', 'wpshop');
+__('Hello [customer_first_name] [customer_last_name], your order ([order_key]) has just been updated. A comment has been added:<br/><br/>[message].<br/><br/> Thank you for your loyalty. Have a good day.', 'wpshop');
+__('Hello [customer_first_name] [customer_last_name], your order ([order_key]) has just been updated. A comment has been added:[message]. Thank you for your loyalty. Have a good day.', 'wpshop');
+__('Private update on an order', 'wpshop');
 
-__('New order on your shop', 'wpshop' );
-__('Hello, New order on your shop ! Order Key : [order_key], Order date : [order_date], Order payment method : [order_payment_method], [order_content] [order_addresses] [order_customer_comments]', 'wpshop' );
-__('New order on shop sended to shop administrator', 'wpshop' );
+__('New order on your shop', 'wpshop');
+__('Hello, New order on your shop ! Order Key : [order_key], Order date : [order_date], Order payment method : [order_payment_method], [order_content] [order_addresses] [order_customer_comments]', 'wpshop');
+__('New order on shop sended to shop administrator', 'wpshop');
 
-__('New quotation on your shop', 'wpshop' );
-__('Hello, New quotation on your shop ! Quotation Key : [order_temporary_key], Quotation date : [order_date], [order_content] [order_addresses] [order_customer_comments]', 'wpshop' );
-__('New quotation on shop sended to shop administrator', 'wpshop' );
+__('New quotation on your shop', 'wpshop');
+__('Hello, New quotation on your shop ! Quotation Key : [order_temporary_key], Quotation date : [order_date], [order_content] [order_addresses] [order_customer_comments]', 'wpshop');
+__('New quotation on shop sended to shop administrator', 'wpshop');
 
-__('Your quotation has been recorded', 'wpshop' );
-__('Hello [customer_first_name] [customer_last_name], this email confirms that your order has been recorded (Quotation date : [order_date]). [order_content]', 'wpshop' );
-__('User quotation confirmation', 'wpshop' );
+__('Your quotation has been recorded', 'wpshop');
+__('Hello [customer_first_name] [customer_last_name], this email confirms that your order has been recorded (Quotation date : [order_date]). [order_content]', 'wpshop');
+__('User quotation confirmation', 'wpshop');
 
-__('Your quotation has been updated', 'wpshop' );
-__('Hello [customer_first_name] [customer_last_name], this email confirms that your quotation has been updated (Quotation date : [order_date]). [order_content]', 'wpshop' );
-__('Notify a customer when quotation is updated', 'wpshop' );
+__('Your quotation has been updated', 'wpshop');
+__('Hello [customer_first_name] [customer_last_name], this email confirms that your quotation has been updated (Quotation date : [order_date]). [order_content]', 'wpshop');
+__('Notify a customer when quotation is updated', 'wpshop');
 
-__('Your downloadable product is available', 'wpshop' );
-__('Hello [customer_first_name] [customer_last_name],<br/>this email confirms that your downloadable product is available : [download_product_link].<br/><br/>Thank you for your loyalty. Have a good day.', 'wpshop' );
-__('Notify a customer when downloadable file is available after an order', 'wpshop' );
+__('Your downloadable product is available', 'wpshop');
+__('Hello [customer_first_name] [customer_last_name],<br/>this email confirms that your downloadable product is available : [download_product_link].<br/><br/>Thank you for your loyalty. Have a good day.', 'wpshop');
+__('Notify a customer when downloadable file is available after an order', 'wpshop');
 
 
-__('Shop', 'wpshop' );
-__('shop', 'wpshop' );
-__('Display shop product list', 'wpshop' );
+__('Shop', 'wpshop');
+__('shop', 'wpshop');
+__('Display shop product list', 'wpshop');
 
-__('Cart', 'wpshop' );
-__('cart', 'wpshop' );
-__('Display the cart page', 'wpshop' );
+__('Cart', 'wpshop');
+__('cart', 'wpshop');
+__('Display the cart page', 'wpshop');
 
-__('Checkout', 'wpshop' );
-__('checkout', 'wpshop' );
-__('Display the checkout page', 'wpshop' );
+__('Checkout', 'wpshop');
+__('checkout', 'wpshop');
+__('Display the checkout page', 'wpshop');
 
-__('My account', 'wpshop' );
-__('myaccount', 'wpshop' );
-__('Display the user account page', 'wpshop' );
+__('My account', 'wpshop');
+__('myaccount', 'wpshop');
+__('Display the user account page', 'wpshop');
 
-__('Signup', 'wpshop' );
-__('signup', 'wpshop' );
-__('Display the signout page', 'wpshop' );
+__('Signup', 'wpshop');
+__('signup', 'wpshop');
+__('Display the signout page', 'wpshop');
 
-__('Payment return successfull', 'wpshop' );
-__('return', 'wpshop' );
-__('Page for succesfull payment return', 'wpshop' );
+__('Payment return successfull', 'wpshop');
+__('return', 'wpshop');
+__('Page for succesfull payment return', 'wpshop');
 
-__('Payment return unsuccessfull', 'wpshop' );
-__('unsuccessfull_payment_return', 'wpshop' );
-__('Page for unsuccesfull payment return', 'wpshop' );
+__('Payment return unsuccessfull', 'wpshop');
+__('unsuccessfull_payment_return', 'wpshop');
+__('Page for unsuccesfull payment return', 'wpshop');
 
-__('Terms of sale', 'wpshop' );
-__('terms-of-sale', 'wpshop' );
-__('Define the page for terms of sale', 'wpshop' );
+__('Terms of sale', 'wpshop');
+__('terms-of-sale', 'wpshop');
+__('Define the page for terms of sale', 'wpshop');

Braces +3 added lines, -1 removed lines

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

languages/alone_text.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
 * Plugin database options
 *

Braces +3 added lines, -1 removed lines

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