Eoxia / wpshop

includes/modules/wps_message/model/wps_message_mdl.php

Braces +3 added lines, -1 removed lines

@@ -1,4 +1,6 @@
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 class wps_message_mdl {
 
 	function __construct() { }

includes/wpshop_ajax.php

Braces +111 added lines, -197 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( !defined( 'ABSPATH' ) ) exit;
+<?php if ( !defined( 'ABSPATH' ) ) {
+	exit;
+}
 /**
 * Ajax request management file
 *
@@ -466,12 +468,10 @@ 
 					wpshop_payment::set_payment_transaction_number($order_id, $transaction_id);
 				}
 				$result = json_encode(array(true,''));
-			}
-			else {
+			} else {
 				$result = json_encode(array(false,__('Choose a payment method and/or type a transaction number', 'wpshop')));
 			}
-		}
-		else {
+		} else {
 			$result = json_encode(array(false,__('Bad order identifier', 'wpshop')));
 		}
 		echo json_encode($result);
@@ -488,8 +488,7 @@ 
 		if ( !empty($order_id) ) {
 			$result = (array(true, '<h1>'.__('Tracking number','wpshop').'</h1><p>'.__('Enter a tracking number, or leave blank:','wpshop').'</p><input type="hidden" value="'.$order_id.'" name="oid" /><input type="text" name="trackingNumber" /><br /><br /><p>'.__('Enter a tracking link, or leave blank: (http included)','wpshop').'</p><input type="text" name="trackingLink" /><br /><br /><input type="submit" data-nonce="' . esc_attr( wp_create_nonce( 'wpshop_change_order_state' ) ) . '" class="button-primary sendTrackingNumber" value="'.__('Send','wpshop').'" /> <input type="button" class="button-secondary closeAlert" value="'.__('Cancel','wpshop').'" />'));
 
-		}
-		else {
+		} else {
 			$result = json_encode(array(false, __('Order reference error', 'wpshop')));
 		}
 		echo json_encode($result);
@@ -528,16 +527,14 @@ 
 				$output_shipping_box = ob_get_clean();
 
 				$result = array( true, $order_state, $output_shipping_box, $output_payment_box_class, $output_payment_box_content );
-			}
-			else {
+			} else {
 				wpshop_payment::setOrderPaymentStatus($order_id, $order_state);
 
 				$result = array(true, $order_state, __($order_status[$order_state], 'wpshop'));
 			}
 			update_post_meta($order_id, '_order_postmeta', $order);
 			update_post_meta($order_id, '_wpshop_order_status', $order_state);
-		}
-		else {
+		} else {
 			$result = array(false, __('Incorrect order request', 'wpshop'));
 		}
 
@@ -623,8 +620,7 @@ 
 			unset($tpl_component);
 
 			echo json_encode(array(true, str_replace('optionsUpdate', 'options', $output)));
-		}
-		else {
+		} else {
 			echo json_encode(array(false, __('The value you entered already exist', 'wpshop')));
 		}
 		die();
@@ -669,13 +665,11 @@ 
 				);
 				$new_option_id = wp_insert_post($new_post);
 				$input_def['valueToPut'] = 'index';
-			}
-			else {
+			} else {
 				$result_status = false;
 				$result = __('This value already exist for this attribute', 'wpshop');
 			}
-		}
-		else {
+		} else {
 			/**	Check if the given value does not exist	*/
 			$query = $wpdb->prepare("SELECT * FROM " . WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS . " WHERE (label = %s OR value = %s) AND attribute_id = %d AND status = 'valid'", str_replace(",", ".", $attribute_options_label), $attribute_options_value, $attribute->id);
 			$existing_values = $wpdb->get_results($query);
@@ -691,8 +685,7 @@ 
 				/**	Add the new value into database	*/
 				$wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('creation_date' => current_time('mysql', 0), 'status' => 'valid', 'attribute_id' => $attribute->id, 'position' => $position, 'label' => str_replace(",", ".", stripslashes($attribute_options_label)), 'value' => stripslashes($attribute_options_value)));
 				$new_option_id = $wpdb->insert_id;
-			}
-			else {
+			} else {
 				$result_status = false;
 				$result = __('This value already exist for this attribute', 'wpshop');
 			}
@@ -843,8 +836,7 @@ 
 			$combo_wp_type = wpshop_form::check_input_type($input_def, WPSHOP_DBT_ATTRIBUTE);
 			$result .= __('Choose the data type to use for this attribute', 'wpshop') . '<a href="#" title="'.sprintf(__('If the type you want to use is not in the list below. You have to create it by using %s menu', 'wpshop'), __('Entities', 'wpshop')).'" class="wpshop_infobulle_marker">?</a><div class="wpshop_cls wpshop_attribute_select_data_type_internal_list">'.$combo_wp_type.'</div>';
 			$result .= '<input type="hidden" value="no" name="delete_items_of_entity" id="delete_items_of_entity" /><input type="hidden" value="no" name="delete_entity" id="delete_entity" />';
-		}
-		else {
+		} else {
 			$result .= '<input type="hidden" value="' . $attribute->default_value . '" name="internal_data" id="internal_data" />';
 
 			unset($input_def);
@@ -901,8 +893,7 @@ 
 					}
 				}
 			}
