Eoxia / wpshop

includes/modules/wps_customer/controller/wps_account_ctr.php

Doc Comments +1 added lines, -1 removed lines

@@ -481,7 +481,7 @@
 	}
 
 	/** SIGN UP - Display the commercial & newsletter form
-	 * @return void
+	 * @return string
 	 */
 	function display_commercial_newsletter_form() {
 		$output = '';

Indentation +2 added lines, -2 removed lines

@@ -1,8 +1,8 @@
 <?php if ( !defined( 'ABSPATH' ) ) exit;
 class wps_account_ctr {
 	/** Define the main directory containing the template for the current plugin
-	* @var string
-	*/
+	 * @var string
+	 */
 	private $template_dir;
 	/**
 	 * Define the directory name for the module in order to check into frontend

Spacing +312 added lines, -312 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_account_ctr {
 	/** Define the main directory containing the template for the current plugin
 	* @var string
@@ -19,50 +19,50 @@ 
 		$this->template_dir = WPS_ACCOUNT_PATH . WPS_ACCOUNT_DIR . "/templates/";
 		/** Shortcodes **/
 		// Sign up Display Shortcode
-		add_shortcode( 'wps_signup', array( &$this, 'display_signup' ) );
+		add_shortcode('wps_signup', array(&$this, 'display_signup'));
 		// Log in Form Display Shortcode
-		add_shortcode( 'wpshop_login', array( &$this, 'get_login_form'));
+		add_shortcode('wpshop_login', array(&$this, 'get_login_form'));
 		//Log in first step
-		add_shortcode( 'wps_first_login', array( &$this, 'get_login_first_step'));
+		add_shortcode('wps_first_login', array(&$this, 'get_login_first_step'));
 		// Forgot password Form
-		add_shortcode( 'wps_forgot_password', array( &$this, 'get_forgot_password_form'));
+		add_shortcode('wps_forgot_password', array(&$this, 'get_forgot_password_form'));
 		// Renew password form
-		add_shortcode( 'wps_renew_password', array( &$this, 'get_renew_password_form'));
+		add_shortcode('wps_renew_password', array(&$this, 'get_renew_password_form'));
 		//Account informations
-		add_shortcode( 'wps_account_informations', array($this, 'display_account_informations') );
+		add_shortcode('wps_account_informations', array($this, 'display_account_informations'));
 		//Account form
-		add_shortcode( 'wps_account_informations_form', array($this, 'account_informations_form') );
+		add_shortcode('wps_account_informations_form', array($this, 'account_informations_form'));
 
 		/** Ajax Actions **/
 		// add_action('wap_ajax_wps_display_connexion_form', array(&$this, 'wps_ajax_get_login_form_interface') );
 		// add_action('wap_ajax_nopriv_wps_display_connexion_form', array(&$this, 'wps_ajax_get_login_form_interface') );
 
-		add_action('wp_ajax_wps_login_request', array(&$this, 'control_login_form_request') );
-		add_action('wp_ajax_nopriv_wps_login_request', array(&$this, 'control_login_form_request') );
+		add_action('wp_ajax_wps_login_request', array(&$this, 'control_login_form_request'));
+		add_action('wp_ajax_nopriv_wps_login_request', array(&$this, 'control_login_form_request'));
 
-		add_action('wp_ajax_wps_forgot_password_request', array(&$this, 'wps_forgot_password_request') );
-		add_action('wp_ajax_nopriv_wps_forgot_password_request', array(&$this, 'wps_forgot_password_request') );
+		add_action('wp_ajax_wps_forgot_password_request', array(&$this, 'wps_forgot_password_request'));
+		add_action('wp_ajax_nopriv_wps_forgot_password_request', array(&$this, 'wps_forgot_password_request'));
 
-		add_action('wp_ajax_wps_forgot_password_renew', array(&$this, 'wps_forgot_password_renew') );
-		add_action('wp_ajax_nopriv_wps_forgot_password_renew', array(&$this, 'wps_forgot_password_renew') );
+		add_action('wp_ajax_wps_forgot_password_renew', array(&$this, 'wps_forgot_password_renew'));
+		add_action('wp_ajax_nopriv_wps_forgot_password_renew', array(&$this, 'wps_forgot_password_renew'));
 
-		add_action('wp_ajax_wps_signup_request', array(&$this, 'wps_save_signup_form') );
-		add_action('wp_ajax_nopriv_wps_signup_request', array(&$this, 'wps_save_signup_form_nopriv') );
+		add_action('wp_ajax_wps_signup_request', array(&$this, 'wps_save_signup_form'));
+		add_action('wp_ajax_nopriv_wps_signup_request', array(&$this, 'wps_save_signup_form_nopriv'));
 
-		add_action('wp_ajax_wps_login_first_request', array(&$this, 'wps_login_first_request') );
-		add_action('wp_ajax_nopriv_wps_login_first_request', array(&$this, 'wps_login_first_request') );
+		add_action('wp_ajax_wps_login_first_request', array(&$this, 'wps_login_first_request'));
+		add_action('wp_ajax_nopriv_wps_login_first_request', array(&$this, 'wps_login_first_request'));
 
-		add_action( 'wp_ajax_wps_save_account_informations', array($this, 'wps_save_account_informations') );
+		add_action('wp_ajax_wps_save_account_informations', array($this, 'wps_save_account_informations'));
 
-		add_action( 'wp_ajax_wps_account_reload_informations', array($this, 'wps_account_reload_informations') );
+		add_action('wp_ajax_wps_account_reload_informations', array($this, 'wps_account_reload_informations'));
 
-		add_action( 'wp_ajax_wps_fill_forgot_password_modal', array($this, 'wps_fill_forgot_password_modal') );
-		add_action( 'wp_ajax_nopriv_wps_fill_forgot_password_modal', array($this, 'wps_fill_forgot_password_modal') );
+		add_action('wp_ajax_wps_fill_forgot_password_modal', array($this, 'wps_fill_forgot_password_modal'));
+		add_action('wp_ajax_nopriv_wps_fill_forgot_password_modal', array($this, 'wps_fill_forgot_password_modal'));
 
-		add_action( 'wp_ajax_wps_fill_account_informations_modal', array($this, 'wps_fill_account_informations_modal') );
-		add_action( 'wp_ajax_nopriv_wps_fill_account_informations_modal', array($this, 'wps_fill_account_informations_modal') );
+		add_action('wp_ajax_wps_fill_account_informations_modal', array($this, 'wps_fill_account_informations_modal'));
+		add_action('wp_ajax_nopriv_wps_fill_account_informations_modal', array($this, 'wps_fill_account_informations_modal'));
 
-		add_action( 'wp_enqueue_scripts', array( $this, 'add_scripts') );
+		add_action('wp_enqueue_scripts', array($this, 'add_scripts'));
 	}
 
 	/**
@@ -70,32 +70,32 @@ 
 	 */
 	function add_scripts() {
 		wp_enqueue_script('jquery');
-		wp_enqueue_script( 'wps_forgot_password_js', WPS_ACCOUNT_URL.'wps_customer/assets/frontend/js/wps_forgot_password.js' );
-		wp_enqueue_script( 'wps_login_js', WPS_ACCOUNT_URL.'wps_customer/assets/frontend/js/wps_login.js' );
-		wp_enqueue_script( 'wps_signup_js', WPS_ACCOUNT_URL.'wps_customer/assets/frontend/js/wps_signup.js' );
-		wp_enqueue_script( 'wps_account_js', WPS_ACCOUNT_URL.'wps_customer/assets/frontend/js/wps_account.js' );
+		wp_enqueue_script('wps_forgot_password_js', WPS_ACCOUNT_URL . 'wps_customer/assets/frontend/js/wps_forgot_password.js');
+		wp_enqueue_script('wps_login_js', WPS_ACCOUNT_URL . 'wps_customer/assets/frontend/js/wps_login.js');
+		wp_enqueue_script('wps_signup_js', WPS_ACCOUNT_URL . 'wps_customer/assets/frontend/js/wps_signup.js');
+		wp_enqueue_script('wps_account_js', WPS_ACCOUNT_URL . 'wps_customer/assets/frontend/js/wps_account.js');
 	}
 
 	/** LOG IN - Display log in Form **/
-	function get_login_form( $force_login = false ) {
+	function get_login_form($force_login = false) {
 		$args = array();
-		if ( get_current_user_id() != 0 ) {
-			return __( 'You are already logged', 'wpshop');
+		if (get_current_user_id() != 0) {
+			return __('You are already logged', 'wpshop');
 		}
 		else {
-			$action = !empty( $_GET['action'] ) ? sanitize_text_field( $_GET['action'] ) : '';
-			$key = !empty( $_GET['key'] ) ? sanitize_text_field( $_GET['key'] ) : '';
-			$login = !empty( $_GET['login'] ) ? sanitize_text_field( $_GET['login'] ) : 0;
-			if ( !empty($action) && $action == 'retrieve_password' && !empty($key) && !empty($login) && !$force_login ) {
+			$action = !empty($_GET['action']) ? sanitize_text_field($_GET['action']) : '';
+			$key = !empty($_GET['key']) ? sanitize_text_field($_GET['key']) : '';
+			$login = !empty($_GET['login']) ? sanitize_text_field($_GET['login']) : 0;
+			if (!empty($action) && $action == 'retrieve_password' && !empty($key) && !empty($login) && !$force_login) {
 				$output = self::get_renew_password_form();
 			}
 			else {
 				ob_start();
-				require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "login/login-form") );
+				require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "login/login-form"));
 				$output = ob_get_contents();
 				ob_end_clean();
-				if ( !$force_login ) {
-					$output .= do_shortcode( '[wps_signup]' );
+				if (!$force_login) {
+					$output .= do_shortcode('[wps_signup]');
 				}
 			}
 			return $output;
@@ -105,53 +105,53 @@ 
 	/** LOG IN - AJAX - Action to connect **/
 	function control_login_form_request() {
 
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'control_login_form_request' ) )
+		if (!wp_verify_nonce($_wpnonce, 'control_login_form_request'))
 			wp_die();
 
 		$result = '';
 		$status = false;
-		$origin = sanitize_text_field( $_POST['wps-checking-origin'] );
-		$wps_login_user_login = !empty( $_POST['wps_login_user_login'] ) ? sanitize_text_field( $_POST['wps_login_user_login' ] ) : '';
-		$wps_login_password = !empty( $_POST['wps_login_password'] ) ? sanitize_text_field( $_POST['wps_login_password' ] ) : '';
-		$page_account_id = wpshop_tools::get_page_id( get_option( 'wpshop_myaccount_page_id') );
-		if ( !empty($wps_login_user_login) && !empty($wps_login_password) ) {
+		$origin = sanitize_text_field($_POST['wps-checking-origin']);
+		$wps_login_user_login = !empty($_POST['wps_login_user_login']) ? sanitize_text_field($_POST['wps_login_user_login']) : '';
+		$wps_login_password = !empty($_POST['wps_login_password']) ? sanitize_text_field($_POST['wps_login_password']) : '';
+		$page_account_id = wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'));
+		if (!empty($wps_login_user_login) && !empty($wps_login_password)) {
 			$creds = array();
 			// Test if an user exist with this login
-			$user_checking = get_user_by( 'login', $wps_login_user_login );
-			if( !empty($user_checking) ) {
+			$user_checking = get_user_by('login', $wps_login_user_login);
+			if (!empty($user_checking)) {
 				$creds['user_login'] = $wps_login_user_login;
 			}
 			else {
-				if ( is_email($wps_login_user_login) ) {
-					$user_checking = get_user_by( 'email', $wps_login_user_login );
+				if (is_email($wps_login_user_login)) {
+					$user_checking = get_user_by('email', $wps_login_user_login);
 					$creds['user_login'] = $user_checking->user_login;
 				}
 			}
-			$creds['user_password'] = wpshop_tools::varSanitizer( $_POST['wps_login_password'] );
-			$creds['remember'] =  !empty( $_POST['wps_login_remember_me'] ) ? (int) $_POST['wps_login_remember_me'] : false;
-			$user = wp_signon( $creds, false );
-			if ( is_wp_error($user) ) {
-				$result = '<div class="wps-alert-error">' .__('Connexion error', 'wpshop'). '</div>';
+			$creds['user_password'] = wpshop_tools::varSanitizer($_POST['wps_login_password']);
+			$creds['remember'] = !empty($_POST['wps_login_remember_me']) ? (int)$_POST['wps_login_remember_me'] : false;
+			$user = wp_signon($creds, false);
+			if (is_wp_error($user)) {
+				$result = '<div class="wps-alert-error">' . __('Connexion error', 'wpshop') . '</div>';
 			}
 			else {
-				$permalink_option = get_option( 'permalink_structure' );
-				$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
-				if( $origin == $page_account_id ) {
-					$result = get_permalink( $page_account_id );
+				$permalink_option = get_option('permalink_structure');
+				$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+				if ($origin == $page_account_id) {
+					$result = get_permalink($page_account_id);
 				}
 				else {
-					$result = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=3';
+					$result = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=3';
 				}
 				$status = true;
 			}
 		}
 		else {
-			$result = '<div class="wps-alert-error">' .__('E-Mail and Password are required', 'wpshop'). '</div>';
+			$result = '<div class="wps-alert-error">' . __('E-Mail and Password are required', 'wpshop') . '</div>';
 		}
 
-		echo json_encode( array( $status, $result) );
+		echo json_encode(array($status, $result));
 		die();
 	}
 
@@ -159,13 +159,13 @@ 
 	 * LOG IN - AJAX - Display log in Form in Ajax
 	 */
 	function wps_ajax_get_login_form_interface() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_ajax_get_login_form_interface' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_ajax_get_login_form_interface'))
 			wp_die();
 
-		$response = array( 'status' => true, 'response' => self::get_login_form() );
-		echo json_encode( $response );
+		$response = array('status' => true, 'response' => self::get_login_form());
+		echo json_encode($response);
 		die();
 	}
 
@@ -173,7 +173,7 @@ 
 	function get_login_first_step() {
 		$output = '';
 		ob_start();
-		require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"frontend", "login/login-form", "first") );
+		require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "login/login-form", "first"));
 		$output .= ob_get_contents();
 		ob_end_clean();
 		return $output;
@@ -183,39 +183,39 @@ 
 	 * LOG IN - First Step log in request
 	 */
 	function wps_login_first_request() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_login_first_request' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_login_first_request'))
 			wp_die();
 
 		$status = false; $login_action = false; $response = '';
-		$user_email = ( !empty($_POST['email_address']) ) ? wpshop_tools::varSanitizer( $_POST['email_address'] ) : null;
-		if ( !empty($user_email) ) {
+		$user_email = (!empty($_POST['email_address'])) ? wpshop_tools::varSanitizer($_POST['email_address']) : null;
+		if (!empty($user_email)) {
 			$status = true;
 			/** Check if a user exist with it's email **/
-			$checking_user = get_user_by( 'login', $user_email);
-			if ( !empty($checking_user) ) {
+			$checking_user = get_user_by('login', $user_email);
+			if (!empty($checking_user)) {
 				$login_action = true;
-				$user_firstname = get_user_meta( $checking_user->ID, 'first_name', true );
+				$user_firstname = get_user_meta($checking_user->ID, 'first_name', true);
 				$response = $user_firstname;
 			}
 			else {
-				$checking_user = get_user_by( 'email', $user_email);
-				if ( !empty( $checking_user ) ) {
+				$checking_user = get_user_by('email', $user_email);
+				if (!empty($checking_user)) {
 					$login_action = true;
-					$user_firstname = get_user_meta( $checking_user->ID, 'first_name', true );
+					$user_firstname = get_user_meta($checking_user->ID, 'first_name', true);
 					$response = $user_firstname;
 				}
 			}
 
-			if( !$login_action && is_email($user_email)  ) {
+			if (!$login_action && is_email($user_email)) {
 				$response = $user_email;
 			}
 		}
 		else {
-			$response = '<div class="wps-alert-error">' .__( 'An e-mail address is required', 'wpshop' ). '</div>';
+			$response = '<div class="wps-alert-error">' . __('An e-mail address is required', 'wpshop') . '</div>';
 		}
-		echo json_encode( array( 'status'=> $status, 'response' => $response, 'login_action' => $login_action) );
+		echo json_encode(array('status'=> $status, 'response' => $response, 'login_action' => $login_action));
 		die();
 	}
 
@@ -224,9 +224,9 @@ 
 	 */
 	function get_forgot_password_form() {
 		$output = '';
-		if ( get_current_user_id() == 0 ) {
+		if (get_current_user_id() == 0) {
 			ob_start();
-			require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "forgot-password/forgot-password") );
+			require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "forgot-password/forgot-password"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -237,16 +237,16 @@ 
 	 * FORGOT PASSWORD - AJAX - Fill the forgot password modal
 	 */
 	function wps_fill_forgot_password_modal() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_fill_forgot_password_modal' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_fill_forgot_password_modal'))
 			wp_die();
 
 		$status = false; $title = $content = '';
-		$title = __( 'Forgot password', 'wpshop' );
+		$title = __('Forgot password', 'wpshop');
 		$content = do_shortcode('[wps_forgot_password]');
 		$status = true;
-		echo json_encode( array('status' => $status, 'title' => $title, 'content' => $content) );
+		echo json_encode(array('status' => $status, 'title' => $title, 'content' => $content));
 		wp_die();
 	}
 
@@ -254,48 +254,48 @@ 
 	 * FORGOT PASSWORD- AJAX - Forgot Password Request
 	 */
 	function wps_forgot_password_request() {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_forgot_password_request' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_forgot_password_request'))
 			wp_die();
 
 		global $wpdb;
 		$status = false; $result = '';
