eventespresso / event-espresso-core

core/db_models/fields/EE_Enum_Text_Field.php

Spacing +7 added lines, -7 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
 /**
  *
  * Class EE_Enum_Text_Field
@@ -23,7 +23,7 @@ 
 	 * @param mixed $default_value
 	 * @param array $allowed_enum_values  keys are values to be used in the DB, values are how they should be displayed
 	 */
-	function __construct($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values){
+	function __construct($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values) {
 		$this->_allowed_enum_values = $allowed_enum_values;
 		parent::__construct($table_column, $nice_name, $nullable, $default_value);
 	}
@@ -38,11 +38,11 @@ 
 	 * @throws EE_Error
 	 */
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
-		if($value_inputted_for_field_on_model_object!==null && !array_key_exists($value_inputted_for_field_on_model_object,$this->_allowed_enum_values)){
-			if( defined( 'WP_DEBUG' ) &&  WP_DEBUG ){
-				$msg = sprintf(__("System is assigning incompatible value '%s' to field '%s'",'event_espresso'),$value_inputted_for_field_on_model_object,$this->_name);
-				$msg2 = sprintf(__("Allowed values for '%s' are %s. You provided %s",'event_espresso'),$this->_name,implode(", ",array_keys($this->_allowed_enum_values)),$value_inputted_for_field_on_model_object);
-				EE_Error::add_error( "$msg||$msg2", __FILE__, __FUNCTION__, __LINE__ );
+		if ($value_inputted_for_field_on_model_object !== null && ! array_key_exists($value_inputted_for_field_on_model_object, $this->_allowed_enum_values)) {
+			if (defined('WP_DEBUG') && WP_DEBUG) {
+				$msg = sprintf(__("System is assigning incompatible value '%s' to field '%s'", 'event_espresso'), $value_inputted_for_field_on_model_object, $this->_name);
+				$msg2 = sprintf(__("Allowed values for '%s' are %s. You provided %s", 'event_espresso'), $this->_name, implode(", ", array_keys($this->_allowed_enum_values)), $value_inputted_for_field_on_model_object);
+				EE_Error::add_error("$msg||$msg2", __FILE__, __FUNCTION__, __LINE__);
 			}
 			return $this->get_default_value();
 

core/db_models/fields/EE_Float_Field.php

Spacing +9 added lines, -9 removed lines

@@ -2,8 +2,8 @@ 
 /**
  * Text_Fields is a base class for any fields which are have float value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...)
  */
-class EE_Float_Field extends EE_Model_Field_Base{
-	function get_wpdb_data_type(){
+class EE_Float_Field extends EE_Model_Field_Base {
+	function get_wpdb_data_type() {
 		return '%f';
 	}
 	/**
@@ -17,26 +17,26 @@ 
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
 //		echo __LINE__."$value_inputted_for_field_on_model_object<br>";
 		//remove whitespaces and thousands separators
-		if(is_string($value_inputted_for_field_on_model_object)){
-			$value_inputted_for_field_on_model_object = str_replace(array(" ",EE_Config::instance()->currency->thsnds),"",$value_inputted_for_field_on_model_object);
+		if (is_string($value_inputted_for_field_on_model_object)) {
+			$value_inputted_for_field_on_model_object = str_replace(array(" ", EE_Config::instance()->currency->thsnds), "", $value_inputted_for_field_on_model_object);
 //echo __LINE__."$value_inputted_for_field_on_model_object<br>";
 //normalize it so periods are decimal marks (we don't care where you're from: we're talking PHP now)
-			$value_inputted_for_field_on_model_object = str_replace( EE_Config::instance()->currency->dec_mrk, ".", $value_inputted_for_field_on_model_object) ;
+			$value_inputted_for_field_on_model_object = str_replace(EE_Config::instance()->currency->dec_mrk, ".", $value_inputted_for_field_on_model_object);
 //echo __LINE__."$value_inputted_for_field_on_model_object<br>";
 //double-check there's absolutely nothing left on this string besides numbers
-			$value_inputted_for_field_on_model_object = preg_replace( "/[^0-9,.]/", "", $value_inputted_for_field_on_model_object);
+			$value_inputted_for_field_on_model_object = preg_replace("/[^0-9,.]/", "", $value_inputted_for_field_on_model_object);
 		}
 //		echo __LINE__."$value_inputted_for_field_on_model_object<br>";
-		return floatval( $value_inputted_for_field_on_model_object );
+		return floatval($value_inputted_for_field_on_model_object);
 	}
 	/**
 	 * Returns the number formatted according to local custom (set by the country of the blog).
 	 * @param float $value_on_field_to_be_outputted
 	 * @return string
 	 */
-	function prepare_for_pretty_echoing($value_on_field_to_be_outputted,$schema = null){
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
 		$EE = EE_Registry::instance();
-		return number_format( $value_on_field_to_be_outputted, $EE->CFG->currency->dec_plc, $EE->CFG->currency->dec_mrk, $EE->CFG->currency->thsnds) ;
+		return number_format($value_on_field_to_be_outputted, $EE->CFG->currency->dec_plc, $EE->CFG->currency->dec_mrk, $EE->CFG->currency->thsnds);
 	}
 
 	function prepare_for_set_from_db($value_found_in_db_for_model_object) {

core/db_models/fields/EE_Foreign_Key_Field_Base.php

Spacing +1 added lines, -1 removed lines

@@ -4,6 +4,6 @@
  * needed functions from its parent, but because all foreign key fields inherit from
  * this one, its easy ot check if a field is a foreign key.
  */
-abstract class EE_Foreign_Key_Field_Base extends EE_Field_With_Model_Name{
+abstract class EE_Foreign_Key_Field_Base extends EE_Field_With_Model_Name {
 	//all needed functionality inherited from parent
 }

core/db_models/fields/EE_Foreign_Key_Int_Field.php

Spacing +4 added lines, -4 removed lines

@@ -1,7 +1,7 @@ 
 <?php
-require_once( EE_MODELS . 'fields/EE_Foreign_Key_Field_Base.php');
-class EE_Foreign_Key_Int_Field extends EE_Foreign_Key_Field_Base{
-	function get_wpdb_data_type(){
+require_once(EE_MODELS.'fields/EE_Foreign_Key_Field_Base.php');
+class EE_Foreign_Key_Int_Field extends EE_Foreign_Key_Field_Base {
+	function get_wpdb_data_type() {
 		return '%d';
 	}
 	/**
@@ -10,7 +10,7 @@ 
 	 * @return int
 	 */
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
-		if($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)){
+		if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
 			$value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
 		}
 		return absint($value_inputted_for_field_on_model_object);

core/db_models/fields/EE_Foreign_Key_String_Field.php

Spacing +4 added lines, -4 removed lines

@@ -1,7 +1,7 @@ 
 <?php
-require_once( EE_MODELS . 'fields/EE_Foreign_Key_Field_Base.php');
-class EE_Foreign_Key_String_Field extends EE_Foreign_Key_Field_Base{
-	function get_wpdb_data_type(){
+require_once(EE_MODELS.'fields/EE_Foreign_Key_Field_Base.php');
+class EE_Foreign_Key_String_Field extends EE_Foreign_Key_Field_Base {
+	function get_wpdb_data_type() {
 		return '%s';
 	}
 	/**
@@ -10,7 +10,7 @@ 
 	 * @return string
 	 */
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
-		if($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)){
+		if ($this->is_model_obj_of_type_pointed_to($value_inputted_for_field_on_model_object)) {
 			$value_inputted_for_field_on_model_object = $value_inputted_for_field_on_model_object->ID();
 		}
 		return strtoupper(wp_strip_all_tags($value_inputted_for_field_on_model_object));

core/db_models/fields/EE_Full_HTML_Field.php

Spacing +5 added lines, -5 removed lines

@@ -1,6 +1,6 @@ 
 <?php
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
-class EE_Full_HTML_Field extends EE_Text_Field_Base{
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
+class EE_Full_HTML_Field extends EE_Text_Field_Base {
 
 
 	/**
@@ -10,11 +10,11 @@ 
 	 * @return string
 	 */
 	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
-		if($schema =='form_input'){
+		if ($schema == 'form_input') {
 			return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
-		}elseif($schema == 'no_wpautop'){
+		}elseif ($schema == 'no_wpautop') {
 			return do_shortcode(parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema));
-		}else{
+		} else {
 			return wpautop(do_shortcode(parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema)));
 		}
 	}

Braces +2 added lines, -2 removed lines

@@ -12,9 +12,9 @@
 	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
 		if($schema =='form_input'){
 			return parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
-		}elseif($schema == 'no_wpautop'){
+		} elseif($schema == 'no_wpautop'){
 			return do_shortcode(parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema));
-		}else{
+		} else{
 			return wpautop(do_shortcode(parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema)));
 		}
 	}

core/db_models/fields/EE_Infinite_Integer_Field.php

Spacing +12 added lines, -12 removed lines

@@ -7,32 +7,32 @@ 
  * other than explicitly setting it to INF.
  * Makes use of constant EE_INF_IN_DB set in espresso.php, and INF, which is a PHP constant definedin the ether
  */
-class EE_Infinite_Integer_Field extends EE_Model_Field_Base{
-	function get_wpdb_data_type(){
+class EE_Infinite_Integer_Field extends EE_Model_Field_Base {
+	function get_wpdb_data_type() {
 		return '%d';
 	}
 	function prepare_for_use_in_db($value_of_field_on_model_object) {
-		if($value_of_field_on_model_object === INF){
+		if ($value_of_field_on_model_object === INF) {
 			return EE_INF_IN_DB;
-		}else{
+		} else {
 			return intval($value_of_field_on_model_object);
 		}
 	}
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
-		if($value_inputted_for_field_on_model_object === EE_INF_IN_DB ||
+		if ($value_inputted_for_field_on_model_object === EE_INF_IN_DB ||
 				$value_inputted_for_field_on_model_object === INF ||
 				$value_inputted_for_field_on_model_object === "INF"
-				){
+				) {
 			return INF;
-		}else{
+		} else {
 			return intval($value_inputted_for_field_on_model_object);
 		}
 	}
 	function prepare_for_set_from_db($value_inputted_for_field_on_model_object) {
 		$intval = intval($value_inputted_for_field_on_model_object);
-		if($intval == EE_INF_IN_DB){
+		if ($intval == EE_INF_IN_DB) {
 			return INF;
-		}else{
+		} else {
 			return $intval;
 		}
 	}
@@ -45,9 +45,9 @@ 
 	 * @param string $schema input, symbol, text; or any string you want to show if the value equals INF
 	 * @return string
 	 */
-	function prepare_for_pretty_echoing( $value_on_field_to_be_outputted, $schema = null ) {
-		if( $value_on_field_to_be_outputted === INF ){
-			switch($schema){
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
+		if ($value_on_field_to_be_outputted === INF) {
+			switch ($schema) {
 				case 'input':
 					return '';
 				case 'symbol':

Braces +3 added lines, -3 removed lines

@@ -92,7 +92,7 @@ 
 	public function construction_finalized(){
 		if( $this->_model instanceof EEM_Base  && $this->_action ){
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}
@@ -125,7 +125,7 @@ 
 	public function has_generated_cap_restrictions(){
 		if( $this->_cap_restrictions_generated === false ){
 			return false;
-		}else{
+		} else{
 			return true;
 		}
 	}
@@ -153,7 +153,7 @@ 
 		$caps_for_admin = EE_Registry::instance()->CAP->get_ee_capabilities( 'administrator' );
 		if( in_array( self::get_cap_name( $model, $action ), $caps_for_admin ) ) {
 			return true;
-		}else{
+		} else{
 			return false;
 		}
 	}

core/db_models/fields/EE_Integer_Field.php

Spacing +2 added lines, -2 removed lines

@@ -3,8 +3,8 @@
 /**
  * Text_Fields is a base class for any fields which are have integer value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...)
  */
-class EE_Integer_Field extends EE_Model_Field_Base{
-	function get_wpdb_data_type(){
+class EE_Integer_Field extends EE_Model_Field_Base {
+	function get_wpdb_data_type() {
 		return '%d';
 	}
 	function prepare_for_set($value_inputted_for_field_on_model_object) {

core/db_models/fields/EE_Maybe_Serialized_Simple_HTML_Field.php

Spacing +14 added lines, -14 removed lines

@@ -24,14 +24,14 @@ 
  * But either way, the string or the array's values can ONLY contain simple HTML tags.
  * If you want to allow Full HTML in the value, use EE_Maybe_Serialized_Text_Field
  */
-class EE_Maybe_Serialized_Simple_HTML_Field extends EE_Maybe_Serialized_Text_Field{
+class EE_Maybe_Serialized_Simple_HTML_Field extends EE_Maybe_Serialized_Text_Field {
 	/**
 	 * removes all non-basic tags when setting
 	 * @param string $value_inputted_for_field_on_model_object
 	 * @return string
 	 */
 	function prepare_for_set($value_inputted_for_field_on_model_object) {
-		return parent::prepare_for_set( $this->_remove_tags(  $value_inputted_for_field_on_model_object ) );
+		return parent::prepare_for_set($this->_remove_tags($value_inputted_for_field_on_model_object));
 	}
 
 	/**
@@ -39,13 +39,13 @@ 
 	 * @param array|string $value
 	 * @return array|string
 	 */
-	protected function _remove_tags( $value ) {
-		if( is_array( $value ) ) {
-			foreach( $value as $key => $v ) {
-				$value[ $key ] = $this->_remove_tags( $v );
+	protected function _remove_tags($value) {
+		if (is_array($value)) {
+			foreach ($value as $key => $v) {
+				$value[$key] = $this->_remove_tags($v);
 			}
-		}elseif( is_string( $value ) ) {
-			$value = wp_kses("$value", $this->_get_allowed_tags() );
+		}elseif (is_string($value)) {
+			$value = wp_kses("$value", $this->_get_allowed_tags());
 		}
 		return $value;
 	}
@@ -56,7 +56,7 @@ 
 	 * @return array|string
 	 */
 	function prepare_for_set_from_db($value_found_in_db_for_model_object) {
-		return parent::prepare_for_set_from_db( $this->_remove_tags(  $value_found_in_db_for_model_object ) );
+		return parent::prepare_for_set_from_db($this->_remove_tags($value_found_in_db_for_model_object));
 	}
 
 
@@ -65,12 +65,12 @@ 
 	 * @global array $allowedtags
 	 * @return array
 	 */
-	function _get_allowed_tags(){
+	function _get_allowed_tags() {
 		global $allowedtags;
 		$tags_we_allow = $allowedtags;
-		$tags_we_allow['ol']=array();
-		$tags_we_allow['ul']=array();
-		$tags_we_allow['li']=array();
-		return apply_filters( 'FHEE__EE_Maybe_Serialized_Simple_HTML_Field___get_allowed_tags', $tags_we_allow, $this );
+		$tags_we_allow['ol'] = array();
+		$tags_we_allow['ul'] = array();
+		$tags_we_allow['li'] = array();
+		return apply_filters('FHEE__EE_Maybe_Serialized_Simple_HTML_Field___get_allowed_tags', $tags_we_allow, $this);
 	}
 }

Braces +4 added lines, -2 removed lines

@@ -1,4 +1,6 @@ 
-<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
+}
 /**
  * Event Espresso
  *
@@ -44,7 +46,7 @@ 
 			foreach( $value as $key => $v ) {
 				$value[ $key ] = $this->_remove_tags( $v );
 			}
-		}elseif( is_string( $value ) ) {
+		} elseif( is_string( $value ) ) {
 			$value = wp_kses("$value", $this->_get_allowed_tags() );
 		}
 		return $value;

Indentation -1 removed lines

@@ -799,7 +799,6 @@
 
 
 	/**
-
 	 *
 	 * 	 If the the first date starts at midnight on one day, and the next date ends at midnight on the
 	 * 	 very next day then this method will return true.