-		}
-		else {
+		} else {
 			$post_list = query_posts(array('post_type' => $internal_data_type));
 			if (!empty($post_list)) {
 				$p=1;
@@ -911,8 +902,7 @@ 
 					$last_insert = $wpdb->insert(WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status'=>'valid', 'creation_date'=>current_time('mysql',0), 'attribute_id'=>$current_attribute, 'position'=>$p, 'value'=>$post->post_name, 'label'=>$post->post_title));
 					if(is_int($last_insert) && $delete_items_of_entity){
 						wp_delete_post($post->ID, true);
-					}
-					else{
+					} else{
 						$error = true;
 					}
 					$p++;
@@ -976,13 +966,11 @@ 
 				}
 				$result = true;
 				$result_output = '<p class="wpshop_duplicate_attribute_result" ><a href="' . admin_url('admin.php?page=' . WPSHOP_URL_SLUG_ATTRIBUTE_LISTING . '&action=edit&id=' . $new_attribute_id) . '" >' . __('Edit the new attribute', 'wpshop') . '</a></p>';
-			}
-			else {
+			} else {
 				$result = false;
 				$result_output = __('An error occured while duplicating attribute', 'wpshop');
 			}
-		}
-		else {
+		} else {
 			$result = false;
 			$result_output = __('This attribute has already been duplicate to this entity', 'wpshop');
 		}
@@ -1012,8 +1000,7 @@ 
 			/* Test if we want display the group unit list OR the unit list */
 			if ( $selected_list == 'group unit' ) {
 				$list = wpshop_attributes_unit::get_unit_group();
-			}
-			else {
+			} else {
 				$list = wpshop_attributes_unit::get_unit_list_for_group($group);
 			}
 
@@ -1021,8 +1008,7 @@ 
 				$response .= '<option value="' . $unit->id . '" '. ( ($current_group == $unit->id && $selected_list == 'group unit') ? 'selected="selected"' : '' ).'>' . $unit->name . '</option>';
 			}
 			$result = array(true, $response);
-		}
-		else {
+		} else {
 			$result = array(false, __('Incorrect order request', 'wpshop'));
 		}
 
@@ -1061,14 +1047,12 @@ 
 								$sub_modif .= $column_name;
 								if( !empty($columns->Field) && ($columns->Field == $column_name) ){
 									$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Field has been created', 'wpshop') . '" title="' . __('Field has been created', 'wpshop') . '" class="db_added_field_check" />';
-								}
-								else{
+								} else{
 									$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Field does not exist', 'wpshop') . '" title="' . __('Field does not exist', 'wpshop') . '" class="db_added_field_check" />';
 									$error_nb++;
 									if ( !empty($error_list[$plugin_db_version]) ) {
 										$error_list[$plugin_db_version] += 1;
-									}
-									else {
+									} else {
 										$error_list[$plugin_db_version] = 1;
 									}
 								}
