Eoxia / wpshop

includes/modules/wps_installer/model/wps_installer_model.php

Doc Comments +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
 	 * Save the current state of installation process
 	 *
 	 * @param string $setted_state A parameter setted for saving the state of installation ( in progress, completed, ignored )
-	 * @param array $current_db_version The current value for database version option
+	 * @param string $current_db_version The current value for database version option
 	 */
 	function installer_state_saver( $setted_state, $current_db_version ) {
 		$current_db_version['installation_state'] = $setted_state;

Braces +3 added lines, -1 removed lines

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

Spacing +31 added lines, -31 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Module controller class definition file
  *
@@ -28,34 +28,34 @@ 
 	 *
 	 * @param integer $the_step_to_save The current step to save
 	 */
-	function save_step( $the_step_to_save ) {
+	function save_step($the_step_to_save) {
 
-		switch ( $the_step_to_save ) {
+		switch ($the_step_to_save) {
 			case 1:
 				/**	Save company informations	*/
-				$wpshop_company_info = !empty( $_POST['wpshop_company_info'] ) ? sanitize_text_field( $_POST['wpshop_company_info'] ) : '';
-				if ( !empty( $wpshop_company_info ) ) {
-					update_option( 'wpshop_company_info', $wpshop_company_info );
+				$wpshop_company_info = !empty($_POST['wpshop_company_info']) ? sanitize_text_field($_POST['wpshop_company_info']) : '';
+				if (!empty($wpshop_company_info)) {
+					update_option('wpshop_company_info', $wpshop_company_info);
 				}
 
 				/**	Save the company logo in case a file is sended	*/
-				$shop_logo = !empty( $_POST['wpshop_logo'] ) ? sanitize_text_field( $_POST['wpshop_logo'] ) : '';
-				if ( !empty( $shop_logo ) ) {
-					update_option( 'wpshop_logo', $shop_logo );
+				$shop_logo = !empty($_POST['wpshop_logo']) ? sanitize_text_field($_POST['wpshop_logo']) : '';
+				if (!empty($shop_logo)) {
+					update_option('wpshop_logo', $shop_logo);
 				}
 				break;
 
 			case 2:
 				/**	Save shop type	*/
-				$wpshop_shop_type = !empty( $_POST['wpshop_shop_type'] ) ? sanitize_text_field( $_POST[ 'wpshop_shop_type' ] ) : '';
-				if ( !empty( $wpshop_shop_type ) ) {
-					update_option( 'wpshop_shop_type', $wpshop_shop_type );
+				$wpshop_shop_type = !empty($_POST['wpshop_shop_type']) ? sanitize_text_field($_POST['wpshop_shop_type']) : '';
+				if (!empty($wpshop_shop_type)) {
+					update_option('wpshop_shop_type', $wpshop_shop_type);
 				}
 
 				/**	Save shop price piloting	*/
-				$wpshop_shop_price_piloting = !empty( $_POST[ 'wpshop_shop_price_piloting' ] ) ? sanitize_text_field( $_POST[ 'wpshop_shop_price_piloting' ] ) : '';
-				if ( !empty( $wpshop_shop_price_piloting ) ) {
-					update_option( 'wpshop_shop_price_piloting', $wpshop_shop_price_piloting );
+				$wpshop_shop_price_piloting = !empty($_POST['wpshop_shop_price_piloting']) ? sanitize_text_field($_POST['wpshop_shop_price_piloting']) : '';
+				if (!empty($wpshop_shop_price_piloting)) {
+					update_option('wpshop_shop_price_piloting', $wpshop_shop_price_piloting);
 				}
 
 				/**	Insert default pages	*/
@@ -63,21 +63,21 @@ 
 				//add_action( 'init', array( 'wps_message_ctr', 'create_default_message' ) );
 
 				/**	In case the user want to insert default datas	*/
-				$wps_installer_data_insertion = !empty( $_POST[ 'wps-installer-data-insertion' ] ) ? sanitize_text_field( $_POST[ 'wps-installer-data-insertion' ] ) : '';
-				if ( !empty( $wps_installer_data_insertion ) && ( 'yes' == $wps_installer_data_insertion ) ) {
+				$wps_installer_data_insertion = !empty($_POST['wps-installer-data-insertion']) ? sanitize_text_field($_POST['wps-installer-data-insertion']) : '';
+				if (!empty($wps_installer_data_insertion) && ('yes' == $wps_installer_data_insertion)) {
 					/**	Insert sample datas */
-					add_action( 'init', array( 'wpshop_install', 'import_sample_datas' ) );
+					add_action('init', array('wpshop_install', 'import_sample_datas'));
 				}
 
-				$wps_current_db_version = get_option( 'wpshop_db_options', 0 );
-				$wps_current_db_version[ 'installation_state' ] = 'completed';
-				$wps_current_db_version[ 'installation_date' ] = current_time( 'mysql', 0 );
-				update_option( 'wpshop_db_options', $wps_current_db_version );
+				$wps_current_db_version = get_option('wpshop_db_options', 0);
+				$wps_current_db_version['installation_state'] = 'completed';
+				$wps_current_db_version['installation_date'] = current_time('mysql', 0);
+				update_option('wpshop_db_options', $wps_current_db_version);
 				break;
 		}
 
-		if ( !empty( $the_step_to_save ) ) {
-			update_option( 'wps-installation-current-step', ( WPSINSTALLER_STEPS_COUNT != $the_step_to_save ? $the_step_to_save + 1 : WPSINSTALLER_STEPS_COUNT ) );
+		if (!empty($the_step_to_save)) {
+			update_option('wps-installation-current-step', (WPSINSTALLER_STEPS_COUNT != $the_step_to_save ? $the_step_to_save + 1 : WPSINSTALLER_STEPS_COUNT));
 		}
 	}
 
@@ -87,16 +87,16 @@ 
 	 * @param string $setted_state A parameter setted for saving the state of installation ( in progress, completed, ignored )
 	 * @param array $current_db_version The current value for database version option
 	 */
-	function installer_state_saver( $setted_state, $current_db_version ) {
+	function installer_state_saver($setted_state, $current_db_version) {
 		$current_db_version['installation_state'] = $setted_state;
-		$current_db_version[ 'installation_date' ] = current_time( 'mysql', 0 );
+		$current_db_version['installation_date'] = current_time('mysql', 0);
 		update_option('wpshop_db_options', $current_db_version);
 
-		if ( "ignored" == $current_db_version['installation_state'] ) {
+		if ("ignored" == $current_db_version['installation_state']) {
 			/**	Create the different pages	*/
-			if ( 2 >= get_option( 'wps-installation-current-step' ) ) {
-				update_option( 'wpshop_shop_price_piloting', 'TTC' );
-				update_option( 'wpshop_shop_type', WPSHOP_DEFAULT_SHOP_TYPE );
+			if (2 >= get_option('wps-installation-current-step')) {
+				update_option('wpshop_shop_price_piloting', 'TTC');
+				update_option('wpshop_shop_type', WPSHOP_DEFAULT_SHOP_TYPE);
 
 				/**	Insert default pages	*/
 				//add_action( 'init', array( 'wpshop_install', 'wpshop_insert_default_pages' ) );
@@ -105,7 +105,7 @@ 
 			}
 
 			/**	Save the crrent step to 4 in order to consider that installation is done	*/
-			update_option( 'wps-installation-current-step', WPSINSTALLER_STEPS_COUNT );
+			update_option('wps-installation-current-step', WPSINSTALLER_STEPS_COUNT);
 		}
 
 		return $current_db_version;

includes/modules/wps_media_manager/controller/wps_media_manager_frontend_ctr.php

Doc Comments +4 added lines, -1 removed lines

@@ -70,7 +70,7 @@ 
 	/**
 	 * Get product Complete Sheet
 	 * @param integer $pid
-	 * @return Ambigous <string, string>
+	 * @return string <string, string>
 	 */
 	public static function get_product_complete_sheet_galery( $pid ) {
 		$output = '';
@@ -157,6 +157,9 @@ 
 		return $output;
 	}
 
+	/**
+	 * @param integer $product_id
+	 */
 	public static function get_product_complete_sheet_attachments( $product_id ) {
 		$output = '';
 

Spacing +60 added lines, -60 removed lines

@@ -1,15 +1,15 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_media_manager_frontend_ctr {
 
-	public static function get_attachments( $pid, $type = 'gallery' ) {
+	public static function get_attachments($pid, $type = 'gallery') {
 		$attachments = array();
-		$media_id_data = get_post_meta( $pid, '_wps_product_media', true );
-		if( !empty($media_id_data) ) {
-			$media_id = explode( ',', $media_id_data );
-			foreach($media_id as $id) {
-				if( ( ( wp_attachment_is_image( $id ) && $type == 'gallery' ) || ( !empty( $id ) && !wp_attachment_is_image( $id ) && $type == 'attachments' ) ) ) {
-					$attachment_data = get_post( $id );
-					if( !empty( $attachment_data ) && !empty($attachment_data->ID) ) {
+		$media_id_data = get_post_meta($pid, '_wps_product_media', true);
+		if (!empty($media_id_data)) {
+			$media_id = explode(',', $media_id_data);
+			foreach ($media_id as $id) {
+				if (((wp_attachment_is_image($id) && $type == 'gallery') || (!empty($id) && !wp_attachment_is_image($id) && $type == 'attachments'))) {
+					$attachment_data = get_post($id);
+					if (!empty($attachment_data) && !empty($attachment_data->ID)) {
 						$attachments[] = $attachment_data;
 					}
 				}
@@ -26,13 +26,13 @@ 
 	 *
 	 * @return string The attachement gallery output
 	 */
-	public static function display_attachment_gallery( $attachement_type, $content ) {
+	public static function display_attachment_gallery($attachement_type, $content) {
 		$galery_output = '';
 
 		/*
 		 * Get the template part for given galery type
 		 */
-		switch ( $attachement_type ) {
+		switch ($attachement_type) {
 			case 'picture':
 					$template_part = 'product_attachment_picture_galery';
 				break;
@@ -52,7 +52,7 @@ 
 		 * Build template
 		 */
 		$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-		if ( $tpl_way_to_take[0] && !empty($tpl_way_to_take[1]) ) {
+		if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
 			/*	Include the old way template part	*/
 			ob_start();
 			require(wpshop_display::get_template_file($tpl_way_to_take[1]));
@@ -72,81 +72,81 @@ 
 	 * @param integer $pid
 	 * @return Ambigous <string, string>
 	 */
-	public static function get_product_complete_sheet_galery( $pid ) {
+	public static function get_product_complete_sheet_galery($pid) {
 		$output = '';
-		if( !empty($pid) ) {
+		if (!empty($pid)) {
 			$tpl_component = $sub_tpl_component = array();
 			$attachments = array();
 			$tpl_component['THUMBNAILS'] = '';
 			$tpl_component['SLIDER_CONTENT'] = '';
 
 			/**	Check and get the product thumbnail	*/
-			$principal_thumbnail_id = get_post_meta( $pid, '_thumbnail_id', true);
-			if( !empty($principal_thumbnail_id) ) {
-				$attachments[0] = get_post( $principal_thumbnail_id );
+			$principal_thumbnail_id = get_post_meta($pid, '_thumbnail_id', true);
+			if (!empty($principal_thumbnail_id)) {
+				$attachments[0] = get_post($principal_thumbnail_id);
 			}
 			else {
 				$sub_tpl_component['THUMBNAIL_GALLERY_THUMBNAIL'] = '';
-				$sub_tpl_component['IMAGE_SLIDER_FULL'] = '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
-				$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
+				$sub_tpl_component['IMAGE_SLIDER_FULL'] = '<img src="' . WPSHOP_DEFAULT_PRODUCT_PICTURE . '" alt="" />';
+				$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = '<img src="' . WPSHOP_DEFAULT_PRODUCT_PICTURE . '" alt="" />';
 				$sub_tpl_component['THUMBNAIL_GALLERY_THUMBNAIL_ID'] = '';
 
-				$tpl_component[ 'SLIDER_CONTENT' ] .= wpshop_display::display_template_element( 'wps_product_complete_sheet_gallery_slider_element', $sub_tpl_component );
-				$tpl_component[ 'THUMBNAILS' ] = '';
+				$tpl_component['SLIDER_CONTENT'] .= wpshop_display::display_template_element('wps_product_complete_sheet_gallery_slider_element', $sub_tpl_component);
+				$tpl_component['THUMBNAILS'] = '';
 			}
 
 			/**	Get product associated pictures	*/
 			$allowed_mime_type = get_allowed_mime_types();
 
-			$attachments = array_merge( $attachments, (array)self::get_attachments( $pid ) );
+			$attachments = array_merge($attachments, (array)self::get_attachments($pid));
 
 			/**	In case there are picture read and display them into product sheet	*/
-			if ( !empty($attachments) ) {
-				foreach( $attachments as $attachment) {
-					if( !empty($attachment) && !empty($attachment->post_mime_type) && in_array( $attachment->post_mime_type, $allowed_mime_type ) ) {
+			if (!empty($attachments)) {
+				foreach ($attachments as $attachment) {
+					if (!empty($attachment) && !empty($attachment->post_mime_type) && in_array($attachment->post_mime_type, $allowed_mime_type)) {
 						//IMAGE SLIDER
-						$image_attributes = wp_get_attachment_metadata( $attachment->ID );
+						$image_attributes = wp_get_attachment_metadata($attachment->ID);
 						$sub_tpl_component['THUMBNAIL_GALLERY_THUMBNAIL'] = '';
 						$sub_tpl_component['THUMBNAIL_GALLERY_THUMBNAIL_ID'] = $attachment->ID;
-						if ( !empty($image_attributes) && !empty($image_attributes['sizes']) && is_array($image_attributes['sizes']) ) {
-							foreach ( $image_attributes['sizes'] as $size_name => $size_def) {
-								$p = wp_get_attachment_image( $attachment->ID, $size_name);
-								$src = wp_get_attachment_image_src( $attachment->ID, $size_name );
+						if (!empty($image_attributes) && !empty($image_attributes['sizes']) && is_array($image_attributes['sizes'])) {
+							foreach ($image_attributes['sizes'] as $size_name => $size_def) {
+								$p = wp_get_attachment_image($attachment->ID, $size_name);
+								$src = wp_get_attachment_image_src($attachment->ID, $size_name);
 								$sub_tpl_component['THUMBNAIL_GALLERY_' . strtoupper($size_name)] = '';
 								$sub_tpl_component['IMAGE_SLIDER_' . strtoupper($size_name)] = '';
-								if( !empty($p) ) {
-									$sub_tpl_component['SRC_IMAGE_SLIDER_' . strtoupper($size_name)] = ( !empty($src) ) ? $src[0] : '';
-									$sub_tpl_component['IMAGE_SLIDER_' . strtoupper($size_name)] = ( !empty( $p ) ) ? $p : '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
-									$sub_tpl_component['THUMBNAIL_GALLERY_' . strtoupper($size_name)] = ( !empty( $p ) ) ? $p : '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
+								if (!empty($p)) {
+									$sub_tpl_component['SRC_IMAGE_SLIDER_' . strtoupper($size_name)] = (!empty($src)) ? $src[0] : '';
+									$sub_tpl_component['IMAGE_SLIDER_' . strtoupper($size_name)] = (!empty($p)) ? $p : '<img src="' . WPSHOP_DEFAULT_PRODUCT_PICTURE . '" alt="" />';
+									$sub_tpl_component['THUMBNAIL_GALLERY_' . strtoupper($size_name)] = (!empty($p)) ? $p : '<img src="' . WPSHOP_DEFAULT_PRODUCT_PICTURE . '" alt="" />';
 								}
 							}
-							$p = wp_get_attachment_image( $attachment->ID, 'full');
-							$src = wp_get_attachment_image_src( $attachment->ID, 'full' );
-							if( !empty($p) ) {
-								$sub_tpl_component['SRC_IMAGE_SLIDER_FULL'] = ( !empty($src) ) ? $src[0] : '';
-								$sub_tpl_component['IMAGE_SLIDER_FULL'] = ( !empty($p) ) ? $p : '';
-								$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = ( !empty($p) ) ? $p : '';
+							$p = wp_get_attachment_image($attachment->ID, 'full');
+							$src = wp_get_attachment_image_src($attachment->ID, 'full');
+							if (!empty($p)) {
+								$sub_tpl_component['SRC_IMAGE_SLIDER_FULL'] = (!empty($src)) ? $src[0] : '';
+								$sub_tpl_component['IMAGE_SLIDER_FULL'] = (!empty($p)) ? $p : '';
+								$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = (!empty($p)) ? $p : '';
 							}
 						}
 						else {
-							$p = wp_get_attachment_image( $attachment->ID, 'full' );
-							$src = wp_get_attachment_image_src( $attachment->ID, 'full' );
-							$sub_tpl_component['SRC_IMAGE_SLIDER_FULL'] = ( !empty($src) ) ? $src[0] : '';
-							$sub_tpl_component['IMAGE_SLIDER_FULL'] = ( !empty( $p ) ) ? $p : '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
-							$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = ( !empty( $p ) ) ? $p : '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
+							$p = wp_get_attachment_image($attachment->ID, 'full');
+							$src = wp_get_attachment_image_src($attachment->ID, 'full');
+							$sub_tpl_component['SRC_IMAGE_SLIDER_FULL'] = (!empty($src)) ? $src[0] : '';
+							$sub_tpl_component['IMAGE_SLIDER_FULL'] = (!empty($p)) ? $p : '<img src="' . WPSHOP_DEFAULT_PRODUCT_PICTURE . '" alt="" />';
+							$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = (!empty($p)) ? $p : '<img src="' . WPSHOP_DEFAULT_PRODUCT_PICTURE . '" alt="" />';
 						}
-						if ( !empty( $sub_tpl_component['IMAGE_SLIDER_FULL'] ) ) {
-							$tpl_component[ 'SLIDER_CONTENT' ] .= wpshop_display::display_template_element( 'wps_product_complete_sheet_gallery_slider_element', $sub_tpl_component );
-							if ( ( 1 < count( $attachments ) ) || ( ( 1 == count( $attachments ) ) && empty( $principal_thumbnail_id ) ) ) {
-								$tpl_component[ 'THUMBNAILS' ] .= wpshop_display::display_template_element( 'wps_product_complete_sheet_gallery_thumbnail_element', $sub_tpl_component );
+						if (!empty($sub_tpl_component['IMAGE_SLIDER_FULL'])) {
+							$tpl_component['SLIDER_CONTENT'] .= wpshop_display::display_template_element('wps_product_complete_sheet_gallery_slider_element', $sub_tpl_component);
+							if ((1 < count($attachments)) || ((1 == count($attachments)) && empty($principal_thumbnail_id))) {
+								$tpl_component['THUMBNAILS'] .= wpshop_display::display_template_element('wps_product_complete_sheet_gallery_thumbnail_element', $sub_tpl_component);
 							}
 						}
-						unset( $sub_tpl_component );
+						unset($sub_tpl_component);
 					}
 					else {
 						$sub_tpl_component['SRC_IMAGE_SLIDER_FULL'] = '';
-						$sub_tpl_component['IMAGE_SLIDER_FULL'] = '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
-						$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
+						$sub_tpl_component['IMAGE_SLIDER_FULL'] = '<img src="' . WPSHOP_DEFAULT_PRODUCT_PICTURE . '" alt="" />';
+						$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = '<img src="' . WPSHOP_DEFAULT_PRODUCT_PICTURE . '" alt="" />';
 					}
 				}
 			}
@@ -157,35 +157,35 @@ 
 		return $output;
 	}
 
-	public static function get_product_complete_sheet_attachments( $product_id ) {
+	public static function get_product_complete_sheet_attachments($product_id) {
 		$output = '';
 
 		/**	Get attachement file for the current product	*/
 		$product_picture_galery_content = $product_document_galery_content = '';
 		$picture_number = $document_number = $index_li = 0;
 
-		$attachments = self::get_attachments( $product_id, 'attachments' );
+		$attachments = self::get_attachments($product_id, 'attachments');
 
-		if ( is_array($attachments) && (count($attachments) > 0) ) {
+		if (is_array($attachments) && (count($attachments) > 0)) {
 			$picture_increment = $document_increment = 1;
 			foreach ($attachments as $attachment) {
 				$tpl_component = array();
-				$attachment_url = wp_get_attachment_url( $attachment->ID );
+				$attachment_url = wp_get_attachment_url($attachment->ID);
 				$attachment_extension = explode('.', $attachment_url);
 				$attachment_extension = $attachment_extension[1];
 				$tpl_component['ATTACHMENT_ITEM_GUID'] = $attachment_url;
 				$tpl_component['ATTACHMENT_ITEM_TITLE'] = $attachment->post_title;
 				$tpl_component['ATTACHMENT_ITEM_EXTENSION'] = $attachment_extension;
-				if(is_int(strpos($attachment->post_mime_type, 'application/')) || is_int(strpos($attachment->post_mime_type, 'text/'))) {
+				if (is_int(strpos($attachment->post_mime_type, 'application/')) || is_int(strpos($attachment->post_mime_type, 'text/'))) {
 					$tpl_component['ATTACHMENT_ITEM_TYPE'] = 'document';
-					$tpl_component['ATTACHMENT_ITEM_SPECIFIC_CLASS'] = (!($document_increment%WPSHOP_DISPLAY_GALLERY_ELEMENT_NUMBER_PER_LINE)) ? 'wpshop_gallery_document_last' : '';
+					$tpl_component['ATTACHMENT_ITEM_SPECIFIC_CLASS'] = (!($document_increment % WPSHOP_DISPLAY_GALLERY_ELEMENT_NUMBER_PER_LINE)) ? 'wpshop_gallery_document_last' : '';
 					/** Template parameters	*/
 					$template_part = 'product_attachment_item_document';
 					$tpl_component['PRODUCT_ID'] = $product_id;
 
 					/** Build template	*/
 					$tpl_way_to_take = wpshop_display::check_way_for_template($template_part);
-					if ( $tpl_way_to_take[0] && !empty($tpl_way_to_take[1]) ) {
+					if ($tpl_way_to_take[0] && !empty($tpl_way_to_take[1])) {
 						/*	Include the old way template part	*/
 
 						ob_start();
@@ -204,7 +204,7 @@ 
 			}
 
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_MEDIA_MANAGER_DIR, WPS_MEDIA_MANAGER_TEMPLATE_DIR, 'frontend', 'associated', 'document' ) );
+			require(wpshop_tools::get_template_part(WPS_MEDIA_MANAGER_DIR, WPS_MEDIA_MANAGER_TEMPLATE_DIR, 'frontend', 'associated', 'document'));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}

Braces +8 added lines, -11 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_media_manager_frontend_ctr {
 
 	public static function get_attachments( $pid, $type = 'gallery' ) {
@@ -58,8 +60,7 @@ 
 			require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 			$galery_output = ob_get_contents();
 			ob_end_clean();
-		}
-		else {
+		} else {
 			$galery_output = wpshop_display::display_template_element($template_part, $tpl_component);
 		}
 		unset($tpl_component);
@@ -84,8 +85,7 @@ 
 			$principal_thumbnail_id = get_post_meta( $pid, '_thumbnail_id', true);
 			if( !empty($principal_thumbnail_id) ) {
 				$attachments[0] = get_post( $principal_thumbnail_id );
-			}
-			else {
+			} else {
 				$sub_tpl_component['THUMBNAIL_GALLERY_THUMBNAIL'] = '';
 				$sub_tpl_component['IMAGE_SLIDER_FULL'] = '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
 				$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
@@ -127,8 +127,7 @@ 
 								$sub_tpl_component['IMAGE_SLIDER_FULL'] = ( !empty($p) ) ? $p : '';
 								$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = ( !empty($p) ) ? $p : '';
 							}
-						}
-						else {
+						} else {
 							$p = wp_get_attachment_image( $attachment->ID, 'full' );
 							$src = wp_get_attachment_image_src( $attachment->ID, 'full' );
 							$sub_tpl_component['SRC_IMAGE_SLIDER_FULL'] = ( !empty($src) ) ? $src[0] : '';
@@ -142,8 +141,7 @@ 
 							}
 						}
 						unset( $sub_tpl_component );
-					}
-					else {
+					} else {
 						$sub_tpl_component['SRC_IMAGE_SLIDER_FULL'] = '';
 						$sub_tpl_component['IMAGE_SLIDER_FULL'] = '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
 						$sub_tpl_component['THUMBNAIL_GALLERY_FULL'] = '<img src="' .WPSHOP_DEFAULT_PRODUCT_PICTURE. '" alt="" />';
@@ -192,8 +190,7 @@ 
 						require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 						$product_document_galery_content .= ob_get_contents();
 						ob_end_clean();
-					}
-					else {
+					} else {
 						$product_document_galery_content .= wpshop_display::display_template_element($template_part, $tpl_component);
 					}
 

includes/modules/wps_message/controller/wps_message_ctr.php

Doc Comments +5 added lines, -1 removed lines

@@ -299,7 +299,11 @@
 	}
 
 	/** Store a new message
-	 * @return boolean
+	 * @param string $email
+	 * @param string $title
+	 * @param string $message
+	 * @param integer $model_id
+	 * @return boolean|null
 	 */
 	function add_message($recipient_id=0, $email, $title, $message, $model_id, $object, $date = null) {
 		$date = empty($date) ? current_time('mysql', 0) : $date;

Spacing +141 added lines, -141 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_message_ctr {
 	/** Define the main directory containing the template for the current plugin
 	 * @var string
@@ -20,14 +20,14 @@ 
 		$this->template_dir = WPS_MESSAGE_PATH . WPS_MESSAGE_DIR . "/templates/";
 
 		// WP General actions
-		add_action( 'admin_init', array( $this, 'wps_messages_init_actions') );
-		add_action('add_meta_boxes', array( $this, 'add_meta_boxes') );
-		add_action('manage_'.WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE.'_posts_custom_column',  array( $this, 'messages_custom_columns'));
-		add_filter('manage_edit-'.WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE.'_columns', array( $this, 'messages_edit_columns'));
+		add_action('admin_init', array($this, 'wps_messages_init_actions'));
+		add_action('add_meta_boxes', array($this, 'add_meta_boxes'));
+		add_action('manage_' . WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE . '_posts_custom_column', array($this, 'messages_custom_columns'));
+		add_filter('manage_edit-' . WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE . '_columns', array($this, 'messages_edit_columns'));
 
 		// Shortcodes
-		add_shortcode( 'wps_message_histo', array( $this, 'display_message_histo_per_customer') );
-		add_shortcode( 'order_customer_personnal_informations', array( $this, 'order_personnal_informations') );
+		add_shortcode('wps_message_histo', array($this, 'display_message_histo_per_customer'));
+		add_shortcode('order_customer_personnal_informations', array($this, 'order_personnal_informations'));
 
 		/** Ajax */
 		add_action('wp_ajax_get_content_message', array($this, 'get_content_message'));
@@ -39,11 +39,11 @@ 
 	public function enqueue_scripts() {
 		/** Css */
 		add_thickbox();
-		wp_register_style( 'wpeo-message-css', WPS_MESSAGE_URL . WPS_MESSAGE_DIR . '/assets/css/frontend.css', '', WPS_MESSAGE_VERSION );
-		wp_enqueue_style( 'wpeo-message-css' );
+		wp_register_style('wpeo-message-css', WPS_MESSAGE_URL . WPS_MESSAGE_DIR . '/assets/css/frontend.css', '', WPS_MESSAGE_VERSION);
+		wp_enqueue_style('wpeo-message-css');
 
 		/** My js */
-		wp_enqueue_script( 'wps-message-js', WPS_MESSAGE_URL . WPS_MESSAGE_DIR . '/assets/js/frontend.js', array("jquery", 'thickbox'), WPS_MESSAGE_VERSION);
+		wp_enqueue_script('wps-message-js', WPS_MESSAGE_URL . WPS_MESSAGE_DIR . '/assets/js/frontend.js', array("jquery", 'thickbox'), WPS_MESSAGE_VERSION);
 	}
 
 	/**
@@ -84,7 +84,7 @@ 
 				'show_in_nav_menus' 		=> false,
 				'rewrite' 					=> false,
 				'query_var' 				=> true,
-				'supports' 					=> array('title','editor'),
+				'supports' 					=> array('title', 'editor'),
 				'has_archive' 				=> false
 		));
 	}
@@ -97,7 +97,7 @@ 
 		add_meta_box(
 		'wpshop_message_histo',
 		__('Message historic', 'wpshop'),
-		array( $this, 'message_histo_box'),
+		array($this, 'message_histo_box'),
 		WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE, 'normal', 'high'
 		);
 	}
@@ -119,15 +119,15 @@ 
 	 * @param  integer $message_type_id : Message type ID
 	 * @return string
 	 */
-	function get_historic_message_by_type( $message_type_id ) {
+	function get_historic_message_by_type($message_type_id) {
 		global $wpdb;
 		$output = '';
-		if ( !empty($message_type_id) ) {
+		if (!empty($message_type_id)) {
 			// Recover all sended messages
 			$wps_message_mdl = new wps_message_mdl();
-			$messages = $wps_message_mdl->get_messages_histo( $message_type_id );
+			$messages = $wps_message_mdl->get_messages_histo($message_type_id);
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, "backend", "message_historic") );
+			require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, "backend", "message_historic"));
 			$output .= ob_get_contents();
 			ob_end_clean();
 		}
@@ -139,13 +139,13 @@ 
 	 */
 	public static function create_default_message() {
 		// Get default messages defined into xml files
-		$xml_default_emails = file_get_contents( WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/default_emails.xml' );
-		$default_emails = new SimpleXMLElement( $xml_default_emails );
+		$xml_default_emails = file_get_contents(WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/assets/datas/default_emails.xml');
+		$default_emails = new SimpleXMLElement($xml_default_emails);
 
 		//Read default emails for options creation
-		foreach ( $default_emails->xpath( '//emails/email' ) as $email ) {
-			if (  ( WPSHOP_DEFINED_SHOP_TYPE == (string)$email->attributes()->shop_type ) || ( 'sale' == WPSHOP_DEFINED_SHOP_TYPE ) ) {
-				self::createMessage( (string)$email->attributes()->code, (string)$email->subject, (string)$email->content );
+		foreach ($default_emails->xpath('//emails/email') as $email) {
+			if ((WPSHOP_DEFINED_SHOP_TYPE == (string)$email->attributes()->shop_type) || ('sale' == WPSHOP_DEFINED_SHOP_TYPE)) {
+				self::createMessage((string)$email->attributes()->code, (string)$email->subject, (string)$email->content);
 			}
 		}
 	}
@@ -157,24 +157,24 @@ 
 	 * @param string $message : Message content
 	 * @return integer message ID
 	 */
-	public static function createMessage( $code, $object = "", $message = "" ) {
+	public static function createMessage($code, $object = "", $message = "") {
 		$id = 0;
 
-		$object = empty( $object ) ? constant( $code . '_OBJECT' ) : $object;
-		$message = empty( $message ) ? constant( $code ) : $message;
-		$message_option = get_option( $code, null );
+		$object = empty($object) ? constant($code . '_OBJECT') : $object;
+		$message = empty($message) ? constant($code) : $message;
+		$message_option = get_option($code, null);
 
-		if ( empty( $message_option ) && !empty( $object ) && !empty( $message ) ) {
+		if (empty($message_option) && !empty($object) && !empty($message)) {
 			$new_message = array(
-				'post_title' 	=> __( $object , 'wpshop'),
-				'post_content' 	=> self::customize_message( __( $message, 'wpshop' ) ),
+				'post_title' 	=> __($object, 'wpshop'),
+				'post_content' 	=> self::customize_message(__($message, 'wpshop')),
 				'post_status' 	=> 'publish',
 				'post_author' 	=> 1,
 				'post_type' 	=> WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE
 			);
-			$id = wp_insert_post( $new_message );
+			$id = wp_insert_post($new_message);
 
-			update_option( $code, $id );
+			update_option($code, $id);
 		}
 		else {
 			$id = $message_option;
@@ -190,13 +190,13 @@ 
 	function messages_custom_columns($column) {
 		global $post;
 		$metadata = get_post_custom();
-		switch($column){
+		switch ($column) {
 			case "extract":
 				echo wp_trim_words($post->post_content, 55);
 			break;
 			case "last_dispatch_date":
-				if(!empty($metadata['wpshop_message_last_dispatch_date'][0]))
-					echo mysql2date('d F Y, H:i:s',$metadata['wpshop_message_last_dispatch_date'][0], true);
+				if (!empty($metadata['wpshop_message_last_dispatch_date'][0]))
+					echo mysql2date('d F Y, H:i:s', $metadata['wpshop_message_last_dispatch_date'][0], true);
 				else
 					echo '-';
 			break;
@@ -211,9 +211,9 @@ 
 		$columns = array(
 				'cb' => '<input type="checkbox" />',
 				'title' => __('Name', 'wpshop'),
-				'extract' =>__('Extract from the message','wpshop'),
-				'date' => __('Creation date','wpshop'),
-				'last_dispatch_date' => __('Last dispatch date','wpshop')
+				'extract' =>__('Extract from the message', 'wpshop'),
+				'date' => __('Creation date', 'wpshop'),
+				'last_dispatch_date' => __('Last dispatch date', 'wpshop')
 		);
 
 		return $columns;
@@ -229,12 +229,12 @@ 
 				'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_MESSAGE,
 				'posts_per_page' => '-1',
 		));
-		$options='';
+		$options = '';
 		if (!empty($posts)) {
-			$options = '<option value="0">' .__('Select values from list', 'wpshop'). '</option>';
+			$options = '<option value="0">' . __('Select values from list', 'wpshop') . '</option>';
 			foreach ($posts as $p) {
-				$selected = $p->ID==$current ? ' selected="selected"': '';
-				$options .= '<option value="'.$p->ID.'"'.$selected.'>'.$p->post_title.'</option>';
+				$selected = $p->ID == $current ? ' selected="selected"' : '';
+				$options .= '<option value="' . $p->ID . '"' . $selected . '>' . $p->post_title . '</option>';
 			}
 		}
 		wp_reset_query();
@@ -247,13 +247,13 @@ 
 	 * @param integer $customer_id : ID to identifiate the customer
 	 * @return string
 	 */
-	function display_message_histo_per_customer( $args, $customer_id = '' ) {
-		$customer_id = ( !empty($customer_id) ) ? $customer_id : get_current_user_id();
-		$message_id = ( !empty($args) && !empty($args['message_id']) ) ? $args['message_id'] : '';
+	function display_message_histo_per_customer($args, $customer_id = '') {
+		$customer_id = (!empty($customer_id)) ? $customer_id : get_current_user_id();
+		$message_id = (!empty($args) && !empty($args['message_id'])) ? $args['message_id'] : '';
 		$message_elements = '';
 
 		$wps_message_mdl = new wps_message_mdl();
-		$messages_data = $wps_message_mdl->get_messages_histo( $message_id, $customer_id );
+		$messages_data = $wps_message_mdl->get_messages_histo($message_id, $customer_id);
 
 // 		ob_start();
 // 		require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, "frontend", "messages") );
@@ -262,21 +262,21 @@ 
 
 		/**	Order emails	*/
 		$messages_histo = array();
-		foreach( $messages_data as $meta_id => $messages ) :
+		foreach ($messages_data as $meta_id => $messages) :
 			$i = 0;
-			foreach ( $messages as $message ) :
-				$messages_histo[ $message[ 'mess_dispatch_date' ][ 0 ] ][ $i ][ 'title' ] = $message[ 'mess_title' ];
-				$messages_histo[ $message[ 'mess_dispatch_date' ][ 0 ] ][ $i ][ 'message' ] = $message[ 'mess_message' ];
-				$messages_histo[ $message[ 'mess_dispatch_date' ][ 0 ] ][ $i ][ 'dates' ] = $message[ 'mess_dispatch_date' ];
-				if ( !empty( $message[ 'mess_object_id' ] ) ) {
-					$messages_histo[ $message[ 'mess_dispatch_date' ][ 0 ] ][ $i ][ 'object' ] = $message[ 'mess_object_id' ];
+			foreach ($messages as $message) :
+				$messages_histo[$message['mess_dispatch_date'][0]][$i]['title'] = $message['mess_title'];
+				$messages_histo[$message['mess_dispatch_date'][0]][$i]['message'] = $message['mess_message'];
+				$messages_histo[$message['mess_dispatch_date'][0]][$i]['dates'] = $message['mess_dispatch_date'];
+				if (!empty($message['mess_object_id'])) {
+					$messages_histo[$message['mess_dispatch_date'][0]][$i]['object'] = $message['mess_object_id'];
 				}
 				$i++;
 			endforeach;
 		endforeach;
-		ksort( $messages_histo );
+		ksort($messages_histo);
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, "frontend", "customer", "messages") );
+		require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, "frontend", "customer", "messages"));
 		$output = ob_get_contents();
 		ob_end_clean();
 
@@ -288,10 +288,10 @@ 
 	 * @param string $message : message content
 	 * @return string
 	 */
-	public static function customize_message( $message ) {
-		if( !empty($message) ) {
+	public static function customize_message($message) {
+		if (!empty($message)) {
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, WPS_MESSAGE_PATH . WPS_MESSAGE_DIR . '/templates/', "backend", "message_html_structure") );
+			require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, WPS_MESSAGE_PATH . WPS_MESSAGE_DIR . '/templates/', "backend", "message_html_structure"));
 			$message = ob_get_contents();
 			ob_end_clean();
 		}
@@ -301,12 +301,12 @@ 
 	/** Store a new message
 	 * @return boolean
 	 */
-	function add_message($recipient_id=0, $email, $title, $message, $model_id, $object, $date = null) {
+	function add_message($recipient_id = 0, $email, $title, $message, $model_id, $object, $date = null) {
 		$date = empty($date) ? current_time('mysql', 0) : $date;
-		$object_empty = array('object_type'=>'','object_id'=>0);
+		$object_empty = array('object_type'=>'', 'object_id'=>0);
 		$object = array_merge($object_empty, $object);
 
-		$historic = get_post_meta($recipient_id, '_wpshop_messages_histo_' .$model_id. '_' .substr($date, 0, 7), true);
+		$historic = get_post_meta($recipient_id, '_wpshop_messages_histo_' . $model_id . '_' . substr($date, 0, 7), true);
 		$data_to_insert = array(
 				'mess_user_id' => $recipient_id,
 				'mess_user_email' => $email,
@@ -318,7 +318,7 @@ 
 		);
 		$historic[] = $data_to_insert;
 
-		update_post_meta($recipient_id, '_wpshop_messages_histo_' .$model_id. '_' .substr($date, 0, 7), $historic);
+		update_post_meta($recipient_id, '_wpshop_messages_histo_' . $model_id . '_' . substr($date, 0, 7), $historic);
 	}
 
 	/**
@@ -329,37 +329,37 @@ 
 	 * @param boolean $duplicate_message : Duplicate a light message for historic storage
 	 * @return string
 	 */
-	function customMessage($string, $data, $model_name='', $duplicate_message=false) {
+	function customMessage($string, $data, $model_name = '', $duplicate_message = false) {
 		$avant = array();
 		$apres = array();
 
-		$logo_option = get_option( 'wpshop_logo' );
+		$logo_option = get_option('wpshop_logo');
 
-		$data['your_shop_logo'] = ( !empty($logo_option) ) ? '<img src="'.$logo_option.'" alt="' .get_bloginfo('name'). '" />' : '';
+		$data['your_shop_logo'] = (!empty($logo_option)) ? '<img src="' . $logo_option . '" alt="' . get_bloginfo('name') . '" />' : '';
 
-		foreach($data as $key => $value) {
-			$avant[] = '['.$key.']';
+		foreach ($data as $key => $value) {
+			$avant[] = '[' . $key . ']';
 			switch ($key) {
 				case 'order_content' :
-					$apres[] = ( $duplicate_message ) ? '[order_content]' : $this->order_content_template_for_mail ( $data['order_id'] );
+					$apres[] = ($duplicate_message) ? '[order_content]' : $this->order_content_template_for_mail($data['order_id']);
 					break;
 				case 'order_addresses' :
-					$apres[] = ( $duplicate_message ) ? '[order_addresses]' : $this->order_addresses_template_for_mail ( $data['order_id'] );
+					$apres[] = ($duplicate_message) ? '[order_addresses]' : $this->order_addresses_template_for_mail($data['order_id']);
 					break;
 
 				case 'order_billing_address' :
-					$apres[] = ( $duplicate_message ) ? '[order_billing_address]' : $this->order_addresses_template_for_mail ( $data['order_id'], 'billing' );
+					$apres[] = ($duplicate_message) ? '[order_billing_address]' : $this->order_addresses_template_for_mail($data['order_id'], 'billing');
 					break;
 
 				case 'order_shipping_address' :
-					$apres[] = ( $duplicate_message ) ? '[order_shipping_address]' : $this->order_addresses_template_for_mail ( $data['order_id'], 'shipping' );
+					$apres[] = ($duplicate_message) ? '[order_shipping_address]' : $this->order_addresses_template_for_mail($data['order_id'], 'shipping');
 					break;
 
 				case 'order_customer_comments' :
-					$apres[] = ( $duplicate_message ) ? '[order_customer_comments]' : $this->order_customer_comment_template_for_mail ( $data['order_id'] );
+					$apres[] = ($duplicate_message) ? '[order_customer_comments]' : $this->order_customer_comment_template_for_mail($data['order_id']);
 					break;
 				case 'order_personnal_informations' :
-					$apres[] = ( $duplicate_message ) ? '[order_personnal_informations]' : $this->order_personnal_informations();
+					$apres[] = ($duplicate_message) ? '[order_personnal_informations]' : $this->order_personnal_informations();
 					break;
 				default :
 					$apres[] = $value;
@@ -368,9 +368,9 @@ 
 		}
 		$string = str_replace($avant, $apres, $string);
 
-		$string = apply_filters( 'wps_more_customized_message', $string, $data, $duplicate_message );
+		$string = apply_filters('wps_more_customized_message', $string, $data, $duplicate_message);
 
-		if ( ($model_name != 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE') ) {
+		if (($model_name != 'WPSHOP_NEW_ORDER_ADMIN_MESSAGE')) {
 			$string = preg_replace("/\[(.*)\]/Usi", '', $string);
 		}
 
@@ -385,21 +385,21 @@ 
 	 * @param string $object : message object
 	 * @param file $attached_file : File to attached to e-mail
 	 */
-	function wpshop_prepared_email($email, $model_name, $data=array(), $object=array(), $attached_file = '') {
+	function wpshop_prepared_email($email, $model_name, $data = array(), $object = array(), $attached_file = '') {
 		global $wpdb;
-		$data = apply_filters( 'wps_extra_data_to_send_in_email', $data );
+		$data = apply_filters('wps_extra_data_to_send_in_email', $data);
 		$model_id = get_option($model_name, 0);
-		$query = $wpdb->prepare( 'SELECT * FROM ' .$wpdb->posts. ' WHERE ID = %s', $model_id);
-		$post_message = $wpdb->get_row( $query );
+		$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE ID = %s', $model_id);
+		$post_message = $wpdb->get_row($query);
 		$duplicate_message = '';
-		if ( !empty($post_message) ) {
+		if (!empty($post_message)) {
 			$title = $this->customMessage($post_message->post_title, $data, $model_name);
 			$message = $this->customMessage($post_message->post_content, $data, $model_name);
 			/* On envoie le mail */
-			if ( array_key_exists('order_content', $data) || array_key_exists('order_addresses', $data) || array_key_exists('order_customer_comments', $data) ) {
+			if (array_key_exists('order_content', $data) || array_key_exists('order_addresses', $data) || array_key_exists('order_customer_comments', $data)) {
 				$duplicate_message = $this->customMessage($post_message->post_content, $data, $model_name, true);
 			}
-			if ( !empty($email) ) {
+			if (!empty($email)) {
 				$this->wpshop_email($email, $title, $message, true, $model_id, $object, $attached_file, $duplicate_message);
 			}
 		}
@@ -419,17 +419,17 @@ 
 	function wpshop_email($email, $title, $message, $save = true, $model_id, $object = array(), $attachments = '', $duplicate_message = '') {
 		global $wpdb;
 		// Sauvegarde
-		if($save) {
-			$user = $wpdb->get_row('SELECT ID FROM '.$wpdb->users.' WHERE user_email="'.$email.'";');
+		if ($save) {
+			$user = $wpdb->get_row('SELECT ID FROM ' . $wpdb->users . ' WHERE user_email="' . $email . '";');
 			$user_id = $user ? $user->ID : get_current_user_id();
-			$query = $wpdb->prepare('SELECT ID FROM ' .$wpdb->posts. ' WHERE post_author = %d AND post_type = %s ', $user_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
-			$user_post_id = $wpdb->get_var( $query );
+			$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_author = %d AND post_type = %s ', $user_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+			$user_post_id = $wpdb->get_var($query);
 
-			if ( !empty($duplicate_message) ) {
-				$this->add_message( $user_post_id, $email, $title, $duplicate_message, $model_id, $object );
+			if (!empty($duplicate_message)) {
+				$this->add_message($user_post_id, $email, $title, $duplicate_message, $model_id, $object);
 			}
 			else {
-				$this->add_message( $user_post_id, $email, $title, $message, $model_id, $object );
+				$this->add_message($user_post_id, $email, $title, $message, $model_id, $object);
 			}
 
 		}
@@ -437,19 +437,19 @@ 
 		$emails = get_option('wpshop_emails', array());
 		$noreply_email = $emails['noreply_email'];
 		// Split the email to get the name
-		$vers_nom = substr($email, 0, strpos($email,'@'));
+		$vers_nom = substr($email, 0, strpos($email, '@'));
 
 		// Headers du mail
 		$headers = "MIME-Version: 1.0\r\n";
 		$headers .= "Content-type: text/html; charset=UTF-8\r\n";
-		$headers .= 'From: '.get_bloginfo('name').' <'.$noreply_email.'>' . "\r\n";
+		$headers .= 'From: ' . get_bloginfo('name') . ' <' . $noreply_email . '>' . "\r\n";
 
 		// Mail en HTML
 		@wp_mail($email, $title, $message, $headers, $attachments);
 
 
-		if ( !empty($attachments) ) {
-			unlink( $attachments );
+		if (!empty($attachments)) {
+			unlink($attachments);
 		}
 	}
 
@@ -458,13 +458,13 @@ 
 	 * @param integer $order_id : Order ID
 	 * @return string
 	 */
-	function order_content_template_for_mail ( $order_id ) {
+	function order_content_template_for_mail($order_id) {
 		$message = '';
-		if ( !empty($order_id) ) {
+		if (!empty($order_id)) {
 			$currency_code = wpshop_tools::wpshop_get_currency(false);
 			$orders_infos = get_post_meta($order_id, '_order_postmeta', true);
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, "backend/mails", "order_content_mail_template" ) );
+			require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, "backend/mails", "order_content_mail_template"));
 			$message .= ob_get_contents();
 			ob_end_clean();
 		}
@@ -477,44 +477,44 @@ 
 	 * @param integer $address_type : Address type ID
 	 * @return string
 	 */
-	function order_addresses_template_for_mail ( $order_id, $address_type = '' ) {
+	function order_addresses_template_for_mail($order_id, $address_type = '') {
 		global $wpdb;
-		$shipping_option = get_option( 'wpshop_shipping_address_choice' );
-		$display_shipping = ( !empty($shipping_option) && !empty($shipping_option['activate']) ) ? true : false;
+		$shipping_option = get_option('wpshop_shipping_address_choice');
+		$display_shipping = (!empty($shipping_option) && !empty($shipping_option['activate'])) ? true : false;
 		$message = '';
-		if ( !empty($order_id) ) {
+		if (!empty($order_id)) {
 			$order_addresses = get_post_meta($order_id, '_order_info', true);
-			if ( !empty($order_addresses) ) {
-				foreach ( $order_addresses as $key=>$order_address ) {
-					if ( !empty($order_address) && ( empty($address_type) || $address_type == $key ) ) {
+			if (!empty($order_addresses)) {
+				foreach ($order_addresses as $key=>$order_address) {
+					if (!empty($order_address) && (empty($address_type) || $address_type == $key)) {
 
-						if( $key != 'shipping' || ($key == 'shipping' && $display_shipping) ) {
-							$address_type_title = ( !empty($key) && $key == 'billing' ) ? __('Billing address', 'wpshop') : __('Shipping address', 'wpshop');
+						if ($key != 'shipping' || ($key == 'shipping' && $display_shipping)) {
+							$address_type_title = (!empty($key) && $key == 'billing') ? __('Billing address', 'wpshop') : __('Shipping address', 'wpshop');
 							$civility = '';
-							if ( !empty($order_address['address']['civility']) ) {
-								$query = $wpdb->prepare('SELECT label FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id = %d', $order_address['address']['civility']);
-								$civility = $wpdb->get_var( $query );
+							if (!empty($order_address['address']['civility'])) {
+								$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id = %d', $order_address['address']['civility']);
+								$civility = $wpdb->get_var($query);
 							}
 
 							// Address informations
-							$customer_last_name = (!empty($order_address['address']['address_last_name']) ) ? $order_address['address']['address_last_name'] : '';
-							$customer_firtsname = (!empty($order_address['address']['address_first_name']) ) ? $order_address['address']['address_first_name'] : '';
-							$customer_company = (!empty($order_address['address']['company']) ) ? $order_address['address']['company'] : '';
-							$customer_address = (!empty($order_address['address']['address']) ) ? $order_address['address']['address'] : '';
-							$customer_zip_code = (!empty($order_address['address']['postcode']) ) ? $order_address['address']['postcode'] : '';
-							$customer_city = (!empty($order_address['address']['city']) ) ? $order_address['address']['city'] : '';
-							$customer_state = (!empty($order_address['address']['state']) ) ? $order_address['address']['state'] : '';
-							$customer_phone = (!empty($order_address['address']['phone']) ) ? ' Tel. : '.$order_address['address']['phone'] : '';
+							$customer_last_name = (!empty($order_address['address']['address_last_name'])) ? $order_address['address']['address_last_name'] : '';
+							$customer_firtsname = (!empty($order_address['address']['address_first_name'])) ? $order_address['address']['address_first_name'] : '';
+							$customer_company = (!empty($order_address['address']['company'])) ? $order_address['address']['company'] : '';
+							$customer_address = (!empty($order_address['address']['address'])) ? $order_address['address']['address'] : '';
+							$customer_zip_code = (!empty($order_address['address']['postcode'])) ? $order_address['address']['postcode'] : '';
+							$customer_city = (!empty($order_address['address']['city'])) ? $order_address['address']['city'] : '';
+							$customer_state = (!empty($order_address['address']['state'])) ? $order_address['address']['state'] : '';
+							$customer_phone = (!empty($order_address['address']['phone'])) ? ' Tel. : ' . $order_address['address']['phone'] : '';
 							$country = '';
-							foreach ( unserialize(WPSHOP_COUNTRY_LIST) as $key => $value ) {
-								if ( !empty($order_address['address']['country']) && $key ==  $order_address['address']['country']) {
+							foreach (unserialize(WPSHOP_COUNTRY_LIST) as $key => $value) {
+								if (!empty($order_address['address']['country']) && $key == $order_address['address']['country']) {
 									$country = $value;
 								}
 							}
 							$customer_country = $country;
 
 							ob_start();
-							require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, "backend/mails", "order_addresses_template_for_mail") );
+							require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, "backend/mails", "order_addresses_template_for_mail"));
 							$message .= ob_get_contents();
 							ob_end_clean();
 						}
@@ -530,21 +530,21 @@ 
 	 * @param integer $order_id : Order ID
 	 * @return string
 	 */
-	function order_customer_comment_template_for_mail ( $order_id ) {
+	function order_customer_comment_template_for_mail($order_id) {
 		global $wpdb;
 		$message = '';
-		if ( !empty($order_id) ) {
-			$query = $wpdb->prepare('SELECT post_excerpt FROM ' .$wpdb->posts. ' WHERE ID = %d', $order_id);
-			$comment = $wpdb->get_var( $query );
+		if (!empty($order_id)) {
+			$query = $wpdb->prepare('SELECT post_excerpt FROM ' . $wpdb->posts . ' WHERE ID = %d', $order_id);
+			$comment = $wpdb->get_var($query);
 			$order_infos = get_post_meta($order_id, '_order_postmeta', true);
-			if ( !empty($order_infos['order_key']) ) {
-				$comment_title =  __('Comments about the order', 'wpshop');
+			if (!empty($order_infos['order_key'])) {
+				$comment_title = __('Comments about the order', 'wpshop');
 			}
 			else {
-				$comment_title =  __('Comments about the quotation', 'wpshop');
+				$comment_title = __('Comments about the quotation', 'wpshop');
 			}
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, "backend/mails", "order_email_customer_comments") );
+			require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, "backend/mails", "order_email_customer_comments"));
 			$message .= ob_get_contents();
 			ob_end_clean();
 		}
@@ -559,15 +559,15 @@ 
 		global $wpdb;
 		$user_id = get_current_user_id();
 		$message = '';
-		$customer_entity = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-		if( !empty($customer_entity) ) {
+		$customer_entity = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+		if (!empty($customer_entity)) {
 
-			$query = $wpdb->prepare( 'SELECT * FROM '.WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE entity_id = %d AND status = %s', $customer_entity, 'valid' );
-			$attributes_sets = $wpdb->get_results( $query );
+			$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d AND status = %s', $customer_entity, 'valid');
+			$attributes_sets = $wpdb->get_results($query);
 
-			if( !empty($attributes_sets) ) {
+			if (!empty($attributes_sets)) {
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_MESSAGE_DIR, $this->template_dir, "backend/mails", "order_personnal_informations_template_for_mail") );
+				require(wpshop_tools::get_template_part(WPS_MESSAGE_DIR, $this->template_dir, "backend/mails", "order_personnal_informations_template_for_mail"));
 				$message .= ob_get_contents();
 				ob_end_clean();
 			}
@@ -578,15 +578,15 @@ 
 	/**
 	 * Support historic messages
 	 */
-	function wpshop_messages_historic_correction () {
+	function wpshop_messages_historic_correction() {
 		global $wpdb;
-		$query = $wpdb->prepare('SELECT * FROM ' .$wpdb->postmeta. ' WHERE meta_key LIKE %s', '_wpshop_messages_histo_%');
-		$messages_histo = $wpdb->get_results( $query );
+		$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->postmeta . ' WHERE meta_key LIKE %s', '_wpshop_messages_histo_%');
+		$messages_histo = $wpdb->get_results($query);
 
-		foreach ( $messages_histo as $message ) {
-			$query_user = $wpdb->prepare( 'SELECT ID FROM ' .$wpdb->posts. ' WHERE post_author = %d AND post_type = %s',  $message->post_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
-			$user_post_id = $wpdb->get_var( $query_user );
-			$wpdb->update($wpdb->postmeta, array('post_id' => $user_post_id ), array('meta_id' => $message->meta_id ) );
+		foreach ($messages_histo as $message) {
+			$query_user = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_author = %d AND post_type = %s', $message->post_id, WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+			$user_post_id = $wpdb->get_var($query_user);
+			$wpdb->update($wpdb->postmeta, array('post_id' => $user_post_id), array('meta_id' => $message->meta_id));
 		}
 	}
 
@@ -595,9 +595,9 @@ 
 	 * Récupères le contenu du message
 	 */
 	public function get_content_message() {
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'get_content_message' ) )
+		if (!wp_verify_nonce($_wpnonce, 'get_content_message'))
 			wp_die();
 
 		global $wpdb;
@@ -607,7 +607,7 @@ 
 		$result = unserialize($result[0]->meta_value);
 		$result = $result[0]['mess_message'];
 
-		wp_die( $result );
+		wp_die($result);
 	}
 
 }

Braces +14 added lines, -13 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_message_ctr {
 	/** Define the main directory containing the template for the current plugin
 	 * @var string
@@ -175,8 +177,7 @@ 
 			$id = wp_insert_post( $new_message );
 
 			update_option( $code, $id );
-		}
-		else {
+		} else {
 			$id = $message_option;
 		}
 
@@ -195,10 +196,11 @@ 
 				echo wp_trim_words($post->post_content, 55);
 			break;
 			case "last_dispatch_date":
-				if(!empty($metadata['wpshop_message_last_dispatch_date'][0]))
-					echo mysql2date('d F Y, H:i:s',$metadata['wpshop_message_last_dispatch_date'][0], true);
-				else
-					echo '-';
+				if(!empty($metadata['wpshop_message_last_dispatch_date'][0])) {
+									echo mysql2date('d F Y, H:i:s',$metadata['wpshop_message_last_dispatch_date'][0], true);
+				} else {
+									echo '-';
+				}
 			break;
 		}
 	}
@@ -427,8 +429,7 @@ 
 
 			if ( !empty($duplicate_message) ) {
 				$this->add_message( $user_post_id, $email, $title, $duplicate_message, $model_id, $object );
-			}
-			else {
+			} else {
 				$this->add_message( $user_post_id, $email, $title, $message, $model_id, $object );
 			}
 
@@ -539,8 +540,7 @@ 
 			$order_infos = get_post_meta($order_id, '_order_postmeta', true);
 			if ( !empty($order_infos['order_key']) ) {
 				$comment_title =  __('Comments about the order', 'wpshop');
-			}
-			else {
+			} else {
 				$comment_title =  __('Comments about the quotation', 'wpshop');
 			}
 			ob_start();
@@ -597,8 +597,9 @@ 
 	public function get_content_message() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'get_content_message' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'get_content_message' ) ) {
+					wp_die();
+		}
 
 		global $wpdb;
 		$meta_id = (int)$_GET['meta_id'];

includes/modules/wps_orders/controller/wps_orders_ctr.php

Doc Comments +4 added lines, -1 removed lines

@@ -129,7 +129,7 @@ 
 		/**
 		 *	Build an array with the different items to add to an order
 		 *
-		 *	@param array $products The item list to add to the order
+		 *	@param array $product The item list to add to the order
 		 *
 		 *	@return array $item_list The item to add to order
 		 */
@@ -321,6 +321,9 @@ 
 			wp_die();
 		}
 
+		/**
+		 * @param integer $order_id
+		 */
 		function pay_quotation( $order_id ) {
 			$status = true;
 			$order_meta = get_post_meta( $order_id, '_order_postmeta', true );

Spacing +123 added lines, -123 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_orders_ctr {
 	/** Define the main directory containing the template for the current plugin
 	 * @var string
@@ -17,12 +17,12 @@ 
 			/** Template Load **/
 // 			add_filter( 'wpshop_custom_template', array( &$this, 'custom_template_load' ) );
 
-			add_shortcode( 'order_customer_informations', array( &$this, 'display_order_customer_informations' ) );
-			add_shortcode( 'wps_orders_in_customer_account', array($this, 'display_orders_in_account') );
+			add_shortcode('order_customer_informations', array(&$this, 'display_order_customer_informations'));
+			add_shortcode('wps_orders_in_customer_account', array($this, 'display_orders_in_account'));
 
-			add_action( 'wp_enqueue_scripts', array( $this, 'wps_orders_scripts') );
+			add_action('wp_enqueue_scripts', array($this, 'wps_orders_scripts'));
 			/**	Include the different javascript	*/
-			add_action( 'admin_init', array(&$this, 'admin_js') );
+			add_action('admin_init', array(&$this, 'admin_js'));
 
 
 			/** Ajax Actions **/
@@ -32,17 +32,17 @@ 
 // 			add_action( 'wap_ajax_wps_orders_load_variations_container', array( &$this, 'wps_orders_load_variations_container') );
 // 			add_action( 'wap_ajax_wps_order_refresh_in_admin', array( &$this, 'wps_order_refresh_in_admin') );
 
-			add_action( 'wp_ajax_wps_orders_load_details', array( $this, 'wps_orders_load_details') );
+			add_action('wp_ajax_wps_orders_load_details', array($this, 'wps_orders_load_details'));
 
 			// Add a product sale historic in administration product panel
-			add_action( 'wp_ajax_wps_order_choose_customer', array( $this, 'wps_order_choose_customer' ) );
+			add_action('wp_ajax_wps_order_choose_customer', array($this, 'wps_order_choose_customer'));
 
 			/** For delete order */
-			add_action( 'wp_ajax_wps_delete_order', array( $this, 'wps_delete_order' ) );
+			add_action('wp_ajax_wps_delete_order', array($this, 'wps_delete_order'));
 
 			/** For pay billing */
-			add_action( 'wp_ajax_wps_checkout_quotation', array( $this, 'wps_checkout_quotation' ) );
-			add_action( 'wp_ajax_nopriv_wps_checkout_quotation', array( $this, 'wps_checkout_quotation_no_login' ) );
+			add_action('wp_ajax_wps_checkout_quotation', array($this, 'wps_checkout_quotation'));
+			add_action('wp_ajax_nopriv_wps_checkout_quotation', array($this, 'wps_checkout_quotation_no_login'));
 
 		}
 
@@ -58,24 +58,24 @@ 
 		 * Add scripts
 		 */
 		function wps_orders_scripts() {
-			wp_enqueue_script( 'wps_orders_fronend', WPS_ORDERS_URL.WPS_ORDERS_DIR.'/assets/frontend/js/wps_orders.js' );
+			wp_enqueue_script('wps_orders_fronend', WPS_ORDERS_URL . WPS_ORDERS_DIR . '/assets/frontend/js/wps_orders.js');
 		}
 
 		function display_order_customer_informations() {
 			global $post_id; global $wpdb;
 			$output = '';
-			if ( !empty($post_id) ) {
-				$order_postmeta = get_post_meta( $post_id, '_order_postmeta', true );
-				$order_info = get_post_meta( $post_id, '_order_info', true );
+			if (!empty($post_id)) {
+				$order_postmeta = get_post_meta($post_id, '_order_postmeta', true);
+				$order_info = get_post_meta($post_id, '_order_info', true);
 
 				/** Check the order status **/
-				if ( !empty($order_postmeta) ) {
-					if ( !empty($order_postmeta['order_status'])  && $order_postmeta['order_status'] != 'awaiting_payment' ) {
-						$output = wps_address::display_an_address( $order_info['billing']['address'] );
-						$output .= wps_address::display_an_address( $order_info['shipping']['address'] );
+				if (!empty($order_postmeta)) {
+					if (!empty($order_postmeta['order_status']) && $order_postmeta['order_status'] != 'awaiting_payment') {
+						$output = wps_address::display_an_address($order_info['billing']['address']);
+						$output .= wps_address::display_an_address($order_info['shipping']['address']);
 					}
 					else {
-						$output = wps_address::display_an_address( $order_info['billing']['address'] );
+						$output = wps_address::display_an_address($order_info['billing']['address']);
 					}
 				}
 			}
@@ -99,7 +99,7 @@ 
 							'blog_id'                 => $GLOBALS['blog_id'],
 							'who'                     => null // string
 						);
-				$tpl_component['CUSTOMERS_LIST'] = wp_dropdown_users( $args );
+				$tpl_component['CUSTOMERS_LIST'] = wp_dropdown_users($args);
 				$output = wpshop_display::display_template_element('wps_orders_choose_customer_interface', $tpl_component, array(), 'admin');
 			}
 			return $output;
@@ -110,16 +110,16 @@ 
 		 * @param integer $customer_id
 		 * @return string
 		 */
-		function display_orders_in_account( $customer_id = '' ) {
+		function display_orders_in_account($customer_id = '') {
 			$output = '';
-			$customer_id = ( !empty($customer_id) ) ? $customer_id : get_current_user_id();
-			$from_admin = ( !empty($customer_id) ) ? true : false;
+			$customer_id = (!empty($customer_id)) ? $customer_id : get_current_user_id();
+			$from_admin = (!empty($customer_id)) ? true : false;
 			$wps_orders_mdl = new wps_orders_mdl();
-			$orders = $wps_orders_mdl->get_customer_orders( $customer_id );
+			$orders = $wps_orders_mdl->get_customer_orders($customer_id);
 
 			// Display orders
 			ob_start();
-			require_once( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, "frontend", "orders_list_in_account") );
+			require_once(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, "frontend", "orders_list_in_account"));
 			$output = ob_get_contents();
 			ob_end_clean();
 
@@ -133,26 +133,26 @@ 
 		 *
 		 *	@return array $item_list The item to add to order
 		 */
-		function add_product_to_order( $product ) {
+		function add_product_to_order($product) {
 			global $wpdb;
 
-			if( !empty($product) && empty($product['price_ttc_before_discount']) && empty($product['price_ht_before_discount']) ) {
-				$price_infos = wpshop_prices::check_product_price( $product, true );
-				$product['price_ht'] = ( !empty($price_infos['discount']) &&  !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ?  $price_infos['discount']['discount_et_price'] : $price_infos['et'];
-				$product['product_price'] = ( !empty($price_infos['discount']) &&  !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_ati_price'] : $price_infos['ati'];
-				$product['tva'] = ( !empty($price_infos['discount']) &&  !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_tva'] : $price_infos['tva'];
+			if (!empty($product) && empty($product['price_ttc_before_discount']) && empty($product['price_ht_before_discount'])) {
+				$price_infos = wpshop_prices::check_product_price($product, true);
+				$product['price_ht'] = (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_et_price'] : $price_infos['et'];
+				$product['product_price'] = (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_ati_price'] : $price_infos['ati'];
+				$product['tva'] = (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist']) && $price_infos['discount']['discount_exist']) ? $price_infos['discount']['discount_tva'] : $price_infos['tva'];
 			}
 
-			$price_piloting = get_option( 'wpshop_shop_price_piloting' );
+			$price_piloting = get_option('wpshop_shop_price_piloting');
 
-			if ( !empty($price_piloting) && $price_piloting == 'HT') {
+			if (!empty($price_piloting) && $price_piloting == 'HT') {
 				$total_ht = $product['price_ht'] * $product['product_qty'];
-				$tva_total_amount = $total_ht * ( $product['tx_tva'] / 100 );
+				$tva_total_amount = $total_ht * ($product['tx_tva'] / 100);
 				$total_ttc = $total_ht + $tva_total_amount;
 			}
 			else {
 				$total_ttc = $product['product_price'] * $product['product_qty'];
-				$total_ht  = $total_ttc / ( 1 + ( $product['tx_tva'] / 100 ) );
+				$total_ht  = $total_ttc / (1 + ($product['tx_tva'] / 100));
 				$tva_total_amount = $total_ttc - $total_ht;
 			}
 
@@ -160,21 +160,21 @@ 
 
 			$item_discount_type = $item_discount_value = $item_discount_amount = 0;
 
-			$d_amount = !empty( $product ) && !empty( $product[ 'discount_amount' ] ) ? wpshop_tools::formate_number( $product['discount_amount'] ) : null;
-			$d_rate = !empty( $product ) && !empty( $product[ 'discount_rate' ] ) ? wpshop_tools::formate_number( $product['discount_rate'] ) : null;
-			$d_special = !empty( $product ) && !empty( $product[ 'special_price' ] ) ? wpshop_tools::formate_number( $product['special_price'] ) : null;
+			$d_amount = !empty($product) && !empty($product['discount_amount']) ? wpshop_tools::formate_number($product['discount_amount']) : null;
+			$d_rate = !empty($product) && !empty($product['discount_rate']) ? wpshop_tools::formate_number($product['discount_rate']) : null;
+			$d_special = !empty($product) && !empty($product['special_price']) ? wpshop_tools::formate_number($product['special_price']) : null;
 
-			if( !empty($d_amount) ) {
+			if (!empty($d_amount)) {
 				$item_discount_type = 'discount_amount';
 				$item_discount_amount = $product['discount_amount'];
 				$item_discount_value = $product['discount_amount'];
 			}
-			elseif(!empty($d_rate)) {
+			elseif (!empty($d_rate)) {
 				$item_discount_type = 'discount_rate';
 				$item_discount_amount = $product['discount_rate'];
 				$item_discount_value = $product['discount_rate'];
 			}
-			elseif(!empty($d_special)) {
+			elseif (!empty($d_special)) {
 				$item_discount_type = 'special_price';
 				$item_discount_amount = $product['special_price'];
 				$item_discount_value = $product['special_price'];
@@ -201,31 +201,31 @@ 
 					'item_meta' => !empty($product['item_meta']) ? $product['item_meta'] : array()
 			);
 
-			$array_not_to_do = array(WPSHOP_PRODUCT_PRICE_HT,WPSHOP_PRODUCT_PRICE_TTC,WPSHOP_PRODUCT_PRICE_TAX_AMOUNT,'product_qty',WPSHOP_PRODUCT_PRICE_TAX,'product_id','product_reference','product_name','variations');
+			$array_not_to_do = array(WPSHOP_PRODUCT_PRICE_HT, WPSHOP_PRODUCT_PRICE_TTC, WPSHOP_PRODUCT_PRICE_TAX_AMOUNT, 'product_qty', WPSHOP_PRODUCT_PRICE_TAX, 'product_id', 'product_reference', 'product_name', 'variations');
 
-			if(!empty($product['item_meta'])) {
-				foreach($product['item_meta'] as $key=>$value) {
-					if( !isset($item['item_'.$key]) && !in_array($key, $array_not_to_do) && !empty($product[$key]) ) {
-						$item['item_'.$key] = $product[$key];
+			if (!empty($product['item_meta'])) {
+				foreach ($product['item_meta'] as $key=>$value) {
+					if (!isset($item['item_' . $key]) && !in_array($key, $array_not_to_do) && !empty($product[$key])) {
+						$item['item_' . $key] = $product[$key];
 					}
 				}
 			}
 
 			/** Check if it's a variation product **/
-			if ( !empty($product) && !empty( $product['item_meta']) && !empty($product['item_meta']['variations']) ) {
-				foreach( $product['item_meta']['variations'] as $k => $variation ) {
-					$product_variation_def = get_post_meta( $k, '_wpshop_variations_attribute_def', true);
-					if ( !empty($product_variation_def) ) {
-						foreach( $product_variation_def as $attribute_code => $variation_id ) {
-							$variation_attribute_def = wpshop_attributes::getElement( $attribute_code, '"valid"', 'code' );
-							if ( !empty($variation_attribute_def) ) {
+			if (!empty($product) && !empty($product['item_meta']) && !empty($product['item_meta']['variations'])) {
+				foreach ($product['item_meta']['variations'] as $k => $variation) {
+					$product_variation_def = get_post_meta($k, '_wpshop_variations_attribute_def', true);
+					if (!empty($product_variation_def)) {
+						foreach ($product_variation_def as $attribute_code => $variation_id) {
+							$variation_attribute_def = wpshop_attributes::getElement($attribute_code, '"valid"', 'code');
+							if (!empty($variation_attribute_def)) {
 								$item['item_meta']['variation_definition'][$attribute_code]['NAME'] = $variation_attribute_def->frontend_label;
-								if ( $variation_attribute_def->data_type_to_use == 'custom' ) {
-									$query = $wpdb->prepare( 'SELECT label FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id=%d', $variation_id);
-									$variation_name = $wpdb->get_var( $query );
+								if ($variation_attribute_def->data_type_to_use == 'custom') {
+									$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id=%d', $variation_id);
+									$variation_name = $wpdb->get_var($query);
 								}
 								else {
-									$variation_post = get_post( $variation_id );
+									$variation_post = get_post($variation_id);
 									$variation_name = $variation_post->post_title;
 								}
 								$item['item_meta']['variation_definition'][$attribute_code]['UNSTYLED_VALUE'] = $variation_name;
@@ -237,19 +237,19 @@ 
 			}
 			else {
 				/** Check if it's product with one variation **/
-				$product_variation_def = get_post_meta( $product['product_id'], '_wpshop_variations_attribute_def', true);
+				$product_variation_def = get_post_meta($product['product_id'], '_wpshop_variations_attribute_def', true);
 
-				if ( !empty($product_variation_def) ) {
-					foreach( $product_variation_def as $attribute_code => $variation_id ) {
-						$variation_attribute_def = wpshop_attributes::getElement( $attribute_code, '"valid"', 'code' );
-						if ( !empty($variation_attribute_def) ) {
+				if (!empty($product_variation_def)) {
+					foreach ($product_variation_def as $attribute_code => $variation_id) {
+						$variation_attribute_def = wpshop_attributes::getElement($attribute_code, '"valid"', 'code');
+						if (!empty($variation_attribute_def)) {
 							$item['item_meta']['variation_definition'][$attribute_code]['NAME'] = $variation_attribute_def->frontend_label;
-							if ( $variation_attribute_def->data_type_to_use == 'custom' ) {
-								$query = $wpdb->prepare( 'SELECT label FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id=%d', $variation_id);
-								$variation_name = $wpdb->get_var( $query );
+							if ($variation_attribute_def->data_type_to_use == 'custom') {
+								$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE id=%d', $variation_id);
+								$variation_name = $wpdb->get_var($query);
 							}
 							else {
-								$variation_post = get_post( $variation_id );
+								$variation_post = get_post($variation_id);
 								$variation_name = $variation_post->post_title;
 							}
 							$item['item_meta']['variation_definition'][$attribute_code]['UNSTYLED_VALUE'] = $variation_name;
@@ -260,7 +260,7 @@ 
 			}
 
 			/**	On ajoute la possibilité d'étendre les données produits ajoutées dans le panier / Add possibility to extends product data saved into cart	*/
-			$item = apply_filters( 'wpshop-add-product-to-order', $item, $product );
+			$item = apply_filters('wpshop-add-product-to-order', $item, $product);
 
 			return $item;
 		}
@@ -270,24 +270,24 @@ 
 		 * AJAX - Load order details in customer account
 		 */
 		function wps_orders_load_details() {
-			$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+			$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_orders_load_details' ) )
+			if (!wp_verify_nonce($_wpnonce, 'wps_orders_load_details'))
 				wp_die();
 
-			$order_id = ( !empty($_POST['order_id']) ) ? wpshop_tools::varSanitizer( $_POST['order_id'] ) : '';
+			$order_id = (!empty($_POST['order_id'])) ? wpshop_tools::varSanitizer($_POST['order_id']) : '';
 			$user_id = get_current_user_id();
 			$status = false; $result = '';
-			if( !empty($order_id) ) {
-				$order = get_post( $order_id );
-				$order_infos = get_post_meta( $order_id, '_order_postmeta', true );
-				$order_key = ( !empty($order_infos['order_key']) ) ? $order_infos['order_key'] : '-';
-				if( !empty($order) && !empty($user_id) && $order->post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER && $order->post_author == $user_id ) {
-					$result = do_shortcode( '[wps_cart cart_type="summary" oid="' .$order_id. '"]' );
+			if (!empty($order_id)) {
+				$order = get_post($order_id);
+				$order_infos = get_post_meta($order_id, '_order_postmeta', true);
+				$order_key = (!empty($order_infos['order_key'])) ? $order_infos['order_key'] : '-';
+				if (!empty($order) && !empty($user_id) && $order->post_type == WPSHOP_NEWTYPE_IDENTIFIER_ORDER && $order->post_author == $user_id) {
+					$result = do_shortcode('[wps_cart cart_type="summary" oid="' . $order_id . '"]');
 					$status = true;
 				}
 			}
-			echo json_encode( array( 'status' => $status, 'title' => sprintf( __( 'Order n° %s details', 'wpshop' ), $order_key ), 'content' => $result ) );
+			echo json_encode(array('status' => $status, 'title' => sprintf(__('Order n° %s details', 'wpshop'), $order_key), 'content' => $result));
 			wp_die();
 		}
 
@@ -295,83 +295,83 @@ 
 		 * AJAX - Choose customer to create order
 		 */
 		function wps_order_choose_customer() {
-			$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+			$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_order_choose_customer' ) )
+			if (!wp_verify_nonce($_wpnonce, 'wps_order_choose_customer'))
 				wp_die();
 
 			$status = false; $billing_data = $shipping_data = '';
-			$customer_id = ( !empty($_POST['customer_id']) ) ? intval( $_POST['customer_id'] ): null;
-			if( !empty($customer_id) ) {
+			$customer_id = (!empty($_POST['customer_id'])) ? intval($_POST['customer_id']) : null;
+			if (!empty($customer_id)) {
 				$wps_address = new wps_address();
-				$billing_option = get_option( 'wpshop_billing_address' );
-				$shipping_option = get_option( 'wpshop_shipping_address_choice' );
+				$billing_option = get_option('wpshop_billing_address');
+				$shipping_option = get_option('wpshop_shipping_address_choice');
 				$billing_option = $billing_option['choice'];
-				$customer_addresses_list = wps_address::get_addresses_list( $customer_id );
+				$customer_addresses_list = wps_address::get_addresses_list($customer_id);
 				$status = true;
-				$billing_data = '<div class="wps-alert-info">' .sprintf( __( 'No Billing address created, <a href="%s" title="' .__( 'Create a new billing address', 'wpshop' ). '" class="thickbox">create one</a>', 'wpshop' ),admin_url( 'admin-ajax.php' ). '?action=wps-add-an-address-in-admin&address_type='.$billing_option.'&customer_id='.$customer_id.'&height=600' ). '</div>';
+				$billing_data = '<div class="wps-alert-info">' . sprintf(__('No Billing address created, <a href="%s" title="' . __('Create a new billing address', 'wpshop') . '" class="thickbox">create one</a>', 'wpshop'), admin_url('admin-ajax.php') . '?action=wps-add-an-address-in-admin&address_type=' . $billing_option . '&customer_id=' . $customer_id . '&height=600') . '</div>';
 
-				if( !empty($shipping_option) && !empty($shipping_option['activate']) ) {
+				if (!empty($shipping_option) && !empty($shipping_option['activate'])) {
 					$shipping_option = $shipping_option['choice'];
-					$shipping_data = '<div class="wps-alert-info">' .sprintf( __( 'No shipping address created, <a href="%s" title="' .__( 'Create a new shipping address', 'wpshop' ). '" class="thickbox">create one</a>', 'wpshop' ),admin_url( 'admin-ajax.php' ). '?action=wps-add-an-address-in-admin&address_type='.$shipping_option.'&customer_id='.$customer_id.'&height=600' ). '</div>';
+					$shipping_data = '<div class="wps-alert-info">' . sprintf(__('No shipping address created, <a href="%s" title="' . __('Create a new shipping address', 'wpshop') . '" class="thickbox">create one</a>', 'wpshop'), admin_url('admin-ajax.php') . '?action=wps-add-an-address-in-admin&address_type=' . $shipping_option . '&customer_id=' . $customer_id . '&height=600') . '</div>';
 				}
 
-				if( !empty($customer_addresses_list) ) {
-					foreach( $customer_addresses_list as $address_type => $customer_addresses ) {
-						if( $billing_option == $address_type ) {
-							$billing_data = $wps_address->display_address_in_administration( $customer_addresses, $address_type );
+				if (!empty($customer_addresses_list)) {
+					foreach ($customer_addresses_list as $address_type => $customer_addresses) {
+						if ($billing_option == $address_type) {
+							$billing_data = $wps_address->display_address_in_administration($customer_addresses, $address_type);
 						}
 						else {
-							$shipping_data = $wps_address->display_address_in_administration( $customer_addresses, $address_type );
+							$shipping_data = $wps_address->display_address_in_administration($customer_addresses, $address_type);
 						}
 					}
 				}
 			}
-			echo json_encode( array( 'status' => $status, 'billing_data' => $billing_data, 'shipping_data' => $shipping_data) );
+			echo json_encode(array('status' => $status, 'billing_data' => $billing_data, 'shipping_data' => $shipping_data));
 			wp_die();
 		}
 
-		function pay_quotation( $order_id ) {
+		function pay_quotation($order_id) {
 			$status = true;
-			$order_meta = get_post_meta( $order_id, '_order_postmeta', true );
-			$order_info = get_post_meta( $order_id, '_order_info', true );
+			$order_meta = get_post_meta($order_id, '_order_postmeta', true);
+			$order_info = get_post_meta($order_id, '_order_info', true);
 			$_SESSION['shipping_method'] = $order_meta['order_payment']['shipping_method'];
-			isset( $order_info['billing']['address_id'] ) ? $_SESSION['billing_address'] = $order_info['billing']['address_id'] : $status = false;
-			isset( $order_info['shipping']['address_id'] ) ? $_SESSION['shipping_address'] = $order_info['shipping']['address_id'] : false;
+			isset($order_info['billing']['address_id']) ? $_SESSION['billing_address'] = $order_info['billing']['address_id'] : $status = false;
+			isset($order_info['shipping']['address_id']) ? $_SESSION['shipping_address'] = $order_info['shipping']['address_id'] : false;
 			$_SESSION['cart'] = array();
-			$_SESSION['cart']['order_id'] = wpshop_tools::varSanitizer( $order_id );
+			$_SESSION['cart']['order_id'] = wpshop_tools::varSanitizer($order_id);
 			$_SESSION['cart']['cart_type'] = 'normal';
 			$_SESSION['cart']['order_amount_to_pay_now'] = $order_meta['order_amount_to_pay_now'];
 			$_SESSION['cart']['order_items'] = $order_meta['order_items'];
-			return array( 'status' => $status, 'permalink' => get_permalink( get_option('wpshop_cart_page_id') ) . '?order_step=5' );
+			return array('status' => $status, 'permalink' => get_permalink(get_option('wpshop_cart_page_id')) . '?order_step=5');
 		}
 		/**
 		 * AJAX - Delete order by order_id
 		 */
 		public function wps_delete_order() {
-			$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+			$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_delete_order' ) )
+			if (!wp_verify_nonce($_wpnonce, 'wps_delete_order'))
 				wp_die();
 
 			$status = false;
 			$output = '';
-			$order_id = !empty( $_POST['order_id'] ) ? (int) $_POST['order_id'] : 0;
-			if( $order_id ) {
-				$order_meta = get_post_meta( $order_id, '_order_postmeta', true );
+			$order_id = !empty($_POST['order_id']) ? (int)$_POST['order_id'] : 0;
+			if ($order_id) {
+				$order_meta = get_post_meta($order_id, '_order_postmeta', true);
 				$wps_credit = new wps_credit();
-				$wps_credit->create_an_credit( $order_id );
+				$wps_credit->create_an_credit($order_id);
 				$order_meta['order_status'] = 'canceled';
-				$order_meta['order_payment']['refunded_action']['refunded_date'] = current_time('mysql', 0 );
+				$order_meta['order_payment']['refunded_action']['refunded_date'] = current_time('mysql', 0);
 				$order_meta['order_payment']['refunded_action']['author'] = get_current_user_id();
-				update_post_meta( $order_id, '_order_postmeta', $order_meta );
+				update_post_meta($order_id, '_order_postmeta', $order_meta);
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_ORDERS_DIR, $this->template_dir, "frontend", "order_row_in_account") );
+				require(wpshop_tools::get_template_part(WPS_ORDERS_DIR, $this->template_dir, "frontend", "order_row_in_account"));
 				$output = ob_get_contents();
 				ob_end_clean();
 				$status = true;
 			}
-			echo json_encode( array( 'status' => $status, 'row' => $output ) );
+			echo json_encode(array('status' => $status, 'row' => $output));
 			wp_die();
 		}
 
@@ -379,37 +379,37 @@ 
 		 * AJAX - Pay billing
 		 */
 		public function wps_checkout_quotation() {
-			$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+			$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_checkout_quotation' ) )
+			if (!wp_verify_nonce($_wpnonce, 'wps_checkout_quotation'))
 				wp_die();
 
 			$status = true;
-			$order_id = !empty( $_REQUEST['order_id'] ) ? (int) $_REQUEST['order_id'] : 0;
+			$order_id = !empty($_REQUEST['order_id']) ? (int)$_REQUEST['order_id'] : 0;
 
-			if( !empty( $order_id ) ) {
-				$pay_quotation = self::pay_quotation( $order_id );
+			if (!empty($order_id)) {
+				$pay_quotation = self::pay_quotation($order_id);
 				$status = $pay_quotation['status'];
 			}
 
-			$is_link = !empty( $_REQUEST['is_link'] ) ? sanitize_text_field( $_REQUEST['is_link'] ) : '';
+			$is_link = !empty($_REQUEST['is_link']) ? sanitize_text_field($_REQUEST['is_link']) : '';
 
-			if( !empty( $is_link ) ) {
-				wp_redirect( $pay_quotation['permalink'] );
+			if (!empty($is_link)) {
+				wp_redirect($pay_quotation['permalink']);
 				exit();
 			} else {
-				echo json_encode( array( 'status' => $status, '301' => $pay_quotation['permalink'] ) );
+				echo json_encode(array('status' => $status, '301' => $pay_quotation['permalink']));
 				wp_die();
 			}
 		}
 		public function wps_checkout_quotation_no_login() {
-			$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+			$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_checkout_quotation' ) )
+			if (!wp_verify_nonce($_wpnonce, 'wps_checkout_quotation'))
 				wp_die();
 
-			$order_id = !empty( $_REQUEST['order_id'] ) ? (int) $_REQUEST['order_id'] : 0;
-			wp_redirect( home_url('/wp-login.php') . '?redirect_to=' . urlencode( admin_url() . 'admin-ajax.php?action=wps_checkout_quotation&order_id=' . $order_id . '&is_link=link' ) );
+			$order_id = !empty($_REQUEST['order_id']) ? (int)$_REQUEST['order_id'] : 0;
+			wp_redirect(home_url('/wp-login.php') . '?redirect_to=' . urlencode(admin_url() . 'admin-ajax.php?action=wps_checkout_quotation&order_id=' . $order_id . '&is_link=link'));
 			exit();
 		}
 }

Braces +27 added lines, -29 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_orders_ctr {
 	/** Define the main directory containing the template for the current plugin
 	 * @var string
@@ -73,13 +75,11 @@ 
 					if ( !empty($order_postmeta['order_status'])  && $order_postmeta['order_status'] != 'awaiting_payment' ) {
 						$output = wps_address::display_an_address( $order_info['billing']['address'] );
 						$output .= wps_address::display_an_address( $order_info['shipping']['address'] );
-					}
-					else {
+					} else {
 						$output = wps_address::display_an_address( $order_info['billing']['address'] );
 					}
 				}
-			}
-			else {
+			} else {
 				/** Display  "Choose customer or create one" Interface **/
 				$tpl_component = array();
 				$args = array(
@@ -149,8 +149,7 @@ 
 				$total_ht = $product['price_ht'] * $product['product_qty'];
 				$tva_total_amount = $total_ht * ( $product['tx_tva'] / 100 );
 				$total_ttc = $total_ht + $tva_total_amount;
-			}
-			else {
+			} else {
 				$total_ttc = $product['product_price'] * $product['product_qty'];
 				$total_ht  = $total_ttc / ( 1 + ( $product['tx_tva'] / 100 ) );
 				$tva_total_amount = $total_ttc - $total_ht;
@@ -168,13 +167,11 @@ 
 				$item_discount_type = 'discount_amount';
 				$item_discount_amount = $product['discount_amount'];
 				$item_discount_value = $product['discount_amount'];
-			}
-			elseif(!empty($d_rate)) {
+			} elseif(!empty($d_rate)) {
 				$item_discount_type = 'discount_rate';
 				$item_discount_amount = $product['discount_rate'];
 				$item_discount_value = $product['discount_rate'];
-			}
-			elseif(!empty($d_special)) {
+			} elseif(!empty($d_special)) {
 				$item_discount_type = 'special_price';
 				$item_discount_amount = $product['special_price'];
 				$item_discount_value = $product['special_price'];
@@ -223,8 +220,7 @@ 
 								if ( $variation_attribute_def->data_type_to_use == 'custom' ) {
 									$query = $wpdb->prepare( 'SELECT label FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id=%d', $variation_id);
 									$variation_name = $wpdb->get_var( $query );
-								}
-								else {
+								} else {
 									$variation_post = get_post( $variation_id );
 									$variation_name = $variation_post->post_title;
 								}
@@ -234,8 +230,7 @@ 
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				/** Check if it's product with one variation **/
 				$product_variation_def = get_post_meta( $product['product_id'], '_wpshop_variations_attribute_def', true);
 
@@ -247,8 +242,7 @@ 
 							if ( $variation_attribute_def->data_type_to_use == 'custom' ) {
 								$query = $wpdb->prepare( 'SELECT label FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE id=%d', $variation_id);
 								$variation_name = $wpdb->get_var( $query );
-							}
-							else {
+							} else {
 								$variation_post = get_post( $variation_id );
 								$variation_name = $variation_post->post_title;
 							}
@@ -272,8 +266,9 @@ 
 		function wps_orders_load_details() {
 			$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_orders_load_details' ) )
-				wp_die();
+			if ( !wp_verify_nonce( $_wpnonce, 'wps_orders_load_details' ) ) {
+							wp_die();
+			}
 
 			$order_id = ( !empty($_POST['order_id']) ) ? wpshop_tools::varSanitizer( $_POST['order_id'] ) : '';
 			$user_id = get_current_user_id();
@@ -297,8 +292,9 @@ 
 		function wps_order_choose_customer() {
 			$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_order_choose_customer' ) )
-				wp_die();
+			if ( !wp_verify_nonce( $_wpnonce, 'wps_order_choose_customer' ) ) {
+							wp_die();
+			}
 
 			$status = false; $billing_data = $shipping_data = '';
 			$customer_id = ( !empty($_POST['customer_id']) ) ? intval( $_POST['customer_id'] ): null;
@@ -320,8 +316,7 @@ 
 					foreach( $customer_addresses_list as $address_type => $customer_addresses ) {
 						if( $billing_option == $address_type ) {
 							$billing_data = $wps_address->display_address_in_administration( $customer_addresses, $address_type );
-						}
-						else {
+						} else {
 							$shipping_data = $wps_address->display_address_in_administration( $customer_addresses, $address_type );
 						}
 					}
@@ -351,8 +346,9 @@ 
 		public function wps_delete_order() {
 			$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_delete_order' ) )
-				wp_die();
+			if ( !wp_verify_nonce( $_wpnonce, 'wps_delete_order' ) ) {
+							wp_die();
+			}
 
 			$status = false;
 			$output = '';
@@ -381,8 +377,9 @@ 
 		public function wps_checkout_quotation() {
 			$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_checkout_quotation' ) )
-				wp_die();
+			if ( !wp_verify_nonce( $_wpnonce, 'wps_checkout_quotation' ) ) {
+							wp_die();
+			}
 
 			$status = true;
 			$order_id = !empty( $_REQUEST['order_id'] ) ? (int) $_REQUEST['order_id'] : 0;
@@ -405,8 +402,9 @@ 
 		public function wps_checkout_quotation_no_login() {
 			$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-			if ( !wp_verify_nonce( $_wpnonce, 'wps_checkout_quotation' ) )
-				wp_die();
+			if ( !wp_verify_nonce( $_wpnonce, 'wps_checkout_quotation' ) ) {
+							wp_die();
+			}
 
 			$order_id = !empty( $_REQUEST['order_id'] ) ? (int) $_REQUEST['order_id'] : 0;
 			wp_redirect( home_url('/wp-login.php') . '?redirect_to=' . urlencode( admin_url() . 'admin-ajax.php?action=wps_checkout_quotation&order_id=' . $order_id . '&is_link=link' ) );

includes/modules/wps_product/controller/wps_product_ajax_ctr.01.php

Doc Comments -1 removed lines

@@ -30,7 +30,6 @@
 	 * of the number of corrected product and the template of the method : ajax_checking_products_values if inconsistent product
 	 * already present.
 	 *
-	 * @param array $_POST['product_price'] List of the new price for the product like array( $id_product => $new_price )
 	 * @return JSON Response
 	 */
 	public function ajax_save_product_price() {

Spacing +27 added lines, -27 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_product_ajax_ctr_01 {
 	public function __construct() {
-		add_action( 'wp_ajax_checking_products_values', array( &$this, 'ajax_render_inconsistent_product_price' ) );
-		add_action( 'wp_ajax_save_products_prices', array( &$this, 'ajax_save_product_price' ) );
+		add_action('wp_ajax_checking_products_values', array(&$this, 'ajax_render_inconsistent_product_price'));
+		add_action('wp_ajax_save_products_prices', array(&$this, 'ajax_save_product_price'));
 	}
 
 	/**
@@ -12,16 +12,16 @@ 
 	 * list. Then display the template product_check_data
 	 */
 	public function ajax_render_inconsistent_product_price() {
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_render_inconsistent_product_price' ) )
+		if (!wp_verify_nonce($_wpnonce, 'ajax_render_inconsistent_product_price'))
 			wp_die();
 
 		$list_product = wps_product_ctr::get_inconsistent_product();
 
 		$inconsistent_product_number = count($list_product);
 
-		require( wpshop_tools::get_template_part( WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, "backend", "product_check_data") );
+		require(wpshop_tools::get_template_part(WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, "backend", "product_check_data"));
 		wp_die();
 	}
 
@@ -39,39 +39,39 @@ 
 	 * @return JSON Response
 	 */
 	public function ajax_save_product_price() {
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_save_product_price' ) )
+		if (!wp_verify_nonce($_wpnonce, 'ajax_save_product_price'))
 			wp_die();
 
-		header( 'Content-Type: application/json' );
+		header('Content-Type: application/json');
 		$response = array();
 
-		$price_piloting_option = get_option( 'wpshop_shop_price_piloting' );
+		$price_piloting_option = get_option('wpshop_shop_price_piloting');
 
-		$inconsistent_product_number 	= !empty( $_POST['product_price'] ) ? (int) count( $_POST['product_price'] ) : 0;
-		$consistent_product_number 		= 0;
+		$inconsistent_product_number = !empty($_POST['product_price']) ? (int)count($_POST['product_price']) : 0;
+		$consistent_product_number = 0;
 
-		$entity_type_id	= wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-		$language 		= WPSHOP_CURRENT_LOCALE;
-		$icl_language = !empty( $_REQUEST['icl_post_language'] ) ? sanitize_text_field( $_REQUEST['icl_post_language'] ) : '';
+		$entity_type_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+		$language = WPSHOP_CURRENT_LOCALE;
+		$icl_language = !empty($_REQUEST['icl_post_language']) ? sanitize_text_field($_REQUEST['icl_post_language']) : '';
 
-		if ( !empty($icl_language) ) {
-			$query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", $icl_language );
+		if (!empty($icl_language)) {
+			$query = $wpdb->prepare("SELECT locale FROM " . $wpdb->prefix . "icl_locale_map WHERE code = %s", $icl_language);
 			$language = $wpdb->get_var($query);
 		}
 
-		$product_price = !empty( $_POST['product_price'] ) ? (array) $_POST['product_price'] : array();
+		$product_price = !empty($_POST['product_price']) ? (array)$_POST['product_price'] : array();
 
-		if( !empty( $product_price ) ) {
-			foreach( $product_price as $product_id => $price ) {
+		if (!empty($product_price)) {
+			foreach ($product_price as $product_id => $price) {
 				try {
-					if( $price_piloting_option == 'TTC' )
-						wpshop_attributes::saveAttributeForEntity( array( 'decimal' => array( 'product_price' => sanitize_text_field( $price ) )), $entity_type_id, (int)$product_id, $language, 'wpshop_products' );
+					if ($price_piloting_option == 'TTC')
+						wpshop_attributes::saveAttributeForEntity(array('decimal' => array('product_price' => sanitize_text_field($price))), $entity_type_id, (int)$product_id, $language, 'wpshop_products');
 					else
-						wpshop_attributes::saveAttributeForEntity( array( 'decimal' => array( 'price_ht' => sanitize_text_field( $price ) )), $entity_type_id, (int)$product_id, $language, 'wpshop_product' );
+						wpshop_attributes::saveAttributeForEntity(array('decimal' => array('price_ht' => sanitize_text_field($price))), $entity_type_id, (int)$product_id, $language, 'wpshop_product');
 
-					wpshop_products::calculate_price( $product_id );
+					wpshop_products::calculate_price($product_id);
 					$consistent_product_number++;
 
 				} catch (Exception $e) {
@@ -79,14 +79,14 @@ 
 			}
 		}
 
-		$response['template_number'] = __( sprintf( 'Number of processed product : %d/%d', $consistent_product_number, $inconsistent_product_number ), 'wps-product' );
+		$response['template_number'] = __(sprintf('Number of processed product : %d/%d', $consistent_product_number, $inconsistent_product_number), 'wps-product');
 
 		$list_product = wps_product_ctr::get_inconsistent_product();
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, "backend", "product_check_data") );
+		require(wpshop_tools::get_template_part(WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, "backend", "product_check_data"));
 		$response['template'] = ob_get_clean();
 
-		wp_die( json_encode( $response ) );
+		wp_die(json_encode($response));
 	}
 }
 

Braces +14 added lines, -9 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_product_ajax_ctr_01 {
 	public function __construct() {
 		add_action( 'wp_ajax_checking_products_values', array( &$this, 'ajax_render_inconsistent_product_price' ) );
@@ -14,8 +16,9 @@ 
 	public function ajax_render_inconsistent_product_price() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_render_inconsistent_product_price' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'ajax_render_inconsistent_product_price' ) ) {
+					wp_die();
+		}
 
 		$list_product = wps_product_ctr::get_inconsistent_product();
 
@@ -41,8 +44,9 @@ 
 	public function ajax_save_product_price() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'ajax_save_product_price' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'ajax_save_product_price' ) ) {
+					wp_die();
+		}
 
 		header( 'Content-Type: application/json' );
 		$response = array();
@@ -66,10 +70,11 @@ 
 		if( !empty( $product_price ) ) {
 			foreach( $product_price as $product_id => $price ) {
 				try {
-					if( $price_piloting_option == 'TTC' )
-						wpshop_attributes::saveAttributeForEntity( array( 'decimal' => array( 'product_price' => sanitize_text_field( $price ) )), $entity_type_id, (int)$product_id, $language, 'wpshop_products' );
-					else
-						wpshop_attributes::saveAttributeForEntity( array( 'decimal' => array( 'price_ht' => sanitize_text_field( $price ) )), $entity_type_id, (int)$product_id, $language, 'wpshop_product' );
+					if( $price_piloting_option == 'TTC' ) {
+											wpshop_attributes::saveAttributeForEntity( array( 'decimal' => array( 'product_price' => sanitize_text_field( $price ) )), $entity_type_id, (int)$product_id, $language, 'wpshop_products' );
+					} else {
+											wpshop_attributes::saveAttributeForEntity( array( 'decimal' => array( 'price_ht' => sanitize_text_field( $price ) )), $entity_type_id, (int)$product_id, $language, 'wpshop_product' );
+					}
 
 					wpshop_products::calculate_price( $product_id );
 					$consistent_product_number++;

includes/modules/wps_product/controller/wps_product_ctr.php

Doc Comments -2 removed lines

@@ -257,8 +257,6 @@
 	 *
 	 * @param int $product_id L'id du produit
 	 * @param string $type Peut être varchar, integer, text, options, decimal, datetime
-	 * @param string $attribute_name Le code d'un attribut
-	 * @param string $attribute_value La valeur à mêttre à jour
 	 */
 	public function update_the_attribute_for_product($product_id, $type, $name_attribute, $value_attribute) {
 		global $wpdb;

Spacing +89 added lines, -89 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_product_ctr {
 
 	/**
@@ -8,16 +8,16 @@ 
 	 * @return void
 	 */
 	function __construct() {
-		add_action( 'admin_enqueue_scripts', array( &$this, 'callback_admin_enqueue_scripts' ) );
+		add_action('admin_enqueue_scripts', array(&$this, 'callback_admin_enqueue_scripts'));
 
-		add_shortcode( 'wps_product_caracteristics', array( $this, 'display_product_caracteristics_tab' ) );
-		add_shortcode( 'wpshop_product_caracteristics', array( $this, 'display_product_caracteristics_tab' ) );
-		add_shortcode( 'wps_product_discount_chip', array( $this, 'display_discount_chip' ) );
-		add_shortcode( 'wpshop_product_discount_chip', array( $this, 'display_discount_chip' ) );
+		add_shortcode('wps_product_caracteristics', array($this, 'display_product_caracteristics_tab'));
+		add_shortcode('wpshop_product_caracteristics', array($this, 'display_product_caracteristics_tab'));
+		add_shortcode('wps_product_discount_chip', array($this, 'display_discount_chip'));
+		add_shortcode('wpshop_product_discount_chip', array($this, 'display_discount_chip'));
 
-		add_shortcode( 'wpshop_product_title', array( $this, 'wpshop_product_title' ) );
-		add_shortcode( 'wpshop_product_content', array( $this, 'wpshop_product_content' ) );
-		add_shortcode( 'wpshop_product_thumbnail', array( $this, 'wpshop_product_thumbnail' ) );
+		add_shortcode('wpshop_product_title', array($this, 'wpshop_product_title'));
+		add_shortcode('wpshop_product_content', array($this, 'wpshop_product_content'));
+		add_shortcode('wpshop_product_thumbnail', array($this, 'wpshop_product_thumbnail'));
 	}
 
 	/**
@@ -28,14 +28,14 @@ 
 		$module_folder = WPS_PRODUCT_PATH . '/modules/';
 
 		/**	Check if the defined directory exists for reading and including the different modules	*/
-		if( is_dir( $module_folder ) ) {
-			$parent_folder_content = scandir( $module_folder );
-			foreach ( $parent_folder_content as $folder ) {
-				if ( $folder && substr( $folder, 0, 1) != '.' && is_dir( $folder ) ) {
-					$child_folder_content = scandir( $module_folder . $folder );
-					if ( file_exists( $module_folder . $folder . '/' . $folder . '.php') ) {
-						$f =  $module_folder . $folder . '/' . $folder . '.php';
-						include( $f );
+		if (is_dir($module_folder)) {
+			$parent_folder_content = scandir($module_folder);
+			foreach ($parent_folder_content as $folder) {
+				if ($folder && substr($folder, 0, 1) != '.' && is_dir($folder)) {
+					$child_folder_content = scandir($module_folder . $folder);
+					if (file_exists($module_folder . $folder . '/' . $folder . '.php')) {
+						$f = $module_folder . $folder . '/' . $folder . '.php';
+						include($f);
 					}
 				}
 			}
@@ -43,7 +43,7 @@ 
 	}
 
 	public function callback_admin_enqueue_scripts() {
-		wp_enqueue_script( 'wps_product_js', WPS_PRODUCT_URL . '/asset/js/backend.js', array( "jquery", "jquery-form" ), WPS_PRODUCT_VERSION );
+		wp_enqueue_script('wps_product_js', WPS_PRODUCT_URL . '/asset/js/backend.js', array("jquery", "jquery-form"), WPS_PRODUCT_VERSION);
 	}
 
 	/**
@@ -51,14 +51,14 @@ 
 	 * @param array $args
 	 * @return string
 	 */
-	function display_product_caracteristics_tab( $args ) {
+	function display_product_caracteristics_tab($args) {
 		$output = '';
-		if( !empty($args) && !empty($args['pid']) ) {
+		if (!empty($args) && !empty($args['pid'])) {
 			$wps_product_mdl = new wps_product_mdl();
-			$product_atts_def = $wps_product_mdl->get_product_atts_def( $args['pid'] );
-			if( !empty($product_atts_def) ) {
+			$product_atts_def = $wps_product_mdl->get_product_atts_def($args['pid']);
+			if (!empty($product_atts_def)) {
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, "frontend", "product_caracteristics_tab") );
+				require(wpshop_tools::get_template_part(WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, "frontend", "product_caracteristics_tab"));
 				$output = ob_get_contents();
 				ob_end_clean();
 			}
@@ -71,14 +71,14 @@ 
 	 * @param array $args
 	 * @return string
 	 */
-	function display_discount_chip( $args ) {
+	function display_discount_chip($args) {
 		$output = '';
-		if( !empty($args) && !empty($args['pid']) ) {
+		if (!empty($args) && !empty($args['pid'])) {
 			$wps_price = new wpshop_prices();
-			$discount_data = wpshop_prices::check_discount_for_product( $args['pid'] );
-			if( !empty($discount_data) ) {
+			$discount_data = wpshop_prices::check_discount_for_product($args['pid']);
+			if (!empty($discount_data)) {
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, "frontend", "product_discount_chip") );
+				require(wpshop_tools::get_template_part(WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, "frontend", "product_discount_chip"));
 				$output = ob_get_contents();
 				ob_end_clean();
 			}
@@ -96,36 +96,36 @@ 
 	 */
 	function check_stock($product_id, $cart_asked_quantity, $combined_variation_id = '') {
 		// Checking if combined variation ID exist and it is a simple option
-		if( !empty($combined_variation_id) && ( strpos($combined_variation_id, '__') !== false ) ) {
-			$var_id = explode( '__', $combined_variation_id);
+		if (!empty($combined_variation_id) && (strpos($combined_variation_id, '__') !== false)) {
+			$var_id = explode('__', $combined_variation_id);
 			$combined_variation_id = $var_id[1];
 		}
 
 
-		if ( !empty($combined_variation_id) ) {
+		if (!empty($combined_variation_id)) {
 
-			$variation_metadata = get_post_meta( $combined_variation_id, '_wpshop_product_metadata', true );
-			if ( isset($variation_metadata['product_stock']) ) {
+			$variation_metadata = get_post_meta($combined_variation_id, '_wpshop_product_metadata', true);
+			if (isset($variation_metadata['product_stock'])) {
 				$product_id = $combined_variation_id;
 			}
 		}
 		$product_data = wpshop_products::get_product_data($product_id, false, '"publish"');
 
-		if(!empty($product_data)) {
+		if (!empty($product_data)) {
 			$manage_stock = !empty($product_data['manage_stock']) ? $product_data['manage_stock'] : '';
 
-			$product_post_type = get_post_type( $product_id );
+			$product_post_type = get_post_type($product_id);
 
-			if ( $product_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION ) {
-				$parent_def = wpshop_products::get_parent_variation( $product_id );
-				if ( !empty($parent_def) && !empty($parent_def['parent_post']) ) {
+			if ($product_post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT_VARIATION) {
+				$parent_def = wpshop_products::get_parent_variation($product_id);
+				if (!empty($parent_def) && !empty($parent_def['parent_post'])) {
 					$parent_post = $parent_def['parent_post'];
 					$parent_product_data = wpshop_products::get_product_data($parent_post->ID);
-					$manage_stock = empty( $manage_stock ) ? $parent_product_data['manage_stock'] : $manage_stock;
+					$manage_stock = empty($manage_stock) ? $parent_product_data['manage_stock'] : $manage_stock;
 				}
 			}
-			$manage_stock_is_activated = (!empty($manage_stock) && ( strtolower(__($manage_stock, 'wpshop')) == strtolower(__('Yes', 'wpshop')) )) ? true : false;
-			$the_qty_is_in_stock = ( !empty($product_data['product_stock']) && $product_data['product_stock'] >= $cart_asked_quantity ) ? true : false ;
+			$manage_stock_is_activated = (!empty($manage_stock) && (strtolower(__($manage_stock, 'wpshop')) == strtolower(__('Yes', 'wpshop')))) ? true : false;
+			$the_qty_is_in_stock = (!empty($product_data['product_stock']) && $product_data['product_stock'] >= $cart_asked_quantity) ? true : false;
 
 			if (($manage_stock_is_activated && $the_qty_is_in_stock) OR !$manage_stock_is_activated) {
 				return true;
@@ -138,18 +138,18 @@ 
 	}
 
 	public static function get_inconsistent_product() {
-		$price_piloting_option = get_option( 'wpshop_shop_price_piloting' );
+		$price_piloting_option = get_option('wpshop_shop_price_piloting');
 
-		$entity_id 		= wpshop_entities::get_entity_identifier_from_code( 'wpshop_product' );
+		$entity_id = wpshop_entities::get_entity_identifier_from_code('wpshop_product');
 
-		$attribute_def	= wpshop_attributes::getElement( ( $price_piloting_option == 'TTC' ) ? 'product_price' : 'price_ht', "'valid'", 'code' );
-		$attribute_id	= $attribute_def->id;
+		$attribute_def = wpshop_attributes::getElement(($price_piloting_option == 'TTC') ? 'product_price' : 'price_ht', "'valid'", 'code');
+		$attribute_id = $attribute_def->id;
 
 		global $wpdb;
 
 		$wpdb->query('SET SESSION group_concat_max_len = 10000');
 
-		$query			= "
+		$query = "
 		SELECT 		post.ID, post.post_title, attr_val_dec.value as price_attribute, GROUP_CONCAT(postmeta.meta_key, '&sep&', postmeta.meta_value, '&&' ORDER BY postmeta.meta_key) as price
 			FROM 		$wpdb->posts as post
 		JOIN		$wpdb->postmeta as postmeta
@@ -162,15 +162,15 @@ 
 			AND			postmeta.meta_key IN( '_product_price', '_wps_price_infos', '_wpshop_displayed_price', '_wpshop_product_metadata' )
 		GROUP BY	post.ID";
 
-		$list_product	= $wpdb->get_results( $wpdb->prepare( $query, array( $entity_id, $attribute_id ) ) );
+		$list_product = $wpdb->get_results($wpdb->prepare($query, array($entity_id, $attribute_id)));
 
-		if( !empty( $list_product ) ) {
-			foreach( $list_product as $key_product => &$product ) {
+		if (!empty($list_product)) {
+			foreach ($list_product as $key_product => &$product) {
 				$product->price = explode('&&,', $product->price);
-				if(!empty($product->price) && is_array($product->price)) {
+				if (!empty($product->price) && is_array($product->price)) {
 					$array_price = array();
-					foreach($product->price as &$price) {
-						if(strpos( $price, '&&' ))
+					foreach ($product->price as &$price) {
+						if (strpos($price, '&&'))
 							$price = substr($price, 0, -2);
 
 						$tmp_price = explode('&sep&', $price);
@@ -178,35 +178,35 @@ 
 						$price = maybe_unserialize($tmp_price[1]);
 
 						/** _wpshop_product_metadata */
-						if( $key == '_wpshop_product_metadata' ) {
-							$array_price[$key] =  ( $price_piloting_option == 'TTC' ) ? $price['product_price'] : $price['price_ht'];
+						if ($key == '_wpshop_product_metadata') {
+							$array_price[$key] = ($price_piloting_option == 'TTC') ? $price['product_price'] : $price['price_ht'];
 						}
 
 						/** _wps_price_infos */
-						if( $key == '_wps_price_infos' ) {
-							$array_price[$key] = !empty( $price['PRODUCT_PRICE'] ) ? $price['PRODUCT_PRICE'] : '-';
+						if ($key == '_wps_price_infos') {
+							$array_price[$key] = !empty($price['PRODUCT_PRICE']) ? $price['PRODUCT_PRICE'] : '-';
 						}
 
-						if( $key == '_product_price' ) {
-							$array_price[$key] = ( $price_piloting_option == 'TTC' ) ? $price : '-';
+						if ($key == '_product_price') {
+							$array_price[$key] = ($price_piloting_option == 'TTC') ? $price : '-';
 						}
 
-						if ( $key == '_wpshop_displayed_price' ) {
+						if ($key == '_wpshop_displayed_price') {
 							$array_price[$key] = $price;
 						}
 						unset($price);
 					}
 
-					$array_meta_list = array( '_product_price', '_wps_price_infos', '_wpshop_displayed_price', '_wpshop_product_metadata', );
+					$array_meta_list = array('_product_price', '_wps_price_infos', '_wpshop_displayed_price', '_wpshop_product_metadata',);
 
-					foreach( $array_meta_list as $meta_list ) {
-						if( !array_key_exists( $meta_list, $array_price ) ) {
+					foreach ($array_meta_list as $meta_list) {
+						if (!array_key_exists($meta_list, $array_price)) {
 							$array_price[$meta_list] = 0;
 						}
 					}
 
 					$product->price = $array_price;
-					if( $product->price_attribute === $product->price['_wpshop_product_metadata'] ) {
+					if ($product->price_attribute === $product->price['_wpshop_product_metadata']) {
 						unset($list_product[$key_product]);
 					}
 
@@ -224,13 +224,13 @@ 
 	 * @param int $pid L'id du produit
 	 * @return WP_Post
 	 */
-	public function get_thumbnail ( $pid ) {
-		if( empty( $pid ) )
+	public function get_thumbnail($pid) {
+		if (empty($pid))
 			return null;
 
-		$thumbnail_id = get_post_meta( $pid, '_thumbnail_id', true );
+		$thumbnail_id = get_post_meta($pid, '_thumbnail_id', true);
 
-		if( empty( $thumbnail_id ) )
+		if (empty($thumbnail_id))
 			return null;
 
 		return $thumbnail_id;
@@ -243,9 +243,9 @@ 
 	 * @param array $array_data The array data [integer][barcode] = 0111100001
 	 */
 	public function update_attributes_for_product($product_id, $array_data) {
-		if(!empty($array_data)) {
-			foreach($array_data as $type => $array) {
-				foreach($array as $name_attribute => $value_attribute) {
+		if (!empty($array_data)) {
+			foreach ($array_data as $type => $array) {
+				foreach ($array as $name_attribute => $value_attribute) {
 					$this->update_the_attribute_for_product($product_id, $type, $name_attribute, $value_attribute);
 				}
 			}
@@ -269,7 +269,7 @@ 
 		$attribute_id = $wpdb->get_var($wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code="%s"', array($name_attribute)));
 
 		/** On vérifie s'il existe si c'est le cas, on update sinon on insert */
-		if(count($wpdb->get_row($wpdb->prepare('SELECT value_id FROM ' . WPSHOP_DBT_ATTRIBUTE . '_value_' . $type . ' WHERE entity_id=%d AND attribute_id IN(SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code="%s")', array($product_id, $name_attribute)))) > 0) {
+		if (count($wpdb->get_row($wpdb->prepare('SELECT value_id FROM ' . WPSHOP_DBT_ATTRIBUTE . '_value_' . $type . ' WHERE entity_id=%d AND attribute_id IN(SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE code="%s")', array($product_id, $name_attribute)))) > 0) {
 			$wpdb->query(
 				$wpdb->prepare('UPDATE ' . WPSHOP_DBT_ATTRIBUTE . '_value_' . $type . ' SET value="%s" WHERE entity_id=%d AND attribute_id=%d',
 					array($value_attribute, $product_id, $attribute_id)
@@ -295,13 +295,13 @@ 
 	 * @param array $args [ 'id' ] L'id du produit
 	 * @return string
 	 */
-	public function wpshop_product_title( $args ) {
-		$output = __( 'No product has been found.', 'wpshop' );
+	public function wpshop_product_title($args) {
+		$output = __('No product has been found.', 'wpshop');
 
-		if ( !empty( $args ) && !empty( $args['pid'] ) ) {
+		if (!empty($args) && !empty($args['pid'])) {
 			global $wpdb;
 			$query = "SELECT post_title FROM {$wpdb->posts} WHERE ID = %d";
-			$output = $wpdb->get_var( $wpdb->prepare( $query, $args['pid'] ) );
+			$output = $wpdb->get_var($wpdb->prepare($query, $args['pid']));
 		}
 
 		return $output;
@@ -312,16 +312,16 @@ 
 	 * @param array $args [ 'id' ] L'id du produit
 	 * @return string
 	 */
-	public function wpshop_product_content( $args ) {
-		$output = __( 'No product has been found.', 'wpshop' );
+	public function wpshop_product_content($args) {
+		$output = __('No product has been found.', 'wpshop');
 
-		if ( !empty( $args ) && !empty( $args['pid'] ) ) {
+		if (!empty($args) && !empty($args['pid'])) {
 			global $wpdb;
 			$query = "SELECT post_content FROM {$wpdb->posts} WHERE ID = %d";
-			$output = $wpdb->get_var( $wpdb->prepare( $query, $args['pid'] ) );
+			$output = $wpdb->get_var($wpdb->prepare($query, $args['pid']));
 		}
 
-		return nl2br( $output );
+		return nl2br($output);
 	}
 
 	/**
@@ -331,12 +331,12 @@ 
 	 * 						[ size ] La taille de l'image. Peut être défini comme : small, medium ou full
 	 * @return string
 	 */
-	public function wpshop_product_thumbnail( $args ) {
+	public function wpshop_product_thumbnail($args) {
 		$url_thumbnail = WPSHOP_DEFAULT_PRODUCT_PICTURE;
 		$size = '20%';
 
-		if ( !empty( $args ) && !empty( $args['size'] ) ) {
-			switch ( $args['size'] ) {
+		if (!empty($args) && !empty($args['size'])) {
+			switch ($args['size']) {
 				case 'small':
 					$size = '20%';
 					break;
@@ -351,20 +351,20 @@ 
 			}
 		}
 
-		if ( !empty( $args ) && !empty( $args['pid'] ) ) {
-			$thumbnail_id = $this->get_thumbnail( $args['pid'] );
+		if (!empty($args) && !empty($args['pid'])) {
+			$thumbnail_id = $this->get_thumbnail($args['pid']);
 
-			if( !empty( $thumbnail_id ) ) {
-				$attachment = get_post( $thumbnail_id );
+			if (!empty($thumbnail_id)) {
+				$attachment = get_post($thumbnail_id);
 
-				if( !empty( $attachment ) && !empty( $attachment->guid ) ) {
+				if (!empty($attachment) && !empty($attachment->guid)) {
 					$url_thumbnail = $attachment->guid;
 				}
 			}
 		}
 
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, "frontend", "product_thumbnail" ) );
+		require(wpshop_tools::get_template_part(WPS_PRODUCT_DIR, WPS_PRODUCT_TEMPLATES_MAIN_DIR, "frontend", "product_thumbnail"));
 		$output = ob_get_clean();
 
 		return $output;

Braces +14 added lines, -11 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_product_ctr {
 
 	/**
@@ -129,8 +131,7 @@ 
 
 			if (($manage_stock_is_activated && $the_qty_is_in_stock) OR !$manage_stock_is_activated) {
 				return true;
-			}
-			else {
+			} else {
 				return __('You cannot add that amount to the cart since there is not enough stock.', 'wpshop');
 			}
 		}
@@ -170,8 +171,9 @@ 
 				if(!empty($product->price) && is_array($product->price)) {
 					$array_price = array();
 					foreach($product->price as &$price) {
-						if(strpos( $price, '&&' ))
-							$price = substr($price, 0, -2);
+						if(strpos( $price, '&&' )) {
+													$price = substr($price, 0, -2);
+						}
 
 						$tmp_price = explode('&sep&', $price);
 						$key = $tmp_price[0];
@@ -225,13 +227,15 @@ 
 	 * @return WP_Post
 	 */
 	public function get_thumbnail ( $pid ) {
-		if( empty( $pid ) )
-			return null;
+		if( empty( $pid ) ) {
+					return null;
+		}
 
 		$thumbnail_id = get_post_meta( $pid, '_thumbnail_id', true );
 
-		if( empty( $thumbnail_id ) )
-			return null;
+		if( empty( $thumbnail_id ) ) {
+					return null;
+		}
 
 		return $thumbnail_id;
 	}
@@ -275,8 +279,7 @@ 
 					array($value_attribute, $product_id, $attribute_id)
 				)
 			);
-		}
-		else {
+		} else {
 			/** Insert avec toutes les informations requise */
 			$wpdb->insert(WPSHOP_DBT_ATTRIBUTE . '_value_' . $type, array(
 					'attribute_id' 			=> $attribute_id,

includes/modules/wps_product/modules/wps_product_mass_interface/controller/wps_product_mass_interface_ctr.php

Doc Comments +4 added lines

@@ -158,6 +158,7 @@ 
 	/**
 	 * Display pagination
 	 *
+	 * @param integer $current_page
 	 * @return string
 	 */
 	function get_products_pagination( $current_page, $attribute_set_id = 1 ) {
@@ -201,6 +202,9 @@ 
 			return $output;
 			}
 
+	/**
+	 * @param integer $product_id
+	 */
 	function wps_product_attached_files( $product_id ) {
 		global $wpdb;
 		$output = '';

Indentation +4 added lines, -4 removed lines

@@ -352,8 +352,8 @@ 
 	}
 
 	/**
-	* Delete product list
-	**/
+	 * Delete product list
+	 **/
 	function wps_mass_delete_file() {
 		$status = false;
 		$file_id = (!empty($_POST['file_id']) ) ? intval($_POST['file_id']) : null;
@@ -366,8 +366,8 @@ 
 	}
 
 	/**
-	* Update product files list
-	*/
+	 * Update product files list
+	 */
 	function wps_mass_edit_update_files_list() {
 		$status = false; $response = '';
 		$product_id = ( !empty($_POST['product_id']) ) ? intval($_POST['product_id']) : null;

Spacing +134 added lines, -134 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Main controller file for product mass modification module
  *
@@ -19,47 +19,47 @@ 
 	 */
 	function __construct() {
 		// Add submenu
-		add_action('admin_menu', array( $this, 'register_mass_products_edit_submenu' ), 350 );
+		add_action('admin_menu', array($this, 'register_mass_products_edit_submenu'), 350);
 
 		// Declare Styles and JS Files
-		add_action( 'admin_enqueue_scripts', array( $this, 'add_admin_scripts') );
-		add_action( 'admin_enqueue_scripts', array( $this, 'admin_css' ) );
-		add_action( 'admin_print_scripts', array( $this, 'admin_print_scripts' ) );
+		add_action('admin_enqueue_scripts', array($this, 'add_admin_scripts'));
+		add_action('admin_enqueue_scripts', array($this, 'admin_css'));
+		add_action('admin_print_scripts', array($this, 'admin_print_scripts'));
 
 		// Trigger ajax action
-		add_action( 'wp_ajax_wps_mass_edit_change_page', array( $this, 'wps_mass_edit_change_page') );
-		add_action( 'wp_ajax_wps_mass_edit_product_save_action', array( $this, 'wps_save_product_quick_interface') );
-		add_action( 'wp_ajax_wps_mass_interface_new_product_creation', array( $this, 'wps_mass_interface_new_product_creation' ) );
-		add_action( 'wp_ajax_wps_mass_delete_file', array( $this, 'wps_mass_delete_file' ) );
-		add_action( 'wp_ajax_wps_mass_edit_update_files_list', array( $this, 'wps_mass_edit_update_files_list' ) );
+		add_action('wp_ajax_wps_mass_edit_change_page', array($this, 'wps_mass_edit_change_page'));
+		add_action('wp_ajax_wps_mass_edit_product_save_action', array($this, 'wps_save_product_quick_interface'));
+		add_action('wp_ajax_wps_mass_interface_new_product_creation', array($this, 'wps_mass_interface_new_product_creation'));
+		add_action('wp_ajax_wps_mass_delete_file', array($this, 'wps_mass_delete_file'));
+		add_action('wp_ajax_wps_mass_edit_update_files_list', array($this, 'wps_mass_edit_update_files_list'));
 		// add_action( 'wap_ajax_wps_mass_delete_post', array( $this, 'wps_mass_delete_post' ) );
 	}
 
 	function register_mass_products_edit_submenu() {
-		add_submenu_page( 'edit.php?post_type=wpshop_product', __('Mass product edit', 'wpshop' ), __('Mass product edit', 'wpshop'), 'manage_options', 'mass_edit_interface', array($this, 'wps_display_mass_edit_interface'));
+		add_submenu_page('edit.php?post_type=wpshop_product', __('Mass product edit', 'wpshop'), __('Mass product edit', 'wpshop'), 'manage_options', 'mass_edit_interface', array($this, 'wps_display_mass_edit_interface'));
 	}
 
 	/**
 	 * Define the aministration pat styles
 	 */
 	function admin_css() {
-		wp_enqueue_style( 'wps-mass-product-update', WPS_PDCT_MASS_URL.'/assets/css/backend.css', '', WPS_PDCT_MASS_VERSION);
+		wp_enqueue_style('wps-mass-product-update', WPS_PDCT_MASS_URL . '/assets/css/backend.css', '', WPS_PDCT_MASS_VERSION);
 	}
 
 	/**
 	 * Add javascript to administration
 	 */
 	function add_admin_scripts() {
-		wp_enqueue_script( 'admin_product_js', WPS_PDCT_MASS_URL.'/assets/js/backend.js', '', WPS_PDCT_MASS_VERSION, true);
+		wp_enqueue_script('admin_product_js', WPS_PDCT_MASS_URL . '/assets/js/backend.js', '', WPS_PDCT_MASS_VERSION, true);
 		wp_enqueue_media();
 	}
 
 	function admin_print_scripts() {
 		$output = '<script type="text/javascript">';
-		$output .= 'var WPS_MASS_ERROR_INIT = "' .__( 'An error has occured, the page cannot be initialized', 'wpshop' ). '";';
-		$output .= 'var WPS_MASS_ERROR_PRODUCT_CREATION = "' .__( 'An error was occured, the new product cannot be created', 'wpshop' ). '";';
-		$output .= 'var WPS_MASS_ERROR_PRODUCT_SAVE = "' .__( 'You must select product to save', 'wpshop' ). '";';
-		$output .= 'var WPS_MASS_CONFIRMATION_NEW_PRODUCT = "' .__( 'You will save selected products, are you sure to continue ?', 'wpshop' ). '";';
+		$output .= 'var WPS_MASS_ERROR_INIT = "' . __('An error has occured, the page cannot be initialized', 'wpshop') . '";';
+		$output .= 'var WPS_MASS_ERROR_PRODUCT_CREATION = "' . __('An error was occured, the new product cannot be created', 'wpshop') . '";';
+		$output .= 'var WPS_MASS_ERROR_PRODUCT_SAVE = "' . __('You must select product to save', 'wpshop') . '";';
+		$output .= 'var WPS_MASS_CONFIRMATION_NEW_PRODUCT = "' . __('You will save selected products, are you sure to continue ?', 'wpshop') . '";';
 		$output .= '</script>';
 		echo $output;
 	}
@@ -71,15 +71,15 @@ 
 	 *
 	 * @return array
 	 */
-	function check_attribute_to_display_for_quick_add( $attribute_list, $quick_add_form_attributes = array() ) {
-
-		if ( !empty( $attribute_list ) ) {
-			foreach( $attribute_list as $attributes_group ) {
-				foreach( $attributes_group as $attributes_sections ) {
-					if( !empty($attributes_sections) && !empty($attributes_sections['attributes']) ) {
-						foreach( $attributes_sections['attributes'] as $attribute_id => $att_def ) {
-							if( !empty($att_def) && !empty($att_def['is_used_in_quick_add_form']) && $att_def['is_used_in_quick_add_form'] == 'yes' ) {
-								$quick_add_form_attributes[ $attribute_id ] = $att_def;
+	function check_attribute_to_display_for_quick_add($attribute_list, $quick_add_form_attributes = array()) {
+
+		if (!empty($attribute_list)) {
+			foreach ($attribute_list as $attributes_group) {
+				foreach ($attributes_group as $attributes_sections) {
+					if (!empty($attributes_sections) && !empty($attributes_sections['attributes'])) {
+						foreach ($attributes_sections['attributes'] as $attribute_id => $att_def) {
+							if (!empty($att_def) && !empty($att_def['is_used_in_quick_add_form']) && $att_def['is_used_in_quick_add_form'] == 'yes') {
+								$quick_add_form_attributes[$attribute_id] = $att_def;
 							}
 						}
 					}
@@ -96,29 +96,29 @@ 
 	 * @param integer $page
 	 * @return string
 	 */
-	function display_products_list( $default = 1, $page = 0  ) {
+	function display_products_list($default = 1, $page = 0) {
 		global $wpdb;
 		// Product entity
-		$product_entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
+		$product_entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
 
 		$user_id = get_current_user_id();
 		// Check product limit
-		$product_limit = get_user_meta( $user_id, 'edit_wpshop_product_per_page', true );
-		$product_limit = ( !empty($product_limit) ) ? $product_limit : 20;
+		$product_limit = get_user_meta($user_id, 'edit_wpshop_product_per_page', true);
+		$product_limit = (!empty($product_limit)) ? $product_limit : 20;
 
 		// Get products for the current page
 		$wps_product_mass_interface_mdl = new wps_product_mass_interface_mdl();
-		$products = $wps_product_mass_interface_mdl->get_quick_interface_products( $default, $page, $product_limit );
+		$products = $wps_product_mass_interface_mdl->get_quick_interface_products($default, $page, $product_limit);
 
 		// Construct Table Head Data
 		$quick_add_form_attributes = array();
 		$get_attributes_quick_add_form = $wps_product_mass_interface_mdl->get_attributes_quick_add_form();
-		foreach( $get_attributes_quick_add_form as $quick_add_form_attribute ) {
+		foreach ($get_attributes_quick_add_form as $quick_add_form_attribute) {
 			$quick_add_form_attributes[$quick_add_form_attribute['id']] = $quick_add_form_attribute;
 		}
 
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface", "product_list" ) );
+		require(wpshop_tools::get_template_part(WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface", "product_list"));
 		$output = ob_get_contents();
 		ob_end_clean();
 		return $output;
@@ -134,25 +134,25 @@ 
 		$products_attributes_groups = $wps_product_mass_interface_mdl->get_product_attributes_sets();
 
 		$default = '';
-		if( !empty($products_attributes_groups) ) {
-			foreach( $products_attributes_groups as $key => $products_attributes_group ) {
-				if( $products_attributes_group->slug == 'free_product' ) {
-					unset( $products_attributes_groups[$key] );
+		if (!empty($products_attributes_groups)) {
+			foreach ($products_attributes_groups as $key => $products_attributes_group) {
+				if ($products_attributes_group->slug == 'free_product') {
+					unset($products_attributes_groups[$key]);
 				}
-				if( !empty($products_attributes_group->default_set) && $products_attributes_group->default_set == 'yes' ) {
+				if (!empty($products_attributes_group->default_set) && $products_attributes_group->default_set == 'yes') {
 					$default = $products_attributes_group->id;
 				}
 			}
 		}
 		// Check page
-		$page = ( !empty( $_GET[ 'page' ] ) && is_int( (int)$_GET[ 'page' ] ) && $_GET[ 'page' ] > 0 ) ? (int)($_GET[ 'page' ] - 1) : 0;
+		$page = (!empty($_GET['page']) && is_int((int)$_GET['page']) && $_GET['page'] > 0) ? (int)($_GET['page'] - 1) : 0;
 		// Display product tab
-		$product_list_interface = $this->display_products_list( $default, $page );
+		$product_list_interface = $this->display_products_list($default, $page);
 
 		// Get pagination
-		$pagination = $this->get_products_pagination( $page, $default );
+		$pagination = $this->get_products_pagination($page, $default);
 
-		require( wpshop_tools::get_template_part( WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface" ) );
+		require(wpshop_tools::get_template_part(WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface"));
 	}
 
 	/**
@@ -160,13 +160,13 @@ 
 	 *
 	 * @return string
 	 */
-	function get_products_pagination( $current_page, $attribute_set_id = 1 ) {
+	function get_products_pagination($current_page, $attribute_set_id = 1) {
 		global $wpdb;
 		$user_id = get_current_user_id();
 		$output = '';
 		/**	Define the element number per page. If the user change the default value, take this value	*/
-		$one_page_limit = get_user_meta( $user_id, 'edit_wpshop_product_per_page', true );
-		$one_page_limit = ( !empty($one_page_limit) ) ? $one_page_limit : 20;
+		$one_page_limit = get_user_meta($user_id, 'edit_wpshop_product_per_page', true);
+		$one_page_limit = (!empty($one_page_limit)) ? $one_page_limit : 20;
 
 		/**	Count the number of product existing in the shop	*/
 		$query = $wpdb->prepare(
@@ -178,37 +178,37 @@ 
 				AND meta_value = %s
 				AND post_status IN ( 'publish', 'draft' )",
 				WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, '_wpshop_product_attribute_set_id', $attribute_set_id);
-		$products = $wpdb->get_var( $query );
+		$products = $wpdb->get_var($query);
 
-			if( !empty($products) ) {
+			if (!empty($products)) {
 			$args = array(
 			'base' => '%_%',
-			'format' => admin_url( 'admin-ajax.php?action=wps_add_quick_interface&page=%#%' ),
-					'current' => ( $current_page + 1 ),
-					'total' => ceil( $products / $one_page_limit ),
+			'format' => admin_url('admin-ajax.php?action=wps_add_quick_interface&page=%#%'),
+					'current' => ($current_page + 1),
+					'total' => ceil($products / $one_page_limit),
 						'type' => 'array',
 						'prev_next' => false,
 						'show_all' => true,
 			);
-			$paginate = paginate_links( $args );
+			$paginate = paginate_links($args);
 
 				$wps_product_ctr = new wps_product_ctr();
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface_pagination" ) );
+				require(wpshop_tools::get_template_part(WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface_pagination"));
 				$output = ob_get_contents();
 			ob_end_clean();
 			}
 			return $output;
 			}
 
-	function wps_product_attached_files( $product_id ) {
+	function wps_product_attached_files($product_id) {
 		global $wpdb;
 		$output = '';
-		$query = $wpdb->prepare( 'SELECT * FROM ' .$wpdb->posts. ' WHERE post_parent = %d AND post_type = %s AND post_mime_type LIKE %s', $product_id, 'attachment', 'application%' );
-		$files = $wpdb->get_results( $query );
-		if( !empty($files) ) {
+		$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_parent = %d AND post_type = %s AND post_mime_type LIKE %s', $product_id, 'attachment', 'application%');
+		$files = $wpdb->get_results($query);
+		if (!empty($files)) {
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface", "attached_files_list" ) );
+			require(wpshop_tools::get_template_part(WPS_PDCT_MASS_DIR, WPS_PDCT_MASS_TEMPLATES_MAIN_DIR, "backend", "quick_add_interface", "attached_files_list"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -220,23 +220,23 @@ 
 	 * AJAX - Change page action on mass edit product interface
 	 */
 	function wps_mass_edit_change_page() {
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_edit_change_page' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_mass_edit_change_page'))
 			wp_die();
 
 		$status = false; $response = '';
-		$page = ( !empty($_POST['page_id']) ) ? intval( $_POST['page_id'] ) - 1 : 0;
-		$attribute_set_id = ( !empty($_POST['att_set_id']) ) ? intval( $_POST['att_set_id'] ) : 1;
-		if( !empty($attribute_set_id) ) {
+		$page = (!empty($_POST['page_id'])) ? intval($_POST['page_id']) - 1 : 0;
+		$attribute_set_id = (!empty($_POST['att_set_id'])) ? intval($_POST['att_set_id']) : 1;
+		if (!empty($attribute_set_id)) {
 			// Get tab
-			$response = $this->display_products_list( $attribute_set_id, $page );
-			$pagination = $this->get_products_pagination( $page, $attribute_set_id );
-			if( !empty($response) ) {
+			$response = $this->display_products_list($attribute_set_id, $page);
+			$pagination = $this->get_products_pagination($page, $attribute_set_id);
+			if (!empty($response)) {
 				$status = true;
 			}
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response, 'pagination' => $pagination ) );
+		echo json_encode(array('status' => $status, 'response' => $response, 'pagination' => $pagination));
 		wp_die();
 	}
 
@@ -244,30 +244,30 @@ 
 	 * AJAX - Create a draft product and display the line allowing to edit informations for this product
 	 */
 	function wps_mass_interface_new_product_creation() {
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_interface_new_product_creation' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_mass_interface_new_product_creation'))
 			wp_die();
 
 		global $wpdb;
 		$output = $pagination = '';
 		$status = false;
 
-		$new_product_id = wp_insert_post( array(
+		$new_product_id = wp_insert_post(array(
 				'post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
 				'post_status' => 'publish',
-				'post_title' => __( 'New product', 'wpshop' ),
-		) );
+				'post_title' => __('New product', 'wpshop'),
+		));
 
-		if( !is_object($new_product_id) ) {
+		if (!is_object($new_product_id)) {
 			$status = true;
 		}
-		if ( !empty( $new_product_id ) ) {
-			$product_attribute_set_id = ( !empty($_POST['attributes_set']) ) ? intval( $_POST['attributes_set'] ) : 1;
-			update_post_meta( $new_product_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id', $product_attribute_set_id );
+		if (!empty($new_product_id)) {
+			$product_attribute_set_id = (!empty($_POST['attributes_set'])) ? intval($_POST['attributes_set']) : 1;
+			update_post_meta($new_product_id, '_' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '_attribute_set_id', $product_attribute_set_id);
 		}
 
-		echo json_encode( array( 'status' => $status, 'response' => $output, 'pagination' => $pagination ) );
+		echo json_encode(array('status' => $status, 'response' => $output, 'pagination' => $pagination));
 		wp_die();
 	}
 
@@ -275,59 +275,59 @@ 
 	 * AJAX - Save datas
 	 */
 	function wps_save_product_quick_interface() {
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_save_product_quick_interface' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_save_product_quick_interface'))
 			wp_die();
 
 		global $wpdb;
 		$response = ''; $status = false;
 		$count_products_to_update = 0; $total_updated_products = 0;
 
-		$wps_product_quick_save = !empty( $_REQUEST['wps_product_quick_save'] ) ? (array) $_REQUEST['wps_product_quick_save'] : array();
-		$wps_mass_interface = !empty( $_REQUEST['wps_mass_interface'] ) ? (array) $_REQUEST['wps_mass_interface'] : array();
-		$wpshop_product_attribute = !empty( $_REQUEST['wpshop_product_attribute'] ) ? (array) $_REQUEST['wpshop_product_attribute'] : array();
+		$wps_product_quick_save = !empty($_REQUEST['wps_product_quick_save']) ? (array)$_REQUEST['wps_product_quick_save'] : array();
+		$wps_mass_interface = !empty($_REQUEST['wps_mass_interface']) ? (array)$_REQUEST['wps_mass_interface'] : array();
+		$wpshop_product_attribute = !empty($_REQUEST['wpshop_product_attribute']) ? (array)$_REQUEST['wpshop_product_attribute'] : array();
 
-		if( !empty($wps_product_quick_save) ) {
-			$count_products_to_update = count( $wps_product_quick_save );
-			foreach( $wps_product_quick_save as $product_to_save ) {
+		if (!empty($wps_product_quick_save)) {
+			$count_products_to_update = count($wps_product_quick_save);
+			foreach ($wps_product_quick_save as $product_to_save) {
 				$data_to_save = array();
 				// Update post
-				$updated_post = wp_update_post( array( 'ID' => $product_to_save,
-						'post_title' => sanitize_text_field( $wps_mass_interface[$product_to_save]['post_title'] ),
-						'post_content' => sanitize_text_field( $wps_mass_interface[$product_to_save]['post_content'] ),
+				$updated_post = wp_update_post(array('ID' => $product_to_save,
+						'post_title' => sanitize_text_field($wps_mass_interface[$product_to_save]['post_title']),
+						'post_content' => sanitize_text_field($wps_mass_interface[$product_to_save]['post_content']),
 						)
 				);
 				// Update attributes
-				if( !empty($updated_post) ) {
+				if (!empty($updated_post)) {
 					// Update Featured picture
-					if( !empty($wps_mass_interface[$product_to_save]['picture']) ) {
-						$thumbnail_exist = get_post_meta( $updated_post, '_thumbnail_id', true );
-						if($wps_mass_interface[$product_to_save]['picture'] != 'deleted') {
-							wp_update_post( array('ID' => (int)$wps_mass_interface[$product_to_save]['picture'], 'post_parent' => $updated_post) );
-							update_post_meta( $updated_post, '_thumbnail_id', (int)$wps_mass_interface[$product_to_save]['picture'] );
+					if (!empty($wps_mass_interface[$product_to_save]['picture'])) {
+						$thumbnail_exist = get_post_meta($updated_post, '_thumbnail_id', true);
+						if ($wps_mass_interface[$product_to_save]['picture'] != 'deleted') {
+							wp_update_post(array('ID' => (int)$wps_mass_interface[$product_to_save]['picture'], 'post_parent' => $updated_post));
+							update_post_meta($updated_post, '_thumbnail_id', (int)$wps_mass_interface[$product_to_save]['picture']);
 						}
-						elseif($wps_mass_interface[$product_to_save]['picture'] == 'deleted' && !empty($thumbnail_exist)) {
-							delete_post_meta( $updated_post, '_thumbnail_id' );
+						elseif ($wps_mass_interface[$product_to_save]['picture'] == 'deleted' && !empty($thumbnail_exist)) {
+							delete_post_meta($updated_post, '_thumbnail_id');
 						}
 					}
 
 					// Update files datas
-					if( !empty($wps_mass_interface[$product_to_save]['files']) ) {
-						$files_data = explode( ',', sanitize_text_field( $_REQUEST['wps_mass_interface'][$product_to_save]['files'] ) );
-						if( !empty($files_data) && is_array($files_data) ) {
-							foreach( $files_data as $file_id ) {
-								if( !empty($file_id) ) {
-									wp_update_post( array('ID' => $file_id, 'post_parent' => $updated_post) );
+					if (!empty($wps_mass_interface[$product_to_save]['files'])) {
+						$files_data = explode(',', sanitize_text_field($_REQUEST['wps_mass_interface'][$product_to_save]['files']));
+						if (!empty($files_data) && is_array($files_data)) {
+							foreach ($files_data as $file_id) {
+								if (!empty($file_id)) {
+									wp_update_post(array('ID' => $file_id, 'post_parent' => $updated_post));
 								}
 							}
 						}
 					}
 
-					$data_to_save['post_ID'] = $data_to_save['product_id'] = intval( $product_to_save );
-					$data_to_save['wpshop_product_attribute'] = ( !empty($wpshop_product_attribute[ $product_to_save ]) ) ? $wpshop_product_attribute[ $product_to_save ] : array();
+					$data_to_save['post_ID'] = $data_to_save['product_id'] = intval($product_to_save);
+					$data_to_save['wpshop_product_attribute'] = (!empty($wpshop_product_attribute[$product_to_save])) ? $wpshop_product_attribute[$product_to_save] : array();
 
-					if(empty($data_to_save['wpshop_product_attribute']['varchar']['barcode'])) {
+					if (empty($data_to_save['wpshop_product_attribute']['varchar']['barcode'])) {
 						// Get current barcode
 						$wps_product_mdl = new wps_product_mdl();
 						$attid = wpshop_attributes::getElement('barcode', "'valid'", 'code')->id;
@@ -338,34 +338,34 @@ 
 					$data_to_save['user_ID'] = get_current_user_id();
 					$data_to_save['action'] = 'editpost';
 
-					if( !empty($wps_mass_interface[$product_to_save]['post_delete']) && $wps_mass_interface[$product_to_save]['post_delete'] == "true" ) {
-						wp_trash_post( $product_to_save );
+					if (!empty($wps_mass_interface[$product_to_save]['post_delete']) && $wps_mass_interface[$product_to_save]['post_delete'] == "true") {
+						wp_trash_post($product_to_save);
 					}
 
-					if( !empty($product_to_save) && !empty( $data_to_save['user_ID'] ) ) {
+					if (!empty($product_to_save) && !empty($data_to_save['user_ID'])) {
 						$product_class = new wpshop_products();
-						$product_class->save_product_custom_informations( $product_to_save, $data_to_save );
+						$product_class->save_product_custom_informations($product_to_save, $data_to_save);
 						$total_updated_products++;
 					}
 				}
 			}
 		}
 		// Checking status
-		$status = ( $total_updated_products == $count_products_to_update ) ? true : false;
+		$status = ($total_updated_products == $count_products_to_update) ? true : false;
 
-		if( $status ) {
-			$response = sprintf( __( '%d products have been successfully updated', 'wpshop'), $total_updated_products );
+		if ($status) {
+			$response = sprintf(__('%d products have been successfully updated', 'wpshop'), $total_updated_products);
 		}
 		else {
-			if( !empty($total_updated_products) ) {
-				$response = sprintf( __( 'All selected products do not be updated. %d on %d products have been successfully updated', 'wpshop'), $total_updated_products, $count_products_to_update );
+			if (!empty($total_updated_products)) {
+				$response = sprintf(__('All selected products do not be updated. %d on %d products have been successfully updated', 'wpshop'), $total_updated_products, $count_products_to_update);
 			}
 			else {
-				$response = __( 'No product have been updated', 'wpshop');
+				$response = __('No product have been updated', 'wpshop');
 			}
 		}
 
-		echo json_encode( array('status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 
@@ -373,18 +373,18 @@ 
 	* Delete product list
 	**/
 	function wps_mass_delete_file() {
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_delete_file' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_mass_delete_file'))
 			wp_die();
 
 		$status = false;
-		$file_id = (!empty($_POST['file_id']) ) ? intval($_POST['file_id']) : null;
-		if( !empty($file_id) ) {
-			wp_update_post( array('ID' => $file_id, 'post_parent' => 0) );
+		$file_id = (!empty($_POST['file_id'])) ? intval($_POST['file_id']) : null;
+		if (!empty($file_id)) {
+			wp_update_post(array('ID' => $file_id, 'post_parent' => 0));
 			$status = true;
 		}
-		echo json_encode( array( 'status' => $status ) );
+		echo json_encode(array('status' => $status));
 		wp_die();
 	}
 
@@ -392,32 +392,32 @@ 
 	* Update product files list
 	*/
 	function wps_mass_edit_update_files_list() {
-		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wponce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_edit_update_files_list' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_mass_edit_update_files_list'))
 			wp_die();
 
 		$status = false; $response = '';
-		$product_id = ( !empty($_POST['product_id']) ) ? intval($_POST['product_id']) : null;
-		$files = ( !empty($_POST['files']) ) ? intval($_POST['files']) : null;
-		if( !empty($product_id ) ) {
+		$product_id = (!empty($_POST['product_id'])) ? intval($_POST['product_id']) : null;
+		$files = (!empty($_POST['files'])) ? intval($_POST['files']) : null;
+		if (!empty($product_id)) {
 			// Update files datas
-			if( !empty($files) ) {
-				$files_data = explode( ',', $files );
-				if( !empty($files_data) && is_array($files_data) ) {
-					foreach( $files_data as $file_id ) {
-						if( !empty($file_id) ) {
-							wp_update_post( array('ID' => $file_id, 'post_parent' => $product_id) );
+			if (!empty($files)) {
+				$files_data = explode(',', $files);
+				if (!empty($files_data) && is_array($files_data)) {
+					foreach ($files_data as $file_id) {
+						if (!empty($file_id)) {
+							wp_update_post(array('ID' => $file_id, 'post_parent' => $product_id));
 						}
 					}
 				}
 			}
 
 
-			$response = $this->wps_product_attached_files( $product_id );
+			$response = $this->wps_product_attached_files($product_id);
 			$status = true;
 		}
-		echo json_encode( array( 'status' => $status, 'response' => $response ) );
+		echo json_encode(array('status' => $status, 'response' => $response));
 		wp_die();
 	}
 

Braces +21 added lines, -17 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Main controller file for product mass modification module
  *
@@ -222,8 +224,9 @@ 
 	function wps_mass_edit_change_page() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_edit_change_page' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_edit_change_page' ) ) {
+					wp_die();
+		}
 
 		$status = false; $response = '';
 		$page = ( !empty($_POST['page_id']) ) ? intval( $_POST['page_id'] ) - 1 : 0;
@@ -246,8 +249,9 @@ 
 	function wps_mass_interface_new_product_creation() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_interface_new_product_creation' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_interface_new_product_creation' ) ) {
+					wp_die();
+		}
 
 		global $wpdb;
 		$output = $pagination = '';
@@ -277,8 +281,9 @@ 
 	function wps_save_product_quick_interface() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_save_product_quick_interface' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_save_product_quick_interface' ) ) {
+					wp_die();
+		}
 
 		global $wpdb;
 		$response = ''; $status = false;
@@ -306,8 +311,7 @@ 
 						if($wps_mass_interface[$product_to_save]['picture'] != 'deleted') {
 							wp_update_post( array('ID' => (int)$wps_mass_interface[$product_to_save]['picture'], 'post_parent' => $updated_post) );
 							update_post_meta( $updated_post, '_thumbnail_id', (int)$wps_mass_interface[$product_to_save]['picture'] );
-						}
-						elseif($wps_mass_interface[$product_to_save]['picture'] == 'deleted' && !empty($thumbnail_exist)) {
+						} elseif($wps_mass_interface[$product_to_save]['picture'] == 'deleted' && !empty($thumbnail_exist)) {
 							delete_post_meta( $updated_post, '_thumbnail_id' );
 						}
 					}
@@ -355,12 +359,10 @@ 
 
 		if( $status ) {
 			$response = sprintf( __( '%d products have been successfully updated', 'wpshop'), $total_updated_products );
-		}
-		else {
+		} else {
 			if( !empty($total_updated_products) ) {
 				$response = sprintf( __( 'All selected products do not be updated. %d on %d products have been successfully updated', 'wpshop'), $total_updated_products, $count_products_to_update );
-			}
-			else {
+			} else {
 				$response = __( 'No product have been updated', 'wpshop');
 			}
 		}
@@ -375,8 +377,9 @@ 
 	function wps_mass_delete_file() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_delete_file' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_delete_file' ) ) {
+					wp_die();
+		}
 
 		$status = false;
 		$file_id = (!empty($_POST['file_id']) ) ? intval($_POST['file_id']) : null;
@@ -394,8 +397,9 @@ 
 	function wps_mass_edit_update_files_list() {
 		$_wponce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_edit_update_files_list' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_mass_edit_update_files_list' ) ) {
+					wp_die();
+		}
 
 		$status = false; $response = '';
 		$product_id = ( !empty($_POST['product_id']) ) ? intval($_POST['product_id']) : null;

includes/modules/wps_product/modules/wps_product_mass_interface/model/wps_product_mass_interface_mdl.php

Doc Comments +1 added lines, -2 removed lines

@@ -16,8 +16,7 @@
 
 	/**
 	 * Returns Products with post data and its attributes configuration
-	 * @param integer $limit
-	 * @param integer $count_products
+	 * @param integer $attribute_set_id
 	 * @return array
 	 */
 	function get_quick_interface_products( $attribute_set_id, $start_limit = 0, $nb_product_per_page = 20 ) {

Spacing +12 added lines, -12 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Model file for product mass modification module
  *
@@ -20,7 +20,7 @@ 
 	 * @param integer $count_products
 	 * @return array
 	 */
-	function get_quick_interface_products( $attribute_set_id, $start_limit = 0, $nb_product_per_page = 20 ) {
+	function get_quick_interface_products($attribute_set_id, $start_limit = 0, $nb_product_per_page = 20) {
 		global $wpdb;
 
 		$products_data = array();
@@ -34,12 +34,12 @@ 
 				AND meta_key = %s
 				AND meta_value = %s
 			ORDER BY ID DESC
-			LIMIT " . $start_limit * $nb_product_per_page . ", " .$nb_product_per_page .""
+			LIMIT " . $start_limit * $nb_product_per_page . ", " . $nb_product_per_page . ""
 			, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, '_wpshop_product_attribute_set_id', $attribute_set_id );
-		$products = $wpdb->get_results( $query );
+		$products = $wpdb->get_results($query);
 
-		if( !empty($products) ) {
-			foreach( $products as $product ) {
+		if (!empty($products)) {
+			foreach ($products as $product) {
 				// For each product stock Post Datas and attributes definition
 				$tmp = array();
 				$tmp['post_datas'] = $product;
@@ -54,9 +54,9 @@ 
 
 	function get_product_attributes_sets() {
 		global $wpdb;
-		$product_entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
-		$query = $wpdb->prepare( 'SELECT * FROM '. WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d AND status = %s', $product_entity_id, 'valid' );
-		$attributes_groups = $wpdb->get_results( $query );
+		$product_entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+		$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d AND status = %s', $product_entity_id, 'valid');
+		$attributes_groups = $wpdb->get_results($query);
 
 		return $attributes_groups;
 	}
@@ -64,9 +64,9 @@ 
 
 	function get_attributes_quick_add_form() {
 		global $wpdb;
-		$product_entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT );
-		$query = $wpdb->prepare( 'SELECT * FROM '. WPSHOP_DBT_ATTRIBUTE . ' WHERE entity_id = %d AND is_used_in_quick_add_form = %s AND status = %s', $product_entity_id, 'yes', 'valid' );
-		$attributes = $wpdb->get_results( $query, ARRAY_A );
+		$product_entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
+		$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE entity_id = %d AND is_used_in_quick_add_form = %s AND status = %s', $product_entity_id, 'yes', 'valid');
+		$attributes = $wpdb->get_results($query, ARRAY_A);
 	
 		return $attributes;
 	}

Braces +3 added lines, -1 removed lines

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

includes/modules/wps_rewrites/wps_rewrites.php

Doc Comments +20 added lines

@@ -78,6 +78,11 @@ 
 			}
 		}
 	}
+
+	/**
+	 * @param string $slug
+	 * @param string $separator
+	 */
 	private function rewrite_term_hierarchy( $parent, &$rewrite, $slug, $separator ) {
 		$childs = get_terms( $this->taxonomy, array( 'parent' => $parent->term_id, 'hide_empty' => false ) );
 		foreach( $childs as $child ) {
@@ -115,6 +120,11 @@ 
 		}
 		return $permalink;
 	}
+
+	/**
+	 * @param string $permalink
+	 * @param string $separator
+	 */
 	private function permalink_term_hierarchy( $term, &$permalink, $taxonomy, $separator ) {
 		if( $term->parent == 0 ) {
 			$permalink = $term->slug . $separator . $permalink;
@@ -220,6 +230,11 @@ 
 			}
 		}
 	}
+
+	/**
+	 * @param string $slug
+	 * @param string $separator
+	 */
 	private function rewrite_term_hierarchy( $parent, &$rewrite, $slug, $separator ) {
 		$rewrite[] = $slug . $parent->slug . $separator;
 		$childs = get_terms( $this->taxonomy, array( 'parent' => $parent->term_id, 'hide_empty' => false ) );
@@ -281,6 +296,11 @@ 
 		}
 		return $permalink;
 	}
+
+	/**
+	 * @param string $permalink
+	 * @param string $separator
+	 */
 	private function permalink_term_hierarchy( $term, &$permalink, $taxonomy, $separator ) {
 		if( $term->parent == 0 ) {
 			$permalink = $term->slug . $separator . $permalink;

Spacing +139 added lines, -139 removed lines

@@ -1,15 +1,15 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 // Rewrite wpshop_categories
-$options = get_option( 'wpshop_catalog_categories_option', null );
+$options = get_option('wpshop_catalog_categories_option', null);
 $slug = !empty($options['wpshop_catalog_categories_slug']) ? $options['wpshop_catalog_categories_slug'] : WPSHOP_CATALOG_PRODUCT_NO_CATEGORY;
-( empty( $options['wpshop_catalog_categories_slug'] ) || $options['wpshop_catalog_categories_slug'] == '/' ) ? new Custom_Taxonomy_Rewrite( WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, $slug, false ) : false;
+(empty($options['wpshop_catalog_categories_slug']) || $options['wpshop_catalog_categories_slug'] == '/') ? new Custom_Taxonomy_Rewrite(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, $slug, false) : false;
 
 // Rewrite wpshop_products
-$options = get_option( 'wpshop_catalog_product_option', null );
-$slug = !empty( $options['wpshop_catalog_product_slug'] ) ? $options['wpshop_catalog_product_slug'] : '/';
-$categories = !empty( $options['wpshop_catalog_product_slug_with_category'] );
-( empty( $options['wpshop_catalog_product_slug'] ) || $options['wpshop_catalog_product_slug'] == '/' ) ? new Custom_Post_Type_Rewrite( WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, $slug, $categories ) : false;
+$options = get_option('wpshop_catalog_product_option', null);
+$slug = !empty($options['wpshop_catalog_product_slug']) ? $options['wpshop_catalog_product_slug'] : '/';
+$categories = !empty($options['wpshop_catalog_product_slug_with_category']);
+(empty($options['wpshop_catalog_product_slug']) || $options['wpshop_catalog_product_slug'] == '/') ? new Custom_Post_Type_Rewrite(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, $slug, $categories) : false;
 
 class Custom_Taxonomy_Rewrite {
 	private $post_type;
@@ -17,95 +17,95 @@ 
 	private $enable_rewrites;
 	private $use_slug;
 	private $use_hierarchy_cat_slug;
-	public function __construct( $taxonomy, $post_type, $slug = '/', $hierarchy = false ) {
+	public function __construct($taxonomy, $post_type, $slug = '/', $hierarchy = false) {
 		$this->post_type = $post_type;
 		$this->taxonomy = $taxonomy;
 		$this->use_slug = $slug;
 		$this->use_hierarchy_cat_slug = $hierarchy;
-		add_action( 'init', array( $this, 'rewrite' ), 11 );
-		add_action( 'created_' . $this->taxonomy, array( $this, 'flush_rewrite' ) );
-		add_action( 'edited_' . $this->taxonomy, array( $this, 'flush_rewrite' ) );
-		add_action( 'delete_' . $this->taxonomy, array( $this, 'flush_rewrite' ) );
-		add_filter( 'term_link', array( $this, 'permalink' ), 10, 3 );
+		add_action('init', array($this, 'rewrite'), 11);
+		add_action('created_' . $this->taxonomy, array($this, 'flush_rewrite'));
+		add_action('edited_' . $this->taxonomy, array($this, 'flush_rewrite'));
+		add_action('delete_' . $this->taxonomy, array($this, 'flush_rewrite'));
+		add_filter('term_link', array($this, 'permalink'), 10, 3);
 	}
 	public function rewrite() {
 		global $wp_rewrite;
 		$this->enable_rewrites = $wp_rewrite->use_trailing_slashes;
-		if( $this->enable_rewrites ) {
-			if( empty( $this->use_slug ) || $this->use_slug == '/' ) {
-				if( $this->use_hierarchy_cat_slug ) {
+		if ($this->enable_rewrites) {
+			if (empty($this->use_slug) || $this->use_slug == '/') {
+				if ($this->use_hierarchy_cat_slug) {
 					$slug = '';
 					$rewrite = array();
-					$terms = get_terms( $this->taxonomy, array( 'parent' => 0, 'hide_empty' => false ) );
-					foreach( $terms as $term ) {
-						$this->rewrite_term_hierarchy( $term, $rewrite, $slug, '/' );
+					$terms = get_terms($this->taxonomy, array('parent' => 0, 'hide_empty' => false));
+					foreach ($terms as $term) {
+						$this->rewrite_term_hierarchy($term, $rewrite, $slug, '/');
 					}
-					foreach( $rewrite as $way ) {
-						add_rewrite_rule( $way . 'feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top' );
-						add_rewrite_rule( $way . '(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top' );
-						add_rewrite_rule( $way . 'page/?([0-9]{1,})/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&paged=$matches[2]', 'top' );
-						add_rewrite_rule( $way . '?$', 'index.php?' . $this->taxonomy . '=$matches[1]', 'top' );
+					foreach ($rewrite as $way) {
+						add_rewrite_rule($way . 'feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top');
+						add_rewrite_rule($way . '(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top');
+						add_rewrite_rule($way . 'page/?([0-9]{1,})/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&paged=$matches[2]', 'top');
+						add_rewrite_rule($way . '?$', 'index.php?' . $this->taxonomy . '=$matches[1]', 'top');
 					}
 				} else {
-					$terms = get_terms( $this->taxonomy, array( 'fields' => 'id=>slug', 'hide_empty' => false ) );
-					foreach( $terms as $term ) {
-						add_rewrite_rule( '(' . $term . ')/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top' );
-						add_rewrite_rule( '(' . $term . ')/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top' );
-						add_rewrite_rule( '(' . $term . ')/page/?([0-9]{1,})/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&paged=$matches[2]', 'top' );
-						add_rewrite_rule( '(' . $term . ')/?$', 'index.php?' . $this->taxonomy . '=$matches[1]', 'top' );
+					$terms = get_terms($this->taxonomy, array('fields' => 'id=>slug', 'hide_empty' => false));
+					foreach ($terms as $term) {
+						add_rewrite_rule('(' . $term . ')/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top');
+						add_rewrite_rule('(' . $term . ')/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top');
+						add_rewrite_rule('(' . $term . ')/page/?([0-9]{1,})/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&paged=$matches[2]', 'top');
+						add_rewrite_rule('(' . $term . ')/?$', 'index.php?' . $this->taxonomy . '=$matches[1]', 'top');
 					}
 				}
 			} else {
-				if( $this->use_hierarchy_cat_slug ) {
+				if ($this->use_hierarchy_cat_slug) {
 					$slug = '/';
 					$rewrite = array();
-					$terms = get_terms( $this->taxonomy, array( 'parent' => 0, 'hide_empty' => false ) );
-					foreach( $terms as $term ) {
-						$this->rewrite_term_hierarchy( $term, $rewrite, $slug, '/' );
+					$terms = get_terms($this->taxonomy, array('parent' => 0, 'hide_empty' => false));
+					foreach ($terms as $term) {
+						$this->rewrite_term_hierarchy($term, $rewrite, $slug, '/');
 					}
-					foreach( $rewrite as $way ) {
-						add_rewrite_rule( $this->use_slug . $way . 'feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top' );
-						add_rewrite_rule( $this->use_slug . $way . '(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top' );
-						add_rewrite_rule( $this->use_slug . $way . 'page/?([0-9]{1,})/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&paged=$matches[2]', 'top' );
-						add_rewrite_rule( $this->use_slug . $way . '?$', 'index.php?' . $this->taxonomy . '=$matches[1]', 'top' );
+					foreach ($rewrite as $way) {
+						add_rewrite_rule($this->use_slug . $way . 'feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top');
+						add_rewrite_rule($this->use_slug . $way . '(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top');
+						add_rewrite_rule($this->use_slug . $way . 'page/?([0-9]{1,})/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&paged=$matches[2]', 'top');
+						add_rewrite_rule($this->use_slug . $way . '?$', 'index.php?' . $this->taxonomy . '=$matches[1]', 'top');
 					}
 				} else {
-					add_rewrite_rule( $this->use_slug . '/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top' );
-					add_rewrite_rule( $this->use_slug . '/([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top' );
-					add_rewrite_rule( $this->use_slug . '/([^/]+)/page/?([0-9]{1,})/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&paged=$matches[2]', 'top' );
-					add_rewrite_rule( $this->use_slug . '/([^/]+)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]', 'top' );
+					add_rewrite_rule($this->use_slug . '/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top');
+					add_rewrite_rule($this->use_slug . '/([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&feed=$matches[2]', 'top');
+					add_rewrite_rule($this->use_slug . '/([^/]+)/page/?([0-9]{1,})/?$', 'index.php?' . $this->taxonomy . '=$matches[1]&paged=$matches[2]', 'top');
+					add_rewrite_rule($this->use_slug . '/([^/]+)/?$', 'index.php?' . $this->taxonomy . '=$matches[1]', 'top');
 				}
 			}
 		}
 	}
-	private function rewrite_term_hierarchy( $parent, &$rewrite, $slug, $separator ) {
-		$childs = get_terms( $this->taxonomy, array( 'parent' => $parent->term_id, 'hide_empty' => false ) );
-		foreach( $childs as $child ) {
-			$this->rewrite_term_hierarchy( $child, $rewrite, $slug . $parent->slug . $separator, $separator );
+	private function rewrite_term_hierarchy($parent, &$rewrite, $slug, $separator) {
+		$childs = get_terms($this->taxonomy, array('parent' => $parent->term_id, 'hide_empty' => false));
+		foreach ($childs as $child) {
+			$this->rewrite_term_hierarchy($child, $rewrite, $slug . $parent->slug . $separator, $separator);
 		}
 		$rewrite[] = $slug . '(' . $parent->slug . ')' . $separator;
 	}
 	public function flush_rewrite() {
-		if( $this->enable_rewrites ) {
+		if ($this->enable_rewrites) {
 			$this->rewrite();
 			flush_rewrite_rules();
 		}
 	}
-	public function permalink( $permalink, $term, $taxonomy ) {
-		if( $this->enable_rewrites ) {
-			if( $taxonomy === $this->taxonomy ) {
-				if( empty( $this->use_slug ) || $this->use_slug == '/' ) {
-					if( $this->use_hierarchy_cat_slug ) {
+	public function permalink($permalink, $term, $taxonomy) {
+		if ($this->enable_rewrites) {
+			if ($taxonomy === $this->taxonomy) {
+				if (empty($this->use_slug) || $this->use_slug == '/') {
+					if ($this->use_hierarchy_cat_slug) {
 						$term_permalink = '';
-						$this->permalink_term_hierarchy( $term, $term_permalink, $taxonomy, '/' );
+						$this->permalink_term_hierarchy($term, $term_permalink, $taxonomy, '/');
 						$permalink = get_site_url() . '/' . $term_permalink;
 					} else {
 						$permalink = get_site_url() . '/' . $term->slug;
 					}
 				} else {
-					if( $this->use_hierarchy_cat_slug ) {
+					if ($this->use_hierarchy_cat_slug) {
 						$term_permalink = '';
-						$this->permalink_term_hierarchy( $term, $term_permalink, $taxonomy, '/' );
+						$this->permalink_term_hierarchy($term, $term_permalink, $taxonomy, '/');
 						$permalink = get_site_url() . '/' . $this->use_slug . '/' . $term_permalink;
 					} else {
 						$permalink = get_site_url() . '/' . $this->use_slug . '/' . $term->slug;
@@ -115,13 +115,13 @@ 
 		}
 		return $permalink;
 	}
-	private function permalink_term_hierarchy( $term, &$permalink, $taxonomy, $separator ) {
-		if( $term->parent == 0 ) {
+	private function permalink_term_hierarchy($term, &$permalink, $taxonomy, $separator) {
+		if ($term->parent == 0) {
 			$permalink = $term->slug . $separator . $permalink;
 		} else {
 			$permalink = $term->slug . $separator . $permalink;
-			$term_parent = get_term( $term->parent, $taxonomy );
-			$this->permalink_term_hierarchy( $term_parent, $permalink, $taxonomy, $separator );
+			$term_parent = get_term($term->parent, $taxonomy);
+			$this->permalink_term_hierarchy($term_parent, $permalink, $taxonomy, $separator);
 		}
 	}
 }
@@ -133,122 +133,122 @@ 
 	private $use_slug;
 	private $use_cat_slug;
 	private $use_hierarchy_cat_slug;
-	public function __construct( $post_type, $taxonomy, $slug = '/', $categories = false ) {
+	public function __construct($post_type, $taxonomy, $slug = '/', $categories = false) {
 		$this->post_type = $post_type;
 		$this->taxonomy = $taxonomy;
 		$this->use_slug = $slug;
-		if( is_bool( $categories ) ) {
+		if (is_bool($categories)) {
 			$this->use_cat_slug = $categories;
 			$this->use_hierarchy_cat_slug = false;
-		} elseif( $categories == 'hierarchy' ) {
+		} elseif ($categories == 'hierarchy') {
 			$this->use_cat_slug = true;
 			$this->use_hierarchy_cat_slug = true;
 		}
-		add_action( 'init', array( $this, 'rewrite' ), 11 );
-		add_action( 'created_' . $this->taxonomy, array( $this, 'flush_rewrite' ) );
-		add_action( 'edited_' . $this->taxonomy, array( $this, 'flush_rewrite' ) );
-		add_action( 'delete_' . $this->taxonomy, array( $this, 'flush_rewrite' ) );
-		add_filter( 'post_type_link', array( $this, 'permalink' ), 10, 3 );
-		add_action( 'pre_get_posts', array( $this, 'query' ) );
+		add_action('init', array($this, 'rewrite'), 11);
+		add_action('created_' . $this->taxonomy, array($this, 'flush_rewrite'));
+		add_action('edited_' . $this->taxonomy, array($this, 'flush_rewrite'));
+		add_action('delete_' . $this->taxonomy, array($this, 'flush_rewrite'));
+		add_filter('post_type_link', array($this, 'permalink'), 10, 3);
+		add_action('pre_get_posts', array($this, 'query'));
 	}
 	public function rewrite() {
 		global $wp_rewrite;
 		$this->enable_rewrites = $wp_rewrite->use_trailing_slashes;
-		if( $this->enable_rewrites ) {
-			if( empty( $this->use_slug ) || $this->use_slug == '/' ) {
-				if( $this->use_cat_slug ) {
-					if( $this->use_hierarchy_cat_slug ) {
+		if ($this->enable_rewrites) {
+			if (empty($this->use_slug) || $this->use_slug == '/') {
+				if ($this->use_cat_slug) {
+					if ($this->use_hierarchy_cat_slug) {
 						add_rewrite_tag('%taxonomies%', '(.*)');
 						$slug = '(';
 						$rewrite = array();
-						$terms = get_terms( $this->taxonomy, array( 'parent' => 0, 'hide_empty' => false ) );
-						foreach( $terms as $term ) {
-							$this->rewrite_term_hierarchy( $term, $rewrite, $slug, '/' );
+						$terms = get_terms($this->taxonomy, array('parent' => 0, 'hide_empty' => false));
+						foreach ($terms as $term) {
+							$this->rewrite_term_hierarchy($term, $rewrite, $slug, '/');
 						}
-						foreach( array_reverse( $rewrite ) as $way ) {
-							add_rewrite_rule( $way . ')([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top' );
-							add_rewrite_rule( $way . ')([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top' );
-							add_rewrite_rule( $way . ')([^/]+)/page/?([0-9]{1,})/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&paged=$matches[3]', 'top' );
-							add_rewrite_rule( $way . ')([^/]+)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]', 'top' );
+						foreach (array_reverse($rewrite) as $way) {
+							add_rewrite_rule($way . ')([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top');
+							add_rewrite_rule($way . ')([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top');
+							add_rewrite_rule($way . ')([^/]+)/page/?([0-9]{1,})/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&paged=$matches[3]', 'top');
+							add_rewrite_rule($way . ')([^/]+)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]', 'top');
 						}
 					} else {
 						add_rewrite_tag('%taxonomies%', '(.*)');
-						$terms = get_terms( $this->taxonomy, array( 'fields' => 'id=>slug', 'hide_empty' => false ) );
-						foreach( $terms as $term ) {
-							add_rewrite_rule( '(' . $term . ')/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top' );
-							add_rewrite_rule( '(' . $term . ')/([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top' );
-							add_rewrite_rule( '(' . $term . ')/([^/]+)/page/?([0-9]{1,})/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&paged=$matches[3]', 'top' );
-							add_rewrite_rule( '(' . $term . ')/([^/]+)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]', 'top' );
+						$terms = get_terms($this->taxonomy, array('fields' => 'id=>slug', 'hide_empty' => false));
+						foreach ($terms as $term) {
+							add_rewrite_rule('(' . $term . ')/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top');
+							add_rewrite_rule('(' . $term . ')/([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top');
+							add_rewrite_rule('(' . $term . ')/([^/]+)/page/?([0-9]{1,})/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&paged=$matches[3]', 'top');
+							add_rewrite_rule('(' . $term . ')/([^/]+)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]', 'top');
 						}
 					}
 				} /*else {
 					Only in the query func
 				} */
 			} else {
-				if( $this->use_cat_slug ) {
-					if( $this->use_hierarchy_cat_slug ) {
+				if ($this->use_cat_slug) {
+					if ($this->use_hierarchy_cat_slug) {
 						add_rewrite_tag('%taxonomies%', '(.*)');
 						$slug = '/(';
 						$rewrite = array();
-						$terms = get_terms( $this->taxonomy, array( 'parent' => 0, 'hide_empty' => false ) );
-						foreach( $terms as $term ) {
-							$this->rewrite_term_hierarchy( $term, $rewrite, $slug, '/' );
+						$terms = get_terms($this->taxonomy, array('parent' => 0, 'hide_empty' => false));
+						foreach ($terms as $term) {
+							$this->rewrite_term_hierarchy($term, $rewrite, $slug, '/');
 						}
-						foreach( array_reverse( $rewrite ) as $way ) {
-							add_rewrite_rule( $this->use_slug . $way . ')([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top' );
-							add_rewrite_rule( $this->use_slug . $way . ')([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top' );
-							add_rewrite_rule( $this->use_slug . $way . ')([^/]+)/page/?([0-9]{1,})/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&paged=$matches[3]', 'top' );
-							add_rewrite_rule( $this->use_slug . $way . ')([^/]+)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]', 'top' );
+						foreach (array_reverse($rewrite) as $way) {
+							add_rewrite_rule($this->use_slug . $way . ')([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top');
+							add_rewrite_rule($this->use_slug . $way . ')([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top');
+							add_rewrite_rule($this->use_slug . $way . ')([^/]+)/page/?([0-9]{1,})/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&paged=$matches[3]', 'top');
+							add_rewrite_rule($this->use_slug . $way . ')([^/]+)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]', 'top');
 						}
 					} else {
 						add_rewrite_tag('%taxonomies%', '(.*)');
-						$terms = get_terms( $this->taxonomy, array( 'fields' => 'id=>slug', 'hide_empty' => false ) );
-						foreach( $terms as $term ) {
-							add_rewrite_rule( $this->use_slug . '/(' . $term . ')/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top' );
-							add_rewrite_rule( $this->use_slug . '/(' . $term . ')/([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top' );
-							add_rewrite_rule( $this->use_slug . '/(' . $term . ')/([^/]+)/page/?([0-9]{1,})/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&paged=$matches[3]', 'top' );
-							add_rewrite_rule( $this->use_slug . '/(' . $term . ')/([^/]+)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]', 'top' );
+						$terms = get_terms($this->taxonomy, array('fields' => 'id=>slug', 'hide_empty' => false));
+						foreach ($terms as $term) {
+							add_rewrite_rule($this->use_slug . '/(' . $term . ')/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top');
+							add_rewrite_rule($this->use_slug . '/(' . $term . ')/([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&feed=$matches[3]', 'top');
+							add_rewrite_rule($this->use_slug . '/(' . $term . ')/([^/]+)/page/?([0-9]{1,})/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]&paged=$matches[3]', 'top');
+							add_rewrite_rule($this->use_slug . '/(' . $term . ')/([^/]+)/?$', 'index.php?taxonomies=$matches[1]&' . $this->post_type . '=$matches[2]', 'top');
 						}
 					}
 				} else {
-					add_rewrite_rule( $this->use_slug . '/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->post_type . '=$matches[1]&feed=$matches[2]', 'top' );
-					add_rewrite_rule( $this->use_slug . '/([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->post_type . '=$matches[1]&feed=$matches[2]', 'top' );
-					add_rewrite_rule( $this->use_slug . '/([^/]+)/page/?([0-9]{1,})/?$', 'index.php?' . $this->post_type . '=$matches[1]&paged=$matches[2]', 'top' );
-					add_rewrite_rule( $this->use_slug . '/([^/]+)/?$', 'index.php?' . $this->post_type . '=$matches[1]', 'top' );
+					add_rewrite_rule($this->use_slug . '/([^/]+)/feed/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->post_type . '=$matches[1]&feed=$matches[2]', 'top');
+					add_rewrite_rule($this->use_slug . '/([^/]+)/(feed|rdf|rss|rss2|atom)/?$', 'index.php?' . $this->post_type . '=$matches[1]&feed=$matches[2]', 'top');
+					add_rewrite_rule($this->use_slug . '/([^/]+)/page/?([0-9]{1,})/?$', 'index.php?' . $this->post_type . '=$matches[1]&paged=$matches[2]', 'top');
+					add_rewrite_rule($this->use_slug . '/([^/]+)/?$', 'index.php?' . $this->post_type . '=$matches[1]', 'top');
 					//'rewrite' => array( 'slug' => $this->post_type ) || true
 				}
 			}
 		}
 	}
-	private function rewrite_term_hierarchy( $parent, &$rewrite, $slug, $separator ) {
+	private function rewrite_term_hierarchy($parent, &$rewrite, $slug, $separator) {
 		$rewrite[] = $slug . $parent->slug . $separator;
-		$childs = get_terms( $this->taxonomy, array( 'parent' => $parent->term_id, 'hide_empty' => false ) );
-		foreach( $childs as $child ) {
-			$this->rewrite_term_hierarchy( $child, $rewrite, $slug . $parent->slug . $separator, $separator );
+		$childs = get_terms($this->taxonomy, array('parent' => $parent->term_id, 'hide_empty' => false));
+		foreach ($childs as $child) {
+			$this->rewrite_term_hierarchy($child, $rewrite, $slug . $parent->slug . $separator, $separator);
 		}
 	}
 	public function flush_rewrite() {
-		if( $this->enable_rewrites ) {
+		if ($this->enable_rewrites) {
 			$this->rewrite();
 			flush_rewrite_rules();
 		}
 	}
-	public function permalink( $permalink, $post, $leavename ) {
-		if( $this->enable_rewrites ) {
-			if( $post->post_type == $this->post_type ) {
-				if( empty( $this->use_slug ) || $this->use_slug == '/' ) {
-					if( $this->use_cat_slug ) {
-						if( $this->use_hierarchy_cat_slug ) {
-							$terms = get_the_terms( $post->ID, $this->taxonomy );
-							if( !empty( $terms ) ) {
+	public function permalink($permalink, $post, $leavename) {
+		if ($this->enable_rewrites) {
+			if ($post->post_type == $this->post_type) {
+				if (empty($this->use_slug) || $this->use_slug == '/') {
+					if ($this->use_cat_slug) {
+						if ($this->use_hierarchy_cat_slug) {
+							$terms = get_the_terms($post->ID, $this->taxonomy);
+							if (!empty($terms)) {
 								$term = $terms[0];
 								$post_permalink = '';
-								$this->permalink_term_hierarchy( $term, $post_permalink, $this->taxonomy, '/' );
+								$this->permalink_term_hierarchy($term, $post_permalink, $this->taxonomy, '/');
 								$permalink = get_site_url() . '/' . $post_permalink . $post->post_name . '/';
 							}
 						} else {
-							$terms = get_the_terms( $post->ID, $this->taxonomy );
-							if( !empty( $terms ) ) {
+							$terms = get_the_terms($post->ID, $this->taxonomy);
+							if (!empty($terms)) {
 								$term = $terms[0];
 								$permalink = get_site_url() . '/' . $term->slug . '/' . $post->post_name . '/';
 							}
@@ -257,18 +257,18 @@ 
 						$permalink = get_site_url() . '/' . $post->post_name . '/';
 					}
 				} else {
-					if( $this->use_cat_slug ) {
-						if( $this->use_hierarchy_cat_slug ) {
-							$terms = get_the_terms( $post->ID, $this->taxonomy );
-							if( !empty( $terms ) ) {
+					if ($this->use_cat_slug) {
+						if ($this->use_hierarchy_cat_slug) {
+							$terms = get_the_terms($post->ID, $this->taxonomy);
+							if (!empty($terms)) {
 								$term = $terms[0];
 								$post_permalink = '';
-								$this->permalink_term_hierarchy( $term, $post_permalink, $this->taxonomy, '/' );
+								$this->permalink_term_hierarchy($term, $post_permalink, $this->taxonomy, '/');
 								$permalink = get_site_url() . '/' . $this->use_slug . '/' . $post_permalink . $post->post_name . '/';
 							}
 						} else {
-							$terms = get_the_terms( $post->ID, $this->taxonomy );
-							if( !empty( $terms ) ) {
+							$terms = get_the_terms($post->ID, $this->taxonomy);
+							if (!empty($terms)) {
 								$term = $terms[0];
 								$permalink = get_site_url() . '/' . $this->use_slug . '/' . $term->slug . '/' . $post->post_name . '/';
 							}
@@ -281,20 +281,20 @@ 
 		}
 		return $permalink;
 	}
-	private function permalink_term_hierarchy( $term, &$permalink, $taxonomy, $separator ) {
-		if( $term->parent == 0 ) {
+	private function permalink_term_hierarchy($term, &$permalink, $taxonomy, $separator) {
+		if ($term->parent == 0) {
 			$permalink = $term->slug . $separator . $permalink;
 		} else {
 			$permalink = $term->slug . $separator . $permalink;
-			$term_parent = get_term( $term->parent, $taxonomy );
-			$this->permalink_term_hierarchy( $term_parent, $permalink, $taxonomy, $separator );
+			$term_parent = get_term($term->parent, $taxonomy);
+			$this->permalink_term_hierarchy($term_parent, $permalink, $taxonomy, $separator);
 		}
 	}
-	public function query( $query ) {
-		if( $this->enable_rewrites ) {
-			if ( empty( $this->use_slug ) || $this->use_slug == '/' && !$this->use_cat_slug ) {
-				if ( !is_admin() && $query->is_main_query() && !isset( $query->page ) && count( $query->query ) == 2 ) {
-					$query->set('post_type', array( 'page', 'post', $this->post_type ) );
+	public function query($query) {
+		if ($this->enable_rewrites) {
+			if (empty($this->use_slug) || $this->use_slug == '/' && !$this->use_cat_slug) {
+				if (!is_admin() && $query->is_main_query() && !isset($query->page) && count($query->query) == 2) {
+					$query->set('post_type', array('page', 'post', $this->post_type));
 				}
 			}
 		}

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
  *