Eoxia / wpshop

core/module_management/controller/module_management.ctr.php

Doc Comments -1 removed lines

@@ -51,7 +51,6 @@
 	/**
 	 * OPTIONS -
 	 *
-	 * @param array $input
 	 *
 	 * @return array
 	 */

Spacing +58 added lines, -58 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Fichier du controleur principal pour la gestion des modules internes dans les extensions wordpress / Main controller file for internal modules management into wordpress plugins
  *
@@ -7,8 +7,8 @@ 
  */
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -24,28 +24,28 @@ 
 	 */
 	function __construct() {
 		/**	Ajoute une interface aux options pour gérer les modules / Add an interface to plugin options screen in order to manage modules	*/
-		add_action( 'admin_init', array( $this, 'declare_options' ), 11 );
+		add_action('admin_init', array($this, 'declare_options'), 11);
 
 		/**	Appel des styles pour l'administration / Call style for administration	*/
-		add_action( 'admin_enqueue_scripts', array( &$this, 'admin_assets' ) );
+		add_action('admin_enqueue_scripts', array(&$this, 'admin_assets'));
 	}
 
 	/**
 	 * Inclusion des feuilles de styles pour l'administration / Admin css enqueue
 	 */
 	function admin_assets() {
-		wp_register_style( 'eomodmanager-admin-css', EOMODMAN_URL . '/assets/css/backend.css', '', EOMODMAN_VERSION );
-		wp_enqueue_style( 'eomodmanager-admin-css' );
+		wp_register_style('eomodmanager-admin-css', EOMODMAN_URL . '/assets/css/backend.css', '', EOMODMAN_VERSION);
+		wp_enqueue_style('eomodmanager-admin-css');
 	}
 
 	/**
 	 * OPTIONS - Déclare les options permettant de gérer les statuts des modules / Declare add-on configuration panel for managing modules status
 	 */
 	function declare_options() {
-		add_settings_section( 'wps_internal_modules', '<i class="dashicons dashicons-admin-plugins"></i>' . __( 'Internal modules management', 'eo-modmanager-i18n' ), '', 'wpshop_addons_options' );
-		register_setting( 'wpshop_options', 'wpshop_modules', array( &$this, 'validate_options' ) );
+		add_settings_section('wps_internal_modules', '<i class="dashicons dashicons-admin-plugins"></i>' . __('Internal modules management', 'eo-modmanager-i18n'), '', 'wpshop_addons_options');
+		register_setting('wpshop_options', 'wpshop_modules', array(&$this, 'validate_options'));
 
-		add_settings_field( 'wpshop_opinions_field', __( 'Internal modules management', 'eo-modmanager-i18n' ), array( &$this, 'module_listing' ), 'wpshop_addons_options', 'wps_internal_modules' );
+		add_settings_field('wpshop_opinions_field', __('Internal modules management', 'eo-modmanager-i18n'), array(&$this, 'module_listing'), 'wpshop_addons_options', 'wps_internal_modules');
 	}
 
 	/**
@@ -55,41 +55,41 @@ 
 	 *
 	 * @return array
 	 */