@@ -1086,8 +1070,7 @@ 
 								$sub_modif .= $column_name;
 								if(empty($columns) || ($columns->Field != $column_name)){
 									$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Field has been deleted', 'wpshop') . '" title="' . __('Field has been deleted', 'wpshop') . '" class="db_deleted_field_check" />';
-								}
-								else{
+								} else{
 									$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Field exists', 'wpshop') . '" title="' . __('Field exists', 'wpshop') . '" class="db_deleted_field_check" />';
 									$error_nb++;
 									$error_list[$plugin_db_version] += 1;
@@ -1109,8 +1092,7 @@ 
 									$changed_key = 'type';
 									if($columns->Type == $field_infos['type']){
 										$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Field has been created', 'wpshop') . '" title="' . __('Field has been created', 'wpshop') . '" class="db_added_field_check" />';
-									}
-									else{
+									} else{
 										$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Field does not exist', 'wpshop') . '" title="' . __('Field does not exist', 'wpshop') . '" class="db_added_field_check" />';
 										$error_nb++;
 										$error_list[$plugin_db_version] += 1;
@@ -1122,8 +1104,7 @@ 
 									$changed_key = 'original_name';
 									if($columns->Field == $field_infos['field']){
 										$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Field has been created', 'wpshop') . '" title="' . __('Field has been created', 'wpshop') . '" class="db_added_field_check" />';
-									}
-									else{
+									} else{
 										$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Field does not exist', 'wpshop') . '" title="' . __('Field does not exist', 'wpshop') . '" class="db_added_field_check" />';
 										$error_nb++;
 										$error_list[$plugin_db_version] += 1;
@@ -1146,8 +1127,7 @@ 
 								$sub_modif .= $column_name;
 								if((empty($columns)) || ($columns->Column_name != $column_name)){
 									$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Index has been deleted', 'wpshop') . '" title="' . __('Index has been deleted', 'wpshop') . '" class="db_deleted_index_check" />';
-								}
-								else{
+								} else{
 									$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Index does not exists', 'wpshop') . '" title="' . __('Index does not exists', 'wpshop') . '" class="db_deleted_index_check" />';
 									$error_nb++;
 									$error_list[$plugin_db_version] += 1;
@@ -1166,8 +1146,7 @@ 
 								$sub_modif .= $column_name;
 								if(($columns->Column_name == $column_name) || ($columns->Key_name == $column_name)){
 									$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Index has been created', 'wpshop') . '" title="' . __('Index has been created', 'wpshop') . '" class="db_added_index_check" />';
-								}
-								else{
+								} else{
 									$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Index does not exist', 'wpshop') . '" title="' . __('Index does not exist', 'wpshop') . '" class="db_added_index_check" />';
 									$error_nb++;
 									$error_list[$plugin_db_version] += 1;
@@ -1186,14 +1165,12 @@ 
 							$table_exists = $wpdb->query($query);
 							if($table_exists == 1){
 								$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Table has been created', 'wpshop') . '" title="' . __('Table has been created', 'wpshop') . '" class="db_table_check" />';
-							}
-							else{
+							} else{
 								$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Table has not been created', 'wpshop') . '" title="' . __('Table has not been created', 'wpshop') . '" class="db_table_check" />';
 								$error_nb++;
 								if ( !empty($error_list[$plugin_db_version]) ) {
 									$error_list[$plugin_db_version] += 1;
-								}
-								else {
+								} else {
 									$error_list[$plugin_db_version] = 1;
 								}
 							}
@@ -1214,21 +1191,17 @@ 
 								$error_nb++;
 								if ( !empty($error_list[$plugin_db_version]) ) {
 									$error_list[$plugin_db_version] += 1;
-								}
-								else {
+								} else {
 									$error_list[$plugin_db_version] = 1;
 								}
-							}
-							elseif($table_exists == 1){
+							} elseif($table_exists == 1){
 								$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Table has been renamed', 'wpshop') . '" title="' . __('Table has been renamed', 'wpshop') . '" class="db_rename_table_check" />';
-							}
-							else{
+							} else{
 								$sub_modif .= '<img src="' . admin_url('images/no.png') . '" alt="' . __('Table has not been renamed', 'wpshop') . '" title="' . __('Table has not been renamed', 'wpshop') . '" class="db_rename_table_check" />';
 								$error_nb++;
 								if ( !empty($error_list[$plugin_db_version]) ) {
 									$error_list[$plugin_db_version] += 1;
-								}
-								else {
+								} else {
 									$error_list[$plugin_db_version] = 1;
 								}
 							}
@@ -1250,24 +1223,20 @@ 
 									$error_nb++;
 									if ( !empty($error_list[$plugin_db_version]) ) {
 										$error_list[$plugin_db_version] += 1;
-									}
-									else {
+									} else {
 										$error_list[$plugin_db_version] = 1;
 									}
-								}
-								else{
+								} else{
 									$deleted_table_result = '<img src="' . EVA_IMG_ICONES_PLUGIN_URL . 'warning_vs.gif" alt="' . __('Table has not been deleted', 'wpshop') . '" title="' . __('Table has not been renamed', 'wpshop') . '" class="db_deleted_table_check" />';
 									$warning_nb++;
 									if ( !empty($warning_list[$plugin_db_version]) ) {
 										$warning_list[$plugin_db_version] += 1;
-									}
-									else {
+									} else {
 										$warning_list[$plugin_db_version] = 1;
 									}
 								}
 								$sub_modif .= $deleted_table_result;
-							}
-							else{
+							} else{
 								$sub_modif .= '<img src="' . admin_url('images/yes.png') . '" alt="' . __('Table has been deleted', 'wpshop') . '" title="' . __('Table has been deleted', 'wpshop') . '" class="db_deleted_table_check" />';
 							}
 							$sub_modif .= ' / ';
@@ -1367,8 +1336,7 @@ 
 
 					if ( $has_error ) {
 						$output_error .= wpshop_display::display_template_element('wpshop_admin_tools_default_datas_check_main_element', $tpl_component, array(), 'admin');
-					}
-					else {
+					} else {
 						$output_ok .= wpshop_display::display_template_element('wpshop_admin_tools_default_datas_check_main_element', $tpl_component, array(), 'admin');
 					}
 				}
@@ -1544,8 +1512,7 @@ 
 										if ( $last_histo === false ) {
 											$has_error = true;
 											$error_count++;
-										}
-										else {
+										} else {
 											$wpdb->delete( WPSHOP_DBT_ATTRIBUTE_VALUES_PREFIX . $attributeType, array( 'value_id' => $attribute_histo->value_id ) );
 										}
 									}
@@ -1564,8 +1531,7 @@ 
 						if ( $new_value === false ) {
 							$has_error = true;
 							$error_count++;
-						}
-						else {
+						} else {
 							/**	Save new atribute values in product metadata	*/
 							$current_product_metadata = get_post_meta( $element->ID, '_wpshop_product_metadata', true);
 							$current_product_metadata[$to_attribute->code] = $element->value;
@@ -1581,23 +1547,19 @@ 
 					if ( !$has_error ) {
 						$response['status'] = true;
 						$response['error'] = __('Transfert between attribute is done', 'wpshop');
-					}
-					else {
+					} else {
 						$response['status'] = false;
 						$response['error'] = sprinttf( __('There are %d error that occured while copying value through attributes', 'wpshop'), $error_count);
 					}
-				}
-				else {
+				} else {
 					$response['status'] = false;
 					$response['error'] = __('There are no element corresponding to attribute choosen to copy from', 'wpshop');
 				}
