eventespresso / event-espresso-core

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

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)));
 		}
 	}

Spacing +4 added lines, -4 removed lines

@@ -11,7 +11,7 @@ 
  * but you want to have an exceptional case where users can directly submit content
  * for this field, then you should first run the content through `wp_kses( $content, 'post' )`
  */
-class EE_Full_HTML_Field extends EE_Text_Field_Base{
+class EE_Full_HTML_Field extends EE_Text_Field_Base {
 
 
 	/**
@@ -21,11 +21,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)));
 		}
 	}

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

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;

Spacing +11 added lines, -11 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 $this->_remove_tags( parent::prepare_for_set_from_db( $value_found_in_db_for_model_object ) );
+		return $this->_remove_tags(parent::prepare_for_set_from_db($value_found_in_db_for_model_object));
 	}
 
 
@@ -65,7 +65,7 @@ 
 	 * @global array $allowedtags
 	 * @return array
 	 */
-	function _get_allowed_tags(){
-		return apply_filters( 'FHEE__EE_Maybe_Serialized_Simple_HTML_Field___get_allowed_tags', EEH_HTML::get_simple_tags(), $this );
+	function _get_allowed_tags() {
+		return apply_filters('FHEE__EE_Maybe_Serialized_Simple_HTML_Field___get_allowed_tags', EEH_HTML::get_simple_tags(), $this);
 	}
 }

Indentation -1 removed lines

@@ -19,7 +19,6 @@
  * @package			Event Espresso
  * @subpackage		includes/models/
  * @author				Michael Nelson
-
  * Model field for representing a column that CAN contain serialized text, or a regular string.
  * 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

core/db_models/fields/EE_Maybe_Serialized_Text_Field.php

Spacing +6 added lines, -6 removed lines

@@ -4,17 +4,17 @@ 
 /**
  * For a db text column, which can either be an array in PHP code or a string.
  */
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
-class EE_Maybe_Serialized_Text_Field extends EE_Serialized_Text_Field{
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
+class EE_Maybe_Serialized_Text_Field extends EE_Serialized_Text_Field {
 	/**
 	 * Value could be an array or a string. If its an array, serialize it. Otherwise, leave it as a string
 	 * @param array|string $value_of_field_on_model_object
 	 * @return string (possibly serialized)
 	 */
 	function prepare_for_use_in_db($value_of_field_on_model_object) {
-		if(is_array($value_of_field_on_model_object)){
+		if (is_array($value_of_field_on_model_object)) {
 			return parent::prepare_for_use_in_db($value_of_field_on_model_object);
-		}else{
+		} else {
 			return $value_of_field_on_model_object;
 		}
 	}
@@ -26,9 +26,9 @@ 
 	 */
 	function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null) {
 		$pretty_value = null;
-		if(is_array($value_on_field_to_be_outputted)){
+		if (is_array($value_on_field_to_be_outputted)) {
 			$pretty_value = parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
-		}else{
+		} else {
 			$pretty_value = $value_on_field_to_be_outputted;
 		}
 		return $pretty_value;

Braces +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 	function prepare_for_use_in_db($value_of_field_on_model_object) {
 		if(is_array($value_of_field_on_model_object)){
 			return parent::prepare_for_use_in_db($value_of_field_on_model_object);
-		}else{
+		} else{
 			return $value_of_field_on_model_object;
 		}
 	}
@@ -28,7 +28,7 @@ 
 		$pretty_value = null;
 		if(is_array($value_on_field_to_be_outputted)){
 			$pretty_value = parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema);
-		}else{
+		} else{
 			$pretty_value = $value_on_field_to_be_outputted;
 		}
 		return $pretty_value;

core/db_models/fields/EE_Model_Field_Base.php

Braces +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
 	function get_name(){
 		if($this->_name){
 			return $this->_name;
-		}else{
+		} else{
 			throw new EE_Error(sprintf(__("Model field '%s' has no name set. Did you make a model and forget to call the parent model constructor?", "event_espresso"),get_class($this)));
 		}
 	}

Spacing +25 added lines, -25 removed lines

@@ -1,5 +1,5 @@ 
-<?php if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
-	exit( 'No direct script access allowed' );
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
+	exit('No direct script access allowed');
 }
 /**
  *
@@ -18,7 +18,7 @@ 
  * @subpackage    /core/db_models/fields/EE_Model_Field_Base.php
  * @author 				Michael Nelson
  */
-abstract class EE_Model_Field_Base{
+abstract class EE_Model_Field_Base {
 	var $_table_alias;
 	var $_table_column;
 	var $_name;
@@ -34,7 +34,7 @@ 
 	 * @param      $nullable
 	 * @param null $default_value
 	 */
-	function __construct($table_column, $nicename, $nullable, $default_value = null){
+	function __construct($table_column, $nicename, $nullable, $default_value = null) {
 		$this->_table_column = $table_column;
 		$this->_nicename = $nicename;
 		$this->_nullable = $nullable;
@@ -48,27 +48,27 @@ 
 	 * @param $name
 	 * @param $model_name
 	 */
-	function _construct_finalize($table_alias, $name, $model_name){
+	function _construct_finalize($table_alias, $name, $model_name) {
 		$this->_table_alias = $table_alias;
 		$this->_name = $name;
 		$this->_model_name = $model_name;
 		/**
 		 * allow for changing the defaults
 		 */
-		$this->_nicename = apply_filters( 'FHEE__EE_Model_Field_Base___construct_finalize___nicename', $this->_nicename, $this );
-		$this->_default_value = apply_filters( 'FHEE__EE_Model_Field_Base___construct_finalize___default_value', $this->_default_value, $this );
+		$this->_nicename = apply_filters('FHEE__EE_Model_Field_Base___construct_finalize___nicename', $this->_nicename, $this);
+		$this->_default_value = apply_filters('FHEE__EE_Model_Field_Base___construct_finalize___default_value', $this->_default_value, $this);
 	}
-	function get_table_alias(){
+	function get_table_alias() {
 		return $this->_table_alias;
 	}
-	function get_table_column(){
+	function get_table_column() {
 		return $this->_table_column;
 	}
 	/**
 	 * Returns the name of the model this field is on. Eg 'Event' or 'Ticket_Datetime'
 	 * @return string
 	 */
-	function get_model_name(){
+	function get_model_name() {
 		return $this->_model_name;
 	}
 
@@ -76,17 +76,17 @@ 
 	 * @throws \EE_Error
 	 * @return string
 	 */
-	function get_name(){
-		if($this->_name){
+	function get_name() {
+		if ($this->_name) {
 			return $this->_name;
-		}else{
-			throw new EE_Error(sprintf(__("Model field '%s' has no name set. Did you make a model and forget to call the parent model constructor?", "event_espresso"),get_class($this)));
+		} else {
+			throw new EE_Error(sprintf(__("Model field '%s' has no name set. Did you make a model and forget to call the parent model constructor?", "event_espresso"), get_class($this)));
 		}
 	}
-	function get_nicename(){
+	function get_nicename() {
 		return $this->_nicename;
 	}
-	function is_nullable(){
+	function is_nullable() {
 		return $this->_nullable;
 	}
 	/**
@@ -94,7 +94,7 @@ 
 	 * on insertion it can be null. However, on updates it must be present.
 	 * @return boolean
 	 */
-	function is_auto_increment(){
+	function is_auto_increment() {
 		return false;
 	}
 	/**
@@ -102,7 +102,7 @@ 
 	 * value domains at the top of EEM_Base
 	 * @return mixed
 	 */
-	function get_default_value(){
+	function get_default_value() {
 		return $this->_default_value;
 	}
 
@@ -113,7 +113,7 @@ 
 	 * in the current query
 	 * @return string
 	 */
-	function get_qualified_column(){
+	function get_qualified_column() {
 		return $this->get_table_alias().".".$this->get_table_column();
 	}
 	/**
@@ -124,7 +124,7 @@ 
 	 * @param mixed $value_of_field_on_model_object
 	 * @return mixed
 	 */
-	function prepare_for_get($value_of_field_on_model_object){
+	function prepare_for_get($value_of_field_on_model_object) {
 		return $value_of_field_on_model_object;
 	}
 	/**
@@ -134,7 +134,7 @@ 
 	 * @param mixed $value_of_field_on_model_object
 	 * @return mixed
 	 */
-	function prepare_for_use_in_db($value_of_field_on_model_object){
+	function prepare_for_use_in_db($value_of_field_on_model_object) {
 		return $value_of_field_on_model_object;
 	}
 
@@ -145,7 +145,7 @@ 
 	 * @param mixed $value_inputted_for_field_on_model_object
 	 * @return mixed
 	 */
-	function prepare_for_set($value_inputted_for_field_on_model_object){
+	function prepare_for_set($value_inputted_for_field_on_model_object) {
 		return $value_inputted_for_field_on_model_object;
 	}
 
@@ -156,7 +156,7 @@ 
 	 * @param mixed $value_found_in_db_for_model_object
 	 * @return mixed
 	 */
-	function prepare_for_set_from_db($value_found_in_db_for_model_object){
+	function prepare_for_set_from_db($value_found_in_db_for_model_object) {
 		return $this->prepare_for_set($value_found_in_db_for_model_object);
 	}
 
@@ -167,7 +167,7 @@ 
 	 * @param mixed $value_on_field_to_be_outputted
 	 * @return mixed
 	 */
-	function prepare_for_pretty_echoing( $value_on_field_to_be_outputted ){
+	function prepare_for_pretty_echoing($value_on_field_to_be_outputted) {
 		return $value_on_field_to_be_outputted;
 	}
 
@@ -182,7 +182,7 @@ 
 	 * By default, all fields aren't db-only.
 	 * @return boolean
 	 */
-	function is_db_only_field(){
+	function is_db_only_field() {
 		return false;
 	}
 }
\ No newline at end of file

Doc Comments +2 added lines, -2 removed lines

@@ -29,9 +29,9 @@
 	protected $_model_name;
 
 	/**
-	 * @param      $table_column
+	 * @param      string $table_column
 	 * @param      $nicename
-	 * @param      $nullable
+	 * @param      boolean $nullable
 	 * @param null $default_value
 	 */
 	function __construct($table_column, $nicename, $nullable, $default_value = null){

core/db_models/fields/EE_Money_Field.php

Braces +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 		if($schema == 'no_currency_code'){
 //			echo "schema no currency!";
 			$display_code = false;
-		}else{
+		} else{
 			$display_code = true;
 		}
 		//we don't use the $pretty_float because format_currency will take care of it.

Spacing +8 added lines, -8 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_Money_Field extends EE_Float_Field{
-	function get_wpdb_data_type(){
+class EE_Money_Field extends EE_Float_Field {
+	function get_wpdb_data_type() {
 		return '%f';
 	}
 	/**
@@ -15,20 +15,20 @@ 
 	 * @param type $schema
 	 * @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) {
 		$pretty_float = parent::prepare_for_pretty_echoing($value_on_field_to_be_outputted);
 
-		if($schema == 'localized_float'){
+		if ($schema == 'localized_float') {
 			return $pretty_float;
 		}
-		if($schema == 'no_currency_code'){
+		if ($schema == 'no_currency_code') {
 //			echo "schema no currency!";
 			$display_code = false;
-		}else{
+		} else {
 			$display_code = true;
 		}
 		//we don't use the $pretty_float because format_currency will take care of it.
-		return EEH_Template::format_currency( $value_on_field_to_be_outputted, false, $display_code );
+		return EEH_Template::format_currency($value_on_field_to_be_outputted, false, $display_code);
 	}
 
 	/**
@@ -47,7 +47,7 @@ 
 		//now it's a float-style string or number
 		$float_val = parent::prepare_for_set($value_inputted_for_field_on_model_object);
 		//round to the correctly number of decimal places for this  currency
-		$rounded_value = round($float_val,  EE_Registry::instance()->CFG->currency->dec_plc);
+		$rounded_value = round($float_val, EE_Registry::instance()->CFG->currency->dec_plc);
 		return $rounded_value;
 	}
 

core/db_models/fields/EE_Plain_Text_Field.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
-class EE_Plain_Text_Field extends EE_Text_Field_Base{
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
+class EE_Plain_Text_Field extends EE_Text_Field_Base {
 	/**
 	 * removes all tags when setting
 	 * @param string $value_inputted_for_field_on_model_object

core/db_models/fields/EE_Slug_Field.php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
-require_once( EE_MODELS . 'fields/EE_Text_Field_Base.php' );
-class EE_Slug_Field extends EE_Text_Field_Base{
+require_once(EE_MODELS.'fields/EE_Text_Field_Base.php');
+class EE_Slug_Field extends EE_Text_Field_Base {
 	/**
 	 * ensures string is usable in URLs
 	 * @param string $value_inputted_for_field_on_model_object