-	function validate_options( $settings ) {
-		if ( is_array( $settings ) ) {
-			$module_option = get_option( 'wpshop_modules' );
+	function validate_options($settings) {
+		if (is_array($settings)) {
+			$module_option = get_option('wpshop_modules');
 			$log_error = array();
-			foreach ( $settings as $module => $module_state ) {
-				if ( !array_key_exists( 'activated', $module_state ) && ( 'on' == $module_state[ 'old_activated' ] ) ) {
-					$module_option[ $module ][ 'activated' ] = 'off';
-					$module_option[ $module ][ 'date_off' ] = gmdate( "Y-m-d H:i:s", time() );
-					$module_option[ $module ][ 'author_off' ] = get_current_user_id();
-					$settings[ $module ] = $module_option[ $module ];
+			foreach ($settings as $module => $module_state) {
+				if (!array_key_exists('activated', $module_state) && ('on' == $module_state['old_activated'])) {
+					$module_option[$module]['activated'] = 'off';
+					$module_option[$module]['date_off'] = gmdate("Y-m-d H:i:s", time());
+					$module_option[$module]['author_off'] = get_current_user_id();
+					$settings[$module] = $module_option[$module];
 
 					/**	Log module activation	*/
-					$user = get_userdata( $module_option[ $folder ][ 'author_on' ] );
+					$user = get_userdata($module_option[$folder]['author_on']);
 					$author = $user->display_name;
-					$log_error[ 'message' ] = sprintf( __( 'Activation made on %1$s by %2$s', 'eo-modmanager-i18n' ), mysql2date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $settings[ $module ][ 'date_on' ], true ), $author);
+					$log_error['message'] = sprintf(__('Activation made on %1$s by %2$s', 'eo-modmanager-i18n'), mysql2date(get_option('date_format') . ' ' . get_option('time_format'), $settings[$module]['date_on'], true), $author);
 				}
-				else if ( array_key_exists( 'activated', $module_state ) && ( 'off' == $module_state[ 'old_activated' ] ) ) {
-					$module_option[ $module ][ 'activated' ] = 'on';
-					$module_option[ $module ][ 'date_on' ] = gmdate( "Y-m-d H:i:s", time() );
-					$module_option[ $module ][ 'author_on' ] = get_current_user_id();
-					$settings[ $module ] = $module_option[ $module ];
+				else if (array_key_exists('activated', $module_state) && ('off' == $module_state['old_activated'])) {
+					$module_option[$module]['activated'] = 'on';
+					$module_option[$module]['date_on'] = gmdate("Y-m-d H:i:s", time());
+					$module_option[$module]['author_on'] = get_current_user_id();
+					$settings[$module] = $module_option[$module];
 
 					/**	Log module activation	*/
-					$user = get_userdata( $module_option[ $folder ][ 'author_off' ] );
+					$user = get_userdata($module_option[$folder]['author_off']);
 					$author = $user->display_name;
-					$log_error[ 'message' ] = sprintf( __( 'Deactivation made on %1$s by %2$s', 'eo-modmanager-i18n' ), mysql2date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $settings[ $module ][ 'date_off' ], true ), $author);
+					$log_error['message'] = sprintf(__('Deactivation made on %1$s by %2$s', 'eo-modmanager-i18n'), mysql2date(get_option('date_format') . ' ' . get_option('time_format'), $settings[$module]['date_off'], true), $author);
 				}
 				else {
-					$settings[ $module ] = $module_option[ $module ];
+					$settings[$module] = $module_option[$module];
 				}
-				unset( $settings[ $module ][ 'old_activated' ] );
-				$log_error[ 'object_id' ] = $module;
+				unset($settings[$module]['old_activated']);
+				$log_error['object_id'] = $module;
 			}
 
-			wpeologs_ctr::log_datas_in_files( 'wps_addon', $log_error, 0 );
+			wpeologs_ctr::log_datas_in_files('wps_addon', $log_error, 0);
 
 		}
 
@@ -104,16 +104,16 @@ 
 		$module_folder = WPSHOP_MODULES_DIR;
 
 		/**	Get	current modules options to know if they are activated or not */
-		$module_option = get_option( 'wpshop_modules' );
+		$module_option = get_option('wpshop_modules');
 
 		/**	Check if the defined directory exists for reading and displaying an input to activate/deactivate the module	*/
-		if( is_dir( $module_folder ) ) {
-			$parent_folder_content = scandir( $module_folder );
+		if (is_dir($module_folder)) {
+			$parent_folder_content = scandir($module_folder);
 
-			require_once( wpshop_tools::get_template_part( EOMODMAN_DIR, EOMODMAN_TEMPLATES_MAIN_DIR, 'backend', 'settings' ) );
+			require_once(wpshop_tools::get_template_part(EOMODMAN_DIR, EOMODMAN_TEMPLATES_MAIN_DIR, 'backend', 'settings'));
 		}
 		else {
-			_e( 'There is no modules to include into current plugin', 'eo-modmanager-i18n' );
+			_e('There is no modules to include into current plugin', 'eo-modmanager-i18n');
 		}
 
 	}
@@ -126,13 +126,13 @@ 
 		$module_folder = WPSHOP_DIR . '/core/';
 
 		/**	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) != '.' && ( EOMODMAN_DIR != $folder ) ) {
-					if ( file_exists( $module_folder . $folder . '/' . $folder . '.php') ) {
-						$f =  $module_folder . $folder . '/' . $folder . '.php';
-						require( $f );
+		if (is_dir($module_folder)) {
+			$parent_folder_content = scandir($module_folder);
+			foreach ($parent_folder_content as $folder) {
+				if ($folder && substr($folder, 0, 1) != '.' && (EOMODMAN_DIR != $folder)) {
+					if (file_exists($module_folder . $folder . '/' . $folder . '.php')) {
+						$f = $module_folder . $folder . '/' . $folder . '.php';
+						require($f);
 					}
 				}
 			}
@@ -147,23 +147,23 @@ 
 		$module_folder = WPSHOP_MODULES_DIR;
 
 		/**	Get	current modules options to know if they are activated or not */
-		$module_option = get_option( 'wpshop_modules' );
+		$module_option = get_option('wpshop_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 );
+		if (is_dir($module_folder)) {
+			$parent_folder_content = scandir($module_folder);
 			$update_option = false;
-			foreach ( $parent_folder_content as $folder ) {
-				if ( $folder && substr( $folder, 0, 1) != '.' ) {
+			foreach ($parent_folder_content as $folder) {
+				if ($folder && substr($folder, 0, 1) != '.') {
 					$is_activated = false;
 					/**	Check current module state to know if we have to include it or not	*/
-					if ( !empty( $module_option ) && array_key_exists( $folder, $module_option ) && ( 'on' == $module_option[ $folder ][ 'activated' ] ) ) {
+					if (!empty($module_option) && array_key_exists($folder, $module_option) && ('on' == $module_option[$folder]['activated'])) {
 						$is_activated = true;
 					}
-					else if ( empty( $module_option ) || ( !empty( $module_option ) && !array_key_exists( $folder, $module_option ) ) ) {
-						$modules_option[ $folder ] = array(
+					else if (empty($module_option) || (!empty($module_option) && !array_key_exists($folder, $module_option))) {
+						$modules_option[$folder] = array(
 							'activated' => 'on',
-							'date_on' => gmdate( "Y-m-d H:i:s", time() ),
+							'date_on' => gmdate("Y-m-d H:i:s", time()),
 							'author_on' => 'auto',
 						);
 						$is_activated = true;
@@ -171,15 +171,15 @@ 
 					}
 
 					/**	Finaly include module if the state allow it	*/
-					if ( $is_activated && file_exists( $module_folder . $folder . '/' . $folder . '.php') ) {
-						$f =  $module_folder . $folder . '/' . $folder . '.php';
-						require( $f );
+					if ($is_activated && file_exists($module_folder . $folder . '/' . $folder . '.php')) {
+						$f = $module_folder . $folder . '/' . $folder . '.php';
+						require($f);
 					}
 				}
 			}
 			/**	Update option only if it is necessary	*/
-			if ( $update_option ) {
-				update_option( 'wpshop_modules', $modules_option );
+			if ($update_option) {
+				update_option('wpshop_modules', $modules_option);
 			}
 		}
 	}

Braces +7 added lines, -9 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier du controleur principal pour la gestion des modules internes dans les extensions wordpress / Main controller file for internal modules management into wordpress plugins
  *
@@ -70,8 +72,7 @@ 
 					$user = get_userdata( $module_option[ $folder ][ 'author_on' ] );
 					$author = $user->display_name;
 					$log_error[ 'message' ] = sprintf( __( 'Activation made on %1$s by %2$s', 'eo-modmanager-i18n' ), mysql2date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $settings[ $module ][ 'date_on' ], true ), $author);
-				}
-				else if ( array_key_exists( 'activated', $module_state ) && ( 'off' == $module_state[ 'old_activated' ] ) ) {
+				} else if ( array_key_exists( 'activated', $module_state ) && ( 'off' == $module_state[ 'old_activated' ] ) ) {
 					$module_option[ $module ][ 'activated' ] = 'on';
 					$module_option[ $module ][ 'date_on' ] = gmdate( "Y-m-d H:i:s", time() );
 					$module_option[ $module ][ 'author_on' ] = get_current_user_id();
@@ -81,8 +82,7 @@ 
 					$user = get_userdata( $module_option[ $folder ][ 'author_off' ] );
 					$author = $user->display_name;
 					$log_error[ 'message' ] = sprintf( __( 'Deactivation made on %1$s by %2$s', 'eo-modmanager-i18n' ), mysql2date( get_option( 'date_format' ) . ' ' . get_option( 'time_format' ), $settings[ $module ][ 'date_off' ], true ), $author);
-				}
-				else {
+				} else {
 					$settings[ $module ] = $module_option[ $module ];
 				}
 				unset( $settings[ $module ][ 'old_activated' ] );
@@ -111,8 +111,7 @@ 
 			$parent_folder_content = scandir( $module_folder );
 
 			require_once( wpshop_tools::get_template_part( EOMODMAN_DIR, EOMODMAN_TEMPLATES_MAIN_DIR, 'backend', 'settings' ) );
-		}
-		else {
+		} else {
 			_e( 'There is no modules to include into current plugin', 'eo-modmanager-i18n' );
 		}
 
@@ -159,8 +158,7 @@ 
 					/**	Check current module state to know if we have to include it or not	*/
 					if ( !empty( $module_option ) && array_key_exists( $folder, $module_option ) && ( 'on' == $module_option[ $folder ][ 'activated' ] ) ) {
 						$is_activated = true;
-					}
-					else if ( empty( $module_option ) || ( !empty( $module_option ) && !array_key_exists( $folder, $module_option ) ) ) {
+					} else if ( empty( $module_option ) || ( !empty( $module_option ) && !array_key_exists( $folder, $module_option ) ) ) {
 						$modules_option[ $folder ] = array(
 							'activated' => 'on',
 							'date_on' => gmdate( "Y-m-d H:i:s", time() ),

core/wpeo_logs/controller/log.controller.01.php

Doc Comments +7 added lines, -3 removed lines

@@ -198,9 +198,9 @@ 
 		/**
 		 * DEBUG LOG - Save a file on the server with content for loggin different action sended
 		 *
-		 * @param string $service (Name module or post type)
 		 * @param array $array_message ('object_id', 'message')
 		 * @param int $criticality The message crit rate (0-2)
+		 * @param string $name
 		 */
 		public static function log_datas_in_files( $name, $array_message, $criticality ) {
 			$upload_dir = wp_upload_dir();
@@ -269,7 +269,8 @@ 
 		/**
 		* check_need_rotate  Checks if the file exceeds the maximum size
 		*
-		* @param string $file_link The file path to write
+		* @param string $name
+		* @param string $message
 		*/
 		public static function check_need_rotate( $service, $name, $message ) {
 			$upload_dir = wp_upload_dir();
@@ -355,6 +356,9 @@ 
 			return $getted_service;
 		}
 
+		/**
+		 * @param integer $id
+		 */
 		public static function get_service_by_id( $id ) {
 			$array_service = get_option( '_wpeo_log_settings', array() );
 
@@ -381,7 +385,7 @@ 
 		 * @param float $input
 		 * @param string $format
 		 * @param boolean $convert
-		 * @return float|number
+		 * @return double
 		 */
 		function convert_to($input, $format, $convert = true) {
 			if($format == 'oc')

Indentation +4 added lines, -4 removed lines

@@ -267,10 +267,10 @@
 		}
 
 		/**
-		* check_need_rotate  Checks if the file exceeds the maximum size
-		*
-		* @param string $file_link The file path to write
-		*/
+		 * check_need_rotate  Checks if the file exceeds the maximum size
+		 *
+		 * @param string $file_link The file path to write
+		 */
 		public static function check_need_rotate( $service, $name, $message ) {
 			$upload_dir = wp_upload_dir();
 

Spacing +167 added lines, -167 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /**
  * Main controller file for WP logs module
@@ -18,7 +18,7 @@ 
  * @subpackage controller
  */
 
-if ( !class_exists( "wpeologs_ctr" ) ) {
+if (!class_exists("wpeologs_ctr")) {
 
 	/**
 	 *
@@ -27,8 +27,8 @@ 
 	 * @param array $args
 	 * @param int $criticality default 0
 	 */
-	function eo_log( $service_name, $args, $criticality = 0 ) {
-		wpeologs_ctr::log_datas_in_files( $service_name, $args, $criticality );
+	function eo_log($service_name, $args, $criticality = 0) {
+		wpeologs_ctr::log_datas_in_files($service_name, $args, $criticality);
 	}
 
 	class wpeologs_ctr {
@@ -45,17 +45,17 @@ 
 		 * @return void
 		 */
 		public function __construct() {
-			add_action( 'admin_menu', array( &$this, 'admin_menu' ) );
+			add_action('admin_menu', array(&$this, 'admin_menu'));
 
 			// Service action
-			add_action( 'admin_post_add', 'wpeo_log::add' );
-			add_action( 'admin_post_add', 'wpeologs_ctr::add' );
-			add_action( 'admin_post_edit_service', array( $this, 'edit_service' ) );
-			add_action( 'admin_post_to_trash', array( $this, 'to_trash' ) );
-			add_action( 'admin_post_file_to_trash', array( $this, 'file_to_trash' ) );
+			add_action('admin_post_add', 'wpeo_log::add');
+			add_action('admin_post_add', 'wpeologs_ctr::add');
+			add_action('admin_post_edit_service', array($this, 'edit_service'));
+			add_action('admin_post_to_trash', array($this, 'to_trash'));
+			add_action('admin_post_file_to_trash', array($this, 'file_to_trash'));
 
 			/**	Call administration style definition	*/
-			add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts' ) );
+			add_action('admin_enqueue_scripts', array($this, 'admin_enqueue_scripts'));
 
 			// Transfert des anciens services
 			$this->transfert();
@@ -67,7 +67,7 @@ 
 		 * @return void
 		 */
 		public function admin_menu() {
-			add_submenu_page( 'tools.php', __( 'Logs', 'wpeolog-i18n' ), __( 'Logs', 'wpeolog-i18n' ), 'manage_options', 'wpeo-log-page', array( &$this, 'render_add_submenu_page' ) );
+			add_submenu_page('tools.php', __('Logs', 'wpeolog-i18n'), __('Logs', 'wpeolog-i18n'), 'manage_options', 'wpeo-log-page', array(&$this, 'render_add_submenu_page'));
 		}
 
 		/**
@@ -79,115 +79,115 @@ 
 			$dir_file = $upload_dir['basedir'] . '/wpeolog/';
 
 			$array_size_format = $this->get_array_size_format();
-			$array_file_rotate_dropdown = array( 'on' => __( 'On', 'wpeolog-i18n' ), 'off' => __( 'Off', 'wpeolog-i18n' ) );
-			$array_service = get_option( '_wpeo_log_settings' );
-			$array_service = json_decode( $array_service, true );
+			$array_file_rotate_dropdown = array('on' => __('On', 'wpeolog-i18n'), 'off' => __('Off', 'wpeolog-i18n'));
+			$array_service = get_option('_wpeo_log_settings');
+			$array_service = json_decode($array_service, true);
 
 
-			if ( !empty( $array_service ) ) {
-				foreach ( $array_service as &$service ) {
-					$service['error'] = $this->open_log( $service['name'] . '-error' );
-					$service['warning'] = $this->open_log( $service['name'] . '-warning' );
+			if (!empty($array_service)) {
+				foreach ($array_service as &$service) {
+					$service['error'] = $this->open_log($service['name'] . '-error');
+					$service['warning'] = $this->open_log($service['name'] . '-warning');
 				}
 			}
-			unset( $service );
+			unset($service);
 
 			$count_service_active = 0;
 			$count_service_desactive = 0;
 
-			$page_transient = get_transient( 'log_message' );
-			if ( !empty( $page_transient ) ) {
-				delete_transient( 'log_message' );
-				$page_transient = json_decode( $page_transient, true );
+			$page_transient = get_transient('log_message');
+			if (!empty($page_transient)) {
+				delete_transient('log_message');
+				$page_transient = json_decode($page_transient, true);
 			}
 
 			$array_data = $this->check_page();
 
 			$count_warning = $array_data['count_warning'];
 			$count_error = $array_data['count_error'];
-			$count_info = count( $array_data['data']['data'] );
+			$count_info = count($array_data['data']['data']);
 
 			$file = $array_data['data']['data'];
 			$list_archive_file = $array_data['list_archive_file'];
 
-			require_once( wpeo_template_01::get_template_part( WPEO_LOGS_DIR, WPEO_LOGS_TEMPLATES_MAIN_DIR, 'backend', 'main' ) );
+			require_once(wpeo_template_01::get_template_part(WPEO_LOGS_DIR, WPEO_LOGS_TEMPLATES_MAIN_DIR, 'backend', 'main'));
 		}
 
 		private function check_page() {
-			if( empty( $_GET['action'] ) || empty( $_GET['type'] ) )
+			if (empty($_GET['action']) || empty($_GET['type']))
 				return false;
 
-			$action = sanitize_text_field( $_GET['action'] );
-			$type = sanitize_text_field( !empty( $_GET['type'] ) ?  $_GET['type'] : '' );
+			$action = sanitize_text_field($_GET['action']);
+			$type = sanitize_text_field(!empty($_GET['type']) ? $_GET['type'] : '');
 
-			if ( !isset( $_GET['service_id'] ) ) return false;
-			else $service_id = (int) $_GET['service_id'];
+			if (!isset($_GET['service_id'])) return false;
+			else $service_id = (int)$_GET['service_id'];
 
-			if ( isset( $_GET['key'] ) && 0 !== (int) $_GET['key'] ) $key = (int) $_GET['key'];
+			if (isset($_GET['key']) && 0 !== (int)$_GET['key']) $key = (int)$_GET['key'];
 
-			if ( 'view' == $action && isset( $service_id ) ) {
-				$service = self::get_service_by_id( $service_id );
+			if ('view' == $action && isset($service_id)) {
+				$service = self::get_service_by_id($service_id);
 
-				if( $service == null )
+				if ($service == null)
 					return false;
 
 				$service_name = $service['name'];
 
-				if ( !empty( $type ) ) {
+				if (!empty($type)) {
 					$service_name .= '-' . $type;
 				}
 
 				// Tous les fichiers
-				$list_archive_file = $this->get_archive_file( $service_name );
+				$list_archive_file = $this->get_archive_file($service_name);
 
-				if( !empty( $key ) ) {
+				if (!empty($key)) {
 					$service_name .= '_' . $key;
 				}
 
-				$count_warning = $this->open_log( $service['name'] . '-warning' );
-				$count_error = $this->open_log( $service['name'] . '-error' );
+				$count_warning = $this->open_log($service['name'] . '-warning');
+				$count_error = $this->open_log($service['name'] . '-error');
 
-				$array_data = $this->open_log( $service_name );
+				$array_data = $this->open_log($service_name);
 
-				return array( 'data' => $array_data, 'list_archive_file' => $list_archive_file, 'count_warning' => $count_warning['count'], 'count_error' => $count_error['count'] );
+				return array('data' => $array_data, 'list_archive_file' => $list_archive_file, 'count_warning' => $count_warning['count'], 'count_error' => $count_error['count']);
 			}
 		}
 
 		public function admin_enqueue_scripts() {
-			wp_register_script( 'wps_statistics_js_chart', WPEO_LOGS_URL . '/asset/js/chart.js');
-			wp_enqueue_script( 'wps_statistics_js_chart' );
+			wp_register_script('wps_statistics_js_chart', WPEO_LOGS_URL . '/asset/js/chart.js');
+			wp_enqueue_script('wps_statistics_js_chart');
 		}
 
-		private function open_log( $service_name ) {
+		private function open_log($service_name) {
 			$upload_dir = wp_upload_dir();
 			$dir_file = $upload_dir['basedir'] . '/wpeolog/' . $service_name . '.csv';
 
-			if ( file_exists( $dir_file ) ) {
-				$file = file( $dir_file );
+			if (file_exists($dir_file)) {
+				$file = file($dir_file);
 
 
 				// Remove the first case empty
-				array_shift( $file );
+				array_shift($file);
 
-				foreach( $file as &$data ) {
-					$data = explode( wpeologs_ctr::$file_separator, $data );
+				foreach ($file as &$data) {
+					$data = explode(wpeologs_ctr::$file_separator, $data);
 				}
 
-				return array( 'data' => $file, 'count' => count( $file ) );
+				return array('data' => $file, 'count' => count($file));
 			}
 			else {
-				return array( 'data' => null, 'count' => 0 );
+				return array('data' => null, 'count' => 0);
 			}
 		}
 
-		private function get_archive_file( $name ) {
+		private function get_archive_file($name) {
 			// Get archive
 			$upload_dir = wp_upload_dir();
 			$dir_file = $upload_dir['basedir'] . '/wpeolog/';
 
-			$array_glob_file = glob( $dir_file . $name . '*.csv' );
+			$array_glob_file = glob($dir_file . $name . '*.csv');
 
-			foreach( $array_glob_file as &$glob_file ) {
+			foreach ($array_glob_file as &$glob_file) {
 				$glob_file = explode('/', $glob_file);
 				$glob_file = $glob_file[count($glob_file) - 1];
 			}
@@ -202,22 +202,22 @@ 
 		 * @param array $array_message ('object_id', 'message')
 		 * @param int $criticality The message crit rate (0-2)
 		 */
-		public static function log_datas_in_files( $name, $array_message, $criticality ) {
+		public static function log_datas_in_files($name, $array_message, $criticality) {
 			$upload_dir = wp_upload_dir();
 
 			$backtrace = debug_backtrace();
 
 			// On récupère le service
-			$service = self::get_service_by_name( $name );
+			$service = self::get_service_by_name($name);
 
-			if( $service == null ) {
+			if ($service == null) {
 			/** Créer le service s'il n'existe pas */
-				$service = self::add( $name );
+				$service = self::add($name);
 			}
 
-			wp_mkdir_p( $upload_dir[ 'basedir' ] . '/wpeolog/' );
+			wp_mkdir_p($upload_dir['basedir'] . '/wpeolog/');
 
-			if( $service == null )
+			if ($service == null)
 				return null;
 
 			$message = "
@@ -225,44 +225,44 @@ 
 			$message .= current_time('mysql', 0) . self::$file_separator;
 			$message .= get_current_user_id() . self::$file_separator;
 			$message .= '"' . $name . '"' . self::$file_separator;
-			$message .= ( !empty( $array_message['object_id'] ) ? $array_message['object_id'] : 'Not found' ) . self::$file_separator;
+			$message .= (!empty($array_message['object_id']) ? $array_message['object_id'] : 'Not found') . self::$file_separator;
 
 			// For post type
-			if(!empty($array_message['previous_element'])) {
+			if (!empty($array_message['previous_element'])) {
 				$message .= '"' . base64_encode(serialize($array_message['previous_element'])) . '"' . self::$file_separator;
 				$message .= '"' . base64_encode(serialize($array_message['previous_element_metas'])) . '"' . self::$file_separator;
 			}
 
-			if(!empty($array_message['message'])) {
+			if (!empty($array_message['message'])) {
 				$message .= '"' . $array_message['message'] . '"' . self::$file_separator;
 			}
 			$message .= $criticality . self::$file_separator . $name . self::$file_separator;
 
-			if ( !empty( $backtrace ) ) {
-				foreach ( $backtrace as $t ) {
-					$message .= ( !empty( $t['file'] ) ? $t['file'] : '' ) . ' line ' . ( !empty( $t['line'] ) ? $t['line'] : '' ) . ' function ' . $t['function'] . '()<br />';
+			if (!empty($backtrace)) {
+				foreach ($backtrace as $t) {
+					$message .= (!empty($t['file']) ? $t['file'] : '') . ' line ' . (!empty($t['line']) ? $t['line'] : '') . ' function ' . $t['function'] . '()<br />';
 				}
 			}
 
-			self::check_need_rotate( $service, $name . '-info', $message);
+			self::check_need_rotate($service, $name . '-info', $message);
 
-			$fp = fopen( $upload_dir[ 'basedir' ] . '/wpeolog/' . $name . '-info.csv', 'a');
+			$fp = fopen($upload_dir['basedir'] . '/wpeolog/' . $name . '-info.csv', 'a');
 			fwrite($fp, $message);
 			fclose($fp);
 
-			if( 2 <= $criticality ) {
-				self::check_need_rotate( $service, $name . '-error', $message);
+			if (2 <= $criticality) {
+				self::check_need_rotate($service, $name . '-error', $message);
 
-				$fp = fopen( $upload_dir[ 'basedir' ] . '/wpeolog/' . $name . '-error.csv', 'a');
+				$fp = fopen($upload_dir['basedir'] . '/wpeolog/' . $name . '-error.csv', 'a');
 				fwrite($fp, $message);
 				fclose($fp);
 			}
-			else if( 1 == $criticality ) {
-				self::check_need_rotate( $service, $name . '-warning', $message);
+			else if (1 == $criticality) {
+				self::check_need_rotate($service, $name . '-warning', $message);
 
-				$fp = fopen( $upload_dir[ 'basedir' ] . '/wpeolog/' . $name . '-warning.csv', 'a');
-				fwrite( $fp, $message );
-				fclose( $fp );
+				$fp = fopen($upload_dir['basedir'] . '/wpeolog/' . $name . '-warning.csv', 'a');
+				fwrite($fp, $message);
+				fclose($fp);
 			}
 		}
 
@@ -271,23 +271,23 @@ 
 		*
 		* @param string $file_link The file path to write
 		*/
-		public static function check_need_rotate( $service, $name, $message ) {
+		public static function check_need_rotate($service, $name, $message) {
 			$upload_dir = wp_upload_dir();
 
 			$max_size = $service['size'];
 
-			$file_link = $upload_dir[ 'basedir' ] . '/wpeolog/' . $name . '.csv';
+			$file_link = $upload_dir['basedir'] . '/wpeolog/' . $name . '.csv';
 
-			if( file_exists( $file_link ) ) {
+			if (file_exists($file_link)) {
 				// Get full message
-				$message = file_get_contents( $file_link ) . $message;
+				$message = file_get_contents($file_link) . $message;
 
-				$file_size = filesize( $file_link );
+				$file_size = filesize($file_link);
 
-				if($file_size >= $max_size)
-					self::rename_current_file( $service, $name, $file_link );
-				else if(strlen($message) >= $max_size)
-					self::rename_current_file( $service, $name, $file_link );
+				if ($file_size >= $max_size)
+					self::rename_current_file($service, $name, $file_link);
+				else if (strlen($message) >= $max_size)
+					self::rename_current_file($service, $name, $file_link);
 
 				return $file_link;
 			}
@@ -300,33 +300,33 @@ 
 		 * @param string $service
 		 * @param string $file_link
 		 */
-		public static function rename_current_file( $service, $name, $file_link ) {
+		public static function rename_current_file($service, $name, $file_link) {
 				$upload_dir = wp_upload_dir();
 
 				$number_archive = $service['number'];
 
-				if( file_exists ( $file_link ) ) {
+				if (file_exists($file_link)) {
 					$file_explode = explode('.csv', $file_link);
 					$get_all_file = glob($file_explode[0] . '*.csv');
 					array_shift($get_all_file);
 					arsort($get_all_file);
 
-					foreach($get_all_file as $full_file) {
+					foreach ($get_all_file as $full_file) {
 						$file = explode('/', $full_file);
 						$file_name = $file[count($file) - 1];
 						$file_name = explode('.', $file_name);
 
 						$file_name[0]++;
-						rename($full_file, $upload_dir[ 'basedir' ] . '/wpeolog/' . $file_name[0] . '.csv');
+						rename($full_file, $upload_dir['basedir'] . '/wpeolog/' . $file_name[0] . '.csv');
 
 						// Check if not execeed the number archive
 						$count = explode('_', $file_name[0]);
 
-						if($count[1] > $number_archive && file_exists($upload_dir[ 'basedir' ] . '/wpeolog/' . $file_name[0] . '.csv')) {
-							unlink($upload_dir[ 'basedir' ] . '/wpeolog/' . $file_name[0] . '.csv');
+						if ($count[1] > $number_archive && file_exists($upload_dir['basedir'] . '/wpeolog/' . $file_name[0] . '.csv')) {
+							unlink($upload_dir['basedir'] . '/wpeolog/' . $file_name[0] . '.csv');
 						}
 					}
-					rename( $file_link, $file_explode[0] . '_1.csv' );
+					rename($file_link, $file_explode[0] . '_1.csv');
 				}
 		}
 
@@ -336,16 +336,16 @@ 
 		 * @param string $name Le nom du service
 		 * @return array | null
 		 */
-		public static function get_service_by_name( $name ) {
-			$array_service = get_option( '_wpeo_log_settings', array() );
+		public static function get_service_by_name($name) {
+			$array_service = get_option('_wpeo_log_settings', array());
 
 			$getted_service = null;
 
-			if ( !empty( $array_service ) ) {
-				$array_service = !is_array( $array_service ) ? json_decode( $array_service, true ) : $array_service;
+			if (!empty($array_service)) {
+				$array_service = !is_array($array_service) ? json_decode($array_service, true) : $array_service;
 
-				foreach ( $array_service as $service ) {
-					if( $service['name'] == $name ) {
+				foreach ($array_service as $service) {
+					if ($service['name'] == $name) {
 						$getted_service = $service;
 						break;
 					}
@@ -355,16 +355,16 @@ 
 			return $getted_service;
 		}
 
-		public static function get_service_by_id( $id ) {
-			$array_service = get_option( '_wpeo_log_settings', array() );
+		public static function get_service_by_id($id) {
+			$array_service = get_option('_wpeo_log_settings', array());
 
 			$getted_service = null;
 
-			if ( !empty( $array_service ) ) {
-				$array_service = json_decode( $array_service, true );
+			if (!empty($array_service)) {
+				$array_service = json_decode($array_service, true);
 
-				foreach ( $array_service as $key => $service ) {
-					if( $key == $id ) {
+				foreach ($array_service as $key => $service) {
+					if ($key == $id) {
 						$getted_service = $service;
 						break;
 					}
@@ -384,19 +384,19 @@ 
 		 * @return float|number
 		 */
 		function convert_to($input, $format, $convert = true) {
-			if($format == 'oc')
+			if ($format == 'oc')
 				return $input;
 
 			$multiple = 0;
 
-			if($format == 'ko')
+			if ($format == 'ko')
 				$multiple = 1024;
-			else if($format == 'mo')
+			else if ($format == 'mo')
 				$multiple = 1048576;
-			else if($format == 'go')
+			else if ($format == 'go')
 				$multiple = 1073741824;
 
-			if($convert)
+			if ($convert)
 				return $input * $multiple;
 			else
 				return $input / $multiple;
@@ -419,113 +419,113 @@ 
 		 * @param string $name Le nom du service
 		 * @return void
 		 */
-		public static function add( $name ) {
+		public static function add($name) {
 			$data_service = array(
 					'active' 		=> true,
-					'name'			=> !empty( $name ) ? $name : 'new_log',
+					'name'			=> !empty($name) ? $name : 'new_log',
 					'size' 			=> '1000000',
 					'format' 		=> 'ko',
 					'rotate'		=> false,
 					'number' 		=> 0,
-					'created_date'	=> current_time( 'mysql' ),
+					'created_date'	=> current_time('mysql'),
 			);
 
-			$array_current_settings = get_option( '_wpeo_log_settings' );
-			if ( !empty( $array_current_settings ) ) {
-				$array_current_settings = json_decode( $array_current_settings, true );
+			$array_current_settings = get_option('_wpeo_log_settings');
+			if (!empty($array_current_settings)) {
+				$array_current_settings = json_decode($array_current_settings, true);
 			}
 			else {
 				$array_current_settings = array();
 			}
 
 			$array_current_settings[] = $data_service;
-			$success = update_option( '_wpeo_log_settings', json_encode( $array_current_settings ) );
+			$success = update_option('_wpeo_log_settings', json_encode($array_current_settings));
 
-			if ( $success ) {
-				set_transient( 'log_message', json_encode( array( 'type' => 'updated', 'message' => __( 'A new service has been created!', 'wpeolog-i18n' ) ) ) );
+			if ($success) {
+				set_transient('log_message', json_encode(array('type' => 'updated', 'message' => __('A new service has been created!', 'wpeolog-i18n'))));
 			}
 
-			if ( !empty( $name ) ) {
+			if (!empty($name)) {
 				return $data_service;
 			}
 			else {
-				wp_safe_redirect( wp_get_referer() );
+				wp_safe_redirect(wp_get_referer());
 				die();
 			}
 		}
 
 		public function edit_service() {
-			if ( empty( $_POST['service'] ) || !is_array( $_POST['service'] ) ) {
-				set_transient( 'log_message', json_encode( array( 'type' => 'error', 'message' => __( 'Invalid data to update service' ), 'wpeolog-i18n' ) ) );
-				wp_safe_redirect( wp_get_referer() );
+			if (empty($_POST['service']) || !is_array($_POST['service'])) {
+				set_transient('log_message', json_encode(array('type' => 'error', 'message' => __('Invalid data to update service'), 'wpeolog-i18n')));
+				wp_safe_redirect(wp_get_referer());
 				die();
 			}
 
-			foreach( $_POST['service'] as &$service ) {
+			foreach ($_POST['service'] as &$service) {
 				// sanitize
-				$service['active'] = sanitize_key( $service['active'] );
-				$service['name'] = sanitize_key( $service['name'] );
-				$service['format'] = sanitize_key( $service['format'] );
-				$service['rotate'] = sanitize_key( $service['rotate'] );
-				$service['number'] = ( int )$service['number'];
-				$service['size'] = ( int )$this->convert_to( $service['size'], $service['format'] );
+				$service['active'] = sanitize_key($service['active']);
+				$service['name'] = sanitize_key($service['name']);
+				$service['format'] = sanitize_key($service['format']);
+				$service['rotate'] = sanitize_key($service['rotate']);
+				$service['number'] = (int)$service['number'];
+				$service['size'] = (int)$this->convert_to($service['size'], $service['format']);
 			}
 
-			unset( $service );
+			unset($service);
 
 
-			$array_current_setting = get_option( '_wpeo_log_settings' );
-			$array_current_setting = json_decode( $array_current_setting, true );
+			$array_current_setting = get_option('_wpeo_log_settings');
+			$array_current_setting = json_decode($array_current_setting, true);
 
-			$array_current_setting = array_replace( $array_current_setting, $_POST['service'] );
+			$array_current_setting = array_replace($array_current_setting, $_POST['service']);
 
-			$success = update_option( '_wpeo_log_settings', json_encode( $array_current_setting ) );
+			$success = update_option('_wpeo_log_settings', json_encode($array_current_setting));
 
 
-			if( $success ) {
-				set_transient( 'log_message', json_encode( array( 'type' => 'updated', 'message' => __( 'The services has been updated!', 'wpeolog-i18n' ) ) ) );
+			if ($success) {
+				set_transient('log_message', json_encode(array('type' => 'updated', 'message' => __('The services has been updated!', 'wpeolog-i18n'))));
 			}
 
-			wp_safe_redirect( wp_get_referer() );
+			wp_safe_redirect(wp_get_referer());
 			die();
 		}
 
 		public function to_trash() {
-			if( empty( $_GET['_wpnonce'] ) ) {
-				wp_safe_redirect( wp_get_referer() );
+			if (empty($_GET['_wpnonce'])) {
+				wp_safe_redirect(wp_get_referer());
 				die();
 			}
-			$wpnonce = sanitize_text_field( $_GET['_wpnonce'] );
+			$wpnonce = sanitize_text_field($_GET['_wpnonce']);
 
-			if ( 0 === (int) $_GET['service_id'] ) {
-				wp_safe_redirect( wp_get_referer() );
+			if (0 === (int)$_GET['service_id']) {
+				wp_safe_redirect(wp_get_referer());
 				die();
 			}
 			else {
-				$service_id = (int) $_GET['service_id'];
+				$service_id = (int)$_GET['service_id'];
 			}
 
-			if ( !isset( $wpnonce ) || !wp_verify_nonce( $wpnonce, 'to_trash_' . $service_id ) ) {
-				wp_safe_redirect( wp_get_referer() );
+			if (!isset($wpnonce) || !wp_verify_nonce($wpnonce, 'to_trash_' . $service_id)) {
+				wp_safe_redirect(wp_get_referer());
 				die();
 			}
 
-			$array_current_setting = get_option( '_wpeo_log_settings' );
-			$array_current_setting = json_decode( $array_current_setting, true );
+			$array_current_setting = get_option('_wpeo_log_settings');
+			$array_current_setting = json_decode($array_current_setting, true);
 
-			if ( !empty( $array_current_setting[$service_id] ) ) {
-				unset( $array_current_setting[$service_id] );
-				$success = update_option( '_wpeo_log_settings', json_encode( $array_current_setting ) );
+			if (!empty($array_current_setting[$service_id])) {
+				unset($array_current_setting[$service_id]);
+				$success = update_option('_wpeo_log_settings', json_encode($array_current_setting));
 
-				if( $success ) {
-					set_transient( 'log_message', json_encode( array( 'type' => 'updated', 'message' => __( sprintf( 'The service %d has been deleted!', $service_id ), 'wpeolog-i18n' ) ) ) );
+				if ($success) {
+					set_transient('log_message', json_encode(array('type' => 'updated', 'message' => __(sprintf('The service %d has been deleted!', $service_id), 'wpeolog-i18n'))));
 				}
 			}
 			else {
-				set_transient( 'log_message', json_encode( array( 'type' => 'error', 'message' => __( sprintf( 'The service %d is invalid!', $service_id ), 'wpeolog-i18n' ) ) ) );
+				set_transient('log_message', json_encode(array('type' => 'error', 'message' => __(sprintf('The service %d is invalid!', $service_id), 'wpeolog-i18n'))));
 			}
 
-			wp_safe_redirect( wp_get_referer() );
+			wp_safe_redirect(wp_get_referer());
 			die();
 		}
 
@@ -539,22 +539,22 @@ 
 			$upload_dir = wp_upload_dir();
 			$dir_file = $upload_dir['basedir'] . '/wpeolog/';
 
-			$file_name = sanitize_file_name( $_GET['file_name'] );
+			$file_name = sanitize_file_name($_GET['file_name']);
 
-			$success = unlink( $dir_file . $file_name );
-			if ( $success )
-				set_transient( 'log_message', json_encode( array( 'type' => 'updated', 'message' => __( 'The file has been deleted!', 'wpeolog-i18n' ) ) ) );
-			wp_safe_redirect( wp_get_referer() );
+			$success = unlink($dir_file . $file_name);
+			if ($success)
+				set_transient('log_message', json_encode(array('type' => 'updated', 'message' => __('The file has been deleted!', 'wpeolog-i18n'))));
+			wp_safe_redirect(wp_get_referer());
 			die();
 		}
 
 		public function transfert() {
-			$array_service = get_option( '_wpeo_log_settings' );
+			$array_service = get_option('_wpeo_log_settings');
 
 			$new_array_service = array();
 
-			if( !empty( $array_service['my_services'] ) && is_array( $array_service['my_services'] ) ) {
-			  foreach ( $array_service['my_services'] as $element ) {
+			if (!empty($array_service['my_services']) && is_array($array_service['my_services'])) {
+			  foreach ($array_service['my_services'] as $element) {
 					$new_array_service[] = array(
 						"active" => $element["service_active"] == 1 ? true : false,
 						"name" => $element["service_name"],
@@ -562,12 +562,12 @@ 
 						"format" => $element["service_size_format"],
 						"rotate" => $element["service_rotate"] == 1 ? true : false,
 						"number" => $element["service_file"],
-						"created_date" => current_time( "mysql" )
+						"created_date" => current_time("mysql")
 					);
 				}
 
-				update_option( '_wpeo_log_settings', json_encode( $new_array_service ) );
-				update_option( '_wpeo_log_old_settings', $array_service );
+				update_option('_wpeo_log_settings', json_encode($new_array_service));
+				update_option('_wpeo_log_old_settings', $array_service);
 			}
 		}
 	}

Braces +50 added lines, -41 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /**
  * Main controller file for WP logs module
@@ -114,22 +116,29 @@ 
 		}
 
 		private function check_page() {
-			if( empty( $_GET['action'] ) || empty( $_GET['type'] ) )
-				return false;
+			if( empty( $_GET['action'] ) || empty( $_GET['type'] ) ) {
+							return false;
+			}
 
 			$action = sanitize_text_field( $_GET['action'] );
 			$type = sanitize_text_field( !empty( $_GET['type'] ) ?  $_GET['type'] : '' );
 
-			if ( !isset( $_GET['service_id'] ) ) return false;
-			else $service_id = (int) $_GET['service_id'];
+			if ( !isset( $_GET['service_id'] ) ) {
+				return false;
+			} else {
+				$service_id = (int) $_GET['service_id'];
+			}
 
-			if ( isset( $_GET['key'] ) && 0 !== (int) $_GET['key'] ) $key = (int) $_GET['key'];
+			if ( isset( $_GET['key'] ) && 0 !== (int) $_GET['key'] ) {
+				$key = (int) $_GET['key'];
+			}
 
 			if ( 'view' == $action && isset( $service_id ) ) {
 				$service = self::get_service_by_id( $service_id );
 
-				if( $service == null )
-					return false;
+				if( $service == null ) {
+									return false;
+				}
 
 				$service_name = $service['name'];
 
@@ -174,8 +183,7 @@ 
 				}
 
 				return array( 'data' => $file, 'count' => count( $file ) );
-			}
-			else {
+			} else {
 				return array( 'data' => null, 'count' => 0 );
 			}
 		}
@@ -217,8 +225,9 @@ 
 
 			wp_mkdir_p( $upload_dir[ 'basedir' ] . '/wpeolog/' );
 
-			if( $service == null )
-				return null;
+			if( $service == null ) {
+							return null;
+			}
 
 			$message = "
 ";
@@ -256,8 +265,7 @@ 
 				$fp = fopen( $upload_dir[ 'basedir' ] . '/wpeolog/' . $name . '-error.csv', 'a');
 				fwrite($fp, $message);
 				fclose($fp);
-			}
-			else if( 1 == $criticality ) {
+			} else if( 1 == $criticality ) {
 				self::check_need_rotate( $service, $name . '-warning', $message);
 
 				$fp = fopen( $upload_dir[ 'basedir' ] . '/wpeolog/' . $name . '-warning.csv', 'a');
@@ -284,10 +292,11 @@ 
 
 				$file_size = filesize( $file_link );
 
-				if($file_size >= $max_size)
-					self::rename_current_file( $service, $name, $file_link );
-				else if(strlen($message) >= $max_size)
-					self::rename_current_file( $service, $name, $file_link );
+				if($file_size >= $max_size) {
+									self::rename_current_file( $service, $name, $file_link );
+				} else if(strlen($message) >= $max_size) {
+									self::rename_current_file( $service, $name, $file_link );
+				}
 
 				return $file_link;
 			}
@@ -384,22 +393,25 @@ 
 		 * @return float|number
 		 */
 		function convert_to($input, $format, $convert = true) {
-			if($format == 'oc')
-				return $input;
+			if($format == 'oc') {
+							return $input;
+			}
 
 			$multiple = 0;
 
-			if($format == 'ko')
-				$multiple = 1024;
-			else if($format == 'mo')
-				$multiple = 1048576;
-			else if($format == 'go')
-				$multiple = 1073741824;
-
-			if($convert)
-				return $input * $multiple;
-			else
-				return $input / $multiple;
+			if($format == 'ko') {
+							$multiple = 1024;
+			} else if($format == 'mo') {
+							$multiple = 1048576;
+			} else if($format == 'go') {
+							$multiple = 1073741824;
+			}
+
+			if($convert) {
+							return $input * $multiple;
+			} else {
+							return $input / $multiple;
+			}
 		}
 
 		/**
@@ -433,8 +445,7 @@ 
 			$array_current_settings = get_option( '_wpeo_log_settings' );
 			if ( !empty( $array_current_settings ) ) {
 				$array_current_settings = json_decode( $array_current_settings, true );
-			}
-			else {
+			} else {
 				$array_current_settings = array();
 			}
 
@@ -447,8 +458,7 @@ 
 
 			if ( !empty( $name ) ) {
 				return $data_service;
-			}
-			else {
+			} else {
 				wp_safe_redirect( wp_get_referer() );
 				die();
 			}
@@ -500,8 +510,7 @@ 
 			if ( 0 === (int) $_GET['service_id'] ) {
 				wp_safe_redirect( wp_get_referer() );
 				die();
-			}
-			else {
+			} else {
 				$service_id = (int) $_GET['service_id'];
 			}
 
@@ -520,8 +529,7 @@ 
 				if( $success ) {
 					set_transient( 'log_message', json_encode( array( 'type' => 'updated', 'message' => __( sprintf( 'The service %d has been deleted!', $service_id ), 'wpeolog-i18n' ) ) ) );
 				}
-			}
-			else {
+			} else {
 				set_transient( 'log_message', json_encode( array( 'type' => 'error', 'message' => __( sprintf( 'The service %d is invalid!', $service_id ), 'wpeolog-i18n' ) ) ) );
 			}
 
@@ -542,8 +550,9 @@ 
 			$file_name = sanitize_file_name( $_GET['file_name'] );
 
 			$success = unlink( $dir_file . $file_name );
-			if ( $success )
-				set_transient( 'log_message', json_encode( array( 'type' => 'updated', 'message' => __( 'The file has been deleted!', 'wpeolog-i18n' ) ) ) );
+			if ( $success ) {
+							set_transient( 'log_message', json_encode( array( 'type' => 'updated', 'message' => __( 'The file has been deleted!', 'wpeolog-i18n' ) ) ) );
+			}
 			wp_safe_redirect( wp_get_referer() );
 			die();
 		}

core/wpeo_model/controller/term_ctr.01.php

Doc Comments -1 removed lines

@@ -156,7 +156,6 @@
 	/**
 	 * Retourne une liste de taxinomies selon les paramètres donnés / Return a taxonomy list according to given parameters
 	 *
-	 * @param array $args_where Optionnal Les paramètres du filtre permettant de récupérer les taxinomies / Parameters allowing to retrieve taxonomies
 	 * @param boolean $cropped Optionnal Permet de choisir si il faut retourner la taxinomie complète ou uniquement les chamsp principaux / Allow to define if the taxonomy must be completly returned or just main fileds must be returned
 	 *
 	 * @return array La liste des taxinomies correspondantes aux paramètres / Taxonomies corresping to parameters

Spacing +39 added lines, -39 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
  * Fichier de gestion du modèle des taxinomies / File for term model management
  *
@@ -53,7 +53,7 @@ 
 	 */
 	public function __construct() {
 		/**	Ajout des routes personnalisées pour les éléments de type "term" / Add specific routes for "term" elements' type	*/
-		add_filter( 'json_endpoints', array( &$this, 'callback_register_route' ) );
+		add_filter('json_endpoints', array(&$this, 'callback_register_route'));
 	}
 
 	/**
@@ -63,20 +63,20 @@ 
 	 *
 	 * @return Object L'objet sauvegardé / The saved object
 	 */
-	public function update( $data ) {
+	public function update($data) {
 		$object = $data;
 
 		/**	Dans le cas d'un tableau on le lit pour construire l'objet / If passed data is an array read and build an object from it	*/
-		if( is_array( $data ) ) {
-			$object = new $this->model_name( $data, $this->meta_key );
+		if (is_array($data)) {
+			$object = new $this->model_name($data, $this->meta_key);
 		}
 
 		/**	Sauvegarde des données dans la base de données / Save data into database	*/
-		$wp_category_danger = wp_update_term( $object->id, $this->get_taxonomy(), $object->do_wp_object() );
-		if ( !is_wp_error( $wp_category_danger ) ) {
+		$wp_category_danger = wp_update_term($object->id, $this->get_taxonomy(), $object->do_wp_object());
+		if (!is_wp_error($wp_category_danger)) {
 			/** Mise à jour des options / Save options */
-			if( !empty( $object->option ) ) {
-				$object->save_meta_data( $object, 'update_term_meta', $this->meta_key );
+			if (!empty($object->option)) {
+				$object->save_meta_data($object, 'update_term_meta', $this->meta_key);
 			}
 		}
 
@@ -90,26 +90,26 @@ 
 	 *
 	 * @return Object L'objet sauvegardé / The saved object
 	 */
-	public function create( $data ) {
+	public function create($data) {
 		$object = $data;
 
-		if( is_array( $data ) ) {
-			$object = new $this->model_name( $data, $this->meta_key );
+		if (is_array($data)) {
+			$object = new $this->model_name($data, $this->meta_key);
 		}
 
-		$wp_category_danger = wp_insert_term( $object->name, $this->get_taxonomy(), array(
+		$wp_category_danger = wp_insert_term($object->name, $this->get_taxonomy(), array(
 			'description'	=> $object->description,
 			'slug'	=> $object->slug,
 			'parent'	=> $object->parent_id,
-		) );
+		));
 
-		if ( !is_wp_error( $wp_category_danger ) ) {
-			$object->id = $wp_category_danger[ 'term_id' ];
-			$object->term_taxonomy_id = $wp_category_danger[ 'term_taxonomy_id' ];
+		if (!is_wp_error($wp_category_danger)) {
+			$object->id = $wp_category_danger['term_id'];
+			$object->term_taxonomy_id = $wp_category_danger['term_taxonomy_id'];
 
 			/** Mise à jour des options / Save options */
-			if( !empty( $object->option ) ) {
-				$object->save_meta_data( $object, 'update_term_meta', $this->meta_key );
+			if (!empty($object->option)) {
+				$object->save_meta_data($object, 'update_term_meta', $this->meta_key);
 			}
 
 			return $object;
@@ -127,8 +127,8 @@ 
 	 *
 	 * @param integer $id L'identifiant de la taxinomie a supprimer / The taxonomy identifier to delete
 	 */
-	public function delete( $id ) {
-		wp_delete_term( $id );
+	public function delete($id) {
+		wp_delete_term($id);
 	}
 
 	/**
@@ -139,18 +139,18 @@ 
 	 *
 	 * @return object la taxinomie construite selon le modèle / The taxonomy builded according to the model
 	 */
-	public function show( $id, $cropped = false ) {
+	public function show($id, $cropped = false) {
 		/**	Récupération de la taxinomie depuis wordpress / Get the taxonomy from wordpress	*/
- 		$wp_term = get_term_by( 'id', $id, $this->taxonomy, OBJECT );
+ 		$wp_term = get_term_by('id', $id, $this->taxonomy, OBJECT);
 
  		/**	Construction de la taxinomie selon le modèle défini / Build the taxonomy according to the model	*/
-		$term = new $this->model_name( $wp_term, $this->meta_key, $cropped );
+		$term = new $this->model_name($wp_term, $this->meta_key, $cropped);
 
 		return $term;
 	}
 
 	public function show_model() {
-			return _e( 'Try to get the model definition', 'term_ctr_mdl' );
+			return _e('Try to get the model definition', 'term_ctr_mdl');
 	}
 
 	/**
@@ -161,15 +161,15 @@ 
 	 *
 	 * @return array La liste des taxinomies correspondantes aux paramètres / Taxonomies corresping to parameters
 	 */
-	public function index( $args = array(), $cropped = false ) {
+	public function index($args = array(), $cropped = false) {
 		$array_model = array();
 
-		$term_final_args = array_merge( $args, array( 'hide_empty' => false, ) );
-		$array_term = get_terms( $this->taxonomy, $term_final_args );
+		$term_final_args = array_merge($args, array('hide_empty' => false,));
+		$array_term = get_terms($this->taxonomy, $term_final_args);
 
-		if( !empty( $array_term ) ) {
-			foreach( $array_term as $key => $term ) {
-				$array_model[$key] = new $this->model_name( $term, $this->meta_key, $cropped );
+		if (!empty($array_term)) {
+			foreach ($array_term as $key => $term) {
+				$array_model[$key] = new $this->model_name($term, $this->meta_key, $cropped);
 			}
 		}
 
@@ -183,30 +183,30 @@ 
 	 *
 	 * @return array La liste des routes personnalisées ajoutées aux routes existantes / The personnalized routes added to existing
 	 */
-	public function callback_register_route( $array_route ) {
+	public function callback_register_route($array_route) {
 		/**	Récupération de la définition du model pour l'élément / Get model structure for element	*/
-		$array_route['/' . $this->version . '/show_model/' . $this->base ] = array(
-				array( array( $this, 'show_model' ), WP_JSON_Server::READABLE )
+		$array_route['/' . $this->version . '/show_model/' . $this->base] = array(
+				array(array($this, 'show_model'), WP_JSON_Server::READABLE)
 		);
 
 		/** Récupération de la liste complète des éléments / Get all existing elements */
-		$array_route['/' . $this->version . '/get/' . $this->base ] = array(
-				array( array( $this, 'index' ), WP_JSON_Server::READABLE | WP_JSON_Server::ACCEPT_JSON )
+		$array_route['/' . $this->version . '/get/' . $this->base] = array(
+				array(array($this, 'index'), WP_JSON_Server::READABLE | WP_JSON_Server::ACCEPT_JSON)
 		);
 
 		/** Récupération d'un élément donné / Get a given element */
 		$array_route['/' . $this->version . '/get/' . $this->base . '/(?P<id>\d+)'] = array(
-				array( array( $this, 'show' ), WP_JSON_Server::READABLE |  WP_JSON_Server::ACCEPT_JSON )
+				array(array($this, 'show'), WP_JSON_Server::READABLE | WP_JSON_Server::ACCEPT_JSON)
 		);
 
 		/** Mise à jour d'un élément / Update an element */
 		$array_route['/' . $this->version . '/post/' . $this->base . ''] = array(
-				array( array( $this, 'update' ), WP_JSON_Server::CREATABLE | WP_JSON_Server::ACCEPT_JSON ),
+				array(array($this, 'update'), WP_JSON_Server::CREATABLE | WP_JSON_Server::ACCEPT_JSON),
 		);
 
 		/** Suppression d'un élément / Delete an element */
 		$array_route['/' . $this->version . '/delete/' . $this->base . '/(?P<id>\d+)'] = array(
-				array( array( $this, 'delete' ), WP_JSON_Server::DELETABLE | WP_JSON_Server::ACCEPT_JSON ),
+				array(array($this, 'delete'), WP_JSON_Server::DELETABLE | WP_JSON_Server::ACCEPT_JSON),
 		);
 
 		return $array_route;

Braces +4 added lines, -3 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Fichier de gestion du modèle des taxinomies / File for term model management
  *
@@ -113,8 +115,7 @@ 
 			}
 
 			return $object;
-		}
-		else {
+		} else {
 			/**
 			 * @todo return error when creation does not work
 			 */

core/wps_utils/wps_utils.php

Doc Comments +3 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
 	 *	Return a variable with some basic treatment
 	 *
 	 *	@param mixed $varToSanitize The variable we want to treat for future use
-	 *	@param mixed $varDefaultValue The default value to set to the variable if the different test are not successfull
+	 *	@param string $varDefaultValue The default value to set to the variable if the different test are not successfull
 	 *	@param string $varType optionnal The type of the var for better verification
 	 *
 	 *	@return mixed $sanitizedVar The var after treatment
@@ -223,6 +223,7 @@ 
 	 * Return unit sigle
 	 * @param unknown_type $code
 	 * @param unknown_type $column_to_return
+	 * @return string
 	 */
 	public static function wpshop_get_sigle($code, $column_to_return = "unit") {
 		$tmp_code = (int)$code;
@@ -316,7 +317,7 @@ 
 	 *	Transform a given text with a specific pattern, send by the second parameter
 	 *
 	 *	@param string $toSlugify The string we want to "clean" for future use
-	 *	@param array|string $slugifyType The type of cleaning we are going to do on the input text
+	 *	@param string[] $slugifyType The type of cleaning we are going to do on the input text
 	 *
 	 *	@return string $slugified The input string that was slugified with the selected method
 	 */

Spacing +81 added lines, -81 removed lines

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

Braces +40 added lines, -32 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
  * Main controller file for product mass modification module
  *
@@ -33,8 +35,9 @@ 
 
 		$templates = array();
 		$name = (string)$name;
-		if ( '' !== $name )
-			$templates[] = "{$side}/{$slug}-{$name}.php";
+		if ( '' !== $name ) {
+					$templates[] = "{$side}/{$slug}-{$name}.php";
+		}
 		$templates[] = "{$side}/{$slug}.php";
 
 		/**	Check if required template exists into current theme	*/
@@ -57,8 +60,9 @@ 
 
 		if ( empty( $path ) ) {
 			foreach ( (array) $templates as $template_name ) {
-				if ( !$template_name )
-					continue;
+				if ( !$template_name ) {
+									continue;
+				}
 
 				if ( !empty( $debug ) ) {
 					echo __LINE__ . ' - ' . $main_template_dir . $template_name . '<hr/>';
@@ -177,8 +181,7 @@ 
 				foreach($values as $value) {
 					$result[] = array($key => $value);
 				}
-			}
-			else {
+			} else {
 				$append = array();
 				foreach($result as &$product) {
 					$product[$key] = array_shift($values);
@@ -213,8 +216,7 @@ 
 		if ( !empty($currency_infos) ) {
 			$code = ($code) ?  $currency_infos->name : $currency_infos->unit;
 			return $code;
-		}
-		else {
+		} else {
 			return '';
 		}
 	}
@@ -256,8 +258,11 @@ 
 	 * @return  boolean
 	 */
 	public static function is_phone( $phone ) {
-		if (strlen(trim(preg_replace('/[\s\#0-9_\-\+\(\)]/', '', $phone)))>0) return false;
-		else return true;
+		if (strlen(trim(preg_replace('/[\s\#0-9_\-\+\(\)]/', '', $phone)))>0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	/**
@@ -266,8 +271,11 @@ 
 	 * @return  boolean
 	 */
 	public static function is_postcode($postcode) {
-		if (strlen(trim(preg_replace('/[\s\-A-Za-z0-9]/', '', $postcode))) > 0) return false;
-		else return true;
+		if (strlen(trim(preg_replace('/[\s\-A-Za-z0-9]/', '', $postcode))) > 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 
 	/**
@@ -282,8 +290,7 @@ 
 
 		if ( $dataFieldType == 'datetime' ) {
 			$type = 'text';
-		}
-		else {
+		} else {
 			switch ( $frontend_verification ) {
 				case 'phone':
 					$type = 'tel';
@@ -305,10 +312,12 @@ 
 	 * @return array The different element send by request method
 	 */
 	public static function getMethode(){
-		if ($_SERVER["REQUEST_METHOD"] == "GET")
-			return $_GET;
-		if ($_SERVER["REQUEST_METHOD"] == "POST")
-			return $_POST;
+		if ($_SERVER["REQUEST_METHOD"] == "GET") {
+					return $_GET;
+		}
+		if ($_SERVER["REQUEST_METHOD"] == "POST") {
+					return $_POST;
+		}
 		die ('Invalid REQUEST_METHOD (not GET, not POST).');
 	}
 
@@ -332,18 +341,15 @@ 
 				{
 					$pattern = array("/&eacute;/", "/&egrave;/", "/&ecirc;/", "/&ccedil;/", "/&agrave;/", "/&acirc;/", "/&icirc;/", "/&iuml;/", "/&ucirc;/", "/&ocirc;/", "/&Egrave;/", "/&Eacute;/", "/&Ecirc;/", "/&Euml;/", "/&Igrave;/", "/&Iacute;/", "/&Icirc;/", "/&Iuml;/", "/&Ouml;/", "/&Ugrave;/", "/&Ucirc;/", "/&Uuml;/","/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/", "/�/");
 					$rep_pat = array("e", "e", "e", "c", "a", "a", "i", "i", "u", "o", "E", "E", "E", "E", "I", "I", "I", "I", "O", "U", "U", "U","e", "e", "e", "c", "a", "a", "i", "i", "u", "o", "E", "E", "E", "E", "I", "I", "I", "I", "O", "U", "U", "U");
-				}
-				elseif($type == 'noSpaces')
+				} elseif($type == 'noSpaces')
 				{
 					$pattern = array('/\s/');
 					$rep_pat = array('_');
 					$slugified = trim($slugified);
-				}
-				elseif($type == 'lowerCase')
+				} elseif($type == 'lowerCase')
 				{
 					$slugified = strtolower($slugified);
-				}
-				elseif($type == 'noPunctuation')
+				} elseif($type == 'noPunctuation')
 				{
 					$pattern = array("/#/", "/\{/", "/\[/", "/\(/", "/\)/", "/\]/", "/\}/", "/&/", "/~/", "/�/", "/`/", "/\^/", "/@/", "/=/", "/�/", "/�/", "/%/", "/�/", "/!/", "/�/", "/:/", "/\$/", "/;/", "/\./", "/,/", "/\?/", "/\\\/", "/\//");
 					$rep_pat = array("_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_", "_");
@@ -368,9 +374,11 @@ 
 	 *	@return string $string The output string that was trunk if necessary
 	 */
 	public static function trunk($string, $maxlength) {
-		if(strlen($string)>$maxlength+3)
-			return substr($string,0,$maxlength).'...';
-		else return $string;
+		if(strlen($string)>$maxlength+3) {
+					return substr($string,0,$maxlength).'...';
+		} else {
+			return $string;
+		}
 	}
 
 	/**
@@ -392,8 +400,7 @@ 
 		ob_start();
 		if ( !empty($args) ) {
 			do_action($hook_name, $args);
-		}
-		else {
+		} else {
 			do_action($hook_name);
 		}
 		$content = ob_get_contents();
@@ -409,8 +416,9 @@ 
 	 */
 	public static function get_plugin_validation_code($plugin_name, $encrypt_base_attribute) {
 		$code = '';
-		if ( !function_exists( 'get_plugin_data') )
-			require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+		if ( !function_exists( 'get_plugin_data') ) {
+					require_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+		}
 		$plug = get_plugin_data( WP_PLUGIN_DIR . '/' . WPSHOP_PLUGIN_DIR . '/wpshop.php' );
 		$code_part = array();
 		$code_part[] = substr(hash ( "sha256" , $plugin_name ), WPSHOP_ADDONS_KEY_IS, 5);

includes/librairies/catalog/categories.class.php

Doc Comments +2 added lines, -6 removed lines

@@ -117,10 +117,7 @@ 
 	/**
 	*	Get the sub categories of a given category
 	*
-	*	@param integer $parent_category The main category we want to have the sub categories for
-	*	@param array $instance The current instance of the widget, allows to get the different selected parameters
-	*
-	* @return mixed $widget_content The widget content build from option
+	* @return string
 	*/
 	public static function category_tree_output($category_id = 0, $instance) {
 		global $category_has_sub_category;
@@ -285,7 +282,7 @@ 
 	*	@param object $category The category definition
 	*	@param string $output_type The output type defined from plugin option
 	*
-	*	@return mixed $content Output the category list
+	*	@return string $content Output the category list
 	*/
 	public static function category_mini_output($category, $output_type = 'list'){
 		$content = '';
@@ -420,7 +417,6 @@ 
 	 * @see wp_get_attachment_image_src
 	 * @param unknown_type $id
 	 * @param unknown_type $size
-	 * @param unknown_type $attr
 	 * @return (string or array)
 	 */
 	public static function get_the_category_thumbnail($id, $size = 'thumbnail', $icon = false) {

Indentation +54 added lines, -54 removed lines

@@ -24,11 +24,11 @@ 
 class wpshop_categories
 {
 	/**
-	* Retourne une liste de cat�gorie
-	* @param boolean $formated : formatage du r�sultat oui/non
-	* @param string $product_search : recherche demand�e
-	* @return mixed
-	**/
+	 * Retourne une liste de cat�gorie
+	 * @param boolean $formated : formatage du r�sultat oui/non
+	 * @param string $product_search : recherche demand�e
+	 * @return mixed
+	 **/
 	function product_list_cats($formated=false, $product_search=null) {
 		$where  = array('hide_empty' => false);
 		if(!empty($product_search))
@@ -54,8 +54,8 @@ 
 	}
 
 	/**
-	*	Call wordpress function that declare a new term type in order to define the product as wordpress term (taxonomy)
-	*/
+	 *	Call wordpress function that declare a new term type in order to define the product as wordpress term (taxonomy)
+	 */
 	public static function create_product_categories(){
 		$options = get_option('wpshop_catalog_categories_option', null);
 		$slug = array(
@@ -88,12 +88,12 @@ 
 	}
 
 	/**
-	*	Build a complete tree with the categories. Contains the complete tree for a given category and a children list for easy checking
-	*
-	*	@param integer $category_id The category identifier we want to get the tree element for
-	*
-	*	@return array $categories_list An array ordered by category with its children
-	*/
+	 *	Build a complete tree with the categories. Contains the complete tree for a given category and a children list for easy checking
+	 *
+	 *	@param integer $category_id The category identifier we want to get the tree element for
+	 *
+	 *	@return array $categories_list An array ordered by category with its children
+	 */
 	public static function category_tree($category_id = 0){
 		$categories_list = array();
 
@@ -115,13 +115,13 @@ 
 		return $categories_list;
 	}
 	/**
-	*	Get the sub categories of a given category
-	*
-	*	@param integer $parent_category The main category we want to have the sub categories for
-	*	@param array $instance The current instance of the widget, allows to get the different selected parameters
-	*
-	* @return mixed $widget_content The widget content build from option
-	*/
+	 *	Get the sub categories of a given category
+	 *
+	 *	@param integer $parent_category The main category we want to have the sub categories for
+	 *	@param array $instance The current instance of the widget, allows to get the different selected parameters
+	 *
+	 * @return mixed $widget_content The widget content build from option
+	 */
 	public static function category_tree_output($category_id = 0, $instance) {
 		global $category_has_sub_category;
 
@@ -148,8 +148,8 @@ 
 
 
 	/**
-	*	Add additionnal fields to the category edition form
-	*/
+	 *	Add additionnal fields to the category edition form
+	 */
 	public static function category_edit_fields(){
 		$category_id = wpshop_tools::varSanitizer($_REQUEST["tag_ID"]);
 		$category_meta_information = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id);
@@ -210,13 +210,13 @@ 
 	}
 
 	/**
-	*	Save the different extra fields added for the plugin
-	*
-	*	@param integer $category_id The category identifier we want to save extra fields for
-	*	@param mixed $tt_id
-	*
-	*	@return void
-	*/
+	 *	Save the different extra fields added for the plugin
+	 *
+	 *	@param integer $category_id The category identifier we want to save extra fields for
+	 *	@param mixed $tt_id
+	 *
+	 *	@return void
+	 */
 	public static function category_fields_saver($category_id, $tt_id){
 		global $wpdb;
 		$category_meta = array();
@@ -241,28 +241,28 @@ 
 	}
 
 	/**
-	*	Add extra column to categories listing interface
-	*
-	*	@param array $columns Actual columns to add extra columns to
-	*
-	*	@return array $columns The new array with additionnal colu
-	*/
+	 *	Add extra column to categories listing interface
+	 *
+	 *	@param array $columns Actual columns to add extra columns to
+	 *
+	 *	@return array $columns The new array with additionnal colu
+	 */
 	public static function category_manage_columns($columns){
-	    unset( $columns["cb"] );
+		unset( $columns["cb"] );
 
-	    $custom_array = array(
+		$custom_array = array(
 				'cb' => '<input type="checkbox" />',
 				'wpshop_category_thumbnail' => __('Thumbnail', 'wpshop')
-	    );
+		);
 
-	    $columns = array_merge( $custom_array, $columns );
+		$columns = array_merge( $custom_array, $columns );
 
-	    return $columns;
+		return $columns;
 	}
 
 	/**
-	*	Define the content of extra columns to add to categories listing interface
-	*/
+	 *	Define the content of extra columns to add to categories listing interface
+	 */
 	public static function category_manage_columns_content($string, $column_name, $category_id){
 		$category_meta_information = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id);
 		$category_thumbnail_preview = '<img src="' .WPSHOP_DEFAULT_CATEGORY_PICTURE. '" alt="No picture" class="category_thumbnail_preview" />';
@@ -275,18 +275,18 @@ 
 		$name = $category->name;
 
 		$image = $category_thumbnail_preview;
-    	return $image;
+		return $image;
 	}
 
 
 	/**
-	*	Display a category in a list
-	*
-	*	@param object $category The category definition
-	*	@param string $output_type The output type defined from plugin option
-	*
-	*	@return mixed $content Output the category list
-	*/
+	 *	Display a category in a list
+	 *
+	 *	@param object $category The category definition
+	 *	@param string $output_type The output type defined from plugin option
+	 *
+	 *	@return mixed $content Output the category list
+	 */
 	public static function category_mini_output($category, $output_type = 'list'){
 		$content = '';
 		/*	Get the different informations for output	*/
@@ -347,10 +347,10 @@ 
 	}
 
 	/**
-	* Traduit le shortcode et affiche une cat�gorie
-	* @param array $atts : tableau de param�tre du shortcode
-	* @return mixed
-	**/
+	 * Traduit le shortcode et affiche une cat�gorie
+	 * @param array $atts : tableau de param�tre du shortcode
+	 * @return mixed
+	 **/
 	public static function wpshop_category_func($atts) {
 		global $wpdb;
 		$string = '';

Braces +19 added lines, -21 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
 * Products management method file
 *
@@ -31,8 +33,9 @@ 
 	**/
 	function product_list_cats($formated=false, $product_search=null) {
 		$where  = array('hide_empty' => false);
-		if(!empty($product_search))
-			$where = array_merge($where, array('name__like'=>$product_search));
+		if(!empty($product_search)) {
+					$where = array_merge($where, array('name__like'=>$product_search));
+		}
 
 		$data = get_terms(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, $where);
 		$cats=array();
@@ -137,8 +140,7 @@ 
 					ob_end_clean();
 				}
 				$category_has_sub_category = true;
-			}
-			else{
+			} else{
 				$category_has_sub_category = false;
 			}
 		}
@@ -188,8 +190,7 @@ 
 									$sub_tpl_component['CATEGORY_FILTERABLE_ATTRIBUTE_NAME'] =  __($product_attribute->frontend_label, 'wpshop');
 									if ( !empty($category_meta_information) && !empty($category_meta_information['wpshop_category_filterable_attributes']) && array_key_exists($product_attribute->attribute_id, $category_meta_information['wpshop_category_filterable_attributes']) ) {
 										$sub_tpl_component['CATEGORY_FILTERABLE_ATTRIBUTE_CHECKED'] = 'checked="checked"';
-									}
-									else {
+									} else {
 										$sub_tpl_component['CATEGORY_FILTERABLE_ATTRIBUTE_CHECKED'] = '';
 									}
 
@@ -201,8 +202,7 @@ 
 					}
 				}
 			}
-		 }
-		 else {
+		 } else {
 		 	$tpl_component['CATEGORY_TAG_ID'] = 1;
 		 }
 		 $output = wpshop_display::display_template_element('wpshop_category_edit_interface_admin', $tpl_component, array(), 'admin');
@@ -229,8 +229,7 @@ 
 
 		if ( !empty($_POST['filterable_attribute_for_category']) && is_array($_POST['filterable_attribute_for_category']) ) {
 			$category_option['wpshop_category_filterable_attributes'] = $_POST['filterable_attribute_for_category'];
-		}
-		else {
+		} else {
 			$category_option['wpshop_category_filterable_attributes'] = array();
 		}
 		update_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id, $category_option);
@@ -336,8 +335,7 @@ 
 			require(wpshop_display::get_template_file($tpl_way_to_take[1]));
 			$content = ob_get_contents();
 			ob_end_clean();
-		}
-		else {
+		} else {
 			//echo $template_part.'-'.$tpl_component.'<br>';
 			$content = wpshop_display::display_template_element($template_part, $tpl_component);
 		}
@@ -368,8 +366,7 @@ 
 					}
 				$string .= '
 					</div>';
-			}
-			else {
+			} else {
 				$sub_category_def = get_term($atts['cid'], WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
 
 				if ( empty($atts['display']) || ($atts['display'] != 'only_products') ){
@@ -385,8 +382,7 @@ 
 					$string .= '</div>';
 				}
 			}
-		}
-		else {
+		} else {
 			$string .= __('No categories found for display', 'wpshop');
 		}
 
@@ -428,8 +424,9 @@ 
 		$array_option_category 	= get_option('wpshop_product_category_' . $id);
 		
 		/** If not attachment/post ID in the category, return "No thumbnail in the category" */
-		if(is_array($array_option_category) && empty($array_option_category['wpshop_category_picture']))
-			return __('No thumbnail in the category', 'wpshop');
+		if(is_array($array_option_category) && empty($array_option_category['wpshop_category_picture'])) {
+					return __('No thumbnail in the category', 'wpshop');
+		}
 		
 		/** Set attachment/post ID in $id_picture */
 		$id_picture = $array_option_category['wpshop_category_picture'];
@@ -440,8 +437,9 @@ 
 		 */
 		$post_thumbnail = wp_get_attachment_image_src($id_picture, $size, $icon);
 		
-		if(!$post_thumbnail)
-			return __('No thumbnail in this post', 'wpshop');
+		if(!$post_thumbnail) {
+					return __('No thumbnail in this post', 'wpshop');
+		}
 			
 		return $post_thumbnail;
 	}

Spacing +87 added lines, -87 removed lines

@@ -1,4 +1,4 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 /**
 * Products management method file
 *
@@ -10,8 +10,8 @@ 
 */
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -29,51 +29,51 @@ 
 	* @param string $product_search : recherche demand�e
 	* @return mixed
 	**/
-	function product_list_cats($formated=false, $product_search=null) {
+	function product_list_cats($formated = false, $product_search = null) {
 		$where  = array('hide_empty' => false);
-		if(!empty($product_search))
+		if (!empty($product_search))
 			$where = array_merge($where, array('name__like'=>$product_search));
 
 		$data = get_terms(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, $where);
-		$cats=array();
-		foreach($data as $d){
+		$cats = array();
+		foreach ($data as $d) {
 			$cats[$d->term_id] = $d->name;
 		}
 
 		// Si le formatage est demand�
-		if($formated) {
-			if(!empty($cats)):
-				$cats_string='';
-				foreach($cats as $key=>$value) {
-					$cats_string.= '
-					<li><input type="checkbox" class="wpshop_shortcode_element wpshop_shortcode_element_categories" value="'.$key.'" id="'.WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES.'-'.$key.'" name="cats[]" /><label for="'.WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES.'-'.$key.'" > '.$value.'</label></li>';
+		if ($formated) {
+			if (!empty($cats)):
+				$cats_string = '';
+				foreach ($cats as $key=>$value) {
+					$cats_string .= '
+					<li><input type="checkbox" class="wpshop_shortcode_element wpshop_shortcode_element_categories" value="'.$key . '" id="' . WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '-' . $key . '" name="cats[]" /><label for="' . WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '-' . $key . '" > ' . $value . '</label></li>';
 				}
 			endif;
 		}
-		return $formated?$cats_string:$cats;
+		return $formated ? $cats_string : $cats;
 	}
 
 	/**
 	*	Call wordpress function that declare a new term type in order to define the product as wordpress term (taxonomy)
 	*/
-	public static function create_product_categories(){
+	public static function create_product_categories() {
 		$options = get_option('wpshop_catalog_categories_option', null);
 		$slug = array(
 				'slug' => '',
 				'with_front' => true,
 				'hierarchical' => true,
 		);
-		( empty($options['wpshop_catalog_categories_slug']) || $options['wpshop_catalog_categories_slug'] == '/' ) ? $slug = false : $slug['slug'] = $options['wpshop_catalog_categories_slug'];
+		(empty($options['wpshop_catalog_categories_slug']) || $options['wpshop_catalog_categories_slug'] == '/') ? $slug = false : $slug['slug'] = $options['wpshop_catalog_categories_slug'];
 		register_taxonomy(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, array(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT), array(
 			'labels' => array(
 				'name' => __('WPshop categories', 'wpshop'),
 				'singular_name' => __('WPshop category', 'wpshop'),
 				'add_new_item' => __('Add new wpshop category', 'wpshop'),
-				'add_new' => _x( 'Add new', 'admin menu: add new wpshop category', 'wpshop'),
+				'add_new' => _x('Add new', 'admin menu: add new wpshop category', 'wpshop'),
 				'add_new_item' => __('Add new wpshop category', 'wpshop'),
 				'edit_item' => __('Edit wpshop category', 'wpshop'),
 				'new_item' => __('New wpshop category', 'wpshop'),
-				'view_item' => __('View wpshop category', 'wpshop' ),
+				'view_item' => __('View wpshop category', 'wpshop'),
 				'search_items' => __('Search wpshop categories', 'wpshop'),
 				'not_found' =>  __('No wpshop categories found', 'wpshop'),
 				'not_found_in_trash' => __('No wpshop categories found in trash', 'wpshop'),
@@ -94,19 +94,19 @@ 
 	*
 	*	@return array $categories_list An array ordered by category with its children
 	*/
-	public static function category_tree($category_id = 0){
+	public static function category_tree($category_id = 0) {
 		$categories_list = array();
 
 		$categories = get_terms(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, 'hide_empty=0&parent=' . $category_id);
-		if(count($categories) > 0){
-			foreach($categories as $category){
+		if (count($categories) > 0) {
+			foreach ($categories as $category) {
 				/*	If necessary un-comment this line in order to get the complete tree for the category	*/
 				// $categories_list[$category->term_id]['children_tree'] = self::category_tree($category->term_id);
 				$categories_list[$category->term_id]['children_category'] = get_term_children($category->term_id, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
 
 				/*	Get the product list for the category	*/
 				$products = get_posts(array('post_type' => WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES => $category->slug));
-				foreach($products as $product){
+				foreach ($products as $product) {
 					$categories_list[$category->term_id]['children_product'][] = $product->ID;
 				}
 			}
@@ -127,10 +127,10 @@ 
 
 		$widget_content = '';
 		$category_tree = wpshop_categories::category_tree($category_id);
-		if((!isset($instance['wpshop_widget_categories']) && !isset($instance['show_all_cat'])) || ($instance['show_all_cat'] == 'yes')){
+		if ((!isset($instance['wpshop_widget_categories']) && !isset($instance['show_all_cat'])) || ($instance['show_all_cat'] == 'yes')) {
 			$categories = get_terms(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES, 'hide_empty=0&parent=' . $category_id);
-			if(count($categories) > 0){
-				foreach($categories as $category){
+			if (count($categories) > 0) {
+				foreach ($categories as $category) {
 					ob_start();
 					require(wpshop_display::get_template_file('categories-widget.tpl.php'));
 					$widget_content .= ob_get_contents();
@@ -138,7 +138,7 @@ 
 				}
 				$category_has_sub_category = true;
 			}
-			else{
+			else {
 				$category_has_sub_category = false;
 			}
 		}
@@ -150,43 +150,43 @@ 
 	/**
 	*	Add additionnal fields to the category edition form
 	*/
-	public static function category_edit_fields(){
-		$category_id = (int) $_REQUEST["tag_ID"];
+	public static function category_edit_fields() {
+		$category_id = (int)$_REQUEST["tag_ID"];
 		$category_meta_information = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id);
 		$tpl_component = array();
-		$category_thumbnail_preview = '<img src="' .WPSHOP_DEFAULT_CATEGORY_PICTURE. '" alt="No picture" class="category_thumbnail_preview" />';
+		$category_thumbnail_preview = '<img src="' . WPSHOP_DEFAULT_CATEGORY_PICTURE . '" alt="No picture" class="category_thumbnail_preview" />';
 		/*	Check if there is already a picture for the selected category	*/
 
-		if ( !empty($category_meta_information['wpshop_category_picture']) ) {
-			$image_post = wp_get_attachment_image( $category_meta_information['wpshop_category_picture'], 'thumbnail', false, array('class' => 'category_thumbnail_preview') );
-			$category_thumbnail_preview = ( !empty($image_post) ) ? $image_post : '<img src="' .WPSHOP_DEFAULT_CATEGORY_PICTURE. '" alt="No picture" class="category_thumbnail_preview" />';
+		if (!empty($category_meta_information['wpshop_category_picture'])) {
+			$image_post = wp_get_attachment_image($category_meta_information['wpshop_category_picture'], 'thumbnail', false, array('class' => 'category_thumbnail_preview'));
+			$category_thumbnail_preview = (!empty($image_post)) ? $image_post : '<img src="' . WPSHOP_DEFAULT_CATEGORY_PICTURE . '" alt="No picture" class="category_thumbnail_preview" />';
 		}
 
 
 		$tpl_component['CATEGORY_DELETE_PICTURE_BUTTON'] = '';
-		if( !empty($category_meta_information) && !empty($category_meta_information['wpshop_category_picture']) ) {
-			$tpl_component['CATEGORY_DELETE_PICTURE_BUTTON'] = '<a href="#" role="button" id="wps-delete-category-picture" class="wps-bton-second-mini-rounded">' .__( 'Delete the category picture', 'wpshop' ). '</a> ';
+		if (!empty($category_meta_information) && !empty($category_meta_information['wpshop_category_picture'])) {
+			$tpl_component['CATEGORY_DELETE_PICTURE_BUTTON'] = '<a href="#" role="button" id="wps-delete-category-picture" class="wps-bton-second-mini-rounded">' . __('Delete the category picture', 'wpshop') . '</a> ';
 		}
-		$tpl_component['CATEGORY_PICTURE_ID'] = ( ( !empty($category_meta_information['wpshop_category_picture']) ) ? $category_meta_information['wpshop_category_picture'] : '' );
+		$tpl_component['CATEGORY_PICTURE_ID'] = ((!empty($category_meta_information['wpshop_category_picture'])) ? $category_meta_information['wpshop_category_picture'] : '');
 
 		$tpl_component['CATEGORY_THUMBNAIL_PREVIEW'] = $category_thumbnail_preview;
-		if(isset($category_id)){
+		if (isset($category_id)) {
 			$tpl_component['CATEGORY_TAG_ID'] = $category_id;
 			$tpl_component['CATEGORY_FILTERABLE_ATTRIBUTES'] = '';
-			$wpshop_category_products = wpshop_categories::get_product_of_category( $category_id );
+			$wpshop_category_products = wpshop_categories::get_product_of_category($category_id);
 			$filterable_attributes_list = array();
-			foreach ( $wpshop_category_products as $wpshop_category_product ) {
+			foreach ($wpshop_category_products as $wpshop_category_product) {
 				$elementId = wpshop_entities::get_entity_identifier_from_code(WPSHOP_NEWTYPE_IDENTIFIER_PRODUCT);
-				if ( !empty($elementId) ) {
+				if (!empty($elementId)) {
 					$product_attributes = wpshop_attributes::get_attribute_list_for_item($elementId, $wpshop_category_product);
-					if ( !empty($product_attributes) ) {
-						foreach ( $product_attributes as $key => $product_attribute ) {
-							if ( !empty($product_attribute) && !empty($product_attribute->is_filterable) && strtolower(__($product_attribute->is_filterable, 'wpshop')) == strtolower(__('Yes', 'wpshop')) ) {
-								if  ( !array_key_exists($product_attribute->attribute_id, $filterable_attributes_list) ) {
+					if (!empty($product_attributes)) {
+						foreach ($product_attributes as $key => $product_attribute) {
+							if (!empty($product_attribute) && !empty($product_attribute->is_filterable) && strtolower(__($product_attribute->is_filterable, 'wpshop')) == strtolower(__('Yes', 'wpshop'))) {
+								if (!array_key_exists($product_attribute->attribute_id, $filterable_attributes_list)) {
 									$filterable_attributes_list[$product_attribute->attribute_id] = $product_attribute;
-									$sub_tpl_component['CATEGORY_FILTERABLE_ATTRIBUTE_ID'] =  $product_attribute->attribute_id;
-									$sub_tpl_component['CATEGORY_FILTERABLE_ATTRIBUTE_NAME'] =  __($product_attribute->frontend_label, 'wpshop');
-									if ( !empty($category_meta_information) && !empty($category_meta_information['wpshop_category_filterable_attributes']) && array_key_exists($product_attribute->attribute_id, $category_meta_information['wpshop_category_filterable_attributes']) ) {
+									$sub_tpl_component['CATEGORY_FILTERABLE_ATTRIBUTE_ID'] = $product_attribute->attribute_id;
+									$sub_tpl_component['CATEGORY_FILTERABLE_ATTRIBUTE_NAME'] = __($product_attribute->frontend_label, 'wpshop');
+									if (!empty($category_meta_information) && !empty($category_meta_information['wpshop_category_filterable_attributes']) && array_key_exists($product_attribute->attribute_id, $category_meta_information['wpshop_category_filterable_attributes'])) {
 										$sub_tpl_component['CATEGORY_FILTERABLE_ATTRIBUTE_CHECKED'] = 'checked="checked"';
 									}
 									else {
@@ -217,20 +217,20 @@ 
 	*
 	*	@return void
 	*/
-	public static function category_fields_saver($category_id, $tt_id){
+	public static function category_fields_saver($category_id, $tt_id) {
 		global $wpdb;
 		$category_meta = array();
-		$category_option = get_option( WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id);
+		$category_option = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id);
 
-		$wps_category_picture_id = !empty($_POST['wps_category_picture_id']) ? (int) $_POST['wps_category_picture_id'] : null;
-		$filterable_attribute_for_category = ( !empty($_POST['filterable_attribute_for_category']) && is_array($_POST['filterable_attribute_for_category']) ) ? (array) $_POST['filterable_attribute_for_category'] : null;
+		$wps_category_picture_id = !empty($_POST['wps_category_picture_id']) ? (int)$_POST['wps_category_picture_id'] : null;
+		$filterable_attribute_for_category = (!empty($_POST['filterable_attribute_for_category']) && is_array($_POST['filterable_attribute_for_category'])) ? (array)$_POST['filterable_attribute_for_category'] : null;
 
-		if ( isset( $wps_category_picture_id ) ) {
-			$attach_id = intval( $wps_category_picture_id );
+		if (isset($wps_category_picture_id)) {
+			$attach_id = intval($wps_category_picture_id);
 			$category_option['wpshop_category_picture'] = $attach_id;
 		}
 
-		if ( isset( $filterable_attribute_for_category ) ) {
+		if (isset($filterable_attribute_for_category)) {
 			$category_option['wpshop_category_filterable_attributes'] = $filterable_attribute_for_category;
 		}
 		else {
@@ -240,7 +240,7 @@ 
 
 		/** Update filter values **/
 		$wpshop_filter_search = new wps_filter_search();
-		$wpshop_filter_search->stock_values_for_attribute( array($category_id) );
+		$wpshop_filter_search->stock_values_for_attribute(array($category_id));
 	}
 
 	/**
@@ -250,15 +250,15 @@ 
 	*
 	*	@return array $columns The new array with additionnal colu
 	*/
-	public static function category_manage_columns($columns){
-	    unset( $columns["cb"] );
+	public static function category_manage_columns($columns) {
+	    unset($columns["cb"]);
 
 	    $custom_array = array(
 				'cb' => '<input type="checkbox" />',
 				'wpshop_category_thumbnail' => __('Thumbnail', 'wpshop')
 	    );
 
-	    $columns = array_merge( $custom_array, $columns );
+	    $columns = array_merge($custom_array, $columns);
 
 	    return $columns;
 	}
@@ -266,13 +266,13 @@ 
 	/**
 	*	Define the content of extra columns to add to categories listing interface
 	*/
-	public static function category_manage_columns_content($string, $column_name, $category_id){
+	public static function category_manage_columns_content($string, $column_name, $category_id) {
 		$category_meta_information = get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category_id);
-		$category_thumbnail_preview = '<img src="' .WPSHOP_DEFAULT_CATEGORY_PICTURE. '" alt="No picture" class="category_thumbnail_preview" />';
+		$category_thumbnail_preview = '<img src="' . WPSHOP_DEFAULT_CATEGORY_PICTURE . '" alt="No picture" class="category_thumbnail_preview" />';
 		/*	Check if there is already a picture for the selected category	*/
-		if ( !empty($category_meta_information['wpshop_category_picture']) ) {
-			$image_post = wp_get_attachment_image( $category_meta_information['wpshop_category_picture'], 'thumbnail', false, array('class' => 'category_thumbnail_preview') );
-			$category_thumbnail_preview = ( !empty($image_post) ) ? $image_post : '<img src="' .WPSHOP_DEFAULT_CATEGORY_PICTURE. '" alt="No picture" class="category_thumbnail_preview" />';
+		if (!empty($category_meta_information['wpshop_category_picture'])) {
+			$image_post = wp_get_attachment_image($category_meta_information['wpshop_category_picture'], 'thumbnail', false, array('class' => 'category_thumbnail_preview'));
+			$category_thumbnail_preview = (!empty($image_post)) ? $image_post : '<img src="' . WPSHOP_DEFAULT_CATEGORY_PICTURE . '" alt="No picture" class="category_thumbnail_preview" />';
 		}
 		$category = get_term_by('id', $category_id, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
 		$name = $category->name;
@@ -290,21 +290,21 @@ 
 	*
 	*	@return mixed $content Output the category list
 	*/
-	public static function category_mini_output($category, $output_type = 'list'){
+	public static function category_mini_output($category, $output_type = 'list') {
 		$content = '';
 		/*	Get the different informations for output	*/
-		$category_meta_information = ( !empty($category) && !empty($category->term_id) ) ? get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category->term_id) : '';
-		$categoryThumbnail = '<img src="' .WPSHOP_DEFAULT_CATEGORY_PICTURE. '" alt="No picture" class="wps-category-thumbnail" />';
+		$category_meta_information = (!empty($category) && !empty($category->term_id)) ? get_option(WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $category->term_id) : '';
+		$categoryThumbnail = '<img src="' . WPSHOP_DEFAULT_CATEGORY_PICTURE . '" alt="No picture" class="wps-category-thumbnail" />';
 		/*	Check if there is already a picture for the selected category	*/
-		if ( !empty($category_meta_information['wpshop_category_picture']) ) {
-			$image_post = wp_get_attachment_image( $category_meta_information['wpshop_category_picture'], 'wps-categorie-display', false, array('class' => 'wps-category-thumbnail') );
-			$categoryThumbnail = ( !empty($image_post) ) ? $image_post : '<img src="' .WPSHOP_DEFAULT_CATEGORY_PICTURE. '" alt="No picture" class="wps-category-thumbnail" />';
+		if (!empty($category_meta_information['wpshop_category_picture'])) {
+			$image_post = wp_get_attachment_image($category_meta_information['wpshop_category_picture'], 'wps-categorie-display', false, array('class' => 'wps-category-thumbnail'));
+			$categoryThumbnail = (!empty($image_post)) ? $image_post : '<img src="' . WPSHOP_DEFAULT_CATEGORY_PICTURE . '" alt="No picture" class="wps-category-thumbnail" />';
 		}
 
 
-		$category_title = ( !empty($category) && !empty($category->name) ) ? $category->name : '';
-		$category_more_informations = ( !empty($category) && !empty($category->description) ) ? wp_trim_words( $category->description, 30, ' [...]' ) : '';
-		$category_link = ( !empty($category) && !empty($category->term_id) ) ?  get_term_link((int)$category->term_id , WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES) : '';
+		$category_title = (!empty($category) && !empty($category->name)) ? $category->name : '';
+		$category_more_informations = (!empty($category) && !empty($category->description)) ? wp_trim_words($category->description, 30, ' [...]') : '';
+		$category_link = (!empty($category) && !empty($category->term_id)) ? get_term_link((int)$category->term_id, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES) : '';
 
 		// $item_width = null;
 		// /*	Make some treatment in case we are in grid mode	*/
@@ -325,14 +325,14 @@ 
 		$tpl_component['CATEGORY_TITLE'] = $category_title;
 		$tpl_component['CATEGORY_DESCRIPTION'] = $category_more_informations;
 		//$tpl_component['ITEM_WIDTH'] = $item_width;
-		$tpl_component['CATEGORY_ID'] = ( !empty($category) && !empty($category->term_id) ) ? $category->term_id : '';
+		$tpl_component['CATEGORY_ID'] = (!empty($category) && !empty($category->term_id)) ? $category->term_id : '';
 		$tpl_component['CATEGORY_DISPLAY_TYPE'] = $output_type;
 
 		/*
 		 * 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();
@@ -357,15 +357,15 @@ 
 	public static function wpshop_category_func($atts) {
 		global $wpdb;
 		$string = '';
-		if ( !empty($atts['cid']) ) {
-			$atts['type'] = (!empty($atts['type']) && in_array($atts['type'],array('grid','list'))) ? $atts['type'] : 'grid';
+		if (!empty($atts['cid'])) {
+			$atts['type'] = (!empty($atts['type']) && in_array($atts['type'], array('grid', 'list'))) ? $atts['type'] : 'grid';
 
 			$cat_list = explode(',', $atts['cid']);
 
-			if ( (count($cat_list) > 1) || ( !empty($atts['display']) && ($atts['display'] == 'only_cat') ) ) {
+			if ((count($cat_list) > 1) || (!empty($atts['display']) && ($atts['display'] == 'only_cat'))) {
 				$string .= '
 					<div class="wpshop_categories_' . $atts['type'] . '" >';
-					foreach( $cat_list as $cat_id ){
+					foreach ($cat_list as $cat_id) {
 						$sub_category_def = get_term($cat_id, WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
 						$string .= wpshop_categories::category_mini_output($sub_category_def, $atts['type']);
 					}
@@ -375,16 +375,16 @@ 
 			else {
 				$sub_category_def = get_term($atts['cid'], WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES);
 
-				if ( empty($atts['display']) || ($atts['display'] != 'only_products') ){
+				if (empty($atts['display']) || ($atts['display'] != 'only_products')) {
 					$string .= wpshop_categories::category_mini_output($sub_category_def, $atts['type']);
 					$string .= '
 					<div class="category_product_' . $atts['type'] . '" >
-						<h2 class="category_content_part_title" >'.__('Category\'s product list', 'wpshop').'</h2>';
+						<h2 class="category_content_part_title" >'.__('Category\'s product list', 'wpshop') . '</h2>';
 				}
 
 				$string .= wpshop_products::wpshop_products_func($atts);
 
-				if ( empty($atts['display']) || ($atts['display'] != 'only_products') ){
+				if (empty($atts['display']) || ($atts['display'] != 'only_products')) {
 					$string .= '</div>';
 				}
 			}
@@ -396,14 +396,14 @@ 
 		return do_shortcode($string);
 	}
 
-	public static function get_product_of_category( $category_id ) {
+	public static function get_product_of_category($category_id) {
 		$product_id_list = array();
-		if ( !empty($category_id) ) {
+		if (!empty($category_id)) {
 			global $wpdb;
 			$query = $wpdb->prepare("SELECT T.* FROM " . $wpdb->term_relationships . " AS T INNER JOIN " . $wpdb->posts . " AS P ON ((P.ID = T.object_id) AND (P.post_status = %s)) WHERE T.term_taxonomy_id = %d ", 'publish', $category_id);
 			$relationships = $wpdb->get_results($query);
-			if ( !empty($relationships) ) {
-				foreach ( $relationships as $relationship ) {
+			if (!empty($relationships)) {
+				foreach ($relationships as $relationship) {
 					$product_id_list[] = $relationship->object_id;
 				}
 			}
@@ -428,10 +428,10 @@ 
 	 */
 	public static function get_the_category_thumbnail($id, $size = 'thumbnail', $icon = false) {
 		/** Get the attachment/post ID */
-		$array_option_category 	= get_option('wpshop_product_category_' . $id);
+		$array_option_category = get_option('wpshop_product_category_' . $id);
 		
 		/** If not attachment/post ID in the category, return "No thumbnail in the category" */
-		if(is_array($array_option_category) && empty($array_option_category['wpshop_category_picture']))
+		if (is_array($array_option_category) && empty($array_option_category['wpshop_category_picture']))
 			return __('No thumbnail in the category', 'wpshop');
 		
 		/** Set attachment/post ID in $id_picture */
@@ -443,7 +443,7 @@ 
 		 */
 		$post_thumbnail = wp_get_attachment_image_src($id_picture, $size, $icon);
 		
-		if(!$post_thumbnail)
+		if (!$post_thumbnail)
 			return __('No thumbnail in this post', 'wpshop');
 			
 		return $post_thumbnail;

includes/librairies/db/database.class.php

Doc Comments +2 added lines

@@ -120,6 +120,7 @@ 
 	*	Save a new attribute in database
 	*
 	*	@param array $informationsToSet An array with the different information we want to set
+	* @param string $dataBaseTable
 	*
 	*	@return string $requestResponse A message that allows to know if the creation has been done correctly or not
 	*/
@@ -141,6 +142,7 @@ 
 	*	Update an existing attribute in database
 	*
 	*	@param array $informationsToSet An array with the different information we want to set
+	* @param string $dataBaseTable
 	*
 	*	@return string $requestResponse A message that allows to know if the update has been done correctly or not
 	*/

Indentation +36 added lines, -36 removed lines

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

Spacing +27 added lines, -27 removed lines

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

Braces +18 added lines, -17 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
@@ -86,23 +88,25 @@ 
 			$type = 'text';
 			if(($field_definition->Key == 'PRI') || ($field_definition->Field == 'creation_date') || ($field_definition->Field == 'last_update_date')){
 				$type =  'hidden';
-			}
-			else{
+			} else{
 				$fieldtype = explode('(',$field_definition->Type);
-				if(!empty($fieldtype[1]))$fieldtype[1] = str_replace(')','',$fieldtype[1]);
+				if(!empty($fieldtype[1])) {
+					$fieldtype[1] = str_replace(')','',$fieldtype[1]);
+				}
 
-				if(($fieldtype[0] == 'char') || ($fieldtype[0] == 'varchar') || ($fieldtype[0] == 'int'))
-					$type = 'text';
-				elseif($fieldtype[0] == 'text')
-					$type = 'textarea';
-				elseif($fieldtype[0] == 'enum')
+				if(($fieldtype[0] == 'char') || ($fieldtype[0] == 'varchar') || ($fieldtype[0] == 'int')) {
+									$type = 'text';
+				} elseif($fieldtype[0] == 'text') {
+									$type = 'textarea';
+				} elseif($fieldtype[0] == 'enum')
 				{
 					$fieldtype[1] = str_replace("'","",$fieldtype[1]);
 					$possible_value = explode(",",$fieldtype[1]);
 
 					$type = 'radio';
-					if(count($possible_value) > 1)
-						$type = 'select';
+					if(count($possible_value) > 1) {
+											$type = 'select';
+					}
 
 					$field_to_form[$i]['possible_value'] = $possible_value;
 				}
@@ -130,8 +134,7 @@ 
 		$updateResult = $wpdb->insert($dataBaseTable, $informationsToSet, '%s');
 		if( $updateResult != false ){
 			$requestResponse = 'done';
-		}
-		else{
+		} else{
 			$requestResponse = 'error';
 		}
 
@@ -152,11 +155,9 @@ 
 
 		if( $updateResult == 1 ){
 			$requestResponse = 'done';
-		}
-		elseif( $updateResult == 0 ){
+		} elseif( $updateResult == 0 ){
 			$requestResponse = 'nothingToUpdate';
-		}
-		elseif( $updateResult == false ){
+		} elseif( $updateResult == false ){
 			$requestResponse = 'error';
 		}
 

includes/librairies/display/display.class.php

Doc Comments +7 added lines, -5 removed lines

@@ -191,10 +191,10 @@ 
 	 * Return a complete html table with header, body and content
 	 *
 	 *	@param string $tableId The unique identifier of the table in the document
-	 *	@param array $tableTitles An array with the different element to put into the table's header and footer
+	 *	@param string[] $tableTitles An array with the different element to put into the table's header and footer
 	 *	@param array $tableRows An array with the different value to put into the table's body
-	 *	@param array $tableClasses An array with the different class to affect to table rows and cols
-	 *	@param array $tableRowsId An array with the different identifier for table lines
+	 *	@param string[] $tableClasses An array with the different class to affect to table rows and cols
+	 *	@param string[] $tableRowsId An array with the different identifier for table lines
 	 *	@param string $tableSummary A summary for the table
 	 *	@param boolean $withFooter Allow to define if the table must be create with a footer or not
 	 *
@@ -274,6 +274,7 @@ 
 	 *
 	 * @param string $file_name The file name to check if exists in current theme
 	 * @param string $dir_name Optionnal The directory name of the file to check Default : wpshop
+	 * @param string $default_dir
 	 *
 	 * @return string $file_path The good filepath to include
 	 */
@@ -299,7 +300,7 @@ 
 	 * Check if the current shop use the first method for templates. One file per element to display
 	 *
 	 * @param string $template_part The part to take display for, will be usefull to check what file take in care if there were a file in old method
-	 * @param string $default_template_dirThe part of website to check template for. Possible values : wpshop / admin
+	 * @param string $default_template_dir part of website to check template for. Possible values : wpshop / admin
 	 *
 	 * @return array First index represent if there is a file for old version support, Second index represent the file to get for support old version
 	 */
@@ -546,6 +547,7 @@ 
 	 * @param string $part The part of shop where to display the given template element
 	 * @param string $template_part The template element we want to display
 	 * @param array $extras_args Allows to define some parameters to spot a specific template for example
+	 * @param string $default_template_dir
 	 *
 	 * @return string The good template to take in care, regarding on the given parameters
 	 */
@@ -742,7 +744,7 @@ 
 	 * Change output for product page
 	 *
 	 * @param string $content The content of a post
-	 * @return Ambigous <mixed, string>|unknown
+	 * @return string <mixed, string>|unknown
 	 */
 	public static function products_page( $content = '' ) {
 		global $wp_query;

Indentation +23 added lines, -23 removed lines

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

Braces +29 added lines, -24 removed lines

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

Spacing +125 added lines, -125 removed lines

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

includes/librairies/display/form.class.php

Doc Comments +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
 	*	@param string $method The default method for the form Default is set to post
 	*	@param string $action The default action for the form Default is set to empty
 	*
-	*	@return mixed $the_form The complete html output of the form
+	*	@return string $the_form The complete html output of the form
 	*/
 	function form($name, $input_list, $method = 'post', $action = ''){
 		$the_form_content_hidden = $the_form_content = '';
@@ -129,7 +129,7 @@ 
 	*	@param string $type The input type Could be: text or hidden or passowrd
 	*	@param string $option Allows to define options for the input Could be readonly or disabled or style
 	*
-	*	@return mixed The output code to add to the form
+	*	@return string The output code to add to the form
 	*/
 	public static function form_input($name, $id, $value = '', $type = 'text', $option = '', $input_label = ''){
 		$allowedType = array('text', 'hidden', 'password', 'file');
@@ -152,7 +152,7 @@ 
 	*	@param mixed $value The default value for the field Default is empty
 	*	@param string $option Allows to define options for the input Could be maxlength or style
 	*
-	*	@return mixed The output code to add to the form
+	*	@return string The output code to add to the form
 	*/
 	public static function form_input_textarea($name, $id, $value = '', $option = '')
 	{
@@ -167,7 +167,7 @@ 
 	*	@param mixed $value The selected value for the field Default is empty
 	*	@param string $option Allows to define options for the input Could be onchange
 	*
-	*	@return mixed $output The output code to add to the form
+	*	@return string $output The output code to add to the form
 	*/
 	public static function form_input_select($name, $id, $content, $value = '', $option = '', $optionValue = ''){
 		global $comboxOptionToHide;
@@ -215,7 +215,7 @@ 
 	*	@param mixed $value The selected value for the field Default is empty
 	*	@param string $option Allows to define options for the input Could be onchange
 	*
-	*	@return mixed $output The output code to add to the form
+	*	@return string $output The output code to add to the form
 	*/
 	public static function form_input_multiple_select($name, $id, $content, $value = array(), $option = '', $optionValue = '') {
 		global $comboxOptionToHide;
@@ -258,7 +258,7 @@ 
 	*	@param mixed $value The selected value for the field Default is empty
 	*	@param string $option Allows to define options for the input Could be onchange
 	*
-	*	@return mixed $output The output code to add to the form
+	*	@return string $output The output code to add to the form
 	*/
 	public static function form_input_check($name, $id, $content, $value = '', $type = 'checkbox', $option = '', $optionValue = '', $input_label=''){
 		$output = '';

Indentation +61 added lines, -61 removed lines

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

Spacing +61 added lines, -61 removed lines

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

Braces +59 added lines, -51 removed lines

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

includes/librairies/display/form_management.class.php

Doc Comments +1 added lines

@@ -26,6 +26,7 @@
 
 	/**
 	* Add an error
+	* @param string $error
 	*/
 	function add_error( $error ) {
 		$this->errors[] = $error;

Indentation +13 added lines, -13 removed lines

@@ -25,36 +25,36 @@ 
 	var $messages = array(); // Stores store messages
 
 	/**
-	* Add an error
-	*/
+	 * Add an error
+	 */
 	function add_error( $error ) {
 		$this->errors[] = $error;
 	}
 
 	/**
-	* Add a message
-	*/
+	 * Add a message
+	 */
 	function add_message( $message ) {
 		$this->messages[] = $message;
 	}
 
 	/**
-	* Get error count
-	*/
+	 * Get error count
+	 */
 	function error_count() {
 		return sizeof($this->errors);
 	}
 
 	/**
-	* Get message count
-	*/
+	 * Get message count
+	 */
 	function message_count() {
 		return sizeof($this->messages);
 	}
 
 	/**
-	* Output the errors and messages
-	*/
+	 * Output the errors and messages
+	 */
 	function show_messages() {
 		if (!empty($this->errors) && $this->error_count()>0) :
 			$message = '<div class="error_bloc">'.__('Errors were detected', 'wpshop').' :<ul>';
@@ -69,9 +69,9 @@ 
 	}
 
 	/** Valide les champs d'un formlaire
-	* @param array $array : Champs a lire
-	* @return boolean
-	*/
+	 * @param array $array : Champs a lire
+	 * @return boolean
+	 */
 	function validateForm($array, $values = array(), $from = '', $partial = false, $user = 0) {
 	
 		

Braces +7 added lines, -4 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 
 /*	Check if file is include. No direct access possible with file url	*/
 if ( !defined( 'WPSHOP_VERSION' ) ) {
@@ -63,8 +65,10 @@ 
 			}
 			$message .= '</ul></div>';
 			return $message;
-		else :
+		else {
+			:
 			return null;
+		}
 		endif;
 	}
 
@@ -96,8 +100,7 @@ 
 						$email_exist = email_exists($value);
 						if(!is_email($value)) {
 							$this->add_error(sprintf(__('The field "%s" is incorrect','wpshop'),$attribute_definition['label']));
-						}
-						elseif ( empty($from) && (($user_id > 0 && !empty($email_exist) && $email_exist !== $user_id) || (!empty($email_exist) && $user_id <= 0)) ) {
+						} elseif ( empty($from) && (($user_id > 0 && !empty($email_exist) && $email_exist !== $user_id) || (!empty($email_exist) && $user_id <= 0)) ) {
 							$this->add_error(__('An account is already registered with your email address. Please login.', 'wpshop'));
 						}
 					break;

Spacing +32 added lines, -32 removed lines

@@ -1,8 +1,8 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if (!defined('ABSPATH')) exit;
 
 /*	Check if file is include. No direct access possible with file url	*/
-if ( !defined( 'WPSHOP_VERSION' ) ) {
-	die( __('Access is not allowed by this way', 'wpshop') );
+if (!defined('WPSHOP_VERSION')) {
+	die(__('Access is not allowed by this way', 'wpshop'));
 }
 
 /**
@@ -27,14 +27,14 @@ 
 	/**
 	* Add an error
 	*/
-	function add_error( $error ) {
+	function add_error($error) {
 		$this->errors[] = $error;
 	}
 
 	/**
 	* Add a message
 	*/
-	function add_message( $message ) {
+	function add_message($message) {
 		$this->messages[] = $message;
 	}
 
@@ -56,10 +56,10 @@ 
 	* Output the errors and messages
 	*/
 	function show_messages() {
-		if (!empty($this->errors) && $this->error_count()>0) :
-			$message = '<div class="error_bloc">'.__('Errors were detected', 'wpshop').' :<ul>';
-			foreach($this->errors as $e) {
-				$message .= '<li>'.$e.'</li>';
+		if (!empty($this->errors) && $this->error_count() > 0) :
+			$message = '<div class="error_bloc">' . __('Errors were detected', 'wpshop') . ' :<ul>';
+			foreach ($this->errors as $e) {
+				$message .= '<li>' . $e . '</li>';
 			}
 			$message .= '</ul></div>';
 			return $message;
@@ -75,42 +75,42 @@ 
 	function validateForm($array, $values = array(), $from = '', $partial = false, $user = 0) {
 	
 		
-		$user_id = empty( $user ) ? get_current_user_id() : $user;
-		foreach($array as $attribute_id => $attribute_definition):
-			$values_array = !empty($values) ? $values : (array) $_POST['attribute'];
-			$value = ( !empty($values_array[$attribute_definition['data_type']][$attribute_definition['name']]) ) ? $values_array[$attribute_definition['data_type']][$attribute_definition['name']] : '';
+		$user_id = empty($user) ? get_current_user_id() : $user;
+		foreach ($array as $attribute_id => $attribute_definition):
+			$values_array = !empty($values) ? $values : (array)$_POST['attribute'];
+			$value = (!empty($values_array[$attribute_definition['data_type']][$attribute_definition['name']])) ? $values_array[$attribute_definition['data_type']][$attribute_definition['name']] : '';
 		
 			// Si le champ est obligatoire
-			if ( empty($value) && ($attribute_definition['required'] == 'yes') ) {
-				$this->add_error(sprintf(__('The field "%s" is required','wpshop'),__( $attribute_definition['label'], 'wpshop' ) ));
+			if (empty($value) && ($attribute_definition['required'] == 'yes')) {
+				$this->add_error(sprintf(__('The field "%s" is required', 'wpshop'), __($attribute_definition['label'], 'wpshop')));
 			}
-			if( $partial == false && $attribute_definition['_need_verification'] == 'yes'  ) {
-				$value2 = $values_array[$attribute_definition['data_type']][$attribute_definition['name'].'2'];
-				if ( $value != $value2) {
-					$this->add_error(sprintf(__('The  "%s" confirmation is incorrect','wpshop'),__($attribute_definition['label'], 'wpshop') ));
+			if ($partial == false && $attribute_definition['_need_verification'] == 'yes') {
+				$value2 = $values_array[$attribute_definition['data_type']][$attribute_definition['name'] . '2'];
+				if ($value != $value2) {
+					$this->add_error(sprintf(__('The  "%s" confirmation is incorrect', 'wpshop'), __($attribute_definition['label'], 'wpshop')));
 				}
 			}
-			if(!empty($value) && !empty($attribute_definition['type'])) {
-				switch($attribute_definition['frontend_verification']) {
+			if (!empty($value) && !empty($attribute_definition['type'])) {
+				switch ($attribute_definition['frontend_verification']) {
 					case 'email':
 						$email_exist = email_exists($value);
-						if(!is_email($value)) {
-							$this->add_error(sprintf(__('The field "%s" is incorrect','wpshop'),$attribute_definition['label']));
+						if (!is_email($value)) {
+							$this->add_error(sprintf(__('The field "%s" is incorrect', 'wpshop'), $attribute_definition['label']));
 						}
-						elseif ( empty($from) && (($user_id > 0 && !empty($email_exist) && $email_exist !== $user_id) || (!empty($email_exist) && $user_id <= 0)) ) {
+						elseif (empty($from) && (($user_id > 0 && !empty($email_exist) && $email_exist !== $user_id) || (!empty($email_exist) && $user_id <= 0))) {
 							$this->add_error(__('An account is already registered with your email address. Please login.', 'wpshop'));
 						}
 					break;
 
 					case 'postcode':
-						if(!wpshop_tools::is_postcode($value)) {
-							$this->add_error(sprintf(__('The field "%s" is incorrect','wpshop'),__( $attribute_definition['label'], 'wpshop' ) ));
+						if (!wpshop_tools::is_postcode($value)) {
+							$this->add_error(sprintf(__('The field "%s" is incorrect', 'wpshop'), __($attribute_definition['label'], 'wpshop')));
 						}
 					break;
 
 					case 'phone':
-						if(!wpshop_tools::is_phone($value)) {
-							$this->add_error(sprintf(__('The field "%s" is incorrect','wpshop'), __( $attribute_definition['label'], 'wpshop' ) ));
+						if (!wpshop_tools::is_phone($value)) {
+							$this->add_error(sprintf(__('The field "%s" is incorrect', 'wpshop'), __($attribute_definition['label'], 'wpshop')));
 						}
 					break;
 
@@ -118,16 +118,16 @@ 
 						$username_exists = username_exists($value);
 						// On s'assure que le nom d'utilisateur est libre
 						if (!validate_username($value)) :
-							$this->add_error( __('Invalid email/username.', 'wpshop') );
-						elseif ( ($user_id > 0) && !empty($username_exists) && ($username_exists !== $user_id) || !empty($username_exists) && ($user_id <= 0) ) :
-							$this->add_error( __('An account is already registered with that username. Please choose another.', 'wpshop') );
+							$this->add_error(__('Invalid email/username.', 'wpshop'));
+						elseif (($user_id > 0) && !empty($username_exists) && ($username_exists !== $user_id) || !empty($username_exists) && ($user_id <= 0)) :
+							$this->add_error(__('An account is already registered with that username. Please choose another.', 'wpshop'));
 						endif;
 					break;
 				}
 			}
 		endforeach;
 
-		return ($this->error_count()==0);
+		return ($this->error_count() == 0);
 	}
 
 }