-			}
-			else {
+			} else {
 				$response['status'] = false;
 				$response['error'] = __('Both attribute must have same data type to be updated', 'wpshop');
 			}
-		}
-		else {
+		} else {
 			$response['status'] = false;
 			$response['error'] = __('You have to choose attributes in order to update values', 'wpshop');
 		}
@@ -1696,8 +1658,7 @@ 
 					if ( !empty($wps_update_att_for_variation_required_state) && ($wps_update_att_for_variation_required_state != 'no_changes') ) {
 						if ( $wps_update_att_for_variation_required_state == 'yes') {
 							$meta_value['options']['required_attributes'][$attribute->code] = $attribute->code;
-						}
-						else if ( !empty($meta_value['options']['required_attributes']) && !empty($meta_value['options']['required_attributes'][$attribute->code]) ) {
+						} else if ( !empty($meta_value['options']['required_attributes']) && !empty($meta_value['options']['required_attributes'][$attribute->code]) ) {
 							unset($meta_value['options']['required_attributes'][$attribute->code]);
 						}
 					}
@@ -1708,8 +1669,7 @@ 
 						if ( !empty($text_from) && ($text_from != 'no_changes') ) {
 							if ( $text_from == 'yes' ) {
 								$meta_value['options']['price_display']['text_from'] = 'on';
-							}
-							else if( !empty($meta_value['options']['price_display']['text_from']) ) {
+							} else if( !empty($meta_value['options']['price_display']['text_from']) ) {
 								unset($meta_value['options']['price_display']['text_from']);
 							}
 						}
@@ -1718,8 +1678,7 @@ 
 						if ( !empty($lower_price) && ($lower_price != 'no_changes') ) {
 							if ( $lower_price == 'yes' ) {
 								$meta_value['options']['price_display']['lower_price'] = 'on';
-							}
-							else if( !empty($meta_value['options']['price_display']['lower_price']) ) {
+							} else if( !empty($meta_value['options']['price_display']['lower_price']) ) {
 								unset($meta_value['options']['price_display']['lower_price']);
 							}
 						}
@@ -1800,20 +1759,16 @@ 
 							$activate_attribute_for_addon = $wpdb->update(WPSHOP_DBT_ATTRIBUTE, array('status' => 'valid'), array('code' => $addons_list[$addon_name][3]));
 						}
 						$state = true;
-					}
-					else {
+					} else {
 						$result = array(false, __('An error occured','wpshop'), __('Desactivated','wpshop'));
 					}
-				}
-				else {
+				} else {
 					$result = array(false, __('The activating code is invalid', 'wpshop'), __('Desactivated','wpshop'));
 				}
-			}
-			else {
+			} else {
 				$result = array(false, __('The addon to activate is invalid', 'wpshop'), __('Desactivated','wpshop'));
 			}
-		}
-		else {
+		} else {
 			$result = array(false, __('An error occured','wpshop'), __('Desactivated','wpshop'));
 		}
 		$activated_class = unserialize(WPSHOP_ADDONS_STATES_CLASS);
@@ -1841,12 +1796,10 @@ 
 				if ( update_option(WPSHOP_ADDONS_OPTION_NAME, $extra_options) ) {
 					$result = array(true, __('The addon has been desactivated successfully', 'wpshop'), __('Desactivated','wpshop'));
 					$state = false;
-				}
-				else {
+				} else {
 					$result = array(false, __('An error occured','wpshop'), __('Activated','wpshop'));
 				}
-			}
-			else {
+			} else {
 				$result = array(false, __('The addon to desactivate is invalid', 'wpshop'), __('Activated','wpshop'));
 			}
 		}
@@ -1885,8 +1838,7 @@ 
 							$submitOrderInfos = !empty( $_POST['submitOrderInfos'] ) ? (int) $_POST['submitOrderInfos'] : 0;
 							if( !empty($submitOrderInfos) ) {
 								$value = $attribute[$attribute->data_type][$attribute->code];
-							}
-							else {
+							} else {
 								$value = '';
 								if ( $attribute->code != 'user_pass') {
 									$code = $attribute->code;
@@ -1957,16 +1909,14 @@ 
 
 		if ( $wpshop_format_result ) {
 			$data = empty($data) ? __('No match', 'wpshop') : $data;
-		}
-		else {
+		} else {
 			if ( !empty($data) ) {
 				$temp_data = $data;
 				unset( $data );
 				foreach ( $temp_data as $post) {
 					$data[$post->ID] = $post->ID . ' - ' . $post->post_title;
 				}
-			}
-			else {
+			} else {
 				$data = array();
 			}
 		}
@@ -2031,8 +1981,7 @@ 
 				$product_title = ( !empty($parent_post) && !empty($parent_post->post_title) ) ? $parent_post->post_title : '';
 				$product_description = ( !empty($parent_post) && !empty($parent_post->post_content) ) ? $parent_post->post_content : '';
 				$product_img =  ( !empty($parent_post->ID) ) ? get_the_post_thumbnail( $parent_post->ID, 'thumbnail') : '';
-			}
-			else {
+			} else {
 				$product_title = $product->post_title;
 				$product_description = $product->post_content;
 				$product_img =  get_the_post_thumbnail( $product_id, 'thumbnail');
@@ -2046,8 +1995,7 @@ 
 
 			echo json_encode( array(true) );
 			die();
-		}
-		else {
+		} else {
 			$return = $wpshop_cart->add_to_cart( $product_to_add_to_cart, array( $new_pid => $product_qty ), $wpshop_cart_type );
 		}
 
@@ -2064,8 +2012,7 @@ 
 				require_once(wpshop_display::get_template_file($tpl_way_to_take[1]));
 				$succes_message_box = ob_get_contents();
 				ob_end_clean();
-			}
-			else {
+			} else {
 				$succes_message_box = wpshop_display::display_template_element($template_part, array('PRODUCT_ID' => $product_id));
 			}
 			unset($tpl_component);