-		$user_login = ( !empty( $_POST['wps_user_login']) ) ? wpshop_tools::varSanitizer($_POST['wps_user_login']) : null;
-		if ( !empty($user_login) ) {
+		$user_login = (!empty($_POST['wps_user_login'])) ? wpshop_tools::varSanitizer($_POST['wps_user_login']) : null;
+		if (!empty($user_login)) {
 			$existing_user = false;
 			$key_for_update = 'user_login';
 			$exist_user = get_user_by('login', $user_login);
-			if( !empty($exist_user) ) {
+			if (!empty($exist_user)) {
 				$existing_user = true;
 			}
 			else {
 				$exist_user = get_user_by('email', $user_login);
 				$key_for_update = 'user_email';
-				if ( !empty($exist_user) ) {
+				if (!empty($exist_user)) {
 					$existing_user = true;
 				}
 			}
 
-			if ( $existing_user ) {
+			if ($existing_user) {
 				$key = $wpdb->get_var($wpdb->prepare("SELECT user_activation_key FROM $wpdb->users WHERE $key_for_update = %s", $user_login));
-				if ( empty($key) ) {
+				if (empty($key)) {
 					$key = wp_generate_password(20, false);
 					$wpdb->update($wpdb->users, array('user_activation_key' => $key), array('user_login' => $user_login));
 				}
 				$this->send_forgot_password_email($key, $user_login, $exist_user);
-				$result = '<div class="wps-alert-info">' .__('An e-mail with an password renew link has been sent to you', 'wpshop'). '</div>';
+				$result = '<div class="wps-alert-info">' . __('An e-mail with an password renew link has been sent to you', 'wpshop') . '</div>';
 				$status = true;
 			}
 			else {
-				$result = '<div class="wps-alert-error">' .__('No customer account corresponds to this email', 'wpshop'). '</div>';
+				$result = '<div class="wps-alert-error">' . __('No customer account corresponds to this email', 'wpshop') . '</div>';
 			}
 		}
 		else {
-			$result = '<div class="wps-alert-error">' .__('Please fill the required field', 'wpshop'). '</div>';
+			$result = '<div class="wps-alert-error">' . __('Please fill the required field', 'wpshop') . '</div>';
 		}
-		$response = array( $status, $result );
-		echo json_encode( $response );
+		$response = array($status, $result);
+		echo json_encode($response);
 		die();
 	}
 
@@ -304,67 +304,67 @@ 
 	 * @param string $key
 	 * @param string $user_login
 	 */
-	function send_forgot_password_email($key, $user_login, $exist_user){
+	function send_forgot_password_email($key, $user_login, $exist_user) {
 		$user_data = $exist_user->data;
 		$email = $user_data->user_email;
 		$wps_message = new wps_message_ctr();
-		$first_name = get_user_meta( $user_data->ID, 'first_name', true );
-		$last_name = get_user_meta( $user_data->ID, 'last_name', true );
-		$permalink_option = get_option( 'permalink_structure' );
-		$link = '<a href="' .get_permalink( wpshop_tools::get_page_id( get_option('wpshop_checkout_page_id') ) ).( (!empty($permalink_option)) ? '?' : '&').'order_step=2&action=retrieve_password&key=' .$key. '&login=' .rawurlencode($user_login). '">' .get_permalink( wpshop_tools::get_page_id( get_option('wpshop_checkout_page_id') ) ). '&action=retrieve_password&key=' .$key. '&login=' .rawurlencode($user_login). '</a>';
-		if( !empty($key) && !empty( $user_login ) ) {
+		$first_name = get_user_meta($user_data->ID, 'first_name', true);
+		$last_name = get_user_meta($user_data->ID, 'last_name', true);
+		$permalink_option = get_option('permalink_structure');
+		$link = '<a href="' . get_permalink(wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'))) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=2&action=retrieve_password&key=' . $key . '&login=' . rawurlencode($user_login) . '">' . get_permalink(wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'))) . '&action=retrieve_password&key=' . $key . '&login=' . rawurlencode($user_login) . '</a>';
+		if (!empty($key) && !empty($user_login)) {
 			$wps_message->wpshop_prepared_email($email,
 			'WPSHOP_FORGOT_PASSWORD_MESSAGE',
-			array( 'customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'forgot_password_link' => $link)
+			array('customer_first_name' => $first_name, 'customer_last_name' => $last_name, 'forgot_password_link' => $link)
 			);
 		}
 	}
 
 	/** FORGOT PASSWORD - AJAX - Make renew password action **/
 	function wps_forgot_password_renew() {
-		check_ajax_referer( 'wps_forgot_password_renew' );
+		check_ajax_referer('wps_forgot_password_renew');
 
 		global $wpdb;
 		$status = false; $result = $form = '';
-		$password = ( !empty( $_POST['pass1']) ) ? wpshop_tools::varSanitizer( $_POST['pass1'] ) : null;
-		$confirm_password = ( !empty( $_POST['pass2']) ) ? wpshop_tools::varSanitizer( $_POST['pass2'] ) : null;
-		$activation_key = ( !empty( $_POST['activation_key']) ) ?  wpshop_tools::varSanitizer( $_POST['activation_key'] ) : null;
-		$login = ( !empty( $_POST['user_login']) ) ?  wpshop_tools::varSanitizer( $_POST['user_login'] ) : null;
-		if ( !empty($password) && !empty($confirm_password) && $confirm_password == $password ) {
-			if ( !empty($activation_key) && !empty($login) ) {
+		$password = (!empty($_POST['pass1'])) ? wpshop_tools::varSanitizer($_POST['pass1']) : null;
+		$confirm_password = (!empty($_POST['pass2'])) ? wpshop_tools::varSanitizer($_POST['pass2']) : null;
+		$activation_key = (!empty($_POST['activation_key'])) ? wpshop_tools::varSanitizer($_POST['activation_key']) : null;
+		$login = (!empty($_POST['user_login'])) ? wpshop_tools::varSanitizer($_POST['user_login']) : null;
+		if (!empty($password) && !empty($confirm_password) && $confirm_password == $password) {
+			if (!empty($activation_key) && !empty($login)) {
 				$existing_user = false;
-				$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $activation_key, $login ) );
-				if( !empty($user) ) {
+				$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $activation_key, $login));
+				if (!empty($user)) {
 					$existing_user = true;
 				}
 				else {
-					$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_email = %s", $activation_key, $login ) );
-					if( !empty($user) ) {
+					$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_email = %s", $activation_key, $login));
+					if (!empty($user)) {
 						$existing_user = true;
 					}
 				}
 
-				if ( $existing_user ){
+				if ($existing_user) {
 					wp_set_password($password, $user->ID);
 					wp_password_change_notification($user);
 					$status = true;
-					$result = '<div class="wps-alert-success">' .__('Your password has been updated', 'wpshop'). '. <a href="#" id="display_connexion_form"> ' .__('Connect you', 'wpshop').' !</a></div>';
-					$form = self::get_login_form( true );
+					$result = '<div class="wps-alert-success">' . __('Your password has been updated', 'wpshop') . '. <a href="#" id="display_connexion_form"> ' . __('Connect you', 'wpshop') . ' !</a></div>';
+					$form = self::get_login_form(true);
 				}
 				else {
-					$result = '<div class=" wps-alert-error">' .__('Invalid activation key', 'wpshop'). '</div>';
+					$result = '<div class=" wps-alert-error">' . __('Invalid activation key', 'wpshop') . '</div>';
 				}
 			}
 			else {
-				$result = '<div class=" wps-alert-error">' .__('Invalid activation key', 'wpshop'). '</div>';
+				$result = '<div class=" wps-alert-error">' . __('Invalid activation key', 'wpshop') . '</div>';
 			}
 		}
 		else {
-			$result = '<div class="wps-alert-error">' .__('Password and confirmation password are differents', 'wpshop'). '</div>';
+			$result = '<div class="wps-alert-error">' . __('Password and confirmation password are differents', 'wpshop') . '</div>';
 		}
 
-		$response = array( $status, $result, $form );
-		echo json_encode( $response);
+		$response = array($status, $result, $form);
+		echo json_encode($response);
 		die();
 	}
 
@@ -373,9 +373,9 @@ 
 	 * @return string
 	 */
 	function get_renew_password_form() {
-		if ( get_current_user_id() == 0 ) {
+		if (get_current_user_id() == 0) {
 			ob_start();
-			require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"frontend", "forgot-password/password-renew") );
+			require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "forgot-password/password-renew"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -384,7 +384,7 @@ 
 
 	/** FORGOT PASSWORD - AJAX - Get Forgot Password form **/
 	function wps_ajax_get_forgot_password_form() {
-		echo json_encode( array(self::get_forgot_password_form() ) );
+		echo json_encode(array(self::get_forgot_password_form()));
 		die();
 	}
 
@@ -392,29 +392,29 @@ 
 	 * SIGN UP - Display Sign up form
 	 * @return string
 	 */
-	function display_signup( $args = array() ) {
+	function display_signup($args = array()) {
 		global $wpdb;
 		$output = '';
-		if ( get_current_user_id() == 0 || !empty($args) ) {
+		if (get_current_user_id() == 0 || !empty($args)) {
 			$fields_to_output = $signup_fields = array();
 
-			$password_attribute = $signup_form_attributes =  array();
+			$password_attribute = $signup_form_attributes = array();
 
-			$entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
+			$entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
 
-			$query = $wpdb->prepare('SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE_SET.' WHERE entity_id = %d', $entity_id);
-			$customer_entity_id = $wpdb->get_var( $query );
+			$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id);
+			$customer_entity_id = $wpdb->get_var($query);
 			$attributes_set = wpshop_attributes_set::getElement($customer_entity_id);
-			$account_attributes = wpshop_attributes_set::getAttributeSetDetails( ( !empty($attributes_set->id) ) ? $attributes_set->id : '', "'valid'");
-			$query = $wpdb->prepare('SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE_GROUP.' WHERE attribute_set_id = %d AND status = %s', $attributes_set->id, 'valid' );
-			$customer_attributes_sections = $wpdb->get_results( $query );
-			foreach( $customer_attributes_sections as $k => $customer_attributes_section ) {
-				foreach( $account_attributes[$customer_attributes_section->id]['attribut'] as $attribute ) {
+			$account_attributes = wpshop_attributes_set::getAttributeSetDetails((!empty($attributes_set->id)) ? $attributes_set->id : '', "'valid'");
+			$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE attribute_set_id = %d AND status = %s', $attributes_set->id, 'valid');
+			$customer_attributes_sections = $wpdb->get_results($query);
+			foreach ($customer_attributes_sections as $k => $customer_attributes_section) {
+				foreach ($account_attributes[$customer_attributes_section->id]['attribut'] as $attribute) {
 					$signup_fields[] = $attribute;
 				}
 			}
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"frontend", "signup/signup") );
+			require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "signup/signup"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
@@ -422,119 +422,119 @@ 
 	}
 
 	function wps_save_signup_form_nopriv() {
-		$this->wps_save_signup_form( true );
+		$this->wps_save_signup_form(true);
 	}
 
 	/**
 	 * SIGN UP - Save sign up form
 	 */
-	function wps_save_signup_form( $connect = false ) {
-		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
+	function wps_save_signup_form($connect = false) {
+		$_wpnonce = !empty($_POST['_wpnonce']) ? sanitize_text_field($_POST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_save_signup_form' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wps_save_signup_form'))
 			wp_die();
 
 		global $wpdb, $wpshop;
-		$user_id = ( !empty( $_POST['wps_sign_up_request_from_admin'] ) ) ? (int) $_POST['wps_sign_up_request_from_admin'] : get_current_user_id();
+		$user_id = (!empty($_POST['wps_sign_up_request_from_admin'])) ? (int)$_POST['wps_sign_up_request_from_admin'] : get_current_user_id();
 		$wps_message = new wps_message_ctr();
 		$status = $account_creation = false; $result = '';
-		$exclude_user_meta = array( 'user_email', 'user_pass' );
-		$attribute = !empty( $_POST['attribute'] ) ? (array) $_POST['attribute'] : array();
-		$element_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-		if ( !empty( $element_id) ){
-			$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE entity_id = %d', $element_id );
-			$attribute_set_id = $wpdb->get_var( $query );
-			if ( !empty($attribute_set_id) ){
-				$group = wps_address::get_addresss_form_fields_by_type( $attribute_set_id );
-				foreach ( $group as $attribute_sets ) {
-					foreach ( $attribute_sets as $attribute_set_field ) {
-						if( !empty($user_id) ) {
-							foreach( $attribute_set_field['content'] as $attribute_code => $att_def ) {
-								if( $attribute_code != 'account_user_email' ) {
+		$exclude_user_meta = array('user_email', 'user_pass');
+		$attribute = !empty($_POST['attribute']) ? (array)$_POST['attribute'] : array();
+		$element_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+		if (!empty($element_id)) {
+			$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $element_id);
+			$attribute_set_id = $wpdb->get_var($query);
+			if (!empty($attribute_set_id)) {
+				$group = wps_address::get_addresss_form_fields_by_type($attribute_set_id);
+				foreach ($group as $attribute_sets) {
+					foreach ($attribute_sets as $attribute_set_field) {
+						if (!empty($user_id)) {
+							foreach ($attribute_set_field['content'] as $attribute_code => $att_def) {
+								if ($attribute_code != 'account_user_email') {
 									$attribute_set_field['content'][$attribute_code]['required'] = 'no';
 								}
 							}
 						}
-						$validate = $wpshop->validateForm($attribute_set_field['content'], $attribute );
+						$validate = $wpshop->validateForm($attribute_set_field['content'], $attribute);
 					}
-					if ( empty($wpshop->errors) ) {
-						$user_name = !empty($attribute['varchar']['user_login']) ? sanitize_text_field( $attribute['varchar']['user_login'] ) : sanitize_email( $attribute['varchar']['user_email'] );
-						$user_pass = ( !empty($attribute['varchar']['user_pass']) && !empty($_POST['wps_signup_account_creation']) ) ? sanitize_text_field( $attribute['varchar']['user_pass'] ) : wp_generate_password( 12, false );
+					if (empty($wpshop->errors)) {
+						$user_name = !empty($attribute['varchar']['user_login']) ? sanitize_text_field($attribute['varchar']['user_login']) : sanitize_email($attribute['varchar']['user_email']);
+						$user_pass = (!empty($attribute['varchar']['user_pass']) && !empty($_POST['wps_signup_account_creation'])) ? sanitize_text_field($attribute['varchar']['user_pass']) : wp_generate_password(12, false);
 
-						if ( $user_id == 0  ) {
-							$user_id = wp_create_user($user_name, $user_pass, sanitize_email( $attribute['varchar']['user_email'] ) );
-							if ( !is_object( $user_id) ) {
+						if ($user_id == 0) {
+							$user_id = wp_create_user($user_name, $user_pass, sanitize_email($attribute['varchar']['user_email']));
+							if (!is_object($user_id)) {
 								$account_creation = true;
 								/** Update newsletter user preferences **/
 								$newsletter_preferences = array();
-								$newsletters_site = !empty( $_POST['newsletters_site'] ) ? (bool) $_POST['newsletters_site'] : false;
-								if( $newsletters_site ) {
+								$newsletters_site = !empty($_POST['newsletters_site']) ? (bool)$_POST['newsletters_site'] : false;
+								if ($newsletters_site) {
 									$newsletter_preferences['newsletters_site'] = 1;
 								}
-								$newsletters_site_partners = !empty( $_POST['newsletters_site_partners'] ) ? (bool) $_POST['newsletters_site_partners'] : false;
-								if( $newsletters_site_partners ) {
+								$newsletters_site_partners = !empty($_POST['newsletters_site_partners']) ? (bool)$_POST['newsletters_site_partners'] : false;
+								if ($newsletters_site_partners) {
 									$newsletter_preferences['newsletters_site_partners'] = 1;
 								}
 
-								update_user_meta( $user_id, 'user_preferences', $newsletter_preferences);
+								update_user_meta($user_id, 'user_preferences', $newsletter_preferences);
 							}
 						}
 
-						$customer_entity_request = $wpdb->prepare( 'SELECT ID FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $user_id);
-						$customer_post_ID = $wpdb->get_var( $customer_entity_request );
+						$customer_entity_request = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $user_id);
+						$customer_post_ID = $wpdb->get_var($customer_entity_request);
 
-						if( !empty( $attribute ) ) {
+						if (!empty($attribute)) {
 							$user_info = $address_forms = $all_addresses_form = array();
-							$billing_option = get_option( 'wpshop_billing_address' );
-							foreach( $attribute as $type => $attributes ) {
-								if( !empty( $billing_option['integrate_into_register_form'] ) && $billing_option['integrate_into_register_form'] == 'yes' && ctype_digit( (string) $type ) ) {
+							$billing_option = get_option('wpshop_billing_address');
+							foreach ($attribute as $type => $attributes) {
+								if (!empty($billing_option['integrate_into_register_form']) && $billing_option['integrate_into_register_form'] == 'yes' && ctype_digit((string)$type)) {
 									//wps_address::save_address_infos( (int) $type );
-									foreach( $attributes as $sub_type => $sub_attributes ) {
-										if( !is_array( $sub_attributes ) ) {
-											$address_forms[$type][$sub_type] = sanitize_text_field( $sub_attributes );
+									foreach ($attributes as $sub_type => $sub_attributes) {
+										if (!is_array($sub_attributes)) {
+											$address_forms[$type][$sub_type] = sanitize_text_field($sub_attributes);
 											continue;
 										}
-										foreach( $sub_attributes as $sub_meta => $sub_attribute_value ) {
-											$address_forms[$type][$sub_type][$sub_meta] = sanitize_text_field( $sub_attribute_value );
+										foreach ($sub_attributes as $sub_meta => $sub_attribute_value) {
+											$address_forms[$type][$sub_type][$sub_meta] = sanitize_text_field($sub_attribute_value);
 										}
 									}
 								} else {
-									foreach( $attributes as $meta => $attribute_value ) {
-										$user_info[$meta] = sanitize_text_field( $attribute_value );
-										if( !empty( $billing_option['integrate_into_register_form'] ) && $billing_option['integrate_into_register_form'] == 'yes' && isset( $billing_option['integrate_into_register_form_matching_field'], $billing_option['integrate_into_register_form_matching_field'][$meta] ) ) {
+									foreach ($attributes as $meta => $attribute_value) {
+										$user_info[$meta] = sanitize_text_field($attribute_value);
+										if (!empty($billing_option['integrate_into_register_form']) && $billing_option['integrate_into_register_form'] == 'yes' && isset($billing_option['integrate_into_register_form_matching_field'], $billing_option['integrate_into_register_form_matching_field'][$meta])) {
 											$all_addresses_form[$type][$meta] = $user_info[$meta];
 										}
 									}
 								}
 							}
-							wps_customer_ctr::save_customer_synchronize( $customer_post_ID, $user_id, $user_info );
-							foreach( $address_forms as $type_of_form => $address_form ) {
-								$address_form = array_merge_recursive( $all_addresses_form, $address_form );
-								wps_address::save_address_infos( (int) $type_of_form, 0, array( 'type_of_form' => (int) $type_of_form, 'attribute' => array( $type_of_form => $address_form ) ), $customer_post_ID );
+							wps_customer_ctr::save_customer_synchronize($customer_post_ID, $user_id, $user_info);
+							foreach ($address_forms as $type_of_form => $address_form) {
+								$address_form = array_merge_recursive($all_addresses_form, $address_form);
+								wps_address::save_address_infos((int)$type_of_form, 0, array('type_of_form' => (int)$type_of_form, 'attribute' => array($type_of_form => $address_form)), $customer_post_ID);
 							}
 						}
 
-						if ( !empty( $_SESSION ) && !empty( $_SESSION[ 'cart' ] ) ) {
-							$permalink_option = get_option( 'permalink_structure' );
-							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ));
-							$result = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=3';
+						if (!empty($_SESSION) && !empty($_SESSION['cart'])) {
+							$permalink_option = get_option('permalink_structure');
+							$checkout_page_id = wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id'));
+							$result = get_permalink($checkout_page_id) . ((!empty($permalink_option)) ? '?' : '&') . 'order_step=3';
 						}
 						else {
-							$account_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_myaccount_page_id' ));
-							$result = get_permalink( $account_page_id  );
+							$account_page_id = wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'));
+							$result = get_permalink($account_page_id);
 						}
 						$status = true;
 
-						if ( $account_creation && !empty( $user_id ) && $connect ) {
+						if ($account_creation && !empty($user_id) && $connect) {
 							$secure_cookie = is_ssl() ? true : false;
-							wp_set_auth_cookie( $user_id, true, $secure_cookie );
+							wp_set_auth_cookie($user_id, true, $secure_cookie);
 						}
-						$wps_message->wpshop_prepared_email( sanitize_email($attribute['varchar']['user_email']), 'WPSHOP_SIGNUP_MESSAGE', array('customer_first_name' => ( !empty($attribute['varchar']['first_name']) ) ? sanitize_text_field( $attribute['varchar']['first_name'] ) : '', 'customer_last_name' => ( !empty($attribute['varchar']['last_name']) ) ? sanitize_text_field( $attribute['varchar']['last_name'] ) : '', 'customer_user_email' => ( !empty($attribute['varchar']['user_email']) ) ? sanitize_email( $attribute['varchar']['user_email'] ) : '') );
+						$wps_message->wpshop_prepared_email(sanitize_email($attribute['varchar']['user_email']), 'WPSHOP_SIGNUP_MESSAGE', array('customer_first_name' => (!empty($attribute['varchar']['first_name'])) ? sanitize_text_field($attribute['varchar']['first_name']) : '', 'customer_last_name' => (!empty($attribute['varchar']['last_name'])) ? sanitize_text_field($attribute['varchar']['last_name']) : '', 'customer_user_email' => (!empty($attribute['varchar']['user_email'])) ? sanitize_email($attribute['varchar']['user_email']) : ''));
 
 					} else {
-						$result = '<div class="wps-alert-error">' .__('Some errors have been detected', 'wpshop') . ' : <ul>';
-						foreach(  $wpshop->errors as $error ){
-							$result .= '<li>' .$error. '</li>';
+						$result = '<div class="wps-alert-error">' . __('Some errors have been detected', 'wpshop') . ' : <ul>';
+						foreach ($wpshop->errors as $error) {
+							$result .= '<li>' . $error . '</li>';
 						}
 						$result .= '</div>';
 					}
@@ -543,7 +543,7 @@ 
 			}
 		}
 
-		wp_die( json_encode( array( $status, $result, $user_id ) ) );
+		wp_die(json_encode(array($status, $result, $user_id)));
 	}
 
 	/** SIGN UP - Display the commercial & newsletter form
@@ -551,10 +551,10 @@ 
 	 */
 	function display_commercial_newsletter_form() {
 		$output = '';
-		$user_preferences = get_user_meta( get_current_user_id(), 'user_preferences', true );
-		$wpshop_cart_option = get_option( 'wpshop_cart_option' );
+		$user_preferences = get_user_meta(get_current_user_id(), 'user_preferences', true);
+		$wpshop_cart_option = get_option('wpshop_cart_option');
 		ob_start();
-		require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "signup/signup", "newsletter") );
+		require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "signup/signup", "newsletter"));
 		$output = ob_get_contents();
 		ob_end_clean();
 
@@ -565,88 +565,88 @@ 
 	 * ACCOUNT - Display Account informations
 	 * @return string
 	 */
-	function display_account_informations( $customer_id = '', $force_edition_form = false, $customer_link = false ) {
+	function display_account_informations($customer_id = '', $force_edition_form = false, $customer_link = false) {
 		global $wpdb;
 		$output = $attributes_sections_tpl = $attribute_details = '';
-		$is_from_admin = ( !empty($customer_id) ) ? true : false;
-		$customer_id = ( !empty($customer_id) ) ? $customer_id : get_current_user_id();
-		if( $customer_id != 0 ) {
+		$is_from_admin = (!empty($customer_id)) ? true : false;
+		$customer_id = (!empty($customer_id)) ? $customer_id : get_current_user_id();
+		if ($customer_id != 0) {
 			$screen = get_current_screen();
-			if( ( is_admin() && isset( $screen ) && is_object( $screen ) && $screen->post_type == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS ) || $force_edition_form ) {
-				$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-				$query = $wpdb->prepare( 'SELECT ID FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $customer_id );
-				$cid = $wpdb->get_var( $query );
+			if ((is_admin() && isset($screen) && is_object($screen) && $screen->post_type == WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS) || $force_edition_form) {
+				$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+				$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $customer_id);
+				$cid = $wpdb->get_var($query);
 
 				$fields_to_output = $signup_fields = array();
 
-				$password_attribute = $signup_form_attributes =  array();
+				$password_attribute = $signup_form_attributes = array();
 
-				$entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
+				$entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
 
-				$query = $wpdb->prepare('SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE_SET.' WHERE entity_id = %d', $entity_id);
-				$customer_entity_id = $wpdb->get_var( $query );
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id);
+				$customer_entity_id = $wpdb->get_var($query);
 				$attributes_set = wpshop_attributes_set::getElement($customer_entity_id);
-				$account_attributes = wpshop_attributes_set::getAttributeSetDetails( ( !empty($attributes_set->id) ) ? $attributes_set->id : '', "'valid'");
-				$query = $wpdb->prepare('SELECT * FROM '.WPSHOP_DBT_ATTRIBUTE_GROUP.' WHERE attribute_set_id = %d', $attributes_set->id );
-				$customer_attributes_sections = $wpdb->get_results( $query );
-				foreach( $customer_attributes_sections as $k => $attributes_section ) {
+				$account_attributes = wpshop_attributes_set::getAttributeSetDetails((!empty($attributes_set->id)) ? $attributes_set->id : '', "'valid'");
+				$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE attribute_set_id = %d', $attributes_set->id);
+				$customer_attributes_sections = $wpdb->get_results($query);
+				foreach ($customer_attributes_sections as $k => $attributes_section) {
 					$signup_fields[$attributes_section->name] = array();
-					if ( !empty( $account_attributes[$attributes_section->id] ) ) {
-						foreach( $account_attributes[$attributes_section->id]['attribut'] as $attribute ) {
+					if (!empty($account_attributes[$attributes_section->id])) {
+						foreach ($account_attributes[$attributes_section->id]['attribut'] as $attribute) {
 							$signup_fields[$attributes_section->name][] = $attribute;
 						}
 					}
 				}
 				ob_start();
-				require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"backend", "customer-informations/customer_informations_form") );
+				require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "backend", "customer-informations/customer_informations_form"));
 				$output = ob_get_contents();
 				ob_end_clean();
 			} else {
-				$customer_entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-				$query = $wpdb->prepare( 'SELECT ID FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $customer_id );
-				$cid = $wpdb->get_var( $query );
-
-				if( !empty($customer_entity_id) ) {
-					$query = $wpdb->prepare( 'SELECT * FROM '.WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE entity_id = %d AND status = %s AND default_set = %s', $customer_entity_id, 'valid', 'yes' );
-					$attributes_sets = $wpdb->get_results( $query );
-					foreach( $attributes_sets as $attributes_set ) {
-						if( !empty($attributes_set->id) ) {
-							$query = $wpdb->prepare( 'SELECT * FROM '. WPSHOP_DBT_ATTRIBUTE_GROUP. ' WHERE attribute_set_id = %d AND status = %s', $attributes_set->id, 'valid');
-							$attributes_sections = $wpdb->get_results( $query );
-
-							if( !empty($attributes_sections) ) {
-								foreach( $attributes_sections as $attributes_section ) {
-									$query = $wpdb->prepare( 'SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_DETAILS. ' WHERE status = %s AND entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', 'valid', $customer_entity_id, $attributes_set->id, $attributes_section->id);
-									$attributes_details = $wpdb->get_results( $query );
-
-									foreach( $attributes_details as $attributes_detail ) {
-										$query = $wpdb->prepare( 'SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE. ' WHERE id = %d AND status = %s', $attributes_detail->attribute_id, 'valid' );
-										$attribute_def = $wpdb->get_row( $query );
-
-										$query = $wpdb->prepare( 'SELECT value  FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX.strtolower($attribute_def->data_type). ' WHERE entity_type_id = %d AND attribute_id = %d AND entity_id = %d ', $customer_entity_id, $attribute_def->id, $cid );
-										$attribute_value = $wpdb->get_var( $query );
+				$customer_entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+				$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $customer_id);
+				$cid = $wpdb->get_var($query);
+
+				if (!empty($customer_entity_id)) {
+					$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d AND status = %s AND default_set = %s', $customer_entity_id, 'valid', 'yes');
+					$attributes_sets = $wpdb->get_results($query);
+					foreach ($attributes_sets as $attributes_set) {
+						if (!empty($attributes_set->id)) {
+							$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE attribute_set_id = %d AND status = %s', $attributes_set->id, 'valid');
+							$attributes_sections = $wpdb->get_results($query);
+
+							if (!empty($attributes_sections)) {
+								foreach ($attributes_sections as $attributes_section) {
+									$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_DETAILS . ' WHERE status = %s AND entity_type_id = %d AND attribute_set_id = %d AND attribute_group_id = %d', 'valid', $customer_entity_id, $attributes_set->id, $attributes_section->id);
+									$attributes_details = $wpdb->get_results($query);
+
+									foreach ($attributes_details as $attributes_detail) {
+										$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE . ' WHERE id = %d AND status = %s', $attributes_detail->attribute_id, 'valid');
+										$attribute_def = $wpdb->get_row($query);
+
+										$query = $wpdb->prepare('SELECT value  FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . strtolower($attribute_def->data_type) . ' WHERE entity_type_id = %d AND attribute_id = %d AND entity_id = %d ', $customer_entity_id, $attribute_def->id, $cid);
+										$attribute_value = $wpdb->get_var($query);
 
 										/**	Check attribute type for specific type display	*/
-										if ( "datetime" == $attribute_def->data_type ) {
-											$attribute_value = mysql2date( get_option( 'date_format' ) . ( ( substr( $attribute_value, -9 ) != ' 00:00:00' ) ? ' ' . get_option( 'time_format' ) : '' ), $attribute_value, true);
+										if ("datetime" == $attribute_def->data_type) {
+											$attribute_value = mysql2date(get_option('date_format') . ((substr($attribute_value, -9) != ' 00:00:00') ? ' ' . get_option('time_format') : ''), $attribute_value, true);
 										}
 
 										/**	Check attribute input type in order to get specific value	*/
-										if ( in_array( $attribute_def->backend_input, array( 'multiple-select', 'select', 'radio', 'checkbox' ) ) ) {
-											if ( $attribute_def->data_type_to_use == 'custom' ) {
-												$query = $wpdb->prepare("SELECT label FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " WHERE attribute_id = %d AND status = 'valid' AND id = %d", $attribute_def->id, $attribute_value );
-												$attribute_value = $wpdb->get_var( $query );
+										if (in_array($attribute_def->backend_input, array('multiple-select', 'select', 'radio', 'checkbox'))) {
+											if ($attribute_def->data_type_to_use == 'custom') {
+												$query = $wpdb->prepare("SELECT label FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " WHERE attribute_id = %d AND status = 'valid' AND id = %d", $attribute_def->id, $attribute_value);
+												$attribute_value = $wpdb->get_var($query);
 											}
-											else if ( $attribute_def->data_type_to_use == 'internal')  {
-												$associated_post = get_post( $atribute_value );
+											else if ($attribute_def->data_type_to_use == 'internal') {
+												$associated_post = get_post($atribute_value);
 												$attribute_value = $associated_post->post_title;
 											}
 										}
 
-										if( !empty( $attribute_def ) ) {
-											if( $attribute_def->frontend_input != 'password' ) {
+										if (!empty($attribute_def)) {
+											if ($attribute_def->frontend_input != 'password') {
 												ob_start();
-												require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"frontend", "account/account_informations_element") );
+												require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "account/account_informations_element"));
 												$attribute_details .= ob_get_contents();
 												ob_end_clean();
 											}
@@ -654,7 +654,7 @@ 
 									}
 
 									ob_start();
-									require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"frontend", "account/account_informations_group_element") );
+									require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "account/account_informations_group_element"));
 									$attributes_sections_tpl .= ob_get_contents();
 									ob_end_clean();
 
@@ -665,7 +665,7 @@ 
 					}
 				}
 				ob_start();
-				require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "account/account_informations") );
+				require_once(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "account/account_informations"));
 				$output = ob_get_contents();
 				ob_end_clean();
 			}
@@ -679,85 +679,85 @@ 
 	function account_informations_form() {
 		global $wpdb;
 		$output = '';
-		if ( get_current_user_id() != 0 ) {
+		if (get_current_user_id() != 0) {
 			// Customer ID data
-				$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
-				$query = $wpdb->prepare( 'SELECT ID FROM ' .$wpdb->posts. ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, get_current_user_id() );
-				$cid = $wpdb->get_var( $query );
+				$customer_entity_type_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
+				$query = $wpdb->prepare('SELECT ID FROM ' . $wpdb->posts . ' WHERE post_type = %s AND post_author = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, get_current_user_id());
+				$cid = $wpdb->get_var($query);
 
 				$fields_to_output = $signup_fields = array();
 
-				$password_attribute = $signup_form_attributes =  array();
+				$password_attribute = $signup_form_attributes = array();
 
-				$entity_id = wpshop_entities::get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
+				$entity_id = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
 
-				$query = $wpdb->prepare('SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE_SET.' WHERE entity_id = %d', $entity_id);
-				$customer_entity_id = $wpdb->get_var( $query );
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $entity_id);
+				$customer_entity_id = $wpdb->get_var($query);
 				$attributes_set = wpshop_attributes_set::getElement($customer_entity_id);
-				$account_attributes = wpshop_attributes_set::getAttributeSetDetails( ( !empty($attributes_set->id) ) ? $attributes_set->id : '', "'valid'");
-				$query = $wpdb->prepare('SELECT id FROM '.WPSHOP_DBT_ATTRIBUTE_GROUP.' WHERE attribute_set_id = %d', $attributes_set->id );
-				$customer_attributes_sections = $wpdb->get_results( $query );
-				foreach( $customer_attributes_sections as $k => $customer_attributes_section ) {
-					if ( !empty( $account_attributes[$customer_attributes_section->id] ) ) {
-						foreach( $account_attributes[$customer_attributes_section->id]['attribut'] as $attribute ) {
+				$account_attributes = wpshop_attributes_set::getAttributeSetDetails((!empty($attributes_set->id)) ? $attributes_set->id : '', "'valid'");
+				$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_GROUP . ' WHERE attribute_set_id = %d', $attributes_set->id);
+				$customer_attributes_sections = $wpdb->get_results($query);
+				foreach ($customer_attributes_sections as $k => $customer_attributes_section) {
+					if (!empty($account_attributes[$customer_attributes_section->id])) {
+						foreach ($account_attributes[$customer_attributes_section->id]['attribut'] as $attribute) {
 							$signup_fields[] = $attribute;
 						}
 					}
 				}
 
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir,"frontend", "account/account_form") );
+			require(wpshop_tools::get_template_part(WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "account/account_form"));
 			$output = ob_get_contents();
 			ob_end_clean();
 		}
 		return $output;
 	}
 
-	function save_account_informations( $cid, $args, $admin = true ) {
+	function save_account_informations($cid, $args, $admin = true) {
 		global $wpdb, $wpshop;
 
-		$exclude_user_meta = array( 'user_email', 'user_pass' );
+		$exclude_user_meta = array('user_email', 'user_pass');
 		$wps_entities = new wpshop_entities();
-		$element_id = $wps_entities->get_entity_identifier_from_code( WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS );
+		$element_id = $wps_entities->get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS);
 
-		$query = $wpdb->prepare( 'SELECT post_author FROM ' .$wpdb->posts. ' WHERE post_type = %s AND ID = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $cid );
-		$user_id = $wpdb->get_var( $query );
+		$query = $wpdb->prepare('SELECT post_author FROM ' . $wpdb->posts . ' WHERE post_type = %s AND ID = %d', WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $cid);
+		$user_id = $wpdb->get_var($query);
 
 		$user_name = !empty($args['attribute']['varchar']['user_login']) ? $args['attribute']['varchar']['user_login'] : $args['attribute']['varchar']['user_email'];
 		$user_pass = !empty($args['attribute']['varchar']['user_pass']) ? $args['attribute']['varchar']['user_pass'] : '';
 
-		$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE entity_id = %d', $element_id );
-		$attribute_set_id = $wpdb->get_var( $query );
-		if ( !empty($attribute_set_id) ) {
-			$group  = wps_address::get_addresss_form_fields_by_type( $attribute_set_id );
+		$query = $wpdb->prepare('SELECT id FROM ' . WPSHOP_DBT_ATTRIBUTE_SET . ' WHERE entity_id = %d', $element_id);
+		$attribute_set_id = $wpdb->get_var($query);
+		if (!empty($attribute_set_id)) {
+			$group = wps_address::get_addresss_form_fields_by_type($attribute_set_id);
 			//Save data in attribute tables, ckeck first if exist to know if Insert or Update
-			wpshop_attributes::saveAttributeForEntity( $args['attribute'], $element_id, $cid );
-			foreach ( $group as $attribute_sets ) {
-				foreach ( $attribute_sets as $attribute_set_field ) {
-					if( $admin ) {
-						$validate = $wpshop->validateForm($attribute_set_field['content'], $args['attribute'] );
+			wpshop_attributes::saveAttributeForEntity($args['attribute'], $element_id, $cid);
+			foreach ($group as $attribute_sets) {
+				foreach ($attribute_sets as $attribute_set_field) {
+					if ($admin) {
+						$validate = $wpshop->validateForm($attribute_set_field['content'], $args['attribute']);
 					}
-					if ( empty($wpshop->errors) || !$admin ) {
+					if (empty($wpshop->errors) || !$admin) {
 						$wpshop_attributes = new wpshop_attributes();
-						foreach( $attribute_set_field['content'] as $attribute ) {
-							$attribute_def = wpshop_attributes::getElement( $attribute['name'], "'valid'", 'code');
-							if ( !in_array( $attribute['name'], $exclude_user_meta ) ) {
-								update_user_meta( $user_id, $attribute['name'], wpshop_tools::varSanitizer( $args['attribute'][$attribute['data_type']][$attribute['name']])  );
+						foreach ($attribute_set_field['content'] as $attribute) {
+							$attribute_def = wpshop_attributes::getElement($attribute['name'], "'valid'", 'code');
+							if (!in_array($attribute['name'], $exclude_user_meta)) {
+								update_user_meta($user_id, $attribute['name'], wpshop_tools::varSanitizer($args['attribute'][$attribute['data_type']][$attribute['name']]));
 							}
 							else {
-								wp_update_user( array('ID' => $user_id, $attribute['name'] => wpshop_tools::varSanitizer( $args['attribute'][$attribute['data_type']][$attribute['name']]) ) );
+								wp_update_user(array('ID' => $user_id, $attribute['name'] => wpshop_tools::varSanitizer($args['attribute'][$attribute['data_type']][$attribute['name']])));
 							}
 						}
 
 						/** Update newsletter user preferences **/
 						$newsletter_preferences = array();
-						if( !empty($args['newsletters_site']) ) {
+						if (!empty($args['newsletters_site'])) {
 							$newsletter_preferences['newsletters_site'] = 1;
 						}
-						if( !empty($args['newsletters_site_partners']) ) {
+						if (!empty($args['newsletters_site_partners'])) {
 							$newsletter_preferences['newsletters_site_partners'] = 1;
 						}
-						update_user_meta( $user_id, 'user_preferences', $newsletter_preferences);
+						update_user_meta($user_id, 'user_preferences', $newsletter_preferences);
 					} else {
 						return $wpshop->errors;
 					}
@@ -769,22 +769,22 @@ 
 	/**
 	 * ACCOUNT - Save account informations
 	 */
-	function wps_save_account_informations () {
-		check_ajax_referer( 'wps_save_account_informations' );
+	function wps_save_account_informations() {
+		check_ajax_referer('wps_save_account_informations');
 
 		global $wpdb;
 		$status = false; $response = '';
 
 		$user_id = get_current_user_id();
-		if ( !empty($user_id) ) {
-			$query = $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_author = %d", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $user_id );
-			$cid = $wpdb->get_var( $query );
+		if (!empty($user_id)) {
+			$query = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_type = %s AND post_author = %d", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $user_id);
+			$cid = $wpdb->get_var($query);
 		}
 
-		$errors = $this->save_account_informations( $cid, $_POST );
-		if( !empty( $errors ) ) {
-			$response = '<div class="wps-alert-error">' .__('Some errors have been detected', 'wpshop') . ' : <ul>';
-			foreach( $errors as $error ){
+		$errors = $this->save_account_informations($cid, $_POST);
+		if (!empty($errors)) {
+			$response = '<div class="wps-alert-error">' . __('Some errors have been detected', 'wpshop') . ' : <ul>';
+			foreach ($errors as $error) {
 				$response .= '<li>' . $error . '</li>';
 			}
 			$response .= '</div>';
@@ -793,7 +793,7 @@ 
 			$status = true;
 		}
 
-		wp_die( json_encode( array( 'status' => $status, 'response' => $response) ) );
+		wp_die(json_encode(array('status' => $status, 'response' => $response)));
 	}
 
 	/**
@@ -804,23 +804,23 @@ 
 
 		$status = false;
 		$response = do_shortcode('[wps_account_informations]');
-		if( !empty($response) ) {
+		if (!empty($response)) {
 			$status = true;
 		}
 
-		wp_die( json_encode( array( 'status' => $status, 'response' => $response ) ) );
+		wp_die(json_encode(array('status' => $status, 'response' => $response)));
 	}
 
 	/**
 	 * ACCOUNT - AJAX - Fill account informations modal
 	 */
 	function wps_fill_account_informations_modal() {
-		check_ajax_referer( 'wps_fill_account_informations_modal' );
+		check_ajax_referer('wps_fill_account_informations_modal');
 
 		$title = $content = '';
 		$title = __('Edit your account informations', 'wpshop');
-		$content = do_shortcode( '[wps_account_informations_form]' );
-		echo json_encode( array( 'status' => true, 'title' => $title, 'content' => $content) );
+		$content = do_shortcode('[wps_account_informations_form]');
+		echo json_encode(array('status' => true, 'title' => $title, 'content' => $content));
 		wp_die();
 	}
 

Braces +40 added lines, -51 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_account_ctr {
 	/** Define the main directory containing the template for the current plugin
 	* @var string
@@ -81,15 +83,13 @@ 
 		$args = array();
 		if ( get_current_user_id() != 0 ) {
 			return __( 'You are already logged', 'wpshop');
-		}
-		else {
+		} else {
 			$action = !empty( $_GET['action'] ) ? sanitize_text_field( $_GET['action'] ) : '';
 			$key = !empty( $_GET['key'] ) ? sanitize_text_field( $_GET['key'] ) : '';
 			$login = !empty( $_GET['login'] ) ? sanitize_text_field( $_GET['login'] ) : 0;
 			if ( !empty($action) && $action == 'retrieve_password' && !empty($key) && !empty($login) && !$force_login ) {
 				$output = self::get_renew_password_form();
-			}
-			else {
+			} else {
 				ob_start();
 				require_once( wpshop_tools::get_template_part( WPS_ACCOUNT_DIR, $this->template_dir, "frontend", "login/login-form") );
 				$output = ob_get_contents();
@@ -107,8 +107,9 @@ 
 
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'control_login_form_request' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'control_login_form_request' ) ) {
+					wp_die();
+		}
 
 		$result = '';
 		$status = false;
@@ -122,8 +123,7 @@ 
 			$user_checking = get_user_by( 'login', $wps_login_user_login );
 			if( !empty($user_checking) ) {
 				$creds['user_login'] = $wps_login_user_login;
-			}
-			else {
+			} else {
 				if ( is_email($wps_login_user_login) ) {
 					$user_checking = get_user_by( 'email', $wps_login_user_login );
 					$creds['user_login'] = $user_checking->user_login;
@@ -134,20 +134,17 @@ 
 			$user = wp_signon( $creds, false );
 			if ( is_wp_error($user) ) {
 				$result = '<div class="wps-alert-error">' .__('Connexion error', 'wpshop'). '</div>';
-			}
-			else {
+			} else {
 				$permalink_option = get_option( 'permalink_structure' );
 				$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ) );
 				if( $origin == $page_account_id ) {
 					$result = get_permalink( $page_account_id );
-				}
-				else {
+				} else {
 					$result = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=3';
 				}
 				$status = true;
 			}
-		}
-		else {
+		} else {
 			$result = '<div class="wps-alert-error">' .__('E-Mail and Password are required', 'wpshop'). '</div>';
 		}
 
@@ -161,8 +158,9 @@ 
 	function wps_ajax_get_login_form_interface() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_ajax_get_login_form_interface' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_ajax_get_login_form_interface' ) ) {
+					wp_die();
+		}
 
 		$response = array( 'status' => true, 'response' => self::get_login_form() );
 		echo json_encode( $response );
@@ -185,8 +183,9 @@ 
 	function wps_login_first_request() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_login_first_request' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_login_first_request' ) ) {
+					wp_die();
+		}
 
 		$status = false; $login_action = false; $response = '';
 		$user_email = ( !empty($_POST['email_address']) ) ? wpshop_tools::varSanitizer( $_POST['email_address'] ) : null;
@@ -198,8 +197,7 @@ 
 				$login_action = true;
 				$user_firstname = get_user_meta( $checking_user->ID, 'first_name', true );
 				$response = $user_firstname;
-			}
-			else {
+			} else {
 				$checking_user = get_user_by( 'email', $user_email);
 				if ( !empty( $checking_user ) ) {
 					$login_action = true;
@@ -211,8 +209,7 @@ 
 			if( !$login_action && is_email($user_email)  ) {
 				$response = $user_email;
 			}
-		}
-		else {
+		} else {
 			$response = '<div class="wps-alert-error">' .__( 'An e-mail address is required', 'wpshop' ). '</div>';
 		}
 		echo json_encode( array( 'status'=> $status, 'response' => $response, 'login_action' => $login_action) );
@@ -239,8 +236,9 @@ 
 	function wps_fill_forgot_password_modal() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_fill_forgot_password_modal' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_fill_forgot_password_modal' ) ) {
+					wp_die();
+		}
 
 		$status = false; $title = $content = '';
 		$title = __( 'Forgot password', 'wpshop' );
@@ -256,8 +254,9 @@ 
 	function wps_forgot_password_request() {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_forgot_password_request' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_forgot_password_request' ) ) {
+					wp_die();
+		}
 
 		global $wpdb;
 		$status = false; $result = '';
@@ -268,8 +267,7 @@ 
 			$exist_user = get_user_by('login', $user_login);
 			if( !empty($exist_user) ) {
 				$existing_user = true;
-			}
-			else {
+			} else {
 				$exist_user = get_user_by('email', $user_login);
 				$key_for_update = 'user_email';
 				if ( !empty($exist_user) ) {
@@ -286,12 +284,10 @@ 
 				$this->send_forgot_password_email($key, $user_login, $exist_user);
 				$result = '<div class="wps-alert-info">' .__('An e-mail with an password renew link has been sent to you', 'wpshop'). '</div>';
 				$status = true;
-			}
-			else {
+			} else {
 				$result = '<div class="wps-alert-error">' .__('No customer account corresponds to this email', 'wpshop'). '</div>';
 			}
-		}
-		else {
+		} else {
 			$result = '<div class="wps-alert-error">' .__('Please fill the required field', 'wpshop'). '</div>';
 		}
 		$response = array( $status, $result );
@@ -336,8 +332,7 @@ 
 				$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_login = %s", $activation_key, $login ) );
 				if( !empty($user) ) {
 					$existing_user = true;
-				}
-				else {
+				} else {
 					$user = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_activation_key = %s AND user_email = %s", $activation_key, $login ) );
 					if( !empty($user) ) {
 						$existing_user = true;
@@ -350,16 +345,13 @@ 
 					$status = true;
 					$result = '<div class="wps-alert-success">' .__('Your password has been updated', 'wpshop'). '. <a href="#" id="display_connexion_form"> ' .__('Connect you', 'wpshop').' !</a></div>';
 					$form = self::get_login_form( true );
-				}
-				else {
+				} else {
 					$result = '<div class=" wps-alert-error">' .__('Invalid activation key', 'wpshop'). '</div>';
 				}
-			}
-			else {
+			} else {
 				$result = '<div class=" wps-alert-error">' .__('Invalid activation key', 'wpshop'). '</div>';
 			}
-		}
-		else {
+		} else {
 			$result = '<div class="wps-alert-error">' .__('Password and confirmation password are differents', 'wpshop'). '</div>';
 		}
 
@@ -431,8 +423,9 @@ 
 	function wps_save_signup_form( $connect = false ) {
 		$_wpnonce = !empty( $_POST['_wpnonce'] ) ? sanitize_text_field( $_POST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wps_save_signup_form' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wps_save_signup_form' ) ) {
+					wp_die();
+		}
 
 		global $wpdb, $wpshop;
 		$user_id = ( !empty( $_POST['wps_sign_up_request_from_admin'] ) ) ? (int) $_POST['wps_sign_up_request_from_admin'] : get_current_user_id();
@@ -518,8 +511,7 @@ 
 							$permalink_option = get_option( 'permalink_structure' );
 							$checkout_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_checkout_page_id' ));
 							$result = get_permalink( $checkout_page_id  ).( ( !empty($permalink_option) ) ? '?' : '&').'order_step=3';
-						}
-						else {
+						} else {
 							$account_page_id = wpshop_tools::get_page_id( get_option( 'wpshop_myaccount_page_id' ));
 							$result = get_permalink( $account_page_id  );
 						}
@@ -636,8 +628,7 @@ 
 											if ( $attribute_def->data_type_to_use == 'custom' ) {
 												$query = $wpdb->prepare("SELECT label FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " WHERE attribute_id = %d AND status = 'valid' AND id = %d", $attribute_def->id, $attribute_value );
 												$attribute_value = $wpdb->get_var( $query );
-											}
-											else if ( $attribute_def->data_type_to_use == 'internal')  {
+											} else if ( $attribute_def->data_type_to_use == 'internal')  {
 												$associated_post = get_post( $atribute_value );
 												$attribute_value = $associated_post->post_title;
 											}
@@ -743,8 +734,7 @@ 
 							$attribute_def = wpshop_attributes::getElement( $attribute['name'], "'valid'", 'code');
 							if ( !in_array( $attribute['name'], $exclude_user_meta ) ) {
 								update_user_meta( $user_id, $attribute['name'], wpshop_tools::varSanitizer( $args['attribute'][$attribute['data_type']][$attribute['name']])  );
-							}
-							else {
+							} else {
 								wp_update_user( array('ID' => $user_id, $attribute['name'] => wpshop_tools::varSanitizer( $args['attribute'][$attribute['data_type']][$attribute['name']]) ) );
 							}
 						}
@@ -788,8 +778,7 @@ 
 				$response .= '<li>' . $error . '</li>';
 			}
 			$response .= '</div>';
-		}
-		else {
+		} else {
 			$status = true;
 		}
 

includes/modules/wps_help/controller/wps_help_menus_ctr.php

Doc Comments +6 added lines

@@ -77,6 +77,12 @@
 		}
 	}
 
+	/**
+	 * @param string $page_title
+	 * @param string $menu_title
+	 * @param string $menu_slug
+	 * @param string[] $callback
+	 */
 	public function set_submenu_page_help( $page_title, $menu_title, $menu_slug, $callback ) {
 		$this->sub_menus[$menu_slug] = array(
 			'page_title'	=> $page_title

Indentation +2 added lines, -2 removed lines

@@ -20,8 +20,8 @@
 	}
 
 	/**
-	* Appelle le template dans wps_installer backend about / Call the template in wps_installer backend about
-	*/
+	 * Appelle le template dans wps_installer backend about / Call the template in wps_installer backend about
+	 */
 	public function render_menu() {
 		require_once( wpshop_tools::get_template_part( WPS_INSTALLER_DIR, WPSINSTALLER_TPL_DIR, "backend", "about" ) );
 	}

Spacing +16 added lines, -16 removed lines

@@ -1,20 +1,20 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_help_menus_ctr {
 	public $sub_menus;
 
 	public function __construct() {
-		$this->set_submenu_page_help( __( 'Shortcodes', 'wpshop' ), __( 'Shortcodes', 'wpshop' ), WPSHOP_URL_SLUG_SHORTCODES, array( 'wpshop_display', 'display_page' ) );
+		$this->set_submenu_page_help(__('Shortcodes', 'wpshop'), __('Shortcodes', 'wpshop'), WPSHOP_URL_SLUG_SHORTCODES, array('wpshop_display', 'display_page'));
 
-		add_action( 'admin_menu', array( $this, 'admin_menu' ) );
-		add_action( 'menu_order', array( $this, 'admin_menu_order' ), 12 );
-		add_action( 'custom_menu_order', array( $this, 'admin_custom_menu_order' ) );
+		add_action('admin_menu', array($this, 'admin_menu'));
+		add_action('menu_order', array($this, 'admin_menu_order'), 12);
+		add_action('custom_menu_order', array($this, 'admin_custom_menu_order'));
 	}
 
 	/**
 	 * Ajout du menu pour le logiciel de caisse dans le backend / Create a new administration menu into backend
 	 */
 	public function admin_menu() {
-		add_menu_page( __( 'Help', 'wpshop' ), __( 'Help', 'wpshop' ), 'wpshop_view_dashboard', WPSHOP_URL_SLUG_ABOUT, array($this, 'render_menu'), 'dashicons-editor-help' );
+		add_menu_page(__('Help', 'wpshop'), __('Help', 'wpshop'), 'wpshop_view_dashboard', WPSHOP_URL_SLUG_ABOUT, array($this, 'render_menu'), 'dashicons-editor-help');
 
 		$this->create_submenu_page_help();
 	}
@@ -23,7 +23,7 @@ 
 	* Appelle le template dans wps_installer backend about / Call the template in wps_installer backend about
 	*/
 	public function render_menu() {
-		require_once( wpshop_tools::get_template_part( WPS_INSTALLER_DIR, WPSINSTALLER_TPL_DIR, "backend", "about" ) );
+		require_once(wpshop_tools::get_template_part(WPS_INSTALLER_DIR, WPSINSTALLER_TPL_DIR, "backend", "about"));
 	}
 
 	/**
@@ -33,19 +33,19 @@ 
 	 *
 	 * @return array The new admin menu order with the POS addon placed
 	 */
-	public function admin_menu_order( $current_menu_order ) {
+	public function admin_menu_order($current_menu_order) {
 		/**	Create a new menu order	*/
 		$wps_pos_menu_ordered = array();
 
 		/**	Read the current existing menu order for rearrange it	*/
-		foreach ( $current_menu_order as $menu_item ) {
-			if ( 'edit.php?post_type=wps_highlighting' == $menu_item ) {
+		foreach ($current_menu_order as $menu_item) {
+			if ('edit.php?post_type=wps_highlighting' == $menu_item) {
 				$wps_pos_menu_ordered[] = 'edit.php?post_type=wps_highlighting';
 				$wps_pos_menu_ordered[] = WPSHOP_URL_SLUG_ABOUT;
 
-				unset( $current_menu_order[ array_search( WPSHOP_URL_SLUG_ABOUT, $current_menu_order ) ] );
+				unset($current_menu_order[array_search(WPSHOP_URL_SLUG_ABOUT, $current_menu_order)]);
 			}
-			else if ( WPSHOP_URL_SLUG_ABOUT != $menu_item ) {
+			else if (WPSHOP_URL_SLUG_ABOUT != $menu_item) {
 				$wps_pos_menu_ordered[] = $menu_item;
 			}
 		}
@@ -59,12 +59,12 @@ 
 	 * @return boolean A boolean var defining if we apply admin menu reorder for current user
 	 */
 	public function admin_custom_menu_order() {
-		return current_user_can( 'manage_options' );
+		return current_user_can('manage_options');
 	}
 
 	public function create_submenu_page_help() {
-		if( is_array( $this->sub_menus ) ) {
-		foreach ( $this->sub_menus as $slug => $data )
+		if (is_array($this->sub_menus)) {
+		foreach ($this->sub_menus as $slug => $data)
 			{
 				add_submenu_page(
 				WPSHOP_URL_SLUG_ABOUT
@@ -77,7 +77,7 @@ 
 		}
 	}
 
-	public function set_submenu_page_help( $page_title, $menu_title, $menu_slug, $callback ) {
+	public function set_submenu_page_help($page_title, $menu_title, $menu_slug, $callback) {
 		$this->sub_menus[$menu_slug] = array(
 			'page_title'	=> $page_title
 			,'menu_title'	=> $menu_title

Braces +4 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_help_menus_ctr {
 	public $sub_menus;
 
@@ -44,8 +46,7 @@ 
 				$wps_pos_menu_ordered[] = WPSHOP_URL_SLUG_ABOUT;
 
 				unset( $current_menu_order[ array_search( WPSHOP_URL_SLUG_ABOUT, $current_menu_order ) ] );
-			}
-			else if ( WPSHOP_URL_SLUG_ABOUT != $menu_item ) {
+			} else if ( WPSHOP_URL_SLUG_ABOUT != $menu_item ) {
 				$wps_pos_menu_ordered[] = $menu_item;
 			}
 		}

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;
+}
 /**
  * Module controller class definition file
  *

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_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() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !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() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !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() {
 		$_wpnonce = !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() {
 		$_wpnonce = !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 +100 added lines, -100 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_product_ctr {
 
 	/**
@@ -8,19 +8,19 @@ 
 	 * @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'));
 
 		/** Product sheet Page **/
-		add_action( 'admin_post_wps_product_sheet', array( $this, 'wpshop_product_sheet_output' ) );
+		add_action('admin_post_wps_product_sheet', array($this, 'wpshop_product_sheet_output'));
 	}
 
 	/**
@@ -31,25 +31,25 @@ 
 		$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( $module_folder . $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($module_folder . $folder)) {
+					$child_folder_content = scandir($module_folder . $folder);
+					if (file_exists($module_folder . $folder . '/' . $folder . '.php')) {
+						$f = $module_folder . $folder . '/' . $folder . '.php';
+						include($f);
 					}
 				}
 			}
 		}
 	}
 
-	public function callback_admin_enqueue_scripts( $hook ) {
-		if( $hook != 'tools_page_wpshop_tools' )
+	public function callback_admin_enqueue_scripts($hook) {
+		if ($hook != 'tools_page_wpshop_tools')
 			return;
 
-		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);
 	}
 
 	/**
@@ -57,14 +57,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();
 			}
@@ -77,14 +77,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();
 			}
@@ -102,39 +102,39 @@ 
 	 */
 	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;
 			} else {
-				$product_id = wp_get_post_parent_id( $combined_variation_id );
-				$product_id = ( $product_id ) ? $product_id : $combined_variation_id;
+				$product_id = wp_get_post_parent_id($combined_variation_id);
+				$product_id = ($product_id) ? $product_id : $combined_variation_id;
 			}
 		}
 		$product_data = wpshop_products::get_product_data($product_id, false, '"publish", "free_product"');
 
-		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;
@@ -147,18 +147,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
@@ -171,15 +171,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);
@@ -187,35 +187,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]);
 					}
 
@@ -233,13 +233,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;
@@ -252,9 +252,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);
 				}
 			}
@@ -278,7 +278,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)
@@ -304,13 +304,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;
@@ -321,16 +321,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);
 	}
 
 	/**
@@ -340,12 +340,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;
@@ -360,20 +360,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;
@@ -383,19 +383,19 @@ 
 	 *	Output product sheet to PDF
 	 */
 	public function wpshop_product_sheet_output() {
-		$product_id = ( !empty($_GET['pid']) ) ? (int) $_GET['pid'] : null;
+		$product_id = (!empty($_GET['pid'])) ? (int)$_GET['pid'] : null;
 		$user_id = get_current_user_id();
-		if( !empty($product_id) && get_post_type( $product_id ) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT && $user_id != 0 && current_user_can( 'manage_options' ) ) {
+		if (!empty($product_id) && get_post_type($product_id) == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT && $user_id != 0 && current_user_can('manage_options')) {
 			$wps_product_administration_ctr = new wps_product_administration_ctr();
-			$html_content = $wps_product_administration_ctr->generate_product_sheet_datas( $product_id );
-			$product_post = get_post( $product_id );
-			require_once(WPSHOP_LIBRAIRIES_DIR.'HTML2PDF/html2pdf.class.php');
+			$html_content = $wps_product_administration_ctr->generate_product_sheet_datas($product_id);
+			$product_post = get_post($product_id);
+			require_once(WPSHOP_LIBRAIRIES_DIR . 'HTML2PDF/html2pdf.class.php');
 			try {
 				$html2pdf = new HTML2PDF('P', 'A4', 'fr');
 				$html2pdf->pdf->SetDisplayMode('fullpage');
 				$html2pdf->setDefaultFont('Arial');
 				$html2pdf->writeHTML($html_content);
-				$html2pdf->Output('product-' .$product_id.'-'.$product_post->post_name.'.pdf', 'D');
+				$html2pdf->Output('product-' . $product_id . '-' . $product_post->post_name . '.pdf', 'D');
 			}
 			catch (HTML2PDF_exception $e) {
 				echo $e;

Braces +18 added lines, -15 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_product_ctr {
 
 	/**
@@ -46,8 +48,9 @@ 
 	}
 
 	public function callback_admin_enqueue_scripts( $hook ) {
-		if( $hook != 'tools_page_wpshop_tools' )
-			return;
+		if( $hook != 'tools_page_wpshop_tools' ) {
+					return;
+		}
 
 		wp_enqueue_script( 'wps_product_js', WPS_PRODUCT_URL . '/asset/js/backend.js', array( "jquery", "jquery-form" ), WPS_PRODUCT_VERSION );
 	}
@@ -138,8 +141,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');
 			}
 		}
@@ -179,8 +181,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];
@@ -234,13 +237,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;
 	}
@@ -284,8 +289,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,
@@ -396,8 +400,7 @@ 
 				$html2pdf->setDefaultFont('Arial');
 				$html2pdf->writeHTML($html_content);
 				$html2pdf->Output('product-' .$product_id.'-'.$product_post->post_name.'.pdf', 'D');
-			}
-			catch (HTML2PDF_exception $e) {
+			} catch (HTML2PDF_exception $e) {
 				echo $e;
 			}
 		}

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

@@ -370,8 +370,8 @@ 
 	}
 
 	/**
-	* Delete product list
-	**/
+	 * Delete product list
+	 **/
 	function wps_mass_delete_file() {
 		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
@@ -389,8 +389,8 @@ 
 	}
 
 	/**
-	* Update product files list
-	*/
+	 * Update product files list
+	 */
 	function wps_mass_edit_update_files_list() {
 		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 

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() {
 		$_wpnonce = !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() {
 		$_wpnonce = !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() {
 		$_wpnonce = !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() {
 		$_wpnonce = !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() {
 		$_wpnonce = !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;

Spacing +144 added lines, -144 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Main controller file for product mass modification module
  *
@@ -21,29 +21,29 @@ 
 	 */
 	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);
 
 		// 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() {
-		$this->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' ) );
+		$this->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'));
 		// Declare Styles and JS Files.
-		add_action( 'admin_print_styles-' . $this->submenu, array( $this, 'admin_print_styles' ) );
-		add_action( 'admin_print_scripts-' . $this->submenu, array( $this, 'admin_print_scripts' ) );
+		add_action('admin_print_styles-' . $this->submenu, array($this, 'admin_print_styles'));
+		add_action('admin_print_scripts-' . $this->submenu, array($this, 'admin_print_scripts'));
 	}
 
 	/**
 	 * Add css to administration
 	 */
 	function admin_print_styles() {
-		wp_enqueue_style( 'wps-mass-product-update', WPS_PDCT_MASS_URL . '/assets/css/backend.css' );
+		wp_enqueue_style('wps-mass-product-update', WPS_PDCT_MASS_URL . '/assets/css/backend.css');
 	}
 
 	/**
@@ -51,12 +51,12 @@ 
 	 */
 	function admin_print_scripts() {
 		wp_enqueue_media();
-		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);
 		$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;
 	}
@@ -68,15 +68,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;
 							}
 						}
 					}
@@ -93,29 +93,29 @@ 
 	 * @param integer $page
 	 * @return string
 	 */
-	function display_products_list( $default = 1, $page = 0, $order_by = 'date', $order = 'ASC' ) {
+	function display_products_list($default = 1, $page = 0, $order_by = 'date', $order = 'ASC') {
 		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;
@@ -131,27 +131,27 @@ 
 		$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
-		$order_by = !empty( $_GET[ 'order_by' ] ) ? sanitize_title( $_GET[ 'order_by' ] ) : 'date';
-		$order = !empty( $_GET[ 'order' ] ) ? sanitize_title( $_GET[ 'order' ] ) : 'ASC';
-		$product_list_interface = $this->display_products_list( $default, $page, $order_by, $order );
+		$order_by = !empty($_GET['order_by']) ? sanitize_title($_GET['order_by']) : 'date';
+		$order = !empty($_GET['order']) ? sanitize_title($_GET['order']) : 'ASC';
+		$product_list_interface = $this->display_products_list($default, $page, $order_by, $order);
 
 		// 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"));
 	}
 
 	/**
@@ -159,13 +159,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(
@@ -177,37 +177,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();
 		}
@@ -219,23 +219,23 @@ 
 	 * AJAX - Change page action on mass edit product interface
 	 */
 	function wps_mass_edit_change_page() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !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();
 	}
 
@@ -243,30 +243,30 @@ 
 	 * AJAX - Create a draft product and display the line allowing to edit informations for this product
 	 */
 	function wps_mass_interface_new_product_creation() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !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();
 	}
 
@@ -274,32 +274,32 @@ 
 	 * AJAX - Save datas
 	 */
 	function wps_save_product_quick_interface() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !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();
 
 		// ------------------------------------------------------------------------------------------------------
 
-		foreach( $_REQUEST['concur'] as $post_id => $columns ) {
+		foreach ($_REQUEST['concur'] as $post_id => $columns) {
 			$concur = array();
-			for( $i = $count = 0; $i <= $count; $i++ ) {
-				foreach( $columns as $key => $rows ) {
-					$count = count( $rows )-1;
+			for ($i = $count = 0; $i <= $count; $i++) {
+				foreach ($columns as $key => $rows) {
+					$count = count($rows) - 1;
 					$concur[$i][$key] = $rows[$i];
 				}
-				if( empty( $concur[$i]['is_row'] ) ) {
-					unset( $concur[$i] );
+				if (empty($concur[$i]['is_row'])) {
+					unset($concur[$i]);
 				} else {
-					unset( $concur[$i]['is_row'] );
+					unset($concur[$i]['is_row']);
 
 					$dotPos = strrpos($concur[$i]['price'], '.');
 					$commaPos = strrpos($concur[$i]['price'], ',');
@@ -309,7 +309,7 @@ 
 					} else {
 						$concur[$i]['price'] = floatval(
 							preg_replace("/[^0-9]/", "", substr($concur[$i]['price'], 0, $sep)) . '.' .
-							preg_replace("/[^0-9]/", "", substr($concur[$i]['price'], $sep+1, strlen($concur[$i]['price'])))
+							preg_replace("/[^0-9]/", "", substr($concur[$i]['price'], $sep + 1, strlen($concur[$i]['price'])))
 						);
 					}
 
@@ -317,51 +317,51 @@ 
 					$concur[$i]['price'] = $concur[$i]['price'];
 				}
 			}
-			update_post_meta( $post_id, '_concur', $concur );
+			update_post_meta($post_id, '_concur', $concur);
 		}
 
 		// ------------------------------------------------------------------------------------------------------
 
-		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' => wp_kses_post( $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' => wp_kses_post($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;
@@ -372,34 +372,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();
 	}
 
@@ -407,18 +407,18 @@ 
 	* Delete product list
 	**/
 	function wps_mass_delete_file() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !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();
 	}
 
@@ -426,32 +426,32 @@ 
 	* Update product files list
 	*/
 	function wps_mass_edit_update_files_list() {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+		$_wpnonce = !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();
 	}
 

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;
+}
 
 // Rewrite wpshop_categories
 $options = get_option( 'wpshop_catalog_categories_option', null );

includes/modules/wps_search/controller/wps_filter_search.php

Doc Comments +4 added lines, -2 removed lines

@@ -131,6 +131,7 @@ 
 	/**
 	 * Construct the element when it's a text Data
 	 * @param StdObject $attribute_def
+	 * @param integer $category_id
 	 * @return string
 	 */
 	function get_filter_element_for_text_data( $attribute_def, $category_id, $current_category_child  ) {
@@ -155,6 +156,7 @@ 
 	/**
 	 * Construct the element when it's a list Data
 	 * @param StdObject $attribute_def
+	 * @param integer $category_id
 	 * @return string
 	 */
 	function get_filter_element_for_list_data ( $attribute_def, $category_id, $current_category_child, $field_type, $type = 'select') {
@@ -241,6 +243,7 @@ 
 	/**
 	 * Construct the element when it's a decimal Data
 	 * @param StdObject $attribute_def
+	 * @param integer $category_id
 	 * @return string
 	 */
 	function get_filter_element_for_integer_data ( $attribute_def, $category_id, $current_category_children  ) {
@@ -268,7 +271,7 @@ 
 	 * Save Products attribute values for List attribute data for a products category
 	 * @param integer $category_id
 	 * @param std_object $attribute_def
-	 * @param array $current_category_child
+	 * @param array $current_category_children
 	 */
 	function save_values_for_list_filterable_attribute( $category_id, $attribute_def, $current_category_children ) {
 		global $wpdb;
@@ -462,7 +465,6 @@ 
 
 	/**
 	 * Save values for attributes
-	 * @param unknown_type $values
 	 */
 	function stock_values_for_attribute( $categories_id = array() ) {
 		@set_time_limit( 900 );

Indentation +2 added lines, -2 removed lines

@@ -2,8 +2,8 @@
 class wps_filter_search {
 
 	/** Define the main directory containing the template for the current plugin
-	* @var string
-	*/
+	 * @var string
+	 */
 	private $template_dir;
 	/**
 	 * Define the directory name for the module in order to check into frontend

Spacing +230 added lines, -230 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 class wps_filter_search {
 
 	/** Define the main directory containing the template for the current plugin
@@ -16,24 +16,24 @@ 
 		// Template Load
 		$this->template_dir = WPS_SEARCH_PATH . WPS_SEARCH_DIR . "/templates/";
 		// Display Filter search
-		add_shortcode('wpshop_filter_search', array( $this, 'display_filter_search'));
+		add_shortcode('wpshop_filter_search', array($this, 'display_filter_search'));
 
 		// WP General actions
 		add_action('save_post', 'wps_filter_search::save_displayed_price_meta');
 		add_action('save_post', array(&$this, 'stock_values_for_attribute'));
 
 		// Add scripts
-		add_action( 'wp_enqueue_scripts', array( &$this, 'add_frontend_scripts' ) );
+		add_action('wp_enqueue_scripts', array(&$this, 'add_frontend_scripts'));
 
 		// Ajax Actions
-		add_action('wp_ajax_filter_search_action',array(&$this, 'wpshop_ajax_filter_search_action'));
-		add_action('wp_ajax_nopriv_filter_search_action',array(&$this, 'wpshop_ajax_filter_search_action'));
+		add_action('wp_ajax_filter_search_action', array(&$this, 'wpshop_ajax_filter_search_action'));
+		add_action('wp_ajax_nopriv_filter_search_action', array(&$this, 'wpshop_ajax_filter_search_action'));
 	}
 
 
 	function add_frontend_scripts() {
-		wp_enqueue_script( 'wpshop_filter_search_chosen', WPSHOP_JS_URL.'jquery-libs/chosen.jquery.min.js' );
-		wp_enqueue_script( 'wpshop_filter_search_js', WPS_SEARCH_URL.WPS_SEARCH_DIR.'/assets/filter_search/js/wpshop_filter_search.js' );
+		wp_enqueue_script('wpshop_filter_search_chosen', WPSHOP_JS_URL . 'jquery-libs/chosen.jquery.min.js');
+		wp_enqueue_script('wpshop_filter_search_js', WPS_SEARCH_URL . WPS_SEARCH_DIR . '/assets/filter_search/js/wpshop_filter_search.js');
 	}
 
 
@@ -41,14 +41,14 @@ 
 	 * Display Filter search interface
 	 * @return string
 	 */
-	function display_filter_search () {
+	function display_filter_search() {
 		global $wp_query;
 		$output = '';
-		if ( !empty($wp_query) && !empty($wp_query->queried_object_id) ) {
+		if (!empty($wp_query) && !empty($wp_query->queried_object_id)) {
 			$category_id = $wp_query->queried_object_id;
-			$category_option =  get_option('wpshop_product_category_'.$category_id);
-			if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) ) {
-				$output = $this->construct_wpshop_filter_search_interface( $category_id );
+			$category_option = get_option('wpshop_product_category_' . $category_id);
+			if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes'])) {
+				$output = $this->construct_wpshop_filter_search_interface($category_id);
 			}
 		}
 		return $output;
@@ -59,19 +59,19 @@ 
 	 * @param integer $category_id
 	 * @return string
 	 */
-	function construct_wpshop_filter_search_interface ( $category_id ) {
+	function construct_wpshop_filter_search_interface($category_id) {
 		global $wpdb;
 		$filter_elements = '';
-		if ( !empty($category_id) ) {
-			$category_option =  get_option('wpshop_product_category_'.$category_id);
-			if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && is_array($category_option['wpshop_category_filterable_attributes']) ) {
-				foreach ( $category_option['wpshop_category_filterable_attributes'] as $k => $attribute ) {
+		if (!empty($category_id)) {
+			$category_option = get_option('wpshop_product_category_' . $category_id);
+			if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && is_array($category_option['wpshop_category_filterable_attributes'])) {
+				foreach ($category_option['wpshop_category_filterable_attributes'] as $k => $attribute) {
 					$attribute_def = wpshop_attributes::getElement($k);
-					$filter_elements .= $this->construct_element( $attribute_def, $category_id );
+					$filter_elements .= $this->construct_element($attribute_def, $category_id);
 					$unity = '';
-					if ( !empty($attribute_def->_default_unit) ) {
-						$query = $wpdb->prepare('SELECT unit FROM ' .WPSHOP_DBT_ATTRIBUTE_UNIT. ' WHERE id= %d', $attribute_def->_default_unit);
-						$unity = $wpdb->get_var( $query );
+					if (!empty($attribute_def->_default_unit)) {
+						$query = $wpdb->prepare('SELECT unit FROM ' . WPSHOP_DBT_ATTRIBUTE_UNIT . ' WHERE id= %d', $attribute_def->_default_unit);
+						$unity = $wpdb->get_var($query);
 					}
 
 					//$tpl_component['DEFAULT_UNITY'.'_'.$attribute_def->code] = $unity;
@@ -79,7 +79,7 @@ 
 			}
 		}
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_search_interface") );
+		require(wpshop_tools::get_template_part(WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_search_interface"));
 		$filter_search_interface = ob_get_contents();
 		ob_end_clean();
 		return $filter_search_interface;
@@ -91,7 +91,7 @@ 
 	 * @param integer $category_id
 	 * @return string
 	 */
-	function construct_element ( $attribute_def, $category_id ) {
+	function construct_element($attribute_def, $category_id) {
 		global $wpdb;
 		$current_category_children = array();
 		$args = array(
@@ -101,27 +101,27 @@ 
 		);
 		$current_category_children = get_categories($args);
 
-		if ( !empty( $attribute_def ) ) {
-			switch ( $attribute_def->frontend_input ) {
+		if (!empty($attribute_def)) {
+			switch ($attribute_def->frontend_input) {
 				case 'text' :
-					if ( $attribute_def->data_type == 'decimal' || $attribute_def->data_type == 'integer') {
-						return $this->get_filter_element_for_integer_data( $attribute_def, $category_id, $current_category_children );
+					if ($attribute_def->data_type == 'decimal' || $attribute_def->data_type == 'integer') {
+						return $this->get_filter_element_for_integer_data($attribute_def, $category_id, $current_category_children);
 					}
 					else {
-						return $this->get_filter_element_for_text_data( $attribute_def, $category_id, $current_category_children );
+						return $this->get_filter_element_for_text_data($attribute_def, $category_id, $current_category_children);
 					}
 					break;
 
 				case 'select' : case 'multiple-select' :
-					return $this->get_filter_element_for_list_data ( $attribute_def, $category_id, $current_category_children, $attribute_def->frontend_input, 'select');
+					return $this->get_filter_element_for_list_data($attribute_def, $category_id, $current_category_children, $attribute_def->frontend_input, 'select');
 				break;
 
 				case 'checkbox' :
-					return $this->get_filter_element_for_list_data ( $attribute_def, $category_id, $current_category_children, $attribute_def->frontend_input, 'checkbox');
+					return $this->get_filter_element_for_list_data($attribute_def, $category_id, $current_category_children, $attribute_def->frontend_input, 'checkbox');
 				break;
 
 				case 'radio' :
-					return $this->get_filter_element_for_list_data ( $attribute_def, $category_id, $current_category_children, $attribute_def->frontend_input, 'radio' );
+					return $this->get_filter_element_for_list_data($attribute_def, $category_id, $current_category_children, $attribute_def->frontend_input, 'radio');
 				break;
 
 			}
@@ -133,20 +133,20 @@ 
 	 * @param StdObject $attribute_def
 	 * @return string
 	 */
-	function get_filter_element_for_text_data( $attribute_def, $category_id, $current_category_child  ) {
+	function get_filter_element_for_text_data($attribute_def, $category_id, $current_category_child) {
 		global $wpdb;
 		$output = '';
-		$category_option = get_option('wpshop_product_category_'.$category_id);
+		$category_option = get_option('wpshop_product_category_' . $category_id);
 		$list_values = '';
 
-		if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]) && is_array($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]) ) {
-			foreach( $category_option['wpshop_category_filterable_attributes'][$attribute_def->id] as $attribute_value ) {
-				$list_values .= '<option value="' .$attribute_value. '">' .$attribute_value. '</option>';
+		if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]) && is_array($category_option['wpshop_category_filterable_attributes'][$attribute_def->id])) {
+			foreach ($category_option['wpshop_category_filterable_attributes'][$attribute_def->id] as $attribute_value) {
+				$list_values .= '<option value="' . $attribute_value . '">' . $attribute_value . '</option>';
 			}
 
 		}
 		ob_start();
-		require( wpshop_tools::get_template_part( WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_combobox") );
+		require(wpshop_tools::get_template_part(WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_combobox"));
 		$output = ob_get_contents();
 		ob_end_clean();
 		return $output;
@@ -157,77 +157,77 @@ 
 	 * @param StdObject $attribute_def
 	 * @return string
 	 */
-	function get_filter_element_for_list_data ( $attribute_def, $category_id, $current_category_child, $field_type, $type = 'select') {
+	function get_filter_element_for_list_data($attribute_def, $category_id, $current_category_child, $field_type, $type = 'select') {
 		global $wpdb;
 		$output = $list_values = '';
-		$category_option = get_option('wpshop_product_category_'.$category_id);
-		if ( !empty( $attribute_def) ){
+		$category_option = get_option('wpshop_product_category_' . $category_id);
+		if (!empty($attribute_def)) {
 			// Recovery values
-			if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && isset($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]) ) {
+			if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && isset($category_option['wpshop_category_filterable_attributes'][$attribute_def->id])) {
 				$available_attribute_values = $category_option['wpshop_category_filterable_attributes'][$attribute_def->id];
 			}
 
 			// Store options for attribute
 			$stored_available_attribute_values = array();
-			$query = $wpdb->prepare( 'SELECT * FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS .' WHERE attribute_id = %d ORDER BY position ASC', $attribute_def->id);
-			$attributes_options = $wpdb->get_results( $query );
-			if ( $attribute_def->data_type_to_use == 'internal') {
-				if ( !empty( $attribute_def->default_value ) ) {
+			$query = $wpdb->prepare('SELECT * FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d ORDER BY position ASC', $attribute_def->id);
+			$attributes_options = $wpdb->get_results($query);
+			if ($attribute_def->data_type_to_use == 'internal') {
+				if (!empty($attribute_def->default_value)) {
 					$attribute_default_value = $attribute_def->default_value;
 					$attribute_default_value = unserialize($attribute_default_value);
 
-					$query = $wpdb->prepare( 'SELECT * FROM ' .$wpdb->posts. ' WHERE post_type = %s ORDER BY menu_order ASC', $attribute_default_value['default_value']);
-					$elements = $wpdb->get_results( $query );
+					$query = $wpdb->prepare('SELECT * FROM ' . $wpdb->posts . ' WHERE post_type = %s ORDER BY menu_order ASC', $attribute_default_value['default_value']);
+					$elements = $wpdb->get_results($query);
 
-					if ( !empty( $elements) ) {
-						foreach ( $elements as $element ) {
-							if ( array_key_exists($element->ID,$available_attribute_values ) ) {
-								$stored_available_attribute_values[] = array( 'option_id' => $element->ID, 'option_label' => $element->post_title );
+					if (!empty($elements)) {
+						foreach ($elements as $element) {
+							if (array_key_exists($element->ID, $available_attribute_values)) {
+								$stored_available_attribute_values[] = array('option_id' => $element->ID, 'option_label' => $element->post_title);
 							}
 						}
 					}
 				}
 			}
 			else {
-				foreach ( $attributes_options as $attributes_option ) {
-					if ( in_array($attributes_option->label, $available_attribute_values) ) {
-						$key_value = array_search( $attributes_option->label, $available_attribute_values);
-						$stored_available_attribute_values[] = array('option_id' => $key_value, 'option_label' => $attributes_option->label );
+				foreach ($attributes_options as $attributes_option) {
+					if (in_array($attributes_option->label, $available_attribute_values)) {
+						$key_value = array_search($attributes_option->label, $available_attribute_values);
+						$stored_available_attribute_values[] = array('option_id' => $key_value, 'option_label' => $attributes_option->label);
 					}
 				}
 			}
 			// Sort Stored values
-			ksort( $stored_available_attribute_values);
-			if ( !empty($stored_available_attribute_values) && is_array($stored_available_attribute_values) ) {
+			ksort($stored_available_attribute_values);
+			if (!empty($stored_available_attribute_values) && is_array($stored_available_attribute_values)) {
 				// Construct List values
-				foreach( $stored_available_attribute_values as $stored_available_attribute_value ) {
-					$list_values .= '<option value="' .$stored_available_attribute_value['option_id']. '">' .$stored_available_attribute_value['option_label']. '</option>';
+				foreach ($stored_available_attribute_values as $stored_available_attribute_value) {
+					$list_values .= '<option value="' . $stored_available_attribute_value['option_id'] . '">' . $stored_available_attribute_value['option_label'] . '</option>';
 				}
 
 				// Display the good template file
-				switch( $type ) {
+				switch ($type) {
 					case 'radio' :
 						ob_start();
-						require( wpshop_tools::get_template_part( WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_radiobox") );
+						require(wpshop_tools::get_template_part(WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_radiobox"));
 						$output = ob_get_contents();
 						ob_end_clean();
 					break;
 					case 'checkbox' :
 						ob_start();
-						require( wpshop_tools::get_template_part( WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_checkbox") );
+						require(wpshop_tools::get_template_part(WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_checkbox"));
 						$output = ob_get_contents();
 						ob_end_clean();
 						break;
 					default :
-						if ( $field_type == 'multiple-select' ) {
+						if ($field_type == 'multiple-select') {
 							ob_start();
-							require( wpshop_tools::get_template_part( WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_multiple_select") );
+							require(wpshop_tools::get_template_part(WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_multiple_select"));
 							$output = ob_get_contents();
 							ob_end_clean();
 						}
 						else {
 							ob_start();
-							require( wpshop_tools::get_template_part( WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_combobox") );
+							require(wpshop_tools::get_template_part(WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_combobox"));
 							$output = ob_get_contents();
 							ob_end_clean();
 						}
@@ -243,20 +243,20 @@ 
 	 * @param StdObject $attribute_def
 	 * @return string
 	 */
-	function get_filter_element_for_integer_data ( $attribute_def, $category_id, $current_category_children  ) {
+	function get_filter_element_for_integer_data($attribute_def, $category_id, $current_category_children) {
 		$min_value = $max_value = 0;
 		$sub_tpl_component = array();
 		$output = '';
 		$first  = true;
 		/** Get allproducts of category **/
-		$category_product_ids = wpshop_categories::get_product_of_category( $category_id );
-		$category_option = get_option('wpshop_product_category_'.$category_id );
-		$amount_min =  ( !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]['min']) ) ? number_format($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]['min'],2, '.', '') : 0;
-		$amount_max =  ( !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]['max']) ) ? number_format($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]['max'],2, '.', '') : 0;
+		$category_product_ids = wpshop_categories::get_product_of_category($category_id);
+		$category_option = get_option('wpshop_product_category_' . $category_id);
+		$amount_min = (!empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]['min'])) ? number_format($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]['min'], 2, '.', '') : 0;
+		$amount_max = (!empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]['max'])) ? number_format($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]['max'], 2, '.', '') : 0;
 
-		if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]) ) {
+		if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id])) {
 			ob_start();
-			require( wpshop_tools::get_template_part( WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_slider") );
+			require(wpshop_tools::get_template_part(WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_slider"));
 			$output = ob_get_contents();
 			ob_end_clean();
 
@@ -270,17 +270,17 @@ 
 	 * @param std_object $attribute_def
 	 * @param array $current_category_child
 	 */
-	function save_values_for_list_filterable_attribute( $category_id, $attribute_def, $current_category_children ) {
+	function save_values_for_list_filterable_attribute($category_id, $attribute_def, $current_category_children) {
 		global $wpdb;
-		$category_option = get_option('wpshop_product_category_'.$category_id);
-		$products = wpshop_categories::get_product_of_category( $category_id );
+		$category_option = get_option('wpshop_product_category_' . $category_id);
+		$products = wpshop_categories::get_product_of_category($category_id);
 		/** If there are sub-categories take all products of sub-categories **/
-		if ( !empty($current_category_children) ) {
-			foreach ( $current_category_children as $current_category_child ) {
-				$sub_categories_product_ids = wpshop_categories::get_product_of_category( $current_category_child->term_taxonomy_id );
-				if ( !empty($sub_categories_product_ids) ) {
-					foreach ( $sub_categories_product_ids as $sub_categories_product_id ) {
-						if ( !in_array($sub_categories_product_id, $products) ) {
+		if (!empty($current_category_children)) {
+			foreach ($current_category_children as $current_category_child) {
+				$sub_categories_product_ids = wpshop_categories::get_product_of_category($current_category_child->term_taxonomy_id);
+				if (!empty($sub_categories_product_ids)) {
+					foreach ($sub_categories_product_ids as $sub_categories_product_id) {
+						if (!in_array($sub_categories_product_id, $products)) {
 							$products[] = $sub_categories_product_id;
 						}
 					}
@@ -289,33 +289,33 @@ 
 		}
 
 
-		if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]) ) {
+		if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id])) {
 			$category_option['wpshop_category_filterable_attributes'][$attribute_def->id] = array();
 		}
 
 
-		if ( !empty( $attribute_def) ){
+		if (!empty($attribute_def)) {
 			$available_attribute_values = array();
 			$test = array();
-			foreach ( $products as $product ) {
-				$available_attribute_values = array_merge( $available_attribute_values, wpshop_attributes::get_affected_value_for_list( $attribute_def->code, $product, $attribute_def->data_type_to_use) ) ;
+			foreach ($products as $product) {
+				$available_attribute_values = array_merge($available_attribute_values, wpshop_attributes::get_affected_value_for_list($attribute_def->code, $product, $attribute_def->data_type_to_use));
 			}
 
 			$available_attribute_values = array_flip($available_attribute_values);
 			$data_to_save = array();
-			if ( !empty($available_attribute_values) ) {
+			if (!empty($available_attribute_values)) {
 				$data_to_save = array();
-				foreach( $available_attribute_values as $k => $available_attribute_value ) {
-					if (  $attribute_def->data_type_to_use == 'internal' ) {
-						$attribute_name = get_the_title( $k );
+				foreach ($available_attribute_values as $k => $available_attribute_value) {
+					if ($attribute_def->data_type_to_use == 'internal') {
+						$attribute_name = get_the_title($k);
 					}
 					else {
-						$query = $wpdb->prepare( 'SELECT label FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE attribute_id = %d AND id = %d', $attribute_def->id, $k);
+						$query = $wpdb->prepare('SELECT label FROM ' . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . ' WHERE attribute_id = %d AND id = %d', $attribute_def->id, $k);
 
-						$attribute_name = $wpdb->get_var( $query );
+						$attribute_name = $wpdb->get_var($query);
 					}
-					if (!empty($attribute_name) && !empty($k) ) {
-						if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && isset($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]) ) {
+					if (!empty($attribute_name) && !empty($k)) {
+						if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && isset($category_option['wpshop_category_filterable_attributes'][$attribute_def->id])) {
 							$data_to_save[$k] = $attribute_name;
 							$category_option['wpshop_category_filterable_attributes'][$attribute_def->id] = $data_to_save;
 						}
@@ -323,7 +323,7 @@ 
 				}
 			}
 		}
-		update_option('wpshop_product_category_'.$category_id, $category_option);
+		update_option('wpshop_product_category_' . $category_id, $category_option);
 	}
 
 	/**
@@ -332,18 +332,18 @@ 
 	 * @param std_object $attribute_def
 	 * @param array $current_category_child
 	 */
-	function save_values_for_integer_filterable_attribute ( $category_id, $attribute_def, $current_category_child ) {
+	function save_values_for_integer_filterable_attribute($category_id, $attribute_def, $current_category_child) {
 		$first = true;
-		$category_option = get_option('wpshop_product_category_'.$category_id);
-		$category_product_ids = wpshop_categories::get_product_of_category( $category_id );
+		$category_option = get_option('wpshop_product_category_' . $category_id);
+		$category_product_ids = wpshop_categories::get_product_of_category($category_id);
 		$min_value = $max_value = 0;
 		/** If there are sub-categories take all products of sub-categories **/
-		if ( !empty($current_category_children) ) {
-			foreach ( $current_category_children as $current_category_child ) {
-				$sub_categories_product_ids = wpshop_categories::get_product_of_category( $current_category_child->term_taxonomy_id );
-				if ( !empty($sub_categories_product_ids) ) {
-					foreach ( $sub_categories_product_ids as $sub_categories_product_id ) {
-						if ( !in_array($sub_categories_product_id, $category_product_ids) ) {
+		if (!empty($current_category_children)) {
+			foreach ($current_category_children as $current_category_child) {
+				$sub_categories_product_ids = wpshop_categories::get_product_of_category($current_category_child->term_taxonomy_id);
+				if (!empty($sub_categories_product_ids)) {
+					foreach ($sub_categories_product_ids as $sub_categories_product_id) {
+						if (!in_array($sub_categories_product_id, $category_product_ids)) {
 							$category_product_ids[] = $sub_categories_product_id;
 						}
 					}
@@ -352,45 +352,45 @@ 
 		}
 
 		/** For each product of category check the value **/
-		if ( !empty( $category_product_ids ) ) {
+		if (!empty($category_product_ids)) {
 			$price_piloting_option = get_option('wpshop_shop_price_piloting');
 			foreach ($category_product_ids as $category_product_id) {
 
-				if ( $attribute_def->code == WPSHOP_PRODUCT_PRICE_TTC || $attribute_def->code == WPSHOP_PRODUCT_PRICE_HT ) {
+				if ($attribute_def->code == WPSHOP_PRODUCT_PRICE_TTC || $attribute_def->code == WPSHOP_PRODUCT_PRICE_HT) {
 
 					$product_infos = wpshop_products::get_product_data($category_product_id);
 					$product_price_infos = wpshop_prices::check_product_price($product_infos);
-					if (!empty($product_price_infos) && !empty($product_price_infos['fork_price']) && !empty($product_price_infos['fork_price']['have_fork_price']) && $product_price_infos['fork_price']['have_fork_price'] ) {
+					if (!empty($product_price_infos) && !empty($product_price_infos['fork_price']) && !empty($product_price_infos['fork_price']['have_fork_price']) && $product_price_infos['fork_price']['have_fork_price']) {
 
 
-						$max_value = ( !empty($product_price_infos['fork_price']['max_product_price']) && $product_price_infos['fork_price']['max_product_price'] > $max_value ) ? $product_price_infos['fork_price']['max_product_price'] : $max_value;
-						$min_value = (!empty($product_price_infos['fork_price']['min_product_price']) && ( ( $product_price_infos['fork_price']['min_product_price'] < $min_value) || $first ) ) ?  $product_price_infos['fork_price']['min_product_price'] : $min_value;
+						$max_value = (!empty($product_price_infos['fork_price']['max_product_price']) && $product_price_infos['fork_price']['max_product_price'] > $max_value) ? $product_price_infos['fork_price']['max_product_price'] : $max_value;
+						$min_value = (!empty($product_price_infos['fork_price']['min_product_price']) && (($product_price_infos['fork_price']['min_product_price'] < $min_value) || $first)) ? $product_price_infos['fork_price']['min_product_price'] : $min_value;
 					}
 					else {
-						if (!empty($product_price_infos) && !empty($product_price_infos['discount']) && !empty($product_price_infos['discount']['discount_exist'] ) && $product_price_infos['discount']['discount_exist'] ) {
-							$product_data = (!empty($price_piloting_option) &&  $price_piloting_option == 'HT')  ? $product_price_infos['discount']['discount_et_price'] : $product_price_infos['discount']['discount_ati_price'];
+						if (!empty($product_price_infos) && !empty($product_price_infos['discount']) && !empty($product_price_infos['discount']['discount_exist']) && $product_price_infos['discount']['discount_exist']) {
+							$product_data = (!empty($price_piloting_option) && $price_piloting_option == 'HT') ? $product_price_infos['discount']['discount_et_price'] : $product_price_infos['discount']['discount_ati_price'];
 
 						}
 						else {
 
-							$product_data = (!empty($price_piloting_option) &&  $price_piloting_option == 'HT')  ? $product_price_infos['et'] : $product_price_infos['ati'];
+							$product_data = (!empty($price_piloting_option) && $price_piloting_option == 'HT') ? $product_price_infos['et'] : $product_price_infos['ati'];
 						}
-						$max_value = ( !empty($product_data) && $product_data > $max_value ) ? $product_data : $max_value;
-						$min_value = (!empty($product_data) && ( ( $product_data < $min_value) || $first )  ) ?  $product_data : $min_value;
+						$max_value = (!empty($product_data) && $product_data > $max_value) ? $product_data : $max_value;
+						$min_value = (!empty($product_data) && (($product_data < $min_value) || $first)) ? $product_data : $min_value;
 					}
 				}
 				else {
 					$product_postmeta = get_post_meta($category_product_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, true);
 					$product_data = $product_postmeta[$attribute_def->code];
-					$max_value = ( !empty($product_data) && $product_data > $max_value ) ? $product_data : $max_value;
-					$min_value = (!empty($product_data) && ( ( $product_data < $min_value) || $first ) ) ?  $product_data : $min_value;
+					$max_value = (!empty($product_data) && $product_data > $max_value) ? $product_data : $max_value;
+					$min_value = (!empty($product_data) && (($product_data < $min_value) || $first)) ? $product_data : $min_value;
 				}
 				$first = false;
 			}
 			$category_option['wpshop_category_filterable_attributes'][$attribute_def->id] = array('min' => $min_value, 'max' => $max_value);
 		}
 		/** Update the category option **/
-		update_option('wpshop_product_category_'.$category_id, $category_option);
+		update_option('wpshop_product_category_' . $category_id, $category_option);
 	}
 
 	/**
@@ -399,66 +399,66 @@ 
 	 * @param std_object $attribute_def
 	 * @param array $current_category_child
 	 */
-	function save_values_for_text_filterable_attribute ( $category_id, $attribute_def, $current_category_child ) {
-		$category_option = get_option('wpshop_product_category_'.$category_id);
-		$category_product_ids = wpshop_categories::get_product_of_category( $category_id );
+	function save_values_for_text_filterable_attribute($category_id, $attribute_def, $current_category_child) {
+		$category_option = get_option('wpshop_product_category_' . $category_id);
+		$category_product_ids = wpshop_categories::get_product_of_category($category_id);
 		/** If there are sub-categories take all products of sub-categories **/
 		$list_values = array();
-		if ( !empty($current_category_children) ) {
-			foreach ( $current_category_children as $current_category_child ) {
-				$sub_categories_product_ids = wpshop_categories::get_product_of_category( $current_category_child->term_taxonomy_id );
-				if ( !empty($sub_categories_product_ids) ) {
-					foreach ( $sub_categories_product_ids as $sub_categories_product_id ) {
-						if ( !in_array($sub_categories_product_id, $category_product_ids) ) {
+		if (!empty($current_category_children)) {
+			foreach ($current_category_children as $current_category_child) {
+				$sub_categories_product_ids = wpshop_categories::get_product_of_category($current_category_child->term_taxonomy_id);
+				if (!empty($sub_categories_product_ids)) {
+					foreach ($sub_categories_product_ids as $sub_categories_product_id) {
+						if (!in_array($sub_categories_product_id, $category_product_ids)) {
 							$category_product_ids[] = $sub_categories_product_id;
 						}
 					}
 				}
 			}
 		}
-		if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id]) ) {
-			if ( !empty( $category_product_ids ) ) {
+		if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && !empty($category_option['wpshop_category_filterable_attributes'][$attribute_def->id])) {
+			if (!empty($category_product_ids)) {
 				$product_data = '';
-				foreach ( $category_product_ids as $category_product_id ) {
+				foreach ($category_product_ids as $category_product_id) {
 					$product_postmeta = get_post_meta($category_product_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, true);
-					$product_data = ( !empty($product_postmeta[$attribute_def->code]) ) ? $product_postmeta[$attribute_def->code] : '';
-					if ( !in_array( $product_data,  $list_values) ) {
+					$product_data = (!empty($product_postmeta[$attribute_def->code])) ? $product_postmeta[$attribute_def->code] : '';
+					if (!in_array($product_data, $list_values)) {
 						$list_values[] = $product_data;
-						if ( !empty($product_data) ) {
+						if (!empty($product_data)) {
 							$category_option['wpshop_category_filterable_attributes'][$attribute_def->id][] = $product_data;
 						}
 					}
 				}
 			}
 		}
-		update_option('wpshop_product_category_'.$category_id, $category_option);
+		update_option('wpshop_product_category_' . $category_id, $category_option);
 	}
 
 	/**
 	 * Save the price which is displayed on website
 	 */
-	public static function save_displayed_price_meta( $product_id = 0 ) {
-		$ID = !empty( $_POST['ID'] ) ? (int) $_POST['ID'] : 0;
-		$post_type = !empty( $_POST['post_type'] ) ? sanitize_text_field( $_POST['post_type'] ) : '';
+	public static function save_displayed_price_meta($product_id = 0) {
+		$ID = !empty($_POST['ID']) ? (int)$_POST['ID'] : 0;
+		$post_type = !empty($_POST['post_type']) ? sanitize_text_field($_POST['post_type']) : '';
 
-		if ( !empty( $product_id ) || ( !empty( $ID ) && !empty($post_type) && $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ) ) {
-			$product_id = !empty( $product_id ) ? $product_id : $ID;
+		if (!empty($product_id) || (!empty($ID) && !empty($post_type) && $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT)) {
+			$product_id = !empty($product_id) ? $product_id : $ID;
 
 			$price_piloting = get_option('wpshop_shop_price_piloting');
 			$product_data = wpshop_products::get_product_data($product_id);
 			$price_infos = wpshop_prices::check_product_price($product_data);
 
-			if ( !empty($price_infos) ) {
-				if ( !empty($price_infos['discount']) &&  !empty($price_infos['discount']['discount_exist']) ) {
-					$displayed_price = ( !empty($price_piloting) && $price_piloting == 'HT') ? $price_infos['discount']['discount_et_price'] : $price_infos['discount']['discount_ati_price'];
+			if (!empty($price_infos)) {
+				if (!empty($price_infos['discount']) && !empty($price_infos['discount']['discount_exist'])) {
+					$displayed_price = (!empty($price_piloting) && $price_piloting == 'HT') ? $price_infos['discount']['discount_et_price'] : $price_infos['discount']['discount_ati_price'];
 				}
-				else if( !empty($price_infos['fork_price']) && !empty($price_infos['fork_price']['have_fork_price']) ) {
+				else if (!empty($price_infos['fork_price']) && !empty($price_infos['fork_price']['have_fork_price'])) {
 					$displayed_price = $price_infos['fork_price']['min_product_price'];
 				}
 				else {
-					$displayed_price = ( !empty($price_piloting) && $price_piloting == 'HT') ? $price_infos['et'] : $price_infos['ati'];
+					$displayed_price = (!empty($price_piloting) && $price_piloting == 'HT') ? $price_infos['et'] : $price_infos['ati'];
 				}
-				update_post_meta($product_id, '_wpshop_displayed_price', number_format($displayed_price,2, '.','') );
+				update_post_meta($product_id, '_wpshop_displayed_price', number_format($displayed_price, 2, '.', ''));
 			}
 		}
 	}
@@ -467,19 +467,19 @@ 
 	 * Save values for attributes
 	 * @param unknown_type $values
 	 */
-	function stock_values_for_attribute( $categories_id = array() ) {
-		@set_time_limit( 900 );
+	function stock_values_for_attribute($categories_id = array()) {
+		@set_time_limit(900);
 
-		$tax_input = ( !empty( $_POST['tax_input'] ) && !empty( $_POST['tax_input']['wpshop_product_category'] ) ) ? (int) $_POST['tax_input']['wpshop_product_category'] : '';
-		$post_type = !empty( $_POST['post_type'] ) ? sanitize_text_field( $_POST['post_type'] ) : '';
-		if (  !empty( $tax_input ) && !empty($post_type) && $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT ) {
+		$tax_input = (!empty($_POST['tax_input']) && !empty($_POST['tax_input']['wpshop_product_category'])) ? (int)$_POST['tax_input']['wpshop_product_category'] : '';
+		$post_type = !empty($_POST['post_type']) ? sanitize_text_field($_POST['post_type']) : '';
+		if (!empty($tax_input) && !empty($post_type) && $post_type == WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT) {
 			$categories_id = $tax_input;
 		}
 
-		if ( !empty( $categories_id )  ) {
-			if ( $categories_id && is_array($categories_id) ) {
-				foreach( $categories_id as $taxonomy_id ) {
-					if ( $taxonomy_id != 0 ) {
+		if (!empty($categories_id)) {
+			if ($categories_id && is_array($categories_id)) {
+				foreach ($categories_id as $taxonomy_id) {
+					if ($taxonomy_id != 0) {
 						$current_category_children = array();
 						$args = array(
 								'type'		=> WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT,
@@ -488,23 +488,23 @@ 
 						);
 						$current_category_children = get_categories($args);
 
-						$category_option = get_option('wpshop_product_category_'.$taxonomy_id);
-						if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && is_array($category_option['wpshop_category_filterable_attributes']) ) {
-							foreach ( $category_option['wpshop_category_filterable_attributes'] as $k => $filterable_attribute ) {
+						$category_option = get_option('wpshop_product_category_' . $taxonomy_id);
+						if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) && is_array($category_option['wpshop_category_filterable_attributes'])) {
+							foreach ($category_option['wpshop_category_filterable_attributes'] as $k => $filterable_attribute) {
 								$attribute_def = wpshop_attributes::getElement($k);
-								if ( !empty( $attribute_def) ) {
-									switch ( $attribute_def->frontend_input ) {
+								if (!empty($attribute_def)) {
+									switch ($attribute_def->frontend_input) {
 										case 'text' :
-											if ( $attribute_def->data_type == 'decimal' || $attribute_def->data_type == 'integer') {
-												$this->save_values_for_integer_filterable_attribute( $taxonomy_id, $attribute_def, $current_category_children );
+											if ($attribute_def->data_type == 'decimal' || $attribute_def->data_type == 'integer') {
+												$this->save_values_for_integer_filterable_attribute($taxonomy_id, $attribute_def, $current_category_children);
 											}
 											else {
-												$this->save_values_for_text_filterable_attribute( $taxonomy_id, $attribute_def, $current_category_children );
+												$this->save_values_for_text_filterable_attribute($taxonomy_id, $attribute_def, $current_category_children);
 											}
 											break;
 
 										case 'select' : case 'checkbox' : case 'radio' : case 'multiple-select' :
-											$this->save_values_for_list_filterable_attribute( $taxonomy_id, $attribute_def, $current_category_children );
+											$this->save_values_for_list_filterable_attribute($taxonomy_id, $attribute_def, $current_category_children);
 											break;
 
 									}
@@ -522,22 +522,22 @@ 
 	 * @param integer $category_id
 	 * @return array
 	 */
-	function pick_up_filter_search_elements_type ( $category_id ) {
+	function pick_up_filter_search_elements_type($category_id) {
 		$filter_search_elements = array();
-		if ( !empty($category_id) ) {
-			$category_option =  get_option('wpshop_product_category_'.$category_id);
-			if ( !empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes']) ) {
-				foreach ( $category_option['wpshop_category_filterable_attributes'] as $k => $attribute ) {
+		if (!empty($category_id)) {
+			$category_option = get_option('wpshop_product_category_' . $category_id);
+			if (!empty($category_option) && !empty($category_option['wpshop_category_filterable_attributes'])) {
+				foreach ($category_option['wpshop_category_filterable_attributes'] as $k => $attribute) {
 					$attribute_def = wpshop_attributes::getElement($k);
-					if ( !empty($attribute_def) ) {
-						if ( $attribute_def->frontend_input == 'text' ) {
-							$filter_search_elements['_'.$attribute_def->code] = array('type' => 'fork_values');
+					if (!empty($attribute_def)) {
+						if ($attribute_def->frontend_input == 'text') {
+							$filter_search_elements['_' . $attribute_def->code] = array('type' => 'fork_values');
 						}
-						elseif( in_array( $attribute_def->frontend_input, array('checkbox', 'multiple-select', 'radio', 'select') ) ) {
-							$filter_search_elements['_'.$attribute_def->code] = array('type' => 'multiple_select_value');
+						elseif (in_array($attribute_def->frontend_input, array('checkbox', 'multiple-select', 'radio', 'select'))) {
+							$filter_search_elements['_' . $attribute_def->code] = array('type' => 'multiple_select_value');
 						}
-						elseif ( !in_array($attribute_def->frontend_input, array('hidden', 'textarea', 'password') ) )  {
-							$filter_search_elements['_'.$attribute_def->code] = array('type' => 'select_value');
+						elseif (!in_array($attribute_def->frontend_input, array('hidden', 'textarea', 'password'))) {
+							$filter_search_elements['_' . $attribute_def->code] = array('type' => 'select_value');
 						}
 					}
 				}
@@ -549,28 +549,28 @@ 
 	/**
 	 * AJAX - Action to search with selected attributes values
 	 */
-	function wpshop_ajax_filter_search_action () {
-		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
+	function wpshop_ajax_filter_search_action() {
+		$_wpnonce = !empty($_REQUEST['_wpnonce']) ? sanitize_text_field($_REQUEST['_wpnonce']) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_filter_search_action' ) )
+		if (!wp_verify_nonce($_wpnonce, 'wpshop_ajax_filter_search_action'))
 			wp_die();
 
 		global $wpdb;
-		$category_id =  !empty($_POST['wpshop_filter_search_category_id']) ? wpshop_tools::varSanitizer( $_POST['wpshop_filter_search_category_id'] ) : 0;
+		$category_id = !empty($_POST['wpshop_filter_search_category_id']) ? wpshop_tools::varSanitizer($_POST['wpshop_filter_search_category_id']) : 0;
 		$filter_search_elements = $this->pick_up_filter_search_elements_type($category_id);
-		$page_id = ( !empty( $_POST['wpshop_filter_search_current_page_id']) ) ? wpshop_tools::varSanitizer( $_POST['wpshop_filter_search_current_page_id'] ) : 1;
+		$page_id = (!empty($_POST['wpshop_filter_search_current_page_id'])) ? wpshop_tools::varSanitizer($_POST['wpshop_filter_search_current_page_id']) : 1;
 		$request_cmd = '';
 		$status = false;
 		$data = array();
-		foreach ( $filter_search_elements as $k=>$filter_search_element) {
-			$search = isset( $_REQUEST['filter_search'.$k] ) ? sanitize_text_field( $_REQUEST['filter_search'.$k] ) : '';
-			$amount_min = !isset( $_REQUEST['amount_min'.$k] ) ? 0 : sanitize_text_field( $_REQUEST['amount_min'.$k] );
-			$amount_max = !isset( $_REQUEST['amount_max'.$k] ) ? 0 : sanitize_text_field( $_REQUEST['amount_max'.$k] );
-			$datatype_element = array( 'select_value', 'multiple_select_value', 'fork_values');
-			if ( (in_array($filter_search_element['type'], $datatype_element) && ( isset($search) && $search == 'all_attribute_values' ) ) ||
-				( ($filter_search_element['type'] == 'select_value' || $filter_search_element['type'] == 'multiple_select_value' ) &&  $search == '' ) ||
-				( $filter_search_element['type'] == 'fork_values' && ( $amount_min == 0 || $amount_max == 0 ) ) ) {
-				unset( $filter_search_elements[$k]);
+		foreach ($filter_search_elements as $k=>$filter_search_element) {
+			$search = isset($_REQUEST['filter_search' . $k]) ? sanitize_text_field($_REQUEST['filter_search' . $k]) : '';
+			$amount_min = !isset($_REQUEST['amount_min' . $k]) ? 0 : sanitize_text_field($_REQUEST['amount_min' . $k]);
+			$amount_max = !isset($_REQUEST['amount_max' . $k]) ? 0 : sanitize_text_field($_REQUEST['amount_max' . $k]);
+			$datatype_element = array('select_value', 'multiple_select_value', 'fork_values');
+			if ((in_array($filter_search_element['type'], $datatype_element) && (isset($search) && $search == 'all_attribute_values')) ||
+				(($filter_search_element['type'] == 'select_value' || $filter_search_element['type'] == 'multiple_select_value') && $search == '') ||
+				($filter_search_element['type'] == 'fork_values' && ($amount_min == 0 || $amount_max == 0))) {
+				unset($filter_search_elements[$k]);
 			}
 		}
 		$request_cmd = '';
@@ -589,8 +589,8 @@ 
 		/** Construct the array for SELECT query IN **/
 		$categories_id = array();
 		$categories_id[] = $category_id;
-		if ( !empty($current_category_children) ) {
-			foreach ( $current_category_children as $current_category_child ) {
+		if (!empty($current_category_children)) {
+			foreach ($current_category_children as $current_category_child) {
 				$categories_id[] = $current_category_child->term_taxonomy_id;
 			}
 		}
@@ -599,55 +599,55 @@ 
 		$array_for_query = implode(',', $categories_id);
 
 		/** SQL request Construct for pick up all product with one of filter search element value **/
-		if ( !empty( $filter_search_elements ) ) {
-			foreach ( $filter_search_elements as $k=>$filter_search_element ) {
-				$search = isset( $_REQUEST['filter_search'.$k] ) ? $_REQUEST['filter_search'.$k] : '';
-				$amount_min = !isset( $_REQUEST['amount_min'.$k] ) ? 0 : sanitize_text_field( $_REQUEST['amount_min'.$k] );
-				$amount_max = !isset( $_REQUEST['amount_max'.$k] ) ? 0 : sanitize_text_field( $_REQUEST['amount_max'.$k] );
-
-				if ( !empty($filter_search_element['type']) && !empty($search) && $filter_search_element['type'] == 'select_value' && $search != 'all_attribute_values') {
-					$request_cmd .= 'SELECT meta_key, post_id FROM ' .$wpdb->postmeta. ' INNER JOIN ' .$wpdb->posts. ' ON  post_id = ID WHERE (meta_key = "'.$k.'" AND meta_value = "'.$search.'") AND post_type = "'.WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT.'" AND post_status = "publish" ';
-					$request_cmd .= ' AND post_id IN (SELECT object_id FROM '.$wpdb->term_relationships.' WHERE term_taxonomy_id IN ('.$array_for_query.') ) ';
+		if (!empty($filter_search_elements)) {
+			foreach ($filter_search_elements as $k=>$filter_search_element) {
+				$search = isset($_REQUEST['filter_search' . $k]) ? $_REQUEST['filter_search' . $k] : '';
+				$amount_min = !isset($_REQUEST['amount_min' . $k]) ? 0 : sanitize_text_field($_REQUEST['amount_min' . $k]);
+				$amount_max = !isset($_REQUEST['amount_max' . $k]) ? 0 : sanitize_text_field($_REQUEST['amount_max' . $k]);
+
+				if (!empty($filter_search_element['type']) && !empty($search) && $filter_search_element['type'] == 'select_value' && $search != 'all_attribute_values') {
+					$request_cmd .= 'SELECT meta_key, post_id FROM ' . $wpdb->postmeta . ' INNER JOIN ' . $wpdb->posts . ' ON  post_id = ID WHERE (meta_key = "' . $k . '" AND meta_value = "' . $search . '") AND post_type = "' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '" AND post_status = "publish" ';
+					$request_cmd .= ' AND post_id IN (SELECT object_id FROM ' . $wpdb->term_relationships . ' WHERE term_taxonomy_id IN (' . $array_for_query . ') ) ';
 				}
-				else if($filter_search_element['type'] == 'fork_values') {
-					$request_cmd .= 'SELECT meta_key, post_id FROM ' .$wpdb->postmeta. ' INNER JOIN ' .$wpdb->posts. ' ON  post_id = ID WHERE (meta_key = "'.( ( !empty($k) && $k == '_product_price' ) ? '_wpshop_displayed_price' : $k).'" AND meta_value BETWEEN '.$amount_min.' AND '.$amount_max.') AND post_type = "'.WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT.'" AND post_status = "publish"';
-					$request_cmd .= ' AND post_id IN (SELECT object_id FROM '.$wpdb->term_relationships.' WHERE term_taxonomy_id IN ('.$array_for_query.') ) ';
+				else if ($filter_search_element['type'] == 'fork_values') {
+					$request_cmd .= 'SELECT meta_key, post_id FROM ' . $wpdb->postmeta . ' INNER JOIN ' . $wpdb->posts . ' ON  post_id = ID WHERE (meta_key = "' . ((!empty($k) && $k == '_product_price') ? '_wpshop_displayed_price' : $k) . '" AND meta_value BETWEEN ' . $amount_min . ' AND ' . $amount_max . ') AND post_type = "' . WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT . '" AND post_status = "publish"';
+					$request_cmd .= ' AND post_id IN (SELECT object_id FROM ' . $wpdb->term_relationships . ' WHERE term_taxonomy_id IN (' . $array_for_query . ') ) ';
 				}
-				else if( $filter_search_element['type'] == 'multiple_select_value' ) {
+				else if ($filter_search_element['type'] == 'multiple_select_value') {
 					/** Check the attribute id **/
 					$attribute_def = wpshop_attributes::getElement(substr($k, 1), "'valid'", 'code');
-					if ( !empty($attribute_def) ) {
-						$request_cmd .= 'SELECT CONCAT("_", code) AS meta_key, ATT_INT.entity_id AS post_id FROM ' .WPSHOP_DBT_ATTRIBUTE. ', '.WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER.' AS ATT_INT WHERE attribute_id = id AND attribute_id = '.$attribute_def->id;
+					if (!empty($attribute_def)) {
+						$request_cmd .= 'SELECT CONCAT("_", code) AS meta_key, ATT_INT.entity_id AS post_id FROM ' . WPSHOP_DBT_ATTRIBUTE . ', ' . WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER . ' AS ATT_INT WHERE attribute_id = id AND attribute_id = ' . $attribute_def->id;
 						$first = true;
-						if ( !empty($search) && is_array($search) ){
-							foreach ( $search as $r ) {
-								if ( $first) {
-									$request_cmd .= ' AND (value ="' . $r. '"';
+						if (!empty($search) && is_array($search)) {
+							foreach ($search as $r) {
+								if ($first) {
+									$request_cmd .= ' AND (value ="' . $r . '"';
 									$first = false;
 								}
 								else {
-									$request_cmd .= ' OR value ="' . $r. '"';
+									$request_cmd .= ' OR value ="' . $r . '"';
 								}
 							}
 							$request_cmd .= ')';
 						}
-						elseif(  !empty($search) )  {
+						elseif (!empty($search)) {
 							$request_cmd .= ' AND (value ="' . $search . '" )';
 						}
-						$request_cmd .= ' AND ATT_INT.entity_id IN (SELECT object_id FROM '.$wpdb->term_relationships.' WHERE term_taxonomy_id IN ('.$array_for_query.') ) ';
+						$request_cmd .= ' AND ATT_INT.entity_id IN (SELECT object_id FROM ' . $wpdb->term_relationships . ' WHERE term_taxonomy_id IN (' . $array_for_query . ') ) ';
 
 
 					}
 				}
 
 
-				if ($i < count($filter_search_elements) ) {
+				if ($i < count($filter_search_elements)) {
 					$request_cmd .= ' UNION ';
 				}
 				$i++;
 			}
 		} else {
-			$request_cmd .= 'SELECT object_id FROM '.$wpdb->term_relationships.' WHERE term_taxonomy_id IN ('.$array_for_query.')';
+			$request_cmd .= 'SELECT object_id FROM ' . $wpdb->term_relationships . ' WHERE term_taxonomy_id IN (' . $array_for_query . ')';
 		}
 		/** SQL Request execution **/
 		$query = $wpdb->prepare($request_cmd, '');
@@ -661,9 +661,9 @@ 
 
 		$last = '';
 		/** Transform the query result array **/
-		foreach ( $results as $result ) {
-			$result->meta_key = ( !empty($result->meta_key) && $result->meta_key == '_wpshop_displayed_price' ) ? '_product_price' : $result->meta_key;
-			if ( $last != $result->meta_key ){
+		foreach ($results as $result) {
+			$result->meta_key = (!empty($result->meta_key) && $result->meta_key == '_wpshop_displayed_price') ? '_product_price' : $result->meta_key;
+			if ($last != $result->meta_key) {
 				$filter_search_elements[$result->meta_key]['count'] = 1;
 				$last = $result->meta_key;
 			}
@@ -677,12 +677,12 @@ 
 		/** Check the smaller array of attributes **/
 		$smaller_array = '';
 		$smaller_array_count = -1;
-		foreach ( $filter_search_elements as $k=>$filter_search_element ) {
-			if ( empty($filter_search_element['count']) ) {
+		foreach ($filter_search_elements as $k=>$filter_search_element) {
+			if (empty($filter_search_element['count'])) {
 				$smaller_array_count = 0;
 				$smaller_array = $k;
 			}
-			elseif( $smaller_array_count == -1 || $filter_search_element['count'] <= $smaller_array_count ) {
+			elseif ($smaller_array_count == -1 || $filter_search_element['count'] <= $smaller_array_count) {
 				$smaller_array_count = $filter_search_element['count'];
 				$smaller_array = $k;
 			}
@@ -690,21 +690,21 @@ 
 		}
 
 		/** Compare the smaller array with the others **/
-		if ( !empty($smaller_array_count) ) {
+		if (!empty($smaller_array_count)) {
 			$temp_tab = $filter_search_elements[$smaller_array]['values'];
-			foreach ( $filter_search_elements as $filter_search) {
-				foreach ( $temp_tab as $value ) {
-					if ( !in_array($value, $filter_search['values']) ) {
+			foreach ($filter_search_elements as $filter_search) {
+				foreach ($temp_tab as $value) {
+					if (!in_array($value, $filter_search['values'])) {
 						/** If value don't exist in the smaller array, delete it **/
 						$key = array_key_exists($value, $temp_tab);
-						if ( $key ) {
+						if ($key) {
 							unset($temp_tab[$value]);
 						}
 					}
 				}
 			}
 			/** Final result to display the products **/
-			if ( !empty( $temp_tab) ) {
+			if (!empty($temp_tab)) {
 				$final_result = $temp_tab;
 			}
 		}
@@ -713,21 +713,21 @@ 
 		}
 
 		$products_count = count($final_result);
-		$products_count = sprintf(__('%s products corresponds to your search.', 'wpshop'),$products_count) ;
+		$products_count = sprintf(__('%s products corresponds to your search.', 'wpshop'), $products_count);
 
 		/** If there is products for this filter search **/
 		$status = true;
-		if ( !empty($final_result) ) {
+		if (!empty($final_result)) {
 			$data['status'] = true;
-			$data['result']  = do_shortcode( '[wpshop_products pid="' . implode(',', $final_result) . '" cid="' . $category_id . '" container="no" ]' ) ;
+			$data['result'] = do_shortcode('[wpshop_products pid="' . implode(',', $final_result) . '" cid="' . $category_id . '" container="no" ]');
 			$data['products_count'] = $products_count;
 		}
 		else {
 			$data['status'] = false;
-			$data['result'] = '<div class="container_product_listing">'.__('There is no product for this filter search.', 'wpshop').'</div>';
+			$data['result'] = '<div class="container_product_listing">' . __('There is no product for this filter search.', 'wpshop') . '</div>';
 			$data['products_count'] = __('No products corresponds to your search', 'wpshop');
 		}
-		echo json_encode( $data );
+		echo json_encode($data);
 		die();
 	}
 }

Braces +27 added lines, -43 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_filter_search {
 
 	/** Define the main directory containing the template for the current plugin
@@ -106,8 +108,7 @@ 
 				case 'text' :
 					if ( $attribute_def->data_type == 'decimal' || $attribute_def->data_type == 'integer') {
 						return $this->get_filter_element_for_integer_data( $attribute_def, $category_id, $current_category_children );
-					}
-					else {
+					} else {
 						return $this->get_filter_element_for_text_data( $attribute_def, $category_id, $current_category_children );
 					}
 					break;
@@ -187,8 +188,7 @@ 
 						}
 					}
 				}
-			}
-			else {
+			} else {
 				foreach ( $attributes_options as $attributes_option ) {
 					if ( in_array($attributes_option->label, $available_attribute_values) ) {
 						$key_value = array_search( $attributes_option->label, $available_attribute_values);
@@ -224,8 +224,7 @@ 
 							require( wpshop_tools::get_template_part( WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_multiple_select") );
 							$output = ob_get_contents();
 							ob_end_clean();
-						}
-						else {
+						} else {
 							ob_start();
 							require( wpshop_tools::get_template_part( WPS_SEARCH_DIR, $this->template_dir, "frontend", "filter_search/filter_elements/element_combobox") );
 							$output = ob_get_contents();
@@ -308,8 +307,7 @@ 
 				foreach( $available_attribute_values as $k => $available_attribute_value ) {
 					if (  $attribute_def->data_type_to_use == 'internal' ) {
 						$attribute_name = get_the_title( $k );
-					}
-					else {
+					} else {
 						$query = $wpdb->prepare( 'SELECT label FROM ' .WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS. ' WHERE attribute_id = %d AND id = %d', $attribute_def->id, $k);
 
 						$attribute_name = $wpdb->get_var( $query );
@@ -365,21 +363,18 @@ 
 
 						$max_value = ( !empty($product_price_infos['fork_price']['max_product_price']) && $product_price_infos['fork_price']['max_product_price'] > $max_value ) ? $product_price_infos['fork_price']['max_product_price'] : $max_value;
 						$min_value = (!empty($product_price_infos['fork_price']['min_product_price']) && ( ( $product_price_infos['fork_price']['min_product_price'] < $min_value) || $first ) ) ?  $product_price_infos['fork_price']['min_product_price'] : $min_value;
-					}
-					else {
+					} else {
 						if (!empty($product_price_infos) && !empty($product_price_infos['discount']) && !empty($product_price_infos['discount']['discount_exist'] ) && $product_price_infos['discount']['discount_exist'] ) {
 							$product_data = (!empty($price_piloting_option) &&  $price_piloting_option == 'HT')  ? $product_price_infos['discount']['discount_et_price'] : $product_price_infos['discount']['discount_ati_price'];
 
-						}
-						else {
+						} else {
 
 							$product_data = (!empty($price_piloting_option) &&  $price_piloting_option == 'HT')  ? $product_price_infos['et'] : $product_price_infos['ati'];
 						}
 						$max_value = ( !empty($product_data) && $product_data > $max_value ) ? $product_data : $max_value;
 						$min_value = (!empty($product_data) && ( ( $product_data < $min_value) || $first )  ) ?  $product_data : $min_value;
 					}
-				}
-				else {
+				} else {
 					$product_postmeta = get_post_meta($category_product_id, WPSHOP_PRODUCT_ATTRIBUTE_META_KEY, true);
 					$product_data = $product_postmeta[$attribute_def->code];
 					$max_value = ( !empty($product_data) && $product_data > $max_value ) ? $product_data : $max_value;
@@ -451,11 +446,9 @@ 
 			if ( !empty($price_infos) ) {
 				if ( !empty($price_infos['discount']) &&  !empty($price_infos['discount']['discount_exist']) ) {
 					$displayed_price = ( !empty($price_piloting) && $price_piloting == 'HT') ? $price_infos['discount']['discount_et_price'] : $price_infos['discount']['discount_ati_price'];
-				}
-				else if( !empty($price_infos['fork_price']) && !empty($price_infos['fork_price']['have_fork_price']) ) {
+				} else if( !empty($price_infos['fork_price']) && !empty($price_infos['fork_price']['have_fork_price']) ) {
 					$displayed_price = $price_infos['fork_price']['min_product_price'];
-				}
-				else {
+				} else {
 					$displayed_price = ( !empty($price_piloting) && $price_piloting == 'HT') ? $price_infos['et'] : $price_infos['ati'];
 				}
 				update_post_meta($product_id, '_wpshop_displayed_price', number_format($displayed_price,2, '.','') );
@@ -497,8 +490,7 @@ 
 										case 'text' :
 											if ( $attribute_def->data_type == 'decimal' || $attribute_def->data_type == 'integer') {
 												$this->save_values_for_integer_filterable_attribute( $taxonomy_id, $attribute_def, $current_category_children );
-											}
-											else {
+											} else {
 												$this->save_values_for_text_filterable_attribute( $taxonomy_id, $attribute_def, $current_category_children );
 											}
 											break;
@@ -532,11 +524,9 @@ 
 					if ( !empty($attribute_def) ) {
 						if ( $attribute_def->frontend_input == 'text' ) {
 							$filter_search_elements['_'.$attribute_def->code] = array('type' => 'fork_values');
-						}
-						elseif( in_array( $attribute_def->frontend_input, array('checkbox', 'multiple-select', 'radio', 'select') ) ) {
+						} elseif( in_array( $attribute_def->frontend_input, array('checkbox', 'multiple-select', 'radio', 'select') ) ) {
 							$filter_search_elements['_'.$attribute_def->code] = array('type' => 'multiple_select_value');
-						}
-						elseif ( !in_array($attribute_def->frontend_input, array('hidden', 'textarea', 'password') ) )  {
+						} elseif ( !in_array($attribute_def->frontend_input, array('hidden', 'textarea', 'password') ) )  {
 							$filter_search_elements['_'.$attribute_def->code] = array('type' => 'select_value');
 						}
 					}
@@ -552,8 +542,9 @@ 
 	function wpshop_ajax_filter_search_action () {
 		$_wpnonce = !empty( $_REQUEST['_wpnonce'] ) ? sanitize_text_field( $_REQUEST['_wpnonce'] ) : '';
 
-		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_filter_search_action' ) )
-			wp_die();
+		if ( !wp_verify_nonce( $_wpnonce, 'wpshop_ajax_filter_search_action' ) ) {
+					wp_die();
+		}
 
 		global $wpdb;
 		$category_id =  !empty($_POST['wpshop_filter_search_category_id']) ? wpshop_tools::varSanitizer( $_POST['wpshop_filter_search_category_id'] ) : 0;
@@ -608,12 +599,10 @@ 
 				if ( !empty($filter_search_element['type']) && !empty($search) && $filter_search_element['type'] == 'select_value' && $search != 'all_attribute_values') {
 					$request_cmd .= 'SELECT meta_key, post_id FROM ' .$wpdb->postmeta. ' INNER JOIN ' .$wpdb->posts. ' ON  post_id = ID WHERE (meta_key = "'.$k.'" AND meta_value = "'.$search.'") AND post_type = "'.WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT.'" AND post_status = "publish" ';
 					$request_cmd .= ' AND post_id IN (SELECT object_id FROM '.$wpdb->term_relationships.' WHERE term_taxonomy_id IN ('.$array_for_query.') ) ';
-				}
-				else if($filter_search_element['type'] == 'fork_values') {
+				} else if($filter_search_element['type'] == 'fork_values') {
 					$request_cmd .= 'SELECT meta_key, post_id FROM ' .$wpdb->postmeta. ' INNER JOIN ' .$wpdb->posts. ' ON  post_id = ID WHERE (meta_key = "'.( ( !empty($k) && $k == '_product_price' ) ? '_wpshop_displayed_price' : $k).'" AND meta_value BETWEEN '.$amount_min.' AND '.$amount_max.') AND post_type = "'.WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT.'" AND post_status = "publish"';
 					$request_cmd .= ' AND post_id IN (SELECT object_id FROM '.$wpdb->term_relationships.' WHERE term_taxonomy_id IN ('.$array_for_query.') ) ';
-				}
-				else if( $filter_search_element['type'] == 'multiple_select_value' ) {
+				} else if( $filter_search_element['type'] == 'multiple_select_value' ) {
 					/** Check the attribute id **/
 					$attribute_def = wpshop_attributes::getElement(substr($k, 1), "'valid'", 'code');
 					if ( !empty($attribute_def) ) {
@@ -624,14 +613,12 @@ 
 								if ( $first) {
 									$request_cmd .= ' AND (value ="' . $r. '"';
 									$first = false;
-								}
-								else {
+								} else {
 									$request_cmd .= ' OR value ="' . $r. '"';
 								}
 							}
 							$request_cmd .= ')';
-						}
-						elseif(  !empty($search) )  {
+						} elseif(  !empty($search) )  {
 							$request_cmd .= ' AND (value ="' . $search . '" )';
 						}
 						$request_cmd .= ' AND ATT_INT.entity_id IN (SELECT object_id FROM '.$wpdb->term_relationships.' WHERE term_taxonomy_id IN ('.$array_for_query.') ) ';
@@ -666,9 +653,9 @@ 
 			if ( $last != $result->meta_key ){
 				$filter_search_elements[$result->meta_key]['count'] = 1;
 				$last = $result->meta_key;
+			} else {
+							$filter_search_elements[$result->meta_key]['count']++;
 			}
-			else
-				$filter_search_elements[$result->meta_key]['count']++;
 
 			$filter_search_elements[$result->meta_key]['values'][$result->post_id] = $result->post_id;
 		}
@@ -681,8 +668,7 @@ 
 			if ( empty($filter_search_element['count']) ) {
 				$smaller_array_count = 0;
 				$smaller_array = $k;
-			}
-			elseif( $smaller_array_count == -1 || $filter_search_element['count'] <= $smaller_array_count ) {
+			} elseif( $smaller_array_count == -1 || $filter_search_element['count'] <= $smaller_array_count ) {
 				$smaller_array_count = $filter_search_element['count'];
 				$smaller_array = $k;
 			}
@@ -707,8 +693,7 @@ 
 			if ( !empty( $temp_tab) ) {
 				$final_result = $temp_tab;
 			}
-		}
-		else {
+		} else {
 			$final_result = array();
 		}
 
@@ -721,8 +706,7 @@ 
 			$data['status'] = true;
 			$data['result']  = do_shortcode( '[wpshop_products pid="' . implode(',', $final_result) . '" cid="' . $category_id . '" container="no" ]' ) ;
 			$data['products_count'] = $products_count;
-		}
-		else {
+		} else {
 			$data['status'] = false;
 			$data['result'] = '<div class="container_product_listing">'.__('There is no product for this filter search.', 'wpshop').'</div>';
 			$data['products_count'] = __('No products corresponds to your search', 'wpshop');