@@ -2082,12 +2029,10 @@ 
 
 				if ( !empty($product_to_add_to_cart[$new_pid]['variations']) && count($product_to_add_to_cart[$new_pid]['variations']) < 2 ) {
 					$idp = $product_to_add_to_cart[$new_pid]['variations'][0];
-				}
-				else {
+				} else {
 					if( strstr( $new_pid, '__') ) {
 						$idp = $new_pid;
-					}
-					else {
+					} else {
 						$idp = $product_to_add_to_cart[$new_pid]['id'];
 					}
 				}
@@ -2112,8 +2057,7 @@ 
 			if ( !empty($related_products) ) {
 				// $linked_products = '<h2>'.__('Linked products', 'wpshop').'</h2>';
 				$linked_products .= '<div class="modal_product_related">' .do_shortcode( '[wpshop_related_products pid="' .$product_id. '" sorting="no"]' ).'</div>';
-			}
-			else {
+			} else {
 				$linked_products = '';
 			}
 
@@ -2123,8 +2067,7 @@ 
 			$modal_footer_content = wpshop_display::display_template_element('wps_new_add_to_cart_confirmation_modal_footer', array( 'LINK_CART_PAGE' => wpshop_tools::get_page_id( get_permalink( get_option('wpshop_cart_page_id') ) ) ) );
 
 			$response = array( true, $succes_message_box, $action_after_add, $cart_page_url, $product_id, array($cart_animation_choice, $message_confirmation), array($product_img, $product_title, $linked_products, $product_price), $modal_content, $modal_footer_content );
-		}
-		else {
+		} else {
 			$response = array( false, $return );
 		}
 
@@ -2170,8 +2113,7 @@ 
 				}
 				$return = $wpshop_cart->set_product_qty( $product_id, $product_qty, $pid );
 				$response[] = $return;
-			}
-			else {
+			} else {
 				$response[] = false;
 				$response[] = __('Parameters error.','wpshop');
 			}
@@ -2322,16 +2264,13 @@ 
 				$permalink_option = get_option('permalink_structure');
 				if ( !empty($permalink_option) ) {
 					$cart_url = get_permalink( wpshop_tools::get_page_id( get_option('wpshop_signup_page_id') ) ).'?complete_sign_up=ok';
-				}
-				else {
+				} else {
 					$cart_url = get_permalink( wpshop_tools::get_page_id(get_option('wpshop_signup_page_id') ) ).'&complete_sign_up=ok';
 				}
-			}
-			else {
+			} else {
 				if ( !empty($_SESSION['cart']) ) {
 					$cart_url = get_permalink( wpshop_tools::get_page_id(get_option('wpshop_checkout_page_id')) );
-				}
-				else {
+				} else {
 					$cart_url = get_permalink( wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id')) );
 				}
 			}
@@ -2391,9 +2330,7 @@ 
 			$retour .= '<div class="wpshop_cls"></div>';
 			$result = json_encode( array(true, $retour) );
 
-		}
-
- 		elseif ( !empty($order_postmeta) && !empty($order_postmeta['order_status']) && in_array($order_postmeta['order_status'], array('awaiting_payment', 'partially_paid'))) {
+		} elseif ( !empty($order_postmeta) && !empty($order_postmeta['order_status']) && in_array($order_postmeta['order_status'], array('awaiting_payment', 'partially_paid'))) {
 			$order_id = !empty( $_REQUEST['order_id'] ) ? (int) $_REQUEST['order_id'] : 0;
  			$order_info_postmeta = get_post_meta($order_id, '_order_info', true);
 
@@ -2409,8 +2346,7 @@ 
  			}
 
  			$result = json_encode( array(true, $billing_form, $shipping_form, $current_customer_id) );
- 		}
-		else {
+ 		} else {
 				// Check the attribute set id of Billing Address
 				$query = $wpdb->prepare('SELECT id FROM ' .WPSHOP_DBT_ATTRIBUTE_SET. ' WHERE name = "' .__('Billing address', 'wpshop'). '"', '');
 				$attribute_set_id = $wpdb->get_var($query);
@@ -2472,8 +2408,7 @@ 
 							$user_id = wp_create_user( sanitize_user( $value ), wp_generate_password( 12, false ) );
 							$query = $wpdb->prepare( "SELECT ID FROM " . $wpdb->posts . " WHERE post_type = %s AND post_author = %d", WPSHOP_NEWTYPE_IDENTIFIER_CUSTOMERS, $user_id );
 							$attribute_option_id = $wpdb->get_var( $query );
-						}
-						else {
+						} else {
 							$entity_args = array(
 								'post_type' 	 => $attribute_default_value['default_value'],
 								'post_title'  	 => $value,
@@ -2482,8 +2417,7 @@ 
 							);
 							$attribute_option_id = wp_insert_post($entity_args);
 						}
-					}
-					else {
+					} else {
 						$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS, array('status'=>'valid', 'creation_date'=>current_time('mysql', 0), 'position' => 1, 'attribute_id'=>$attribute_def->id, 'value'=>$value, 'label'=>$value) );
 						$attribute_option_id = $wpdb->insert_id;
 					}
@@ -2572,8 +2506,7 @@ 
 			}
 
 			echo json_encode( array( true,  __('Element has been saved', 'wpshop'), $attribute_to_reload, $new_entity_id) );
-		}
-		else {
+		} else {
 			echo json_encode( array(false, __('An error occured while adding your element', 'wpshop')) );
 		}
 
@@ -2613,20 +2546,17 @@ 
 				if ( !empty($available_payement_method[0]) ) {
 					if ( $cart_type=='quotation' ) {
 						$checkout_payment_button = wpshop_display::display_template_element('wpshop_checkout_page_quotation_validation_button', array() );
-					}
-					else {
+					} else {
 						$checkout_payment_button = wpshop_display::display_template_element('wpshop_checkout_page_validation_button', array() );
 					}
 				}
-			}
-			else {
+			} else {
 				$checkout_payment_button = wpshop_display::display_template_element('wpshop_checkout_page_impossible_to_order', array());
 			}
 			if( $address_type == 'billing_address') {
 				$billing_option = get_option( 'wpshop_billing_address' );
 				$address_option = $billing_option['choice'];
-			}
-			else {
+			} else {
 				$shipping_address_option = get_option('wpshop_shipping_address_choice');
 				$address_option = $shipping_address_option['choice'];
 			}
@@ -2638,8 +2568,7 @@ 
 
 			$edit_link = '<a href="' .get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))) . (strpos(get_permalink(wpshop_tools::get_page_id(get_option('wpshop_myaccount_page_id'))), '?')===false ? '?' : '&') . 'action=editAddress&amp;id='.$address_id.'" title="' .__('Edit', 'wpshop'). '">' .__('Edit', 'wpshop'). '</a>';
 			$result = json_encode( array(true, $retour, $edit_link, $is_allowed_destination, $checkout_payment_button) );
-		}
-		else {
+		} else {
 			$result = json_encode( array(false, 'missing_informations') );
 		}
 		echo $result;
@@ -2708,13 +2637,11 @@ 
 					wps_address::save_address_infos( $shipping_address);
 				}
 				$result = json_encode( array(true, __('Customer created', 'wpshop'), $user_id) );
-			}
-			else {
+			} else {
 				$result = json_encode( array(false, __('A customer account is already created with this email address', 'wpshop')) );
 			}
 
-		}
-		else {
+		} else {
 			$result = json_encode( array(false, __('An email address is required', 'wpshop')) );
 		}
 		echo $result;
@@ -2742,8 +2669,7 @@ 
 			$wps_message = new wps_message_ctr();
 			$wps_message->wpshop_prepared_email( $email, $model_name, array('order_id' => $order_id, 'order_key' => ( ( !empty($order_post_meta) && !empty($order_post_meta['order_key']) ) ? $order_post_meta['order_key'] : '' ), 'order_date' => ( ( !empty($order_post_meta) && !empty($order_post_meta['order_date']) ) ? $order_post_meta['order_date'] : '' ),'customer_first_name' => $first_name, 'customer_last_name' => $last_name) );
 			$result = array('status' => true, 'response' => $wps_message->get_historic_message_by_type($message_type_id) );
-		}
-		else {
+		} else {
 			$result = array('status' => false, 'response' => __('An error occured', 'wpshop') );
 		}
 		echo json_encode($result);
@@ -2770,8 +2696,7 @@ 
 			$n = WPSHOP_UPLOAD_URL.'/'.$name;
 			update_post_meta( $element_identifier, 'attribute_option_is_downloadable_', array('file_url' => $n));
 			$result = '<a href="' .$n. '" target="_blank" download>' .$name. '</a>';
-		}
-		else {
+		} else {
 			$result = '';
 		}
 		echo $result;
@@ -3000,12 +2925,10 @@ 
 
 				$response = __( 'Direct payment link has been send', 'wpshop' );
 				$status = true;
-			}
-			else {
+			} else {
 				$response = __( 'An error was occured', 'wpshop' );
 			}
-		}
-		else {
+		} else {
 			$response = __( 'An error was occured, no Order ID defined', 'wpshop' );
 		}
 		echo json_encode( array( 'status' => $status, 'response' => $response) );
@@ -3092,8 +3015,7 @@ 
 					$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array_merge( $common_datas, array( 'attribute_id' => 28, 'value' => $ht ) ) );
 					$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_VALUES_INTEGER, array_merge( $common_datas, array( 'attribute_id' => 29, 'value' => $the_tax->rate_id ) ) );
 					$wpdb->insert( WPSHOP_DBT_ATTRIBUTE_VALUES_DECIMAL, array_merge( $common_datas, array( 'attribute_id' => 30, 'value' => $tax_amount ) ) );
-				}
-				else {
+				} else {
 					$common_datas = array(
 						'value_id' => null,
 						'entity_type_id' => 5,
@@ -3261,8 +3183,7 @@ 
 						if( !empty($element_definition['content'][$att]) ) {
 							$formatted_datas[$element_id]['content'][$att] = $element_definition['content'][$att];
 							$controller_rows_array[ $att ] = true;
-						}
-						else {
+						} else {
 							$formatted_datas[$element_id]['content'][$att] = array();
 						}
 					}
@@ -3292,8 +3213,7 @@ 
 										if( $current_attribute->data_type_to_use == 'internal' ) {
 											$current_val = get_the_title($current_val);
 											$old_val = get_the_title($old_val);
-										}
-										else {
+										} else {
 											$query = $wpdb->prepare( 'SELECT label FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS.' WHERE id=%d', $old_val);
 											$old_val = $wpdb->get_var( $query );
 											$query = $wpdb->prepare( 'SELECT label FROM '.WPSHOP_DBT_ATTRIBUTE_VALUES_OPTIONS.' WHERE id=%d', $current_val);
@@ -3348,12 +3268,10 @@ 
 				update_option( WPSHOP_NEWTYPE_IDENTIFIER_CATEGORIES . '_' . $cat_id, $category_option );
 				$response = '<img src="' .WPSHOP_DEFAULT_CATEGORY_PICTURE. '" alt="No picture" class="category_thumbnail_preview"/>';
 				$status = true;
-			}
-			else {
+			} else {
 				$response = __( 'Category options are not defined', 'wpshop');
 			}
-		}
-		else {
+		} else {
 			$response = __( 'Category ID is not defined', 'wpshop');
 		}
 		echo json_encode( array( 'status' => $status, 'response' => $response) );
@@ -3385,8 +3303,7 @@ 
 		if ( $attributeSetSectionCreation == 'done' ) {
 			$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_SUCCES_ICON . '\' alt=\'action_success\' class=\'wpshopPageMessage_Icon\' />' . __('New section has been created successfully', 'wpshop');
 			$more_script = 'wpshop_go_to("#attribute_group_'.$wpdb->insert_id.'")';
-		}
-		else {
+		} else {
 			$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_ERROR_ICON . '\' alt=\'action_error\' class=\'wpshopPageMessage_Icon\' />' . __('An error occured while saving new section', 'wpshop');
 		}
 
@@ -3414,10 +3331,11 @@ 
 		$attributeSetInfos['backend_display_type'] = $backend_display_type;
 		$attributeSetInfos['display_on_frontend'] = $display_on_frontend;
 		$attributeSetSectionCreation = wpshop_database::update($attributeSetInfos, $attributeSetSectionId, WPSHOP_DBT_ATTRIBUTE_GROUP);
-		if ( $attributeSetSectionCreation == 'done' )
-			$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_SUCCES_ICON . '\' alt=\'action_success\' class=\'wpshopPageMessage_Icon\' />' . __('The section has been updated successfully', 'wpshop');
-		else
-			$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_ERROR_ICON . '\' alt=\'action_error\' class=\'wpshopPageMessage_Icon\' />' . __('An error occured while updating the section', 'wpshop');
+		if ( $attributeSetSectionCreation == 'done' ) {
+					$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_SUCCES_ICON . '\' alt=\'action_success\' class=\'wpshopPageMessage_Icon\' />' . __('The section has been updated successfully', 'wpshop');
+		} else {
+					$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_ERROR_ICON . '\' alt=\'action_error\' class=\'wpshopPageMessage_Icon\' />' . __('An error occured while updating the section', 'wpshop');
+		}
 		echo wpshop_attributes_set::attributeSetDetailsManagement($elementIdentifier) . '<script type="text/javascript" >wpshopShowMessage("' . $attributeSetSectionCreation_Result . '");hideShowMessage(5000);</script>';
 		wp_die();
 	}
@@ -3437,9 +3355,9 @@ 
 		if ( $attributeSetSectionCreation == 'done' ) {
 			$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_SUCCES_ICON . '\' alt=\'action_success\' class=\'wpshopPageMessage_Icon\' />' . __('The section has been successfully been deleted', 'wpshop');
 			$more_script.='jQuery("#attribute_group_'.$attributeSetSectionId.'").remove();';
+		} else {
+					$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_ERROR_ICON . '\' alt=\'action_error\' class=\'wpshopPageMessage_Icon\' />' . __('An error occured while deleting the section', 'wpshop');
 		}
-		else
-			$attributeSetSectionCreation_Result = '<img src=\'' . WPSHOP_ERROR_ICON . '\' alt=\'action_error\' class=\'wpshopPageMessage_Icon\' />' . __('An error occured while deleting the section', 'wpshop');
 		echo '<script type="text/javascript" >wpshopShowMessage("' . $attributeSetSectionCreation_Result . '");hideShowMessage(5000);'.$more_script.'</script>';
 		wp_die();
 	}
@@ -3505,8 +3423,7 @@ 
 		if($save_unit_result == 'done'){
 			$save_output = wpshop_attributes_unit::elementList();
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action successful" src="' . WPSHOP_SUCCES_ICON . '" />' . __('The new unit has been saved succesfully', 'wpshop');
-		}
-		else{
+		} else{
 			$save_output = wpshop_attributes_unit::elementEdition();
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action error" src="' . WPSHOP_ERROR_ICON . '" />' . __('An error occured during new unit saving', 'wpshop');
 		}
@@ -3542,8 +3459,7 @@ 
 		if ( $save_unit_result == 'done' ) {
 			$save_output = wpshop_attributes_unit::elementList();
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action successful" src="' . WPSHOP_SUCCES_ICON . '" />' . __('The unit has been saved succesfully', 'wpshop');
-		}
-		else {
+		} else {
 			$save_output = wpshop_attributes_unit::elementEdition($attributeUnitId);
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action error" src="' . WPSHOP_ERROR_ICON . '" />' . __('An error occured during unit saving', 'wpshop');
 		}
@@ -3563,8 +3479,7 @@ 
 		$save_unit_result = wpshop_database::update($attribute_unit_informations, $unit_id, WPSHOP_DBT_ATTRIBUTE_UNIT);
 		if ( $save_unit_result == 'done' ) {
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action succesful" src="' . WPSHOP_SUCCES_ICON . '" />' . __('The unit has been deleted succesfully', 'wpshop');
-		}
-		else {
+		} else {
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action error" src="' . WPSHOP_ERROR_ICON . '" />' . __('An error occured during unit deletion', 'wpshop');
 		}
 
@@ -3606,8 +3521,7 @@ 
 		if($save_unit_result == 'done'){
 			$save_output = wpshop_attributes_unit::unit_group_list();
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action successful" src="' . WPSHOP_SUCCES_ICON . '" />' . __('The new unit group has been saved succesfully', 'wpshop');
-		}
-		else{
+		} else{
 			$save_output = wpshop_attributes_unit::unit_group_edition();
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action error" src="' . WPSHOP_ERROR_ICON . '" />' . __('An error occured during new unit group saving', 'wpshop');
 		}
@@ -3630,8 +3544,7 @@ 
 		if($save_unit_result == 'done'){
 			$save_output = wpshop_attributes_unit::unit_group_list();
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action successful" src="' . WPSHOP_SUCCES_ICON . '" />' . __('The unit group has been saved succesfully', 'wpshop');
-		}
-		else{
+		} else{
 			$save_output = wpshop_attributes_unit::unit_group_edition($attributeUnitId);
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action error" src="' . WPSHOP_ERROR_ICON . '" />' . __('An error occured during unit group saving', 'wpshop');
 		}
@@ -3651,8 +3564,7 @@ 
 		$save_unit_result = wpshop_database::update($attribute_unit_informations, $unit_id, WPSHOP_DBT_ATTRIBUTE_UNIT_GROUP);
 		if($save_unit_result == 'done'){
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action succesful" src="' . WPSHOP_SUCCES_ICON . '" />' . __('The unit group has been deleted succesfully', 'wpshop');
-		}
-		else{
+		} else{
 			$save_message = '<img class="wpshopPageMessage_Icon" alt="action error" src="' . WPSHOP_ERROR_ICON . '" />' . __('An error occured during unit group deletion', 'wpshop');
 		}
 
@@ -3681,7 +3593,9 @@ 
 		$data = wpshop_products::wpshop_get_product_by_criteria( $criteria, $cid, $products_id, $display_type, $order, $page_number, $products_per_page );
 		if($data[0]) {
 			echo json_encode(array(true, do_shortcode($data[1])));
-		} else echo json_encode(array(false,__('No product found','wpshop')));
+		} else {
+			echo json_encode(array(false,__('No product found','wpshop')));
+		}
 		wp_die();
 	}
 	add_action( 'wp_ajax_wps_products_by_criteria', 'products_by_criteria' );
@@ -3708,10 +3622,10 @@ 
 			if (!empty($user_info->user_email)) {
 				$wps_message_ctr->wpshop_email($user_info->user_email, $title, $message, $save=true, $model_id=$post_id, $object=array());
 				$array = array('result' => true, 'message' => '');
+			} else {
+				$array = array('result' => true, 'message' => __('An error occured','wpshop'));
 			}
-			else $array = array('result' => true, 'message' => __('An error occured','wpshop'));
-		}
-		else {
+		} else {
 			$array = array('result' => false, 'message' => __('An error occured','wpshop'));
 		}
 
@@ -3740,12 +3654,10 @@ 
 				$wps_message_ctr->wpshop_email($data['mess_user_email'], $data['mess_title'], $data['mess_message'], $save=false, $object=array());
 
 				$array = array('result' => true, 'message' => '');
-			}
-			else {
+			} else {
 				$array = array('result' => false, 'message' => __('An error occured','wpshop'));
 			}
-		}
-		else {
+		} else {
 			$array = array('result' => false, 'message' => __('An error occured','wpshop'));
 		}
 
@@ -3777,7 +3689,9 @@ 
 			$order = $wps_cart_ctr->calcul_cart_information(array());
 			$wps_cart_ctr->store_cart_in_session($order);
 			echo json_encode(array(true, ''));
-		} else echo json_encode(array(false, $result['message']));
+		} else {
+			echo json_encode(array(false, $result['message']));
+		}
 		wp_die();
 	}
 	add_action( 'wp_ajax_wps_cart_action_apply_coupon', 'applyCoupon' );