Completed
Branch BUG-9019-ticket-selector-submi... (f025e0)
by
unknown
467:48 queued 450:54
created
core/db_classes/EE_Base_Class.class.php 4 patches
Doc Comments   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -512,7 +512,7 @@  discard block
 block discarded – undo
512 512
 	 * @access protected
513 513
 	 * @param string $fieldname the property item the corresponding value is for.
514 514
 	 * @param mixed  $value     The value we are caching.
515
-	 * @param null   $cache_type
515
+	 * @param string   $cache_type
516 516
 	 * @return void
517 517
 	 */
518 518
 	protected function _set_cached_property( $fieldname, $value, $cache_type = NULL ) {
@@ -825,7 +825,7 @@  discard block
 block discarded – undo
825 825
 	 *
826 826
 	 * @param null $field_to_order_by   What field is being used as the reference point.
827 827
 	 * @param array $query_params       Any additional conditions on the query.
828
-	 * @param null $columns_to_select   If left null, then an array of EE_Base_Class objects is returned, otherwise
828
+	 * @param string $columns_to_select   If left null, then an array of EE_Base_Class objects is returned, otherwise
829 829
 	 *                                  you can indicate just the columns you want returned
830 830
 	 *
831 831
 	 * @return array|EE_Base_Class
@@ -850,7 +850,7 @@  discard block
 block discarded – undo
850 850
 	 *
851 851
 	 * @param null $field_to_order_by   What field is being used as the reference point.
852 852
 	 * @param array $query_params       Any additional conditions on the query.
853
-	 * @param null $columns_to_select   If left null, then an EE_Base_Class object is returned, otherwise
853
+	 * @param string $columns_to_select   If left null, then an EE_Base_Class object is returned, otherwise
854 854
 	 *                                  you can indicate just the column you want returned
855 855
 	 *
856 856
 	 * @return array|EE_Base_Class
@@ -987,11 +987,11 @@  discard block
 block discarded – undo
987 987
 	 *
988 988
 	 * @access   protected
989 989
 	 * @param  string  $field_name   Field on the instantiated EE_Base_Class child object
990
-	 * @param null     $dt_frmt 	valid datetime format used for date (if '' then we just use the default on the field, if NULL we use the last-used format)
991
-	 * @param null     $tm_frmt 	Same as above except this is for time format
990
+	 * @param string|null     $dt_frmt 	valid datetime format used for date (if '' then we just use the default on the field, if NULL we use the last-used format)
991
+	 * @param null|string     $tm_frmt 	Same as above except this is for time format
992 992
 	 * @param string   $date_or_time if NULL then both are returned, otherwise "D" = only date and "T" = only time.
993 993
 	 * @param  boolean $echo         Whether the dtt is echoing using pretty echoing or just returned using vanilla get
994
-	 * @return void | string | bool | EE_Error string on success, FALSE on fail, or EE_Error Exception is thrown if field is not a valid dtt field, or void if echoing
994
+	 * @return string|boolean | string | bool | EE_Error string on success, FALSE on fail, or EE_Error Exception is thrown if field is not a valid dtt field, or void if echoing
995 995
 	 */
996 996
 	protected function _get_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL, $date_or_time = NULL, $echo = FALSE ) {
997 997
 
@@ -1164,7 +1164,7 @@  discard block
 block discarded – undo
1164 1164
 	 * sets the time on a datetime property
1165 1165
 	 *
1166 1166
 	 * @access protected
1167
-	 * @param string|Datetime $time      a valid time string for php datetime functions (or DateTime object)
1167
+	 * @param string $time      a valid time string for php datetime functions (or DateTime object)
1168 1168
 	 * @param string $fieldname the name of the field the time is being set on (must match a EE_Datetime_Field)
1169 1169
 	 */
1170 1170
 	protected function _set_time_for( $time, $fieldname ) {
@@ -1179,7 +1179,7 @@  discard block
 block discarded – undo
1179 1179
 	 * sets the date on a datetime property
1180 1180
 	 *
1181 1181
 	 * @access protected
1182
-	 * @param string|DateTime $date      a valid date string for php datetime functions ( or DateTime object)
1182
+	 * @param string $date      a valid date string for php datetime functions ( or DateTime object)
1183 1183
 	 * @param string $fieldname the name of the field the date is being set on (must match a EE_Datetime_Field)
1184 1184
 	 */
1185 1185
 	protected function _set_date_for( $date, $fieldname ) {
@@ -1483,7 +1483,7 @@  discard block
 block discarded – undo
1483 1483
 
1484 1484
 	/**
1485 1485
 	 * for getting a model while instantiated.
1486
-	 * @return \EEM_Base | \EEM_CPT_Base
1486
+	 * @return boolean | \EEM_CPT_Base
1487 1487
 	 */
1488 1488
 	public function get_model() {
1489 1489
 		$modelName = self::_get_model_classname( get_class($this) );
@@ -1514,7 +1514,7 @@  discard block
 block discarded – undo
1514 1514
 	 * If there is a key in the incoming array that matches the primary key for the model AND it is not null, then we check the db. If there's a an object we return it.  If not we return false.
1515 1515
 	 * @param  array  $props_n_values incoming array of properties and their values
1516 1516
 	 * @param  string $classname      the classname of the child class
1517
-	 * @param null    $timezone
1517
+	 * @param null|string    $timezone
1518 1518
 	 * @return mixed (EE_Base_Class|bool)
1519 1519
 	 */
1520 1520
 	protected static function _check_for_object( $props_n_values, $classname, $timezone = NULL ) {
@@ -1550,7 +1550,7 @@  discard block
 block discarded – undo
1550 1550
 	 * @param      $classname
1551 1551
 	 * @param null $timezone
1552 1552
 	 * @throws EE_Error
1553
-	 * @return EEM_Base
1553
+	 * @return boolean
1554 1554
 	 */
1555 1555
 	protected static function  _get_model( $classname, $timezone = NULL ){
1556 1556
 		//find model for this class
@@ -1566,8 +1566,8 @@  discard block
 block discarded – undo
1566 1566
 	/**
1567 1567
 	 * Gets the model instance (eg instance of EEM_Attendee) given its classname (eg EE_Attendee)
1568 1568
 	 * @param string $model_classname
1569
-	 * @param null   $timezone
1570
-	 * @return EEM_Base
1569
+	 * @param string|null   $timezone
1570
+	 * @return boolean
1571 1571
 	 */
1572 1572
 	protected static function _get_model_instance_with_name($model_classname, $timezone = NULL){
1573 1573
 		$model_classname = str_replace( 'EEM_', '', $model_classname );
Please login to merge, or discard this patch.
Indentation   +67 added lines, -67 removed lines patch added patch discarded remove patch
@@ -47,25 +47,25 @@  discard block
 block discarded – undo
47 47
 
48 48
 
49 49
 	/**
50
-    *	date format
51
-	*
52
-    *	pattern or format for displaying dates
53
-	*
54
-	*	@access	protected
55
-    *	@var string
56
-    */
50
+	 *	date format
51
+	 *
52
+	 *	pattern or format for displaying dates
53
+	 *
54
+	 *	@access	protected
55
+	 *	@var string
56
+	 */
57 57
 	protected $_dt_frmt;
58 58
 
59 59
 
60 60
 
61
-    /**
62
-    *	time format
63
-	*
64
-    *	pattern or format for displaying time
65
-	*
66
-	*	@access	protected
67
-    *	@var string
68
-    */
61
+	/**
62
+	 *	time format
63
+	 *
64
+	 *	pattern or format for displaying time
65
+	 *
66
+	 *	@access	protected
67
+	 *	@var string
68
+	 */
69 69
 	protected $_tm_frmt;
70 70
 
71 71
 
@@ -205,12 +205,12 @@  discard block
 block discarded – undo
205 205
 
206 206
 
207 207
 		/**
208
-	 * Gets the field's original value when this object was constructed during this request.
209
-	 * This can be helpful when determining if a model object has changed or not
210
-	 *
211
-	 * @param string $field_name
212
-	 * @return mixed|null
213
-	 */
208
+		 * Gets the field's original value when this object was constructed during this request.
209
+		 * This can be helpful when determining if a model object has changed or not
210
+		 *
211
+		 * @param string $field_name
212
+		 * @return mixed|null
213
+		 */
214 214
 	public function get_original( $field_name ){
215 215
 		if( isset( $this->_props_n_values_provided_in_constructor[ $field_name ] ) &&
216 216
 				$field_settings = $this->get_Model()->field_settings_for( $field_name )){
@@ -1273,7 +1273,7 @@  discard block
 block discarded – undo
1273 1273
 		 */
1274 1274
 		do_action( 'AHEE__EE_Base_Class__delete__before', $this );
1275 1275
 		$result = $this->get_model()->delete_by_ID( $this->ID() );
1276
-                $this->refresh_cache_of_related_objects();
1276
+				$this->refresh_cache_of_related_objects();
1277 1277
 		/**
1278 1278
 		 * Called just after deleting a model object
1279 1279
 		 * @param EE_Base_Class $model_object that was just 'deleted'
@@ -1293,35 +1293,35 @@  discard block
 block discarded – undo
1293 1293
 		$model=$this->get_model();
1294 1294
 		if($model instanceof EEM_Soft_Delete_Base){
1295 1295
 			$result=$model->delete_permanently_by_ID($this->ID());
1296
-                        $this->refresh_cache_of_related_objects();
1296
+						$this->refresh_cache_of_related_objects();
1297 1297
 		}else{
1298 1298
 			$result = $this->delete();
1299 1299
 		}
1300 1300
 		return $result ? true : false;
1301 1301
 	}
1302 1302
 
1303
-        /**
1304
-         * When this model object is deleted, it may still be cached on related model objects. This clears the cache of
1305
-         * related model objects
1306
-         */
1307
-        public function refresh_cache_of_related_objects() {
1308
-            foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) {
1309
-                if( ! empty( $this->_model_relations[ $relation_name ] ) ) {
1310
-                    $related_objects = $this->_model_relations[ $relation_name ];
1311
-                    if( $relation_obj instanceof EE_Belongs_To_Relation ) {
1312
-                        //this relation only stores a single model object, not an array
1313
-                        //but let's make it consistent
1314
-                        $related_objects = array( $related_objects );
1315
-                    }
1316
-                    foreach( $related_objects as $related_object ) {
1317
-                        //only refresh their cache if they're in memory
1318
-                        if( $related_object instanceof EE_Base_Class ) {
1303
+		/**
1304
+		 * When this model object is deleted, it may still be cached on related model objects. This clears the cache of
1305
+		 * related model objects
1306
+		 */
1307
+		public function refresh_cache_of_related_objects() {
1308
+			foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) {
1309
+				if( ! empty( $this->_model_relations[ $relation_name ] ) ) {
1310
+					$related_objects = $this->_model_relations[ $relation_name ];
1311
+					if( $relation_obj instanceof EE_Belongs_To_Relation ) {
1312
+						//this relation only stores a single model object, not an array
1313
+						//but let's make it consistent
1314
+						$related_objects = array( $related_objects );
1315
+					}
1316
+					foreach( $related_objects as $related_object ) {
1317
+						//only refresh their cache if they're in memory
1318
+						if( $related_object instanceof EE_Base_Class ) {
1319 1319
 							$related_object->clear_cache( $this->get_model()->get_this_model_name(), $this );
1320
-                        }
1321
-                    }
1322
-                }
1323
-            }
1324
-        }
1320
+						}
1321
+					}
1322
+				}
1323
+			}
1324
+		}
1325 1325
 
1326 1326
 
1327 1327
 
@@ -1671,9 +1671,9 @@  discard block
 block discarded – undo
1671 1671
 			$otherObject = $this->get_model()->add_relationship_to( $this, $otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values );
1672 1672
 			//clear cache so future get_many_related and get_first_related() return new results.
1673 1673
 			$this->clear_cache( $relationName, $otherObject, TRUE );
1674
-                        if( $otherObject instanceof EE_Base_Class ) {
1675
-                            $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
1676
-                        }
1674
+						if( $otherObject instanceof EE_Base_Class ) {
1675
+							$otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
1676
+						}
1677 1677
 		} else {
1678 1678
 			//this thing doesn't exist in the DB,  so just cache it
1679 1679
 			if( ! $otherObjectModelObjectOrID instanceof EE_Base_Class){
@@ -1687,18 +1687,18 @@  discard block
 block discarded – undo
1687 1687
 			}
1688 1688
 			$this->cache( $relationName, $otherObjectModelObjectOrID, $cache_id );
1689 1689
 		}
1690
-                if( $otherObject instanceof EE_Base_Class ) {
1691
-                    //fix the reciprocal relation too
1692
-                    if( $otherObject->ID() ) {
1693
-                            //its saved so assumed relations exist in the DB, so we can just
1694
-                            //clear the cache so future queries use the updated info in the DB
1695
-                            $otherObject->clear_cache( $this->get_model()->get_this_model_name(), null, true );
1696
-                    } else {
1697
-
1698
-                            //it's not saved, so it caches relations like this
1699
-                            $otherObject->cache( $this->get_model()->get_this_model_name(), $this );
1700
-                    }
1701
-                }
1690
+				if( $otherObject instanceof EE_Base_Class ) {
1691
+					//fix the reciprocal relation too
1692
+					if( $otherObject->ID() ) {
1693
+							//its saved so assumed relations exist in the DB, so we can just
1694
+							//clear the cache so future queries use the updated info in the DB
1695
+							$otherObject->clear_cache( $this->get_model()->get_this_model_name(), null, true );
1696
+					} else {
1697
+
1698
+							//it's not saved, so it caches relations like this
1699
+							$otherObject->cache( $this->get_model()->get_this_model_name(), $this );
1700
+					}
1701
+				}
1702 1702
 		return $otherObject;
1703 1703
 	}
1704 1704
 
@@ -1728,9 +1728,9 @@  discard block
 block discarded – undo
1728 1728
 			//this doesn't exist in the DB, just remove it from the cache
1729 1729
 			$otherObject = $this->clear_cache( $relationName, $otherObjectModelObjectOrID );
1730 1730
 		}
1731
-                if( $otherObject instanceof EE_Base_Class ) {
1732
-                    $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
1733
-                }
1731
+				if( $otherObject instanceof EE_Base_Class ) {
1732
+					$otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
1733
+				}
1734 1734
 		return $otherObject;
1735 1735
 	}
1736 1736
 
@@ -1749,11 +1749,11 @@  discard block
 block discarded – undo
1749 1749
 			//this doesn't exist in the DB, just remove it from the cache
1750 1750
 			$otherObjects = $this->clear_cache( $relationName, null, true );
1751 1751
 		}
1752
-                if( is_array( $otherObjects ) ) {
1753
-                    foreach ( $otherObjects as $otherObject ) {
1754
-                            $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
1755
-                    }
1756
-                }
1752
+				if( is_array( $otherObjects ) ) {
1753
+					foreach ( $otherObjects as $otherObject ) {
1754
+							$otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
1755
+					}
1756
+				}
1757 1757
 		return $otherObjects;
1758 1758
 	}
1759 1759
 
Please login to merge, or discard this patch.
Spacing   +481 added lines, -481 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
2
-do_action( 'AHEE_log', __FILE__, ' FILE LOADED', '' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
2
+do_action('AHEE_log', __FILE__, ' FILE LOADED', '');
3 3
 /**
4 4
  *
5 5
  * Event Espresso
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
  * ------------------------------------------------------------------------
25 25
  */
26 26
 
27
-abstract class EE_Base_Class{
27
+abstract class EE_Base_Class {
28 28
 
29 29
 	/**
30 30
 	 * This is an array of the original properties and values provided during construction
@@ -117,60 +117,60 @@  discard block
 block discarded – undo
117 117
 	 * @throws EE_Error
118 118
 	 * @return \EE_Base_Class
119 119
 	 */
120
-	protected function __construct( $fieldValues = array(), $bydb = FALSE, $timezone = '', $date_formats = array() ){
120
+	protected function __construct($fieldValues = array(), $bydb = FALSE, $timezone = '', $date_formats = array()) {
121 121
 
122
-		$className=get_class($this);
122
+		$className = get_class($this);
123 123
 
124
-		do_action("AHEE__{$className}__construct",$this,$fieldValues);
125
-		$model=$this->get_model();
126
-		$model_fields = $model->field_settings( FALSE );
124
+		do_action("AHEE__{$className}__construct", $this, $fieldValues);
125
+		$model = $this->get_model();
126
+		$model_fields = $model->field_settings(FALSE);
127 127
 		// ensure $fieldValues is an array
128
-		$fieldValues = is_array( $fieldValues ) ? $fieldValues : array( $fieldValues );
128
+		$fieldValues = is_array($fieldValues) ? $fieldValues : array($fieldValues);
129 129
 		// EEH_Debug_Tools::printr( $fieldValues, '$fieldValues  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
130 130
 		// verify client code has not passed any invalid field names
131
-		foreach($fieldValues as $field_name=> $field_value){
132
-			if( ! isset( $model_fields[ $field_name] ) ){
133
-				throw new EE_Error(sprintf(__("Invalid field (%s) passed to constructor of %s. Allowed fields are :%s", "event_espresso"),$field_name,get_class($this),implode(", ",array_keys($model_fields))));
131
+		foreach ($fieldValues as $field_name=> $field_value) {
132
+			if ( ! isset($model_fields[$field_name])) {
133
+				throw new EE_Error(sprintf(__("Invalid field (%s) passed to constructor of %s. Allowed fields are :%s", "event_espresso"), $field_name, get_class($this), implode(", ", array_keys($model_fields))));
134 134
 			}
135 135
 		}
136 136
 		// EEH_Debug_Tools::printr( $model_fields, '$model_fields  <br /><span style="font-size:10px;font-weight:normal;">' . __FILE__ . '<br />line no: ' . __LINE__ . '</span>', 'auto' );
137
-		EE_Registry::instance()->load_helper( 'DTT_Helper' );
138
-		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string( $timezone );
137
+		EE_Registry::instance()->load_helper('DTT_Helper');
138
+		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string($timezone);
139 139
 
140
-		if ( ! empty( $date_formats ) && is_array( $date_formats ) ) {
140
+		if ( ! empty($date_formats) && is_array($date_formats)) {
141 141
 			$this->_dt_frmt = $date_formats[0];
142 142
 			$this->_tm_frmt = $date_formats[1];
143 143
 		} else {
144 144
 			//set default formats for date and time
145
-			$this->_dt_frmt = get_option( 'date_format' );
146
-			$this->_tm_frmt = get_option( 'time_format' );
145
+			$this->_dt_frmt = get_option('date_format');
146
+			$this->_tm_frmt = get_option('time_format');
147 147
 		}
148 148
 
149 149
 		//if db model is instantiating
150
-		if ( $bydb ){
150
+		if ($bydb) {
151 151
 			//client code has indicated these field values are from the database
152
-			foreach( $model_fields as $fieldName => $field ){
153
-				$this->set_from_db( $fieldName, isset( $fieldValues[ $fieldName] ) ? $fieldValues[ $fieldName ] : null );
152
+			foreach ($model_fields as $fieldName => $field) {
153
+				$this->set_from_db($fieldName, isset($fieldValues[$fieldName]) ? $fieldValues[$fieldName] : null);
154 154
 			}
155 155
 		} else {
156 156
 			//we're constructing a brand
157 157
 			//new instance of the model object. Generally, this means we'll need to do more field validation
158
-			foreach( $model_fields as $fieldName => $field ){
159
-				$this->set( $fieldName, isset( $fieldValues[ $fieldName ] ) ? $fieldValues[ $fieldName ] : null, true );
158
+			foreach ($model_fields as $fieldName => $field) {
159
+				$this->set($fieldName, isset($fieldValues[$fieldName]) ? $fieldValues[$fieldName] : null, true);
160 160
 			}
161 161
 		}
162 162
 
163 163
 		//remember what values were passed to this constructor
164 164
 		$this->_props_n_values_provided_in_constructor = $fieldValues;
165 165
 		//remember in entity mapper
166
-		if($model->has_primary_key_field() && $this->ID() && ! $bydb ){
166
+		if ($model->has_primary_key_field() && $this->ID() && ! $bydb) {
167 167
 			$model->add_to_entity_map($this);
168 168
 		}
169 169
 		//setup all the relations
170
-		foreach($this->get_model()->relation_settings() as $relation_name=>$relation_obj){
171
-			if($relation_obj instanceof EE_Belongs_To_Relation){
170
+		foreach ($this->get_model()->relation_settings() as $relation_name=>$relation_obj) {
171
+			if ($relation_obj instanceof EE_Belongs_To_Relation) {
172 172
 				$this->_model_relations[$relation_name] = NULL;
173
-			}else{
173
+			} else {
174 174
 				$this->_model_relations[$relation_name] = array();
175 175
 			}
176 176
 		}
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 		 * Action done at the end of each model object construction
179 179
 		 * @param EE_Base_Class $this the model object just created
180 180
 		 */
181
-		do_action( 'AHEE__EE_Base_Class__construct__finished', $this );
181
+		do_action('AHEE__EE_Base_Class__construct__finished', $this);
182 182
 	}
183 183
 
184 184
 	/**
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
 	 * @param boolean $allow_persist
199 199
 	 * @return boolean
200 200
 	 */
201
-	function set_allow_persist( $allow_persist ) {
201
+	function set_allow_persist($allow_persist) {
202 202
 		return $this->_allow_persist = $allow_persist;
203 203
 	}
204 204
 
@@ -211,11 +211,11 @@  discard block
 block discarded – undo
211 211
 	 * @param string $field_name
212 212
 	 * @return mixed|null
213 213
 	 */
214
-	public function get_original( $field_name ){
215
-		if( isset( $this->_props_n_values_provided_in_constructor[ $field_name ] ) &&
216
-				$field_settings = $this->get_Model()->field_settings_for( $field_name )){
217
-			return $field_settings->prepare_for_get( $this->_props_n_values_provided_in_constructor[ $field_name ] );
218
-		}else{
214
+	public function get_original($field_name) {
215
+		if (isset($this->_props_n_values_provided_in_constructor[$field_name]) &&
216
+				$field_settings = $this->get_Model()->field_settings_for($field_name)) {
217
+			return $field_settings->prepare_for_get($this->_props_n_values_provided_in_constructor[$field_name]);
218
+		} else {
219 219
 			return NULL;
220 220
 		}
221 221
 	}
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 	 * @param EE_Base_Class $obj
226 226
 	 * @return string
227 227
 	 */
228
-	public function get_class($obj){
228
+	public function get_class($obj) {
229 229
 		return get_class($obj);
230 230
 	}
231 231
 
@@ -238,19 +238,19 @@  discard block
 block discarded – undo
238 238
 	 * @param	mixed 	$field_value
239 239
 	 * @param bool 	$use_default
240 240
 	 */
241
-	public function set( $field_name, $field_value, $use_default = FALSE ){
242
-		$field_obj = $this->get_model()->field_settings_for( $field_name );
243
-		if ( $field_obj instanceof EE_Model_Field_Base ) {
241
+	public function set($field_name, $field_value, $use_default = FALSE) {
242
+		$field_obj = $this->get_model()->field_settings_for($field_name);
243
+		if ($field_obj instanceof EE_Model_Field_Base) {
244 244
 //			if ( method_exists( $field_obj, 'set_timezone' )) {
245
-			if ( $field_obj instanceof EE_Datetime_Field ) {
246
-				$field_obj->set_timezone( $this->_timezone );
247
-				$field_obj->set_date_format( $this->_dt_frmt );
248
-				$field_obj->set_time_format( $this->_tm_frmt );
245
+			if ($field_obj instanceof EE_Datetime_Field) {
246
+				$field_obj->set_timezone($this->_timezone);
247
+				$field_obj->set_date_format($this->_dt_frmt);
248
+				$field_obj->set_time_format($this->_tm_frmt);
249 249
 			}
250 250
 
251 251
 			$holder_of_value = $field_obj->prepare_for_set($field_value);
252 252
 			//should the value be null?
253
-			if( ($field_value === NULL || $holder_of_value === NULL || $holder_of_value ==='') && $use_default){
253
+			if (($field_value === NULL || $holder_of_value === NULL || $holder_of_value === '') && $use_default) {
254 254
 				$this->_fields[$field_name] = $field_obj->get_default_value();
255 255
 
256 256
 				/**
@@ -260,19 +260,19 @@  discard block
 block discarded – undo
260 260
 				 * object.
261 261
 				 * @since 4.6.10+
262 262
 				 */
263
-				if ( $field_obj instanceof EE_Datetime_Field && ! is_null( $this->_fields[$field_name] ) && ! $this->_fields[$field_name] instanceof DateTime ) {
264
-					empty( $this->_fields[$field_name] ) ? $this->set( $field_name, time() ) : $this->set( $field_name, $this->_fields[$field_name] );
263
+				if ($field_obj instanceof EE_Datetime_Field && ! is_null($this->_fields[$field_name]) && ! $this->_fields[$field_name] instanceof DateTime) {
264
+					empty($this->_fields[$field_name]) ? $this->set($field_name, time()) : $this->set($field_name, $this->_fields[$field_name]);
265 265
 				}
266 266
 
267
-			}else{
267
+			} else {
268 268
 				$this->_fields[$field_name] = $holder_of_value;
269 269
 			}
270 270
 
271 271
 			//if we're not in the constructor...
272 272
 			//now check if what we set was a primary key
273
-			if($this->_props_n_values_provided_in_constructor && //note: props_n_values_provided_in_constructor is only set at the END of the constructor
273
+			if ($this->_props_n_values_provided_in_constructor && //note: props_n_values_provided_in_constructor is only set at the END of the constructor
274 274
 				$field_name == $this->_get_primary_key_name(get_class($this)) &&
275
-				$field_value){
275
+				$field_value) {
276 276
 				//if so, we want all this object's fields to be filled either with
277 277
 				//what we've explicitly set on this model
278 278
 				//or what we have in the db
@@ -280,20 +280,20 @@  discard block
 block discarded – undo
280 280
 				$fields_on_model = $this->_get_model(get_class($this))->field_settings();
281 281
 
282 282
 				$obj_in_db = $this->_get_model(get_class($this))->get_one_by_ID($field_value);
283
-				foreach($fields_on_model as $field_obj){
284
-					if( ! array_key_exists($field_obj->get_name(), $this->_props_n_values_provided_in_constructor)
285
-						&& $field_obj->get_name() != $field_name ){
283
+				foreach ($fields_on_model as $field_obj) {
284
+					if ( ! array_key_exists($field_obj->get_name(), $this->_props_n_values_provided_in_constructor)
285
+						&& $field_obj->get_name() != $field_name) {
286 286
 
287
-						$this->set($field_obj->get_name(),$obj_in_db->get($field_obj->get_name()));
287
+						$this->set($field_obj->get_name(), $obj_in_db->get($field_obj->get_name()));
288 288
 					}
289 289
 				}
290 290
 				//oh this model object has an ID? well make sure its in the entity mapper
291 291
 				$this->get_model()->add_to_entity_map($this);
292 292
 			}
293 293
 			//let's unset any cache for this field_name from the $_cached_properties property.
294
-			$this->_clear_cached_property( $field_name );
295
-		}else{
296
-			throw new EE_Error( sprintf( __( "A valid EE_Model_Field_Base could not be found for the given field name: %s", "event_espresso" ), $field_name  ) );
294
+			$this->_clear_cached_property($field_name);
295
+		} else {
296
+			throw new EE_Error(sprintf(__("A valid EE_Model_Field_Base could not be found for the given field name: %s", "event_espresso"), $field_name));
297 297
 		}
298 298
 
299 299
 	}
@@ -312,14 +312,14 @@  discard block
 block discarded – undo
312 312
 	 * @param mixed  $field_value  The value to set.
313 313
 	 * @return int|bool @see EE_Base_Class::update_extra_meta() for return docs.
314 314
 	 */
315
-	public function set_field_or_extra_meta( $field_name, $field_value ) {
316
-		if ( $this->get_model()->has_field( $field_name ) ) {
317
-			$this->set( $field_name, $field_value );
315
+	public function set_field_or_extra_meta($field_name, $field_value) {
316
+		if ($this->get_model()->has_field($field_name)) {
317
+			$this->set($field_name, $field_value);
318 318
 			return true;
319 319
 		} else {
320 320
 			//ensure this object is saved first so that extra meta can be properly related.
321 321
 			$this->save();
322
-			return $this->update_extra_meta( $field_name, $field_value );
322
+			return $this->update_extra_meta($field_name, $field_value);
323 323
 		}
324 324
 	}
325 325
 
@@ -343,12 +343,12 @@  discard block
 block discarded – undo
343 343
 	 * @param  string $field_name  expecting the fully qualified field name.
344 344
 	 * @return mixed|null  value for the field if found.  null if not found.
345 345
 	 */
346
-	public function get_field_or_extra_meta( $field_name ) {
347
-		if ( $this->get_model()->has_field( $field_name ) ) {
348
-			$column_value = $this->get( $field_name );
346
+	public function get_field_or_extra_meta($field_name) {
347
+		if ($this->get_model()->has_field($field_name)) {
348
+			$column_value = $this->get($field_name);
349 349
 		} else {
350 350
 			//This isn't a column in the main table, let's see if it is in the extra meta.
351
-			$column_value = $this->get_extra_meta( $field_name, true, null );
351
+			$column_value = $this->get_extra_meta($field_name, true, null);
352 352
 		}
353 353
 		return $column_value;
354 354
 	}
@@ -367,19 +367,19 @@  discard block
 block discarded – undo
367 367
 	 * @param string $timezone A valid timezone string as described by @link http://www.php.net/manual/en/timezones.php
368 368
 	 * @return void
369 369
 	 */
370
-	public function set_timezone( $timezone = '' ) {
370
+	public function set_timezone($timezone = '') {
371 371
 		EE_Registry::instance()->load_helper('DTT_Helper');
372
-		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string( $timezone );
372
+		$this->_timezone = EEH_DTT_Helper::get_valid_timezone_string($timezone);
373 373
 		//make sure we clear all cached properties because they won't be relevant now
374 374
 		$this->_clear_cached_properties();
375 375
 
376 376
 		//make sure we update field settings and the date for all EE_Datetime_Fields
377
-		$model_fields = $this->get_model()->field_settings( false );
378
-		foreach ( $model_fields as $field_name => $field_obj ) {
379
-			if ( $field_obj instanceof EE_Datetime_Field ) {
380
-				$field_obj->set_timezone( $this->_timezone );
381
-				if ( isset( $this->_fields[$field_name] ) && $this->_fields[$field_name] instanceof DateTime ) {
382
-					$this->_fields[$field_name]->setTimezone( new DateTimeZone( $this->_timezone ) );
377
+		$model_fields = $this->get_model()->field_settings(false);
378
+		foreach ($model_fields as $field_name => $field_obj) {
379
+			if ($field_obj instanceof EE_Datetime_Field) {
380
+				$field_obj->set_timezone($this->_timezone);
381
+				if (isset($this->_fields[$field_name]) && $this->_fields[$field_name] instanceof DateTime) {
382
+					$this->_fields[$field_name]->setTimezone(new DateTimeZone($this->_timezone));
383 383
 				}
384 384
 			}
385 385
 		}
@@ -408,7 +408,7 @@  discard block
 block discarded – undo
408 408
 	 *
409 409
 	 * @param string $format   should be a format recognizable by PHP date() functions.
410 410
 	 */
411
-	public function set_date_format( $format ) {
411
+	public function set_date_format($format) {
412 412
 		$this->_dt_frmt = $format;
413 413
 		//clear cached_properties because they won't be relevant now.
414 414
 		$this->_clear_cached_properties();
@@ -424,7 +424,7 @@  discard block
 block discarded – undo
424 424
 	 * @since 4.6
425 425
 	 * @param string $format should be a format recognizable by PHP date() functions.
426 426
 	 */
427
-	public function set_time_format( $format ) {
427
+	public function set_time_format($format) {
428 428
 		$this->_tm_frmt = $format;
429 429
 		//clear cached_properties because they won't be relevant now.
430 430
 		$this->_clear_cached_properties();
@@ -441,8 +441,8 @@  discard block
 block discarded – undo
441 441
 	 *
442 442
 	 * @return mixed string|array
443 443
 	 */
444
-	public function get_format( $full = true ) {
445
-		return $full ? $this->_dt_frmt . ' ' . $this->_tm_frmt : array( $this->_dt_frmt, $this->_tm_frmt );
444
+	public function get_format($full = true) {
445
+		return $full ? $this->_dt_frmt.' '.$this->_tm_frmt : array($this->_dt_frmt, $this->_tm_frmt);
446 446
 	}
447 447
 
448 448
 
@@ -460,17 +460,17 @@  discard block
 block discarded – undo
460 460
 	 * @throws EE_Error
461 461
 	 * @return mixed    index into cache, or just TRUE if the relation is of type Belongs_To (because there's only one related thing, no array)
462 462
 	 */
463
-	public function cache( $relationName = '', $object_to_cache = NULL, $cache_id = NULL ){
463
+	public function cache($relationName = '', $object_to_cache = NULL, $cache_id = NULL) {
464 464
 		// its entirely possible that there IS no related object yet in which case there is nothing to cache.
465
-		if ( ! $object_to_cache instanceof EE_Base_Class ) {
465
+		if ( ! $object_to_cache instanceof EE_Base_Class) {
466 466
 			return FALSE;
467 467
 		}
468 468
 		// also get "how" the object is related, or throw an error
469
-		if( ! $relationship_to_model = $this->get_model()->related_settings_for( $relationName )) {
470
-			throw new EE_Error( sprintf( __( 'There is no relationship to %s on a %s. Cannot cache it', 'event_espresso' ), $relationName, get_class( $this )));
469
+		if ( ! $relationship_to_model = $this->get_model()->related_settings_for($relationName)) {
470
+			throw new EE_Error(sprintf(__('There is no relationship to %s on a %s. Cannot cache it', 'event_espresso'), $relationName, get_class($this)));
471 471
 		}
472 472
 		// how many things are related ?
473
-		if( $relationship_to_model instanceof EE_Belongs_To_Relation ){
473
+		if ($relationship_to_model instanceof EE_Belongs_To_Relation) {
474 474
 			// if it's a "belongs to" relationship, then there's only one related model object  eg, if this is a registration, there's only 1 attendee for it
475 475
 			// so for these model objects just set it to be cached
476 476
 			$this->_model_relations[$relationName] = $object_to_cache;
@@ -478,26 +478,26 @@  discard block
 block discarded – undo
478 478
 		} else {
479 479
 			// otherwise, this is the "many" side of a one to many relationship, so we'll add the object to the array of related objects for that type.
480 480
 			// eg: if this is an event, there are many registrations for that event, so we cache the registrations in an array
481
-			if( ! is_array( $this->_model_relations[$relationName] )) {
481
+			if ( ! is_array($this->_model_relations[$relationName])) {
482 482
 				// if for some reason, the cached item is a model object, then stick that in the array, otherwise start with an empty array
483
-				$this->_model_relations[$relationName] = $this->_model_relations[$relationName] instanceof EE_Base_Class ? array( $this->_model_relations[$relationName] ) : array();
483
+				$this->_model_relations[$relationName] = $this->_model_relations[$relationName] instanceof EE_Base_Class ? array($this->_model_relations[$relationName]) : array();
484 484
 			}
485 485
 			// first check for a cache_id which is normally empty
486
-			if ( ! empty( $cache_id )) {
486
+			if ( ! empty($cache_id)) {
487 487
 				// if the cache_id exists, then it means we are purposely trying to cache this with a known key that can then be used to retrieve the object later on
488
-				$this->_model_relations[$relationName][ $cache_id ] = $object_to_cache;
488
+				$this->_model_relations[$relationName][$cache_id] = $object_to_cache;
489 489
 				$return = $cache_id;
490
-			} elseif ( $object_to_cache->ID() ) {
490
+			} elseif ($object_to_cache->ID()) {
491 491
 				// OR the cached object originally came from the db, so let's just use it's PK for an ID
492
-				$this->_model_relations[$relationName][ $object_to_cache->ID() ] = $object_to_cache;
492
+				$this->_model_relations[$relationName][$object_to_cache->ID()] = $object_to_cache;
493 493
 				$return = $object_to_cache->ID();
494 494
 			} else {
495 495
 				// OR it's a new object with no ID, so just throw it in the array with an auto-incremented ID
496 496
 				$this->_model_relations[$relationName][] = $object_to_cache;
497 497
 				  // move the internal pointer to the end of the array
498
-				end( $this->_model_relations[$relationName] );
498
+				end($this->_model_relations[$relationName]);
499 499
 				// and grab the key so that we can return it
500
-				$return = key( $this->_model_relations[$relationName] );
500
+				$return = key($this->_model_relations[$relationName]);
501 501
 			}
502 502
 
503 503
 		}
@@ -515,11 +515,11 @@  discard block
 block discarded – undo
515 515
 	 * @param null   $cache_type
516 516
 	 * @return void
517 517
 	 */
518
-	protected function _set_cached_property( $fieldname, $value, $cache_type = NULL ) {
518
+	protected function _set_cached_property($fieldname, $value, $cache_type = NULL) {
519 519
 		//first make sure this property exists
520 520
 		$this->get_model()->field_settings_for($fieldname);
521 521
 
522
-		$cache_type = empty( $cache_type ) ? 'standard' : $cache_type;
522
+		$cache_type = empty($cache_type) ? 'standard' : $cache_type;
523 523
 		$this->_cached_properties[$fieldname][$cache_type] = $value;
524 524
 	}
525 525
 
@@ -534,34 +534,34 @@  discard block
 block discarded – undo
534 534
 	 *                                 It can also accept certain pre-defined "schema" strings to define how to output the property. see the field's prepare_for_pretty_echoing for what strings can be used
535 535
 	 * @return mixed                whatever the value for the property is we're retrieving
536 536
 	 */
537
-	protected function _get_cached_property( $fieldname, $pretty = FALSE, $extra_cache_ref = NULL ) {
537
+	protected function _get_cached_property($fieldname, $pretty = FALSE, $extra_cache_ref = NULL) {
538 538
 		//verify the field exists
539 539
 		$this->get_model()->field_settings_for($fieldname);
540 540
 
541 541
 		$cache_type = $pretty ? 'pretty' : 'standard';
542
-		$cache_type .= !empty( $extra_cache_ref ) ? '_' . $extra_cache_ref : '';
542
+		$cache_type .= ! empty($extra_cache_ref) ? '_'.$extra_cache_ref : '';
543 543
 
544
-		if ( isset( $this->_cached_properties[$fieldname][$cache_type] ) ) {
544
+		if (isset($this->_cached_properties[$fieldname][$cache_type])) {
545 545
 			return $this->_cached_properties[$fieldname][$cache_type];
546 546
 		}
547 547
 
548 548
 		$field_obj = $this->get_model()->field_settings_for($fieldname);
549
-		if ( $field_obj instanceof EE_Model_Field_Base ) {
549
+		if ($field_obj instanceof EE_Model_Field_Base) {
550 550
 			/**
551 551
 			 * maybe this is EE_Datetime_Field.  If so we need to make sure timezone and
552 552
 			 * formats are correct.
553 553
 			 */
554
-			if ( $field_obj instanceof EE_Datetime_Field ) {
555
-				$field_obj->set_timezone( $this->_timezone );
556
-				$field_obj->set_date_format( $this->_dt_frmt, $pretty );
557
-				$field_obj->set_time_format( $this->_tm_frmt, $pretty );
554
+			if ($field_obj instanceof EE_Datetime_Field) {
555
+				$field_obj->set_timezone($this->_timezone);
556
+				$field_obj->set_date_format($this->_dt_frmt, $pretty);
557
+				$field_obj->set_time_format($this->_tm_frmt, $pretty);
558 558
 			}
559 559
 
560
-			if( ! isset($this->_fields[$fieldname])){
560
+			if ( ! isset($this->_fields[$fieldname])) {
561 561
 				$this->_fields[$fieldname] = NULL;
562 562
 			}
563
-			$value = $pretty ? $field_obj->prepare_for_pretty_echoing($this->_fields[$fieldname], $extra_cache_ref) : $field_obj->prepare_for_get($this->_fields[$fieldname] );
564
-			$this->_set_cached_property( $fieldname, $value, $cache_type );
563
+			$value = $pretty ? $field_obj->prepare_for_pretty_echoing($this->_fields[$fieldname], $extra_cache_ref) : $field_obj->prepare_for_get($this->_fields[$fieldname]);
564
+			$this->_set_cached_property($fieldname, $value, $cache_type);
565 565
 			return $value;
566 566
 		}
567 567
 		return FALSE;
@@ -587,9 +587,9 @@  discard block
 block discarded – undo
587 587
 	 * @param  string $property_name the property to remove if it exists (from the _cached_properties array)
588 588
 	 * @return void
589 589
 	 */
590
-	protected function _clear_cached_property( $property_name ) {
591
-		if ( isset( $this->_cached_properties[ $property_name ] ) )
592
-			unset( $this->_cached_properties[ $property_name ] );
590
+	protected function _clear_cached_property($property_name) {
591
+		if (isset($this->_cached_properties[$property_name]))
592
+			unset($this->_cached_properties[$property_name]);
593 593
 	}
594 594
 
595 595
 
@@ -600,7 +600,7 @@  discard block
 block discarded – undo
600 600
 	 * @param string $model_name name of the related thing, eg 'Attendee',
601 601
 	 * @return EE_Base_Class
602 602
 	 */
603
-	protected function ensure_related_thing_is_model_obj($object_or_id,$model_name){
603
+	protected function ensure_related_thing_is_model_obj($object_or_id, $model_name) {
604 604
 		$other_model_instance = self::_get_model_instance_with_name(self::_get_model_classname($model_name), $this->_timezone);
605 605
 		$model_obj = $other_model_instance->ensure_is_obj($object_or_id);
606 606
 		return $model_obj;
@@ -620,55 +620,55 @@  discard block
 block discarded – undo
620 620
 	 * @throws EE_Error
621 621
 	 * @return EE_Base_Class | boolean from which was cleared from the cache, or true if we requested to remove a relation from all
622 622
 	 */
623
-	public function clear_cache($relationName, $object_to_remove_or_index_into_array = NULL, $clear_all = FALSE){
623
+	public function clear_cache($relationName, $object_to_remove_or_index_into_array = NULL, $clear_all = FALSE) {
624 624
 		$relationship_to_model = $this->get_model()->related_settings_for($relationName);
625 625
 		$index_in_cache = '';
626
-		if( ! $relationship_to_model){
627
-			throw new EE_Error(sprintf(__("There is no relationship to %s on a %s. Cannot clear that cache",'event_espresso'),$relationName,get_class($this)));
626
+		if ( ! $relationship_to_model) {
627
+			throw new EE_Error(sprintf(__("There is no relationship to %s on a %s. Cannot clear that cache", 'event_espresso'), $relationName, get_class($this)));
628 628
 		}
629
-		if($clear_all){
629
+		if ($clear_all) {
630 630
 			$obj_removed = true;
631 631
 			$this->_model_relations[$relationName]  = null;
632
-		}elseif($relationship_to_model instanceof EE_Belongs_To_Relation){
632
+		}elseif ($relationship_to_model instanceof EE_Belongs_To_Relation) {
633 633
 			$obj_removed = $this->_model_relations[$relationName];
634 634
 			$this->_model_relations[$relationName]  = null;
635
-		}else{
636
-			if($object_to_remove_or_index_into_array instanceof EE_Base_Class && $object_to_remove_or_index_into_array->ID()){
635
+		} else {
636
+			if ($object_to_remove_or_index_into_array instanceof EE_Base_Class && $object_to_remove_or_index_into_array->ID()) {
637 637
 				$index_in_cache = $object_to_remove_or_index_into_array->ID();
638
-				if( is_array($this->_model_relations[$relationName]) && ! isset($this->_model_relations[$relationName][$index_in_cache])){
638
+				if (is_array($this->_model_relations[$relationName]) && ! isset($this->_model_relations[$relationName][$index_in_cache])) {
639 639
 					$index_found_at = NULL;
640 640
 					//find this object in the array even though it has a different key
641
-					foreach($this->_model_relations[$relationName] as $index=>$obj){
642
-						if( $obj instanceof EE_Base_Class && ( $obj == $object_to_remove_or_index_into_array || $obj->ID() == $object_to_remove_or_index_into_array->ID() )) {
641
+					foreach ($this->_model_relations[$relationName] as $index=>$obj) {
642
+						if ($obj instanceof EE_Base_Class && ($obj == $object_to_remove_or_index_into_array || $obj->ID() == $object_to_remove_or_index_into_array->ID())) {
643 643
 							$index_found_at = $index;
644 644
 							break;
645 645
 						}
646 646
 					}
647
-					if($index_found_at){
647
+					if ($index_found_at) {
648 648
 						$index_in_cache = $index_found_at;
649
-					}else{
649
+					} else {
650 650
 						//it wasn't found. huh. well obviously it doesn't need to be removed from teh cache
651 651
 						//if it wasn't in it to begin with. So we're done
652 652
 						return $object_to_remove_or_index_into_array;
653 653
 					}
654 654
 				}
655
-			}elseif($object_to_remove_or_index_into_array instanceof EE_Base_Class){
655
+			}elseif ($object_to_remove_or_index_into_array instanceof EE_Base_Class) {
656 656
 				//so they provided a model object, but it's not yet saved to the DB... so let's go hunting for it!
657
-				foreach($this->get_all_from_cache($relationName) as $index => $potentially_obj_we_want){
658
-					if($potentially_obj_we_want == $object_to_remove_or_index_into_array){
657
+				foreach ($this->get_all_from_cache($relationName) as $index => $potentially_obj_we_want) {
658
+					if ($potentially_obj_we_want == $object_to_remove_or_index_into_array) {
659 659
 						$index_in_cache = $index;
660 660
 					}
661 661
 				}
662
-			}else{
662
+			} else {
663 663
 				$index_in_cache = $object_to_remove_or_index_into_array;
664 664
 			}
665 665
 			//supposedly we've found it. But it could just be that the client code
666 666
 			//provided a bad index/object
667
-			if(isset( $this->_model_relations[$relationName]) &&
668
-					isset( $this->_model_relations[$relationName][$index_in_cache])){
667
+			if (isset($this->_model_relations[$relationName]) &&
668
+					isset($this->_model_relations[$relationName][$index_in_cache])) {
669 669
 				$obj_removed = $this->_model_relations[$relationName][$index_in_cache];
670 670
 				unset($this->_model_relations[$relationName][$index_in_cache]);
671
-			}else{
671
+			} else {
672 672
 				//that thing was never cached anyways.
673 673
 				$obj_removed = NULL;
674 674
 			}
@@ -687,24 +687,24 @@  discard block
 block discarded – undo
687 687
 	 * @param string                $current_cache_id   - the ID that was used when originally caching the object
688 688
 	 * @return boolean TRUE on success, FALSE on fail
689 689
 	 */
690
-	public function update_cache_after_object_save( $relationName, EE_Base_Class $newly_saved_object, $current_cache_id = '') {
690
+	public function update_cache_after_object_save($relationName, EE_Base_Class $newly_saved_object, $current_cache_id = '') {
691 691
 		// verify that incoming object is of the correct type
692
-		$obj_class = 'EE_' . $relationName;
693
-		if ( $newly_saved_object instanceof $obj_class ) {
692
+		$obj_class = 'EE_'.$relationName;
693
+		if ($newly_saved_object instanceof $obj_class) {
694 694
 			/* @type EE_Base_Class $newly_saved_object*/
695 695
 			// now get the type of relation
696
-			$relationship_to_model = $this->get_model()->related_settings_for( $relationName );
696
+			$relationship_to_model = $this->get_model()->related_settings_for($relationName);
697 697
 			// if this is a 1:1 relationship
698
-			if( $relationship_to_model instanceof EE_Belongs_To_Relation ) {
698
+			if ($relationship_to_model instanceof EE_Belongs_To_Relation) {
699 699
 				// then just replace the cached object with the newly saved object
700 700
 				$this->_model_relations[$relationName] = $newly_saved_object;
701 701
 				return TRUE;
702 702
 			// or if it's some kind of sordid feral polyamorous relationship...
703
-			} elseif ( is_array( $this->_model_relations[$relationName] ) && isset( $this->_model_relations[$relationName][ $current_cache_id ] )) {
703
+			} elseif (is_array($this->_model_relations[$relationName]) && isset($this->_model_relations[$relationName][$current_cache_id])) {
704 704
 				// then remove the current cached item
705
-				unset( $this->_model_relations[$relationName][ $current_cache_id ] );
705
+				unset($this->_model_relations[$relationName][$current_cache_id]);
706 706
 				// and cache the newly saved object using it's new ID
707
-				$this->_model_relations[$relationName][ $newly_saved_object->ID() ] = $newly_saved_object;
707
+				$this->_model_relations[$relationName][$newly_saved_object->ID()] = $newly_saved_object;
708 708
 				return TRUE;
709 709
 			}
710 710
 		}
@@ -720,11 +720,11 @@  discard block
 block discarded – undo
720 720
 	 * @param string $relationName
721 721
 	 * @return EE_Base_Class
722 722
 	 */
723
-	public function get_one_from_cache($relationName){
724
-		$cached_array_or_object = isset( $this->_model_relations[$relationName] ) ? $this->_model_relations[$relationName] : null;
725
-		if(is_array($cached_array_or_object)){
723
+	public function get_one_from_cache($relationName) {
724
+		$cached_array_or_object = isset($this->_model_relations[$relationName]) ? $this->_model_relations[$relationName] : null;
725
+		if (is_array($cached_array_or_object)) {
726 726
 			return array_shift($cached_array_or_object);
727
-		}else{
727
+		} else {
728 728
 			return $cached_array_or_object;
729 729
 		}
730 730
 	}
@@ -739,14 +739,14 @@  discard block
 block discarded – undo
739 739
 	 * @throws \EE_Error
740 740
 	 * @return EE_Base_Class[] NOT necessarily indexed by primary keys
741 741
 	 */
742
-	public function get_all_from_cache($relationName){
743
-		$cached_array_or_object =  isset( $this->_model_relations[$relationName] ) ? $this->_model_relations[$relationName] : array();
744
-		if(is_array($cached_array_or_object)){
742
+	public function get_all_from_cache($relationName) {
743
+		$cached_array_or_object = isset($this->_model_relations[$relationName]) ? $this->_model_relations[$relationName] : array();
744
+		if (is_array($cached_array_or_object)) {
745 745
 			$objects = $cached_array_or_object;
746
-		}elseif($cached_array_or_object){
746
+		}elseif ($cached_array_or_object) {
747 747
 			//if the result is not an array, but exists, make it an array
748 748
 			$objects = array($cached_array_or_object);
749
-		}else{
749
+		} else {
750 750
 			//if nothing was found, return an empty array
751 751
 			$objects = array();
752 752
 		}
@@ -754,15 +754,15 @@  discard block
 block discarded – undo
754 754
 		//basically, if this model object was stored in the session, and these cached model objects
755 755
 		//already have IDs, let's make sure they're in their model's entity mapper
756 756
 		//otherwise we will have duplicates next time we call EE_Registry::instance()->load_model( $relationName )->get_one_by_ID( $result->ID() );
757
-		foreach( $objects as $model_object ){
758
-			$model = EE_Registry::instance()->load_model( $relationName );
759
-			if( $model instanceof EEM_Base && $model_object instanceof EE_Base_Class ){
757
+		foreach ($objects as $model_object) {
758
+			$model = EE_Registry::instance()->load_model($relationName);
759
+			if ($model instanceof EEM_Base && $model_object instanceof EE_Base_Class) {
760 760
 				//ensure its in the map if it has an ID; otherwise it will be added to the map when its saved
761
-				if( $model_object->ID() ){
762
-					$model->add_to_entity_map( $model_object );
761
+				if ($model_object->ID()) {
762
+					$model->add_to_entity_map($model_object);
763 763
 				}
764
-			}else{
765
-				throw new EE_Error( sprintf( __( 'Error retrieving related model objects. Either $1%s is not a model or $2%s is not a model object', 'event_espresso' ), $relationName, gettype( $model_object )));
764
+			} else {
765
+				throw new EE_Error(sprintf(__('Error retrieving related model objects. Either $1%s is not a model or $2%s is not a model object', 'event_espresso'), $relationName, gettype($model_object)));
766 766
 			}
767 767
 		}
768 768
 		return $objects;
@@ -781,13 +781,13 @@  discard block
 block discarded – undo
781 781
 	 *
782 782
 	 * @return array|EE_Base_Class[]
783 783
 	 */
784
-	public function next_x( $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
785
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by;
786
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
787
-		if ( empty( $field ) || empty( $current_value ) ) {
784
+	public function next_x($field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
785
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by;
786
+		$current_value = ! empty($field) ? $this->get($field) : null;
787
+		if (empty($field) || empty($current_value)) {
788 788
 			return array();
789 789
 		}
790
-		return $this->get_model()->next_x( $current_value, $field, $limit, $query_params, $columns_to_select );
790
+		return $this->get_model()->next_x($current_value, $field, $limit, $query_params, $columns_to_select);
791 791
 	}
792 792
 
793 793
 
@@ -806,13 +806,13 @@  discard block
 block discarded – undo
806 806
 	 *
807 807
 	 * @return array|EE_Base_Class[]
808 808
 	 */
809
-	public function previous_x( $field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null ) {
810
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by;
811
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
812
-		if ( empty( $field ) || empty( $current_value ) ) {
809
+	public function previous_x($field_to_order_by = null, $limit = 1, $query_params = array(), $columns_to_select = null) {
810
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by;
811
+		$current_value = ! empty($field) ? $this->get($field) : null;
812
+		if (empty($field) || empty($current_value)) {
813 813
 			return array();
814 814
 		}
815
-		return $this->get_model()->previous_x( $current_value, $field, $limit, $query_params, $columns_to_select );
815
+		return $this->get_model()->previous_x($current_value, $field, $limit, $query_params, $columns_to_select);
816 816
 	}
817 817
 
818 818
 
@@ -830,13 +830,13 @@  discard block
 block discarded – undo
830 830
 	 *
831 831
 	 * @return array|EE_Base_Class
832 832
 	 */
833
-	public function next( $field_to_order_by = null, $query_params = array(), $columns_to_select = null ) {
834
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by;
835
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
836
-		if ( empty( $field ) || empty( $current_value ) ) {
833
+	public function next($field_to_order_by = null, $query_params = array(), $columns_to_select = null) {
834
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by;
835
+		$current_value = ! empty($field) ? $this->get($field) : null;
836
+		if (empty($field) || empty($current_value)) {
837 837
 			return array();
838 838
 		}
839
-		return $this->get_model()->next( $current_value, $field, $query_params, $columns_to_select );
839
+		return $this->get_model()->next($current_value, $field, $query_params, $columns_to_select);
840 840
 	}
841 841
 
842 842
 
@@ -855,13 +855,13 @@  discard block
 block discarded – undo
855 855
 	 *
856 856
 	 * @return array|EE_Base_Class
857 857
 	 */
858
-	public function previous( $field_to_order_by = null, $query_params = array(), $columns_to_select = null ) {
859
-		$field = empty( $field_to_order_by ) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by;
860
-		$current_value = ! empty( $field ) ? $this->get( $field ) : null;
861
-		if ( empty( $field ) || empty( $current_value ) ) {
858
+	public function previous($field_to_order_by = null, $query_params = array(), $columns_to_select = null) {
859
+		$field = empty($field_to_order_by) && $this->get_model()->has_primary_key_field() ? $this->get_model()->get_primary_key_field()->get_name() : $field_to_order_by;
860
+		$current_value = ! empty($field) ? $this->get($field) : null;
861
+		if (empty($field) || empty($current_value)) {
862 862
 			return array();
863 863
 		}
864
-		return $this->get_model()->previous( $current_value, $field, $query_params, $columns_to_select );
864
+		return $this->get_model()->previous($current_value, $field, $query_params, $columns_to_select);
865 865
 	}
866 866
 
867 867
 
@@ -875,25 +875,25 @@  discard block
 block discarded – undo
875 875
 	 * @param string $field_name
876 876
 	 * @param mixed  $field_value_from_db
877 877
 	 */
878
-	public function set_from_db($field_name,$field_value_from_db){
878
+	public function set_from_db($field_name, $field_value_from_db) {
879 879
 		$field_obj = $this->get_model()->field_settings_for($field_name);
880
-		if ( $field_obj instanceof EE_Model_Field_Base ) {
880
+		if ($field_obj instanceof EE_Model_Field_Base) {
881 881
 			//you would think the DB has no NULLs for non-null label fields right? wrong!
882 882
 			//eg, a CPT model object could have an entry in the posts table, but no
883 883
 			//entry in the meta table. Meaning that all its columns in the meta table
884 884
 			//are null! yikes! so when we find one like that, use defaults for its meta columns
885
-			if($field_value_from_db === NULL ){
886
-				if( $field_obj->is_nullable()){
885
+			if ($field_value_from_db === NULL) {
886
+				if ($field_obj->is_nullable()) {
887 887
 					//if the field allows nulls, then let it be null
888 888
 					$field_value = NULL;
889
-				}else{
889
+				} else {
890 890
 					$field_value = $field_obj->get_default_value();
891 891
 				}
892
-			}else{
893
-				$field_value = $field_obj->prepare_for_set_from_db( $field_value_from_db );
892
+			} else {
893
+				$field_value = $field_obj->prepare_for_set_from_db($field_value_from_db);
894 894
 			}
895 895
 			$this->_fields[$field_name] = $field_value;
896
-			$this->_clear_cached_property( $field_name );
896
+			$this->_clear_cached_property($field_name);
897 897
 		}
898 898
 	}
899 899
 
@@ -905,8 +905,8 @@  discard block
 block discarded – undo
905 905
 	 * @param string $extra_cache_ref This allows the user to specify an extra cache ref for the given property (in cases where the same property may be used for different outputs - i.e. datetime, money etc.)
906 906
 	 * @return boolean
907 907
 	 */
908
-	public function get($field_name, $extra_cache_ref = NULL ){
909
-		return $this->_get_cached_property( $field_name, FALSE, $extra_cache_ref );
908
+	public function get($field_name, $extra_cache_ref = NULL) {
909
+		return $this->_get_cached_property($field_name, FALSE, $extra_cache_ref);
910 910
 	}
911 911
 
912 912
 
@@ -936,11 +936,11 @@  discard block
 block discarded – undo
936 936
 	 *                    				     just null is returned (because that indicates that likely
937 937
 	 *                    				     this field is nullable).
938 938
 	 */
939
-	public function get_DateTime_object( $field_name ) {
940
-		$field_settings = $this->get_model()->field_settings_for( $field_name );
939
+	public function get_DateTime_object($field_name) {
940
+		$field_settings = $this->get_model()->field_settings_for($field_name);
941 941
 
942
-		if ( ! $field_settings instanceof EE_Datetime_Field ) {
943
-			EE_Error::add_error( sprintf( __('The field %s is not an EE_Datetime_Field field.  There is no DateTime object stored on this field type.', 'event_espresso' ), $field_name ), __FILE__, __FUNCTION__, __LINE__ );
942
+		if ( ! $field_settings instanceof EE_Datetime_Field) {
943
+			EE_Error::add_error(sprintf(__('The field %s is not an EE_Datetime_Field field.  There is no DateTime object stored on this field type.', 'event_espresso'), $field_name), __FILE__, __FUNCTION__, __LINE__);
944 944
 			return false;
945 945
 		}
946 946
 
@@ -956,7 +956,7 @@  discard block
 block discarded – undo
956 956
 	 * @param string         $extra_cache_ref This allows the user to specify an extra cache ref for the given property (in cases where the same property may be used for different outputs - i.e. datetime, money etc.)
957 957
 	 * @return void
958 958
 	 */
959
-	public function e($field_name, $extra_cache_ref = NULL){
959
+	public function e($field_name, $extra_cache_ref = NULL) {
960 960
 		echo $this->get_pretty($field_name, $extra_cache_ref);
961 961
 	}
962 962
 	/**
@@ -965,8 +965,8 @@  discard block
 block discarded – undo
965 965
 	 * @param string $field_name
966 966
 	 * @return void
967 967
 	 */
968
-	public function f($field_name){
969
-		$this->e($field_name,'form_input');
968
+	public function f($field_name) {
969
+		$this->e($field_name, 'form_input');
970 970
 	}
971 971
 
972 972
 	/**
@@ -975,8 +975,8 @@  discard block
 block discarded – undo
975 975
 	 * @param string         $extra_cache_ref This allows the user to specify an extra cache ref for the given property (in cases where the same property may be used for different outputs - i.e. datetime, money etc.)
976 976
 	 * @return mixed
977 977
 	 */
978
-	public function get_pretty($field_name, $extra_cache_ref = NULL){
979
-		return  $this->_get_cached_property( $field_name, TRUE, $extra_cache_ref );
978
+	public function get_pretty($field_name, $extra_cache_ref = NULL) {
979
+		return  $this->_get_cached_property($field_name, TRUE, $extra_cache_ref);
980 980
 	}
981 981
 
982 982
 
@@ -993,37 +993,37 @@  discard block
 block discarded – undo
993 993
 	 * @param  boolean $echo         Whether the dtt is echoing using pretty echoing or just returned using vanilla get
994 994
 	 * @return void | string | bool | EE_Error string on success, FALSE on fail, or EE_Error Exception is thrown if field is not a valid dtt field, or void if echoing
995 995
 	 */
996
-	protected function _get_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL, $date_or_time = NULL, $echo = FALSE ) {
996
+	protected function _get_datetime($field_name, $dt_frmt = NULL, $tm_frmt = NULL, $date_or_time = NULL, $echo = FALSE) {
997 997
 
998
-		$in_dt_frmt = empty($dt_frmt) ? $this->_dt_frmt :  $dt_frmt;
998
+		$in_dt_frmt = empty($dt_frmt) ? $this->_dt_frmt : $dt_frmt;
999 999
 		$in_tm_frmt = empty($tm_frmt) ? $this->_tm_frmt : $tm_frmt;
1000 1000
 
1001 1001
 		//validate field for datetime and returns field settings if valid.
1002
-		$field = $this->_get_dtt_field_settings( $field_name );
1002
+		$field = $this->_get_dtt_field_settings($field_name);
1003 1003
 
1004 1004
 		//clear cached property if either formats are not null.
1005
-		if( $dt_frmt !== null || $tm_frmt !== null ) {
1006
-			$this->_clear_cached_property( $field_name );
1005
+		if ($dt_frmt !== null || $tm_frmt !== null) {
1006
+			$this->_clear_cached_property($field_name);
1007 1007
 			//reset format properties because they are used in get()
1008 1008
 			$this->_dt_frmt = $in_dt_frmt;
1009 1009
 			$this->_tm_frmt = $in_tm_frmt;
1010 1010
 		}
1011 1011
 
1012
-		if ( $echo )
1013
-			$field->set_pretty_date_format( $in_dt_frmt );
1012
+		if ($echo)
1013
+			$field->set_pretty_date_format($in_dt_frmt);
1014 1014
 		else
1015
-			$field->set_date_format( $in_dt_frmt );
1015
+			$field->set_date_format($in_dt_frmt);
1016 1016
 
1017
-		if ( $echo )
1018
-			$field->set_pretty_time_format( $in_tm_frmt );
1017
+		if ($echo)
1018
+			$field->set_pretty_time_format($in_tm_frmt);
1019 1019
 		else
1020
-			$field->set_time_format( $in_tm_frmt );
1020
+			$field->set_time_format($in_tm_frmt);
1021 1021
 
1022 1022
 		//set timezone in field object
1023
-		$field->set_timezone( $this->_timezone );
1023
+		$field->set_timezone($this->_timezone);
1024 1024
 
1025 1025
 		//set the output returned
1026
-		switch ( $date_or_time ) {
1026
+		switch ($date_or_time) {
1027 1027
 
1028 1028
 			case 'D' :
1029 1029
 				$field->set_date_time_output('date');
@@ -1038,11 +1038,11 @@  discard block
 block discarded – undo
1038 1038
 		}
1039 1039
 
1040 1040
 
1041
-		if ( $echo ) {
1042
-			$this->e( $field_name, $date_or_time );
1041
+		if ($echo) {
1042
+			$this->e($field_name, $date_or_time);
1043 1043
 			return '';
1044 1044
 		 }
1045
-		return $this->get( $field_name, $date_or_time );
1045
+		return $this->get($field_name, $date_or_time);
1046 1046
 	}
1047 1047
 
1048 1048
 
@@ -1052,8 +1052,8 @@  discard block
 block discarded – undo
1052 1052
 	 * @param  string $format     format for the date returned (if NULL we use default in dt_frmt property)
1053 1053
 	 * @return string            datetime value formatted
1054 1054
 	 */
1055
-	public function get_date( $field_name, $format = NULL ) {
1056
-		return $this->_get_datetime( $field_name, $format, NULL, 'D' );
1055
+	public function get_date($field_name, $format = NULL) {
1056
+		return $this->_get_datetime($field_name, $format, NULL, 'D');
1057 1057
 	}
1058 1058
 
1059 1059
 
@@ -1062,8 +1062,8 @@  discard block
 block discarded – undo
1062 1062
 	 * @param      $field_name
1063 1063
 	 * @param null $format
1064 1064
 	 */
1065
-	public function e_date( $field_name, $format = NULL ) {
1066
-		$this->_get_datetime( $field_name, $format, NULL, 'D', TRUE );
1065
+	public function e_date($field_name, $format = NULL) {
1066
+		$this->_get_datetime($field_name, $format, NULL, 'D', TRUE);
1067 1067
 	}
1068 1068
 
1069 1069
 
@@ -1073,8 +1073,8 @@  discard block
 block discarded – undo
1073 1073
 	 * @param  string $format     format for the time returned ( if NULL we use default in tm_frmt property)
1074 1074
 	 * @return string             datetime value formatted
1075 1075
 	 */
1076
-	public function get_time( $field_name, $format = NULL ) {
1077
-		return $this->_get_datetime( $field_name, NULL, $format, 'T' );
1076
+	public function get_time($field_name, $format = NULL) {
1077
+		return $this->_get_datetime($field_name, NULL, $format, 'T');
1078 1078
 	}
1079 1079
 
1080 1080
 
@@ -1083,8 +1083,8 @@  discard block
 block discarded – undo
1083 1083
 	 * @param      $field_name
1084 1084
 	 * @param null $format
1085 1085
 	 */
1086
-	public function e_time( $field_name, $format = NULL ) {
1087
-		$this->_get_datetime( $field_name, NULL, $format, 'T', TRUE );
1086
+	public function e_time($field_name, $format = NULL) {
1087
+		$this->_get_datetime($field_name, NULL, $format, 'T', TRUE);
1088 1088
 	}
1089 1089
 
1090 1090
 
@@ -1097,8 +1097,8 @@  discard block
 block discarded – undo
1097 1097
 	 * @param  string $tm_frmt    format for the time returned (if NULL we use default in tm_frmt property)
1098 1098
 	 * @return string             datetime value formatted
1099 1099
 	 */
1100
-	public function get_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL ) {
1101
-		return $this->_get_datetime( $field_name, $dt_frmt, $tm_frmt );
1100
+	public function get_datetime($field_name, $dt_frmt = NULL, $tm_frmt = NULL) {
1101
+		return $this->_get_datetime($field_name, $dt_frmt, $tm_frmt);
1102 1102
 	}
1103 1103
 
1104 1104
 
@@ -1108,8 +1108,8 @@  discard block
 block discarded – undo
1108 1108
 	 * @param null $dt_frmt
1109 1109
 	 * @param null $tm_frmt
1110 1110
 	 */
1111
-	public function e_datetime( $field_name, $dt_frmt = NULL, $tm_frmt = NULL ) {
1112
-		$this->_get_datetime( $field_name, $dt_frmt, $tm_frmt, NULL, TRUE);
1111
+	public function e_datetime($field_name, $dt_frmt = NULL, $tm_frmt = NULL) {
1112
+		$this->_get_datetime($field_name, $dt_frmt, $tm_frmt, NULL, TRUE);
1113 1113
 	}
1114 1114
 
1115 1115
 
@@ -1124,10 +1124,10 @@  discard block
 block discarded – undo
1124 1124
 	 * @return string Date and time string in set locale or false if no field exists for the given
1125 1125
 	 *                         field name.
1126 1126
 	 */
1127
-	public function get_i18n_datetime( $field_name, $format = NULL ) {
1128
-		EE_Registry::instance()->load_helper( 'DTT_Helper' );
1129
-		$format = empty( $format ) ? $this->_dt_frmt . ' ' . $this->_tm_frmt : $format;
1130
-		return date_i18n( $format, EEH_DTT_Helper::get_timestamp_with_offset( $this->get_raw( $field_name ), $this->_timezone ) );
1127
+	public function get_i18n_datetime($field_name, $format = NULL) {
1128
+		EE_Registry::instance()->load_helper('DTT_Helper');
1129
+		$format = empty($format) ? $this->_dt_frmt.' '.$this->_tm_frmt : $format;
1130
+		return date_i18n($format, EEH_DTT_Helper::get_timestamp_with_offset($this->get_raw($field_name), $this->_timezone));
1131 1131
 	}
1132 1132
 
1133 1133
 
@@ -1139,14 +1139,14 @@  discard block
 block discarded – undo
1139 1139
 	 * @throws EE_Error
1140 1140
 	 * @return EE_Datetime_Field
1141 1141
 	 */
1142
-	protected function _get_dtt_field_settings( $field_name ) {
1142
+	protected function _get_dtt_field_settings($field_name) {
1143 1143
 		$field = $this->get_model()->field_settings_for($field_name);
1144 1144
 
1145 1145
 		//check if field is dtt
1146
-		if ( $field instanceof EE_Datetime_Field ) {
1146
+		if ($field instanceof EE_Datetime_Field) {
1147 1147
 			return $field;
1148 1148
 		} else {
1149
-			throw new EE_Error( sprintf( __('The field name "%s" has been requested for the EE_Base_Class datetime functions and it is not a valid EE_Datetime_Field.  Please check the spelling of the field and make sure it has been setup as a EE_Datetime_Field in the %s model constructor', 'event_espresso'), $field_name, self::_get_model_classname( get_class($this) ) ) );
1149
+			throw new EE_Error(sprintf(__('The field name "%s" has been requested for the EE_Base_Class datetime functions and it is not a valid EE_Datetime_Field.  Please check the spelling of the field and make sure it has been setup as a EE_Datetime_Field in the %s model constructor', 'event_espresso'), $field_name, self::_get_model_classname(get_class($this))));
1150 1150
 		}
1151 1151
 	}
1152 1152
 
@@ -1167,8 +1167,8 @@  discard block
 block discarded – undo
1167 1167
 	 * @param string|Datetime $time      a valid time string for php datetime functions (or DateTime object)
1168 1168
 	 * @param string $fieldname the name of the field the time is being set on (must match a EE_Datetime_Field)
1169 1169
 	 */
1170
-	protected function _set_time_for( $time, $fieldname ) {
1171
-		$this->_set_date_time( 'T', $time, $fieldname );
1170
+	protected function _set_time_for($time, $fieldname) {
1171
+		$this->_set_date_time('T', $time, $fieldname);
1172 1172
 	}
1173 1173
 
1174 1174
 
@@ -1182,8 +1182,8 @@  discard block
 block discarded – undo
1182 1182
 	 * @param string|DateTime $date      a valid date string for php datetime functions ( or DateTime object)
1183 1183
 	 * @param string $fieldname the name of the field the date is being set on (must match a EE_Datetime_Field)
1184 1184
 	 */
1185
-	protected function _set_date_for( $date, $fieldname ) {
1186
-		$this->_set_date_time( 'D', $date, $fieldname );
1185
+	protected function _set_date_for($date, $fieldname) {
1186
+		$this->_set_date_time('D', $date, $fieldname);
1187 1187
 	}
1188 1188
 
1189 1189
 
@@ -1199,21 +1199,21 @@  discard block
 block discarded – undo
1199 1199
 	 * @param string|DateTime $datetime_value A valid Date or Time string (or DateTime object)
1200 1200
 	 * @param string $fieldname     the name of the field the date OR time is being set on (must match a EE_Datetime_Field property)
1201 1201
 	 */
1202
-	protected function _set_date_time( $what = 'T', $datetime_value, $fieldname ) {
1203
-		$field = $this->_get_dtt_field_settings( $fieldname );
1204
-		$field->set_timezone( $this->_timezone );
1205
-		$field->set_date_format( $this->_dt_frmt );
1206
-		$field->set_time_format( $this->_tm_frmt );
1202
+	protected function _set_date_time($what = 'T', $datetime_value, $fieldname) {
1203
+		$field = $this->_get_dtt_field_settings($fieldname);
1204
+		$field->set_timezone($this->_timezone);
1205
+		$field->set_date_format($this->_dt_frmt);
1206
+		$field->set_time_format($this->_tm_frmt);
1207 1207
 
1208
-		switch ( $what ) {
1208
+		switch ($what) {
1209 1209
 			case 'T' :
1210
-				$this->_fields[$fieldname] = $field->prepare_for_set_with_new_time( $datetime_value, $this->_fields[$fieldname] );
1210
+				$this->_fields[$fieldname] = $field->prepare_for_set_with_new_time($datetime_value, $this->_fields[$fieldname]);
1211 1211
 				break;
1212 1212
 			case 'D' :
1213
-				$this->_fields[$fieldname] = $field->prepare_for_set_with_new_date( $datetime_value, $this->_fields[$fieldname] );
1213
+				$this->_fields[$fieldname] = $field->prepare_for_set_with_new_date($datetime_value, $this->_fields[$fieldname]);
1214 1214
 				break;
1215 1215
 			case 'B' :
1216
-				$this->_fields[$fieldname] = $field->prepare_for_set( $datetime_value );
1216
+				$this->_fields[$fieldname] = $field->prepare_for_set($datetime_value);
1217 1217
 				break;
1218 1218
 		}
1219 1219
 
@@ -1236,25 +1236,25 @@  discard block
 block discarded – undo
1236 1236
 	 * @throws EE_Error
1237 1237
 	 * @return string timestamp
1238 1238
 	 */
1239
-	public function display_in_my_timezone( $field_name, $callback = 'get_datetime', $args = NULL, $prepend = '', $append = '' ) {
1239
+	public function display_in_my_timezone($field_name, $callback = 'get_datetime', $args = NULL, $prepend = '', $append = '') {
1240 1240
 		EE_Registry::instance()->load_helper('DTT_Helper');
1241 1241
 		$timezone = EEH_DTT_Helper::get_timezone();
1242 1242
 
1243
-		if ( $timezone == $this->_timezone )
1243
+		if ($timezone == $this->_timezone)
1244 1244
 			return '';
1245 1245
 
1246 1246
 		$original_timezone = $this->_timezone;
1247
-		$this->set_timezone( $timezone );
1247
+		$this->set_timezone($timezone);
1248 1248
 
1249 1249
 		$fn = (array) $field_name;
1250
-		$args = array_merge( $fn, (array) $args );
1250
+		$args = array_merge($fn, (array) $args);
1251 1251
 
1252
-		if ( !method_exists( $this, $callback ) )
1253
-			throw new EE_Error(sprintf( __('The method named "%s" given as the callback param in "display_in_my_timezone" does not exist.  Please check your spelling', 'event_espresso'), $callback ) );
1252
+		if ( ! method_exists($this, $callback))
1253
+			throw new EE_Error(sprintf(__('The method named "%s" given as the callback param in "display_in_my_timezone" does not exist.  Please check your spelling', 'event_espresso'), $callback));
1254 1254
 		$args = (array) $args;
1255
-		$return =  $prepend . call_user_func_array( array( $this, $callback ), $args ) . $append;
1255
+		$return = $prepend.call_user_func_array(array($this, $callback), $args).$append;
1256 1256
 
1257
-		$this->set_timezone( $original_timezone );
1257
+		$this->set_timezone($original_timezone);
1258 1258
 		return $return;
1259 1259
 	}
1260 1260
 
@@ -1265,21 +1265,21 @@  discard block
 block discarded – undo
1265 1265
 	 * Deletes this model object. That may mean just 'soft deleting' it though.
1266 1266
 	 * @return boolean | int
1267 1267
 	 */
1268
-	public function delete(){
1268
+	public function delete() {
1269 1269
 		/**
1270 1270
 		 * Called just before deleting a model object
1271 1271
 		 *
1272 1272
 		 * @param EE_Base_Class $model_object about to be 'deleted'
1273 1273
 		 */
1274
-		do_action( 'AHEE__EE_Base_Class__delete__before', $this );
1275
-		$result = $this->get_model()->delete_by_ID( $this->ID() );
1274
+		do_action('AHEE__EE_Base_Class__delete__before', $this);
1275
+		$result = $this->get_model()->delete_by_ID($this->ID());
1276 1276
                 $this->refresh_cache_of_related_objects();
1277 1277
 		/**
1278 1278
 		 * Called just after deleting a model object
1279 1279
 		 * @param EE_Base_Class $model_object that was just 'deleted'
1280 1280
 		 * @param boolean $result
1281 1281
 		 */
1282
-		do_action( 'AHEE__EE_Base_Class__delete__end', $this, $result );
1282
+		do_action('AHEE__EE_Base_Class__delete__end', $this, $result);
1283 1283
 		return $result;
1284 1284
 	}
1285 1285
 
@@ -1289,12 +1289,12 @@  discard block
 block discarded – undo
1289 1289
 	 * Deletes this model object permanently from db (but keep in mind related models my block the delete and return an error)
1290 1290
 	 * @return bool
1291 1291
 	 */
1292
-	public function delete_permanently(){
1293
-		$model=$this->get_model();
1294
-		if($model instanceof EEM_Soft_Delete_Base){
1295
-			$result=$model->delete_permanently_by_ID($this->ID());
1292
+	public function delete_permanently() {
1293
+		$model = $this->get_model();
1294
+		if ($model instanceof EEM_Soft_Delete_Base) {
1295
+			$result = $model->delete_permanently_by_ID($this->ID());
1296 1296
                         $this->refresh_cache_of_related_objects();
1297
-		}else{
1297
+		} else {
1298 1298
 			$result = $this->delete();
1299 1299
 		}
1300 1300
 		return $result ? true : false;
@@ -1305,18 +1305,18 @@  discard block
 block discarded – undo
1305 1305
          * related model objects
1306 1306
          */
1307 1307
         public function refresh_cache_of_related_objects() {
1308
-            foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) {
1309
-                if( ! empty( $this->_model_relations[ $relation_name ] ) ) {
1310
-                    $related_objects = $this->_model_relations[ $relation_name ];
1311
-                    if( $relation_obj instanceof EE_Belongs_To_Relation ) {
1308
+            foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) {
1309
+                if ( ! empty($this->_model_relations[$relation_name])) {
1310
+                    $related_objects = $this->_model_relations[$relation_name];
1311
+                    if ($relation_obj instanceof EE_Belongs_To_Relation) {
1312 1312
                         //this relation only stores a single model object, not an array
1313 1313
                         //but let's make it consistent
1314
-                        $related_objects = array( $related_objects );
1314
+                        $related_objects = array($related_objects);
1315 1315
                     }
1316
-                    foreach( $related_objects as $related_object ) {
1316
+                    foreach ($related_objects as $related_object) {
1317 1317
                         //only refresh their cache if they're in memory
1318
-                        if( $related_object instanceof EE_Base_Class ) {
1319
-							$related_object->clear_cache( $this->get_model()->get_this_model_name(), $this );
1318
+                        if ($related_object instanceof EE_Base_Class) {
1319
+							$related_object->clear_cache($this->get_model()->get_this_model_name(), $this);
1320 1320
                         }
1321 1321
                     }
1322 1322
                 }
@@ -1336,17 +1336,17 @@  discard block
 block discarded – undo
1336 1336
 	 * @return int , 1 on a successful update, the ID of the new entry on insert; 0 on failure or if the model object
1337 1337
 	 * isn't allowed to persist (as determined by EE_Base_Class::allow_persist())
1338 1338
 	 */
1339
-	public function save($set_cols_n_values=array()) {
1339
+	public function save($set_cols_n_values = array()) {
1340 1340
 		/**
1341 1341
 		 * Filters the fields we're about to save on the model object
1342 1342
 		 *
1343 1343
 		 * @param array $set_cols_n_values
1344 1344
 		 * @param EE_Base_Class $model_object
1345 1345
 		 */
1346
-		$set_cols_n_values = apply_filters( 'FHEE__EE_Base_Class__save__set_cols_n_values', $set_cols_n_values, $this  );
1346
+		$set_cols_n_values = apply_filters('FHEE__EE_Base_Class__save__set_cols_n_values', $set_cols_n_values, $this);
1347 1347
 		//set attributes as provided in $set_cols_n_values
1348
-		foreach($set_cols_n_values as $column=>$value){
1349
-			$this->set($column,$value);
1348
+		foreach ($set_cols_n_values as $column=>$value) {
1349
+			$this->set($column, $value);
1350 1350
 		}
1351 1351
 		/**
1352 1352
 		 * Saving a model object.
@@ -1354,8 +1354,8 @@  discard block
 block discarded – undo
1354 1354
 		 * Before we perform a save, this action is fired.
1355 1355
 		 * @param EE_Base_Class $model_object the model object about to be saved.
1356 1356
 		 */
1357
-		do_action( 'AHEE__EE_Base_Class__save__begin', $this );
1358
-		if( ! $this->allow_persist() ) {
1357
+		do_action('AHEE__EE_Base_Class__save__begin', $this);
1358
+		if ( ! $this->allow_persist()) {
1359 1359
 			return 0;
1360 1360
 		}
1361 1361
 		//now get current attribute values
@@ -1365,61 +1365,61 @@  discard block
 block discarded – undo
1365 1365
 		$old_assumption_concerning_value_preparation = $this->get_model()->get_assumption_concerning_values_already_prepared_by_model_object();
1366 1366
 		$this->get_model()->assume_values_already_prepared_by_model_object(true);
1367 1367
 		//does this model have an autoincrement PK?
1368
-		if($this->get_model()->has_primary_key_field()){
1369
-			if($this->get_model()->get_primary_key_field()->is_auto_increment()){
1368
+		if ($this->get_model()->has_primary_key_field()) {
1369
+			if ($this->get_model()->get_primary_key_field()->is_auto_increment()) {
1370 1370
 				//ok check if it's set, if so: update; if not, insert
1371
-				if ( ! empty( $save_cols_n_values[self::_get_primary_key_name( get_class($this) )] ) ){
1372
-					$results = $this->get_model()->update_by_ID ( $save_cols_n_values, $this->ID() );
1371
+				if ( ! empty($save_cols_n_values[self::_get_primary_key_name(get_class($this))])) {
1372
+					$results = $this->get_model()->update_by_ID($save_cols_n_values, $this->ID());
1373 1373
 				} else {
1374
-					unset($save_cols_n_values[self::_get_primary_key_name( get_class( $this) )]);
1375
-					$results = $this->get_model()->insert( $save_cols_n_values, true);
1376
-					if($results){
1374
+					unset($save_cols_n_values[self::_get_primary_key_name(get_class($this))]);
1375
+					$results = $this->get_model()->insert($save_cols_n_values, true);
1376
+					if ($results) {
1377 1377
 						//if successful, set the primary key
1378 1378
 						//but don't use the normal SET method, because it will check if
1379 1379
 						//an item with the same ID exists in the mapper & db, then
1380 1380
 						//will find it in the db (because we just added it) and THAT object
1381 1381
 						//will get added to the mapper before we can add this one!
1382 1382
 						//but if we just avoid using the SET method, all that headache can be avoided
1383
-						$pk_field_name =self::_get_primary_key_name( get_class($this));
1383
+						$pk_field_name = self::_get_primary_key_name(get_class($this));
1384 1384
 						$this->_fields[$pk_field_name] = $results;
1385 1385
 						$this->_clear_cached_property($pk_field_name);
1386
-						$this->get_model()->add_to_entity_map( $this );
1386
+						$this->get_model()->add_to_entity_map($this);
1387 1387
 						$this->_update_cached_related_model_objs_fks();
1388 1388
 					}
1389 1389
 				}
1390
-			}else{//PK is NOT auto-increment
1390
+			} else {//PK is NOT auto-increment
1391 1391
 				//so check if one like it already exists in the db
1392
-				if( $this->get_model()->exists_by_ID( $this->ID() ) ){
1393
-					if( ! $this->in_entity_map() && WP_DEBUG ){
1392
+				if ($this->get_model()->exists_by_ID($this->ID())) {
1393
+					if ( ! $this->in_entity_map() && WP_DEBUG) {
1394 1394
 						throw new EE_Error(
1395 1395
 							sprintf(
1396
-								__( 'Using a model object %1$s that is NOT in the entity map, can lead to unexpected errors. You should either: %4$s 1. Put it in the entity mapper by calling %2$s %4$s 2. Discard this model object and use what is in the entity mapper %4$s 3. Fetch from the database using %3$s', 'event_espresso' ),
1396
+								__('Using a model object %1$s that is NOT in the entity map, can lead to unexpected errors. You should either: %4$s 1. Put it in the entity mapper by calling %2$s %4$s 2. Discard this model object and use what is in the entity mapper %4$s 3. Fetch from the database using %3$s', 'event_espresso'),
1397 1397
 								get_class($this),
1398
-								get_class( $this->get_model() ) . '::instance()->add_to_entity_map()',
1399
-								get_class( $this->get_model() ) . '::instance()->get_one_by_ID()',
1398
+								get_class($this->get_model()).'::instance()->add_to_entity_map()',
1399
+								get_class($this->get_model()).'::instance()->get_one_by_ID()',
1400 1400
 								'<br />'
1401 1401
 							)
1402 1402
 						);
1403 1403
 					}
1404 1404
 					$results = $this->get_model()->update_by_ID($save_cols_n_values, $this->ID());
1405
-				}else{
1405
+				} else {
1406 1406
 					$results = $this->get_model()->insert($save_cols_n_values);
1407 1407
 					$this->_update_cached_related_model_objs_fks();
1408 1408
 				}
1409 1409
 			}
1410
-		}else{//there is NO primary key
1410
+		} else {//there is NO primary key
1411 1411
 			$already_in_db = false;
1412
-			foreach($this->get_model()->unique_indexes() as $index){
1412
+			foreach ($this->get_model()->unique_indexes() as $index) {
1413 1413
 				$uniqueness_where_params = array_intersect_key($save_cols_n_values, $index->fields());
1414
-				if($this->get_model()->exists(array($uniqueness_where_params))){
1414
+				if ($this->get_model()->exists(array($uniqueness_where_params))) {
1415 1415
 					$already_in_db = true;
1416 1416
 				}
1417 1417
 			}
1418
-			if( $already_in_db ){
1419
-				$combined_pk_fields_n_values = array_intersect_key( $save_cols_n_values, $this->get_model()->get_combined_primary_key_fields() );
1420
-				$results = $this->get_model()->update( $save_cols_n_values,$combined_pk_fields_n_values );
1421
-			}else{
1422
-				$results = $this->get_model()->insert( $save_cols_n_values );
1418
+			if ($already_in_db) {
1419
+				$combined_pk_fields_n_values = array_intersect_key($save_cols_n_values, $this->get_model()->get_combined_primary_key_fields());
1420
+				$results = $this->get_model()->update($save_cols_n_values, $combined_pk_fields_n_values);
1421
+			} else {
1422
+				$results = $this->get_model()->insert($save_cols_n_values);
1423 1423
 			}
1424 1424
 		}
1425 1425
 		//restore the old assumption about values being prepared by the model object
@@ -1432,7 +1432,7 @@  discard block
 block discarded – undo
1432 1432
 		 * @param boolean|int $results if it were updated, TRUE or FALSE; if it were newly inserted
1433 1433
 		 * the new ID (or 0 if an error occurred and it wasn't updated)
1434 1434
 		 */
1435
-		do_action( 'AHEE__EE_Base_Class__save__end', $this, $results );
1435
+		do_action('AHEE__EE_Base_Class__save__end', $this, $results);
1436 1436
 		return $results;
1437 1437
 	}
1438 1438
 
@@ -1444,13 +1444,13 @@  discard block
 block discarded – undo
1444 1444
 	 * and we want to let its cached relations with foreign keys to it know about that change. Eg: we've created a transaction but haven't saved it to the db. We also create a registration and don't save it to the DB, but we DO cache it on the transaction. Now, when we save the transaction, the registration's TXN_ID will be automatically updated, whether or not they exist in the DB (if they do, their DB records will be automatically updated)
1445 1445
 	 * @return void
1446 1446
 	 */
1447
-	protected function _update_cached_related_model_objs_fks(){
1448
-		foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ){
1449
-			if( $relation_obj instanceof EE_Has_Many_Relation ){
1450
-				foreach( $this->get_all_from_cache( $relation_name ) as $related_model_obj_in_cache) {
1451
-					$fk_to_this = $related_model_obj_in_cache->get_model()->get_foreign_key_to( $this->get_model()->get_this_model_name() );
1452
-					$related_model_obj_in_cache->set($fk_to_this->get_name(), $this->ID() );
1453
-					if( $related_model_obj_in_cache->ID() ){
1447
+	protected function _update_cached_related_model_objs_fks() {
1448
+		foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) {
1449
+			if ($relation_obj instanceof EE_Has_Many_Relation) {
1450
+				foreach ($this->get_all_from_cache($relation_name) as $related_model_obj_in_cache) {
1451
+					$fk_to_this = $related_model_obj_in_cache->get_model()->get_foreign_key_to($this->get_model()->get_this_model_name());
1452
+					$related_model_obj_in_cache->set($fk_to_this->get_name(), $this->ID());
1453
+					if ($related_model_obj_in_cache->ID()) {
1454 1454
 						$related_model_obj_in_cache->save();
1455 1455
 					}
1456 1456
 				}
@@ -1466,21 +1466,21 @@  discard block
 block discarded – undo
1466 1466
 	 * and this object and properly setup
1467 1467
 	 * @return int ID of new model object on save; 0 on failure+
1468 1468
 	 */
1469
-	public function save_new_cached_related_model_objs(){
1469
+	public function save_new_cached_related_model_objs() {
1470 1470
 		//make sure this has been saved
1471
-		if( ! $this->ID()){
1471
+		if ( ! $this->ID()) {
1472 1472
 			$id = $this->save();
1473
-		}else{
1473
+		} else {
1474 1474
 			$id = $this->ID();
1475 1475
 		}
1476 1476
 		//now save all the NEW cached model objects  (ie they don't exist in the DB)
1477
-		foreach($this->get_model()->relation_settings() as $relationName => $relationObj){
1477
+		foreach ($this->get_model()->relation_settings() as $relationName => $relationObj) {
1478 1478
 
1479 1479
 
1480
-			if($this->_model_relations[$relationName]){
1480
+			if ($this->_model_relations[$relationName]) {
1481 1481
 				//is this a relation where we should expect just ONE related object (ie, EE_Belongs_To_relation)
1482 1482
 				//or MANY related objects (ie, EE_HABTM_Relation or EE_Has_Many_Relation)?
1483
-				if($relationObj instanceof EE_Belongs_To_Relation){
1483
+				if ($relationObj instanceof EE_Belongs_To_Relation) {
1484 1484
 					//add a relation to that relation type (which saves the appropriate thing in the process)
1485 1485
 					//but ONLY if it DOES NOT exist in the DB
1486 1486
 					/* @var $related_model_obj EE_Base_Class */
@@ -1489,8 +1489,8 @@  discard block
 block discarded – undo
1489 1489
 						$this->_add_relation_to($related_model_obj, $relationName);
1490 1490
 						$related_model_obj->save_new_cached_related_model_objs();
1491 1491
 //					}
1492
-				}else{
1493
-					foreach($this->_model_relations[$relationName] as $related_model_obj){
1492
+				} else {
1493
+					foreach ($this->_model_relations[$relationName] as $related_model_obj) {
1494 1494
 						//add a relation to that relation type (which saves the appropriate thing in the process)
1495 1495
 						//but ONLY if it DOES NOT exist in the DB
1496 1496
 //						if( ! $related_model_obj->ID()){
@@ -1511,8 +1511,8 @@  discard block
 block discarded – undo
1511 1511
 	 * @return \EEM_Base | \EEM_CPT_Base
1512 1512
 	 */
1513 1513
 	public function get_model() {
1514
-		$modelName = self::_get_model_classname( get_class($this) );
1515
-		return self::_get_model_instance_with_name($modelName, $this->_timezone );
1514
+		$modelName = self::_get_model_classname(get_class($this));
1515
+		return self::_get_model_instance_with_name($modelName, $this->_timezone);
1516 1516
 	}
1517 1517
 
1518 1518
 
@@ -1522,10 +1522,10 @@  discard block
 block discarded – undo
1522 1522
 	 * @param $classname
1523 1523
 	 * @return mixed bool|EE_Base_Class|EEM_CPT_Base
1524 1524
 	 */
1525
-	protected static function _get_object_from_entity_mapper($props_n_values, $classname){
1525
+	protected static function _get_object_from_entity_mapper($props_n_values, $classname) {
1526 1526
 		//TODO: will not work for Term_Relationships because they have no PK!
1527
-		$primary_id_ref = self::_get_primary_key_name( $classname );
1528
-		if ( array_key_exists( $primary_id_ref, $props_n_values ) && !empty( $props_n_values[$primary_id_ref] ) ) {
1527
+		$primary_id_ref = self::_get_primary_key_name($classname);
1528
+		if (array_key_exists($primary_id_ref, $props_n_values) && ! empty($props_n_values[$primary_id_ref])) {
1529 1529
 			$id = $props_n_values[$primary_id_ref];
1530 1530
 			return self::_get_model($classname)->get_from_entity_map($id);
1531 1531
 		}
@@ -1542,24 +1542,24 @@  discard block
 block discarded – undo
1542 1542
 	 * @param null    $timezone
1543 1543
 	 * @return mixed (EE_Base_Class|bool)
1544 1544
 	 */
1545
-	protected static function _check_for_object( $props_n_values, $classname, $timezone = NULL ) {
1546
-		if( self::_get_model( $classname )->has_primary_key_field()){
1547
-			$primary_id_ref = self::_get_primary_key_name( $classname );
1545
+	protected static function _check_for_object($props_n_values, $classname, $timezone = NULL) {
1546
+		if (self::_get_model($classname)->has_primary_key_field()) {
1547
+			$primary_id_ref = self::_get_primary_key_name($classname);
1548 1548
 
1549
-			if ( array_key_exists( $primary_id_ref, $props_n_values ) && !empty( $props_n_values[$primary_id_ref] ) ) {
1550
-				$existing = self::_get_model( $classname, $timezone )->get_one_by_ID( $props_n_values[$primary_id_ref] );
1551
-			}else{
1549
+			if (array_key_exists($primary_id_ref, $props_n_values) && ! empty($props_n_values[$primary_id_ref])) {
1550
+				$existing = self::_get_model($classname, $timezone)->get_one_by_ID($props_n_values[$primary_id_ref]);
1551
+			} else {
1552 1552
 				$existing = null;
1553 1553
 			}
1554
-		}elseif( self::_get_model( $classname, $timezone )->has_all_combined_primary_key_fields(  $props_n_values ) ){
1554
+		}elseif (self::_get_model($classname, $timezone)->has_all_combined_primary_key_fields($props_n_values)) {
1555 1555
 			//no primary key on this model, but there's still a matching item in the DB
1556
-				$existing = self::_get_model($classname, $timezone)->get_one_by_ID( self::_get_model($classname, $timezone)->get_index_primary_key_string( $props_n_values ) );
1557
-		}else{
1556
+				$existing = self::_get_model($classname, $timezone)->get_one_by_ID(self::_get_model($classname, $timezone)->get_index_primary_key_string($props_n_values));
1557
+		} else {
1558 1558
 			$existing = null;
1559 1559
 		}
1560
-		if ( $existing ) {
1561
-			foreach ( $props_n_values as $property => $field_value ) {
1562
-				$existing->set( $property, $field_value );
1560
+		if ($existing) {
1561
+			foreach ($props_n_values as $property => $field_value) {
1562
+				$existing->set($property, $field_value);
1563 1563
 			}
1564 1564
 			return $existing;
1565 1565
 		} else {
@@ -1577,13 +1577,13 @@  discard block
 block discarded – undo
1577 1577
 	 * @throws EE_Error
1578 1578
 	 * @return EEM_Base
1579 1579
 	 */
1580
-	protected static function  _get_model( $classname, $timezone = NULL ){
1580
+	protected static function  _get_model($classname, $timezone = NULL) {
1581 1581
 		//find model for this class
1582
-		if( ! $classname ){
1583
-			throw new EE_Error(sprintf(__("What were you thinking calling _get_model(%s)?? You need to specify the class name", "event_espresso"),$classname));
1582
+		if ( ! $classname) {
1583
+			throw new EE_Error(sprintf(__("What were you thinking calling _get_model(%s)?? You need to specify the class name", "event_espresso"), $classname));
1584 1584
 		}
1585
-		$modelName=self::_get_model_classname($classname);
1586
-		return self::_get_model_instance_with_name($modelName, $timezone );
1585
+		$modelName = self::_get_model_classname($classname);
1586
+		return self::_get_model_instance_with_name($modelName, $timezone);
1587 1587
 	}
1588 1588
 
1589 1589
 
@@ -1594,10 +1594,10 @@  discard block
 block discarded – undo
1594 1594
 	 * @param null   $timezone
1595 1595
 	 * @return EEM_Base
1596 1596
 	 */
1597
-	protected static function _get_model_instance_with_name($model_classname, $timezone = NULL){
1598
-		$model_classname = str_replace( 'EEM_', '', $model_classname );
1599
-		$model = EE_Registry::instance()->load_model( $model_classname );
1600
-		$model->set_timezone( $timezone );
1597
+	protected static function _get_model_instance_with_name($model_classname, $timezone = NULL) {
1598
+		$model_classname = str_replace('EEM_', '', $model_classname);
1599
+		$model = EE_Registry::instance()->load_model($model_classname);
1600
+		$model->set_timezone($timezone);
1601 1601
 		return $model;
1602 1602
 	}
1603 1603
 
@@ -1609,10 +1609,10 @@  discard block
 block discarded – undo
1609 1609
 	 * @param null $model_name
1610 1610
 	 * @return string like EEM_Attendee
1611 1611
 	 */
1612
-	private static function _get_model_classname( $model_name = null){
1613
-		if(strpos($model_name,"EE_")===0){
1614
-			$model_classname=str_replace("EE_","EEM_",$model_name);
1615
-		}else{
1612
+	private static function _get_model_classname($model_name = null) {
1613
+		if (strpos($model_name, "EE_") === 0) {
1614
+			$model_classname = str_replace("EE_", "EEM_", $model_name);
1615
+		} else {
1616 1616
 			$model_classname = "EEM_".$model_name;
1617 1617
 		}
1618 1618
 		return $model_classname;
@@ -1626,11 +1626,11 @@  discard block
 block discarded – undo
1626 1626
 	 * @throws EE_Error
1627 1627
 	 * @return string
1628 1628
 	 */
1629
-	protected static function _get_primary_key_name( $classname = NULL ){
1630
-		if( ! $classname){
1631
-			throw new EE_Error(sprintf(__("What were you thinking calling _get_primary_key_name(%s)", "event_espresso"),$classname));
1629
+	protected static function _get_primary_key_name($classname = NULL) {
1630
+		if ( ! $classname) {
1631
+			throw new EE_Error(sprintf(__("What were you thinking calling _get_primary_key_name(%s)", "event_espresso"), $classname));
1632 1632
 		}
1633
-		return self::_get_model( $classname )->get_primary_key_field()->get_name();
1633
+		return self::_get_model($classname)->get_primary_key_field()->get_name();
1634 1634
 	}
1635 1635
 
1636 1636
 
@@ -1642,12 +1642,12 @@  discard block
 block discarded – undo
1642 1642
 	 * Usually defaults for integer primary keys are 0; string primary keys are usually NULL).
1643 1643
 	 * @return mixed, if the primary key is of type INT it'll be an int. Otherwise it could be a string
1644 1644
 	 */
1645
-	public function ID(){
1645
+	public function ID() {
1646 1646
 		//now that we know the name of the variable, use a variable variable to get its value and return its
1647
-		if( $this->get_model()->has_primary_key_field() ) {
1648
-			return $this->_fields[self::_get_primary_key_name( get_class($this) )];
1649
-		}else{
1650
-			return $this->get_model()->get_index_primary_key_string( $this->_fields );
1647
+		if ($this->get_model()->has_primary_key_field()) {
1648
+			return $this->_fields[self::_get_primary_key_name(get_class($this))];
1649
+		} else {
1650
+			return $this->get_model()->get_index_primary_key_string($this->_fields);
1651 1651
 		}
1652 1652
 	}
1653 1653
 
@@ -1665,38 +1665,38 @@  discard block
 block discarded – undo
1665 1665
 	 * @throws EE_Error
1666 1666
 	 * @return EE_Base_Class the object the relation was added to
1667 1667
 	 */
1668
-	public function _add_relation_to( $otherObjectModelObjectOrID,$relationName, $extra_join_model_fields_n_values = array(), $cache_id = NULL ){
1668
+	public function _add_relation_to($otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values = array(), $cache_id = NULL) {
1669 1669
 		//if this thing exists in the DB, save the relation to the DB
1670
-		if( $this->ID() ){
1671
-			$otherObject = $this->get_model()->add_relationship_to( $this, $otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values );
1670
+		if ($this->ID()) {
1671
+			$otherObject = $this->get_model()->add_relationship_to($this, $otherObjectModelObjectOrID, $relationName, $extra_join_model_fields_n_values);
1672 1672
 			//clear cache so future get_many_related and get_first_related() return new results.
1673
-			$this->clear_cache( $relationName, $otherObject, TRUE );
1674
-                        if( $otherObject instanceof EE_Base_Class ) {
1675
-                            $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
1673
+			$this->clear_cache($relationName, $otherObject, TRUE);
1674
+                        if ($otherObject instanceof EE_Base_Class) {
1675
+                            $otherObject->clear_cache($this->get_model()->get_this_model_name(), $this);
1676 1676
                         }
1677 1677
 		} else {
1678 1678
 			//this thing doesn't exist in the DB,  so just cache it
1679
-			if( ! $otherObjectModelObjectOrID instanceof EE_Base_Class){
1680
-				throw new EE_Error( sprintf(
1681
-					__( 'Before a model object is saved to the database, calls to _add_relation_to must be passed an actual object, not just an ID. You provided %s as the model object to a %s', 'event_espresso' ),
1679
+			if ( ! $otherObjectModelObjectOrID instanceof EE_Base_Class) {
1680
+				throw new EE_Error(sprintf(
1681
+					__('Before a model object is saved to the database, calls to _add_relation_to must be passed an actual object, not just an ID. You provided %s as the model object to a %s', 'event_espresso'),
1682 1682
 					$otherObjectModelObjectOrID,
1683
-					get_class( $this )
1683
+					get_class($this)
1684 1684
 				));
1685 1685
 			} else {
1686 1686
 				$otherObject = $otherObjectModelObjectOrID;
1687 1687
 			}
1688
-			$this->cache( $relationName, $otherObjectModelObjectOrID, $cache_id );
1688
+			$this->cache($relationName, $otherObjectModelObjectOrID, $cache_id);
1689 1689
 		}
1690
-                if( $otherObject instanceof EE_Base_Class ) {
1690
+                if ($otherObject instanceof EE_Base_Class) {
1691 1691
                     //fix the reciprocal relation too
1692
-                    if( $otherObject->ID() ) {
1692
+                    if ($otherObject->ID()) {
1693 1693
                             //its saved so assumed relations exist in the DB, so we can just
1694 1694
                             //clear the cache so future queries use the updated info in the DB
1695
-                            $otherObject->clear_cache( $this->get_model()->get_this_model_name(), null, true );
1695
+                            $otherObject->clear_cache($this->get_model()->get_this_model_name(), null, true);
1696 1696
                     } else {
1697 1697
 
1698 1698
                             //it's not saved, so it caches relations like this
1699
-                            $otherObject->cache( $this->get_model()->get_this_model_name(), $this );
1699
+                            $otherObject->cache($this->get_model()->get_this_model_name(), $this);
1700 1700
                     }
1701 1701
                 }
1702 1702
 		return $otherObject;
@@ -1719,17 +1719,17 @@  discard block
 block discarded – undo
1719 1719
 	 * 				Also remember that if an exact match isn't found for these extra cols/val pairs, then a NEW row is created in the join table.
1720 1720
 	 * @return EE_Base_Class the relation was removed from
1721 1721
 	 */
1722
-	public function _remove_relation_to($otherObjectModelObjectOrID,$relationName, $where_query = array() ){
1723
-		if ( $this->ID() ) {
1722
+	public function _remove_relation_to($otherObjectModelObjectOrID, $relationName, $where_query = array()) {
1723
+		if ($this->ID()) {
1724 1724
 			//if this exists in the DB, save the relation change to the DB too
1725
-			$otherObject = $this->get_model()->remove_relationship_to( $this, $otherObjectModelObjectOrID, $relationName, $where_query );
1726
-			$this->clear_cache( $relationName, $otherObject );
1725
+			$otherObject = $this->get_model()->remove_relationship_to($this, $otherObjectModelObjectOrID, $relationName, $where_query);
1726
+			$this->clear_cache($relationName, $otherObject);
1727 1727
 		} else {
1728 1728
 			//this doesn't exist in the DB, just remove it from the cache
1729
-			$otherObject = $this->clear_cache( $relationName, $otherObjectModelObjectOrID );
1729
+			$otherObject = $this->clear_cache($relationName, $otherObjectModelObjectOrID);
1730 1730
 		}
1731
-                if( $otherObject instanceof EE_Base_Class ) {
1732
-                    $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
1731
+                if ($otherObject instanceof EE_Base_Class) {
1732
+                    $otherObject->clear_cache($this->get_model()->get_this_model_name(), $this);
1733 1733
                 }
1734 1734
 		return $otherObject;
1735 1735
 	}
@@ -1740,18 +1740,18 @@  discard block
 block discarded – undo
1740 1740
 	 * @param array $where_query_params like EEM_Base::get_all's $query_params[0] (where conditions)
1741 1741
 	 * @return EE_Base_Class
1742 1742
 	 */
1743
-	public function _remove_relations($relationName,$where_query_params = array()){
1744
-		if ( $this->ID() ) {
1743
+	public function _remove_relations($relationName, $where_query_params = array()) {
1744
+		if ($this->ID()) {
1745 1745
 			//if this exists in the DB, save the relation change to the DB too
1746
-			$otherObjects = $this->get_model()->remove_relations( $this, $relationName, $where_query_params );
1747
-			$this->clear_cache( $relationName, null, true );
1746
+			$otherObjects = $this->get_model()->remove_relations($this, $relationName, $where_query_params);
1747
+			$this->clear_cache($relationName, null, true);
1748 1748
 		} else {
1749 1749
 			//this doesn't exist in the DB, just remove it from the cache
1750
-			$otherObjects = $this->clear_cache( $relationName, null, true );
1750
+			$otherObjects = $this->clear_cache($relationName, null, true);
1751 1751
 		}
1752
-                if( is_array( $otherObjects ) ) {
1753
-                    foreach ( $otherObjects as $otherObject ) {
1754
-                            $otherObject->clear_cache( $this->get_model()->get_this_model_name(), $this );
1752
+                if (is_array($otherObjects)) {
1753
+                    foreach ($otherObjects as $otherObject) {
1754
+                            $otherObject->clear_cache($this->get_model()->get_this_model_name(), $this);
1755 1755
                     }
1756 1756
                 }
1757 1757
 		return $otherObjects;
@@ -1769,26 +1769,26 @@  discard block
 block discarded – undo
1769 1769
 	 * @return EE_Base_Class[] Results not necessarily indexed by IDs, because some results might not have primary keys
1770 1770
 	 * or might not be saved yet. Consider using EEM_Base::get_IDs() on these results if you want IDs
1771 1771
 	 */
1772
-	public function get_many_related($relationName,$query_params = array()){
1773
-		if($this->ID()){//this exists in the DB, so get the related things from either the cache or the DB
1772
+	public function get_many_related($relationName, $query_params = array()) {
1773
+		if ($this->ID()) {//this exists in the DB, so get the related things from either the cache or the DB
1774 1774
 			//if there are query parameters, forget about caching the related model objects.
1775
-			if( $query_params ){
1775
+			if ($query_params) {
1776 1776
 				$related_model_objects = $this->get_model()->get_all_related($this, $relationName, $query_params);
1777
-			}else{
1777
+			} else {
1778 1778
 				//did we already cache the result of this query?
1779 1779
 				$cached_results = $this->get_all_from_cache($relationName);
1780
-				if ( ! $cached_results ){
1780
+				if ( ! $cached_results) {
1781 1781
 					$related_model_objects = $this->get_model()->get_all_related($this, $relationName, $query_params);
1782 1782
 					//if no query parameters were passed, then we got all the related model objects
1783 1783
 					//for that relation. We can cache them then.
1784
-					foreach($related_model_objects as $related_model_object){
1784
+					foreach ($related_model_objects as $related_model_object) {
1785 1785
 						$this->cache($relationName, $related_model_object);
1786 1786
 					}
1787
-				}else{
1787
+				} else {
1788 1788
 					$related_model_objects = $cached_results;
1789 1789
 				}
1790 1790
 			}
1791
-		}else{//this doesn't exist itn eh DB, so just get the related things from the cache
1791
+		} else {//this doesn't exist itn eh DB, so just get the related things from the cache
1792 1792
 			$related_model_objects = $this->get_all_from_cache($relationName);
1793 1793
 		}
1794 1794
 		return $related_model_objects;
@@ -1805,8 +1805,8 @@  discard block
 block discarded – undo
1805 1805
 	 * @param bool   	$distinct       if we want to only count the distinct values for the column then you can trigger that by the setting $distinct to TRUE;
1806 1806
 	 * @return int
1807 1807
 	 */
1808
-	public function count_related($relation_name, $query_params =array(),$field_to_count = NULL, $distinct = FALSE){
1809
-		return $this->get_model()->count_related($this,$relation_name,$query_params,$field_to_count,$distinct);
1808
+	public function count_related($relation_name, $query_params = array(), $field_to_count = NULL, $distinct = FALSE) {
1809
+		return $this->get_model()->count_related($this, $relation_name, $query_params, $field_to_count, $distinct);
1810 1810
 	}
1811 1811
 
1812 1812
 
@@ -1820,7 +1820,7 @@  discard block
 block discarded – undo
1820 1820
 	 * 						By default, uses primary key (which doesn't make much sense, so you should probably change it)
1821 1821
 	 * @return int
1822 1822
 	 */
1823
-	public function sum_related($relation_name, $query_params = array(), $field_to_sum = null){
1823
+	public function sum_related($relation_name, $query_params = array(), $field_to_sum = null) {
1824 1824
 		return $this->get_model()->sum_related($this, $relation_name, $query_params, $field_to_sum);
1825 1825
 	}
1826 1826
 
@@ -1832,34 +1832,34 @@  discard block
 block discarded – undo
1832 1832
 	 * @param array  $query_params  like EEM_Base::get_all
1833 1833
 	 * @return EE_Base_Class (not an array, a single object)
1834 1834
 	 */
1835
-	public function get_first_related($relationName,$query_params = array()){
1836
-		if($this->ID()){//this exists in the DB, get from the cache OR the DB
1835
+	public function get_first_related($relationName, $query_params = array()) {
1836
+		if ($this->ID()) {//this exists in the DB, get from the cache OR the DB
1837 1837
 
1838 1838
 			//if they've provided some query parameters, don't bother trying to cache the result
1839 1839
 			//also make sure we're not caching the result of get_first_related
1840 1840
 			//on a relation which should have an array of objects (because the cache might have an array of objects)
1841
-			if ($query_params || ! $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){
1842
-				$related_model_object =  $this->get_model()->get_first_related($this, $relationName, $query_params);
1843
-			}else{
1841
+			if ($query_params || ! $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation) {
1842
+				$related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params);
1843
+			} else {
1844 1844
 				//first, check if we've already cached the result of this query
1845 1845
 				$cached_result = $this->get_one_from_cache($relationName);
1846
-				if ( ! $cached_result ){
1846
+				if ( ! $cached_result) {
1847 1847
 
1848 1848
 					$related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params);
1849
-					$this->cache($relationName,$related_model_object);
1850
-				}else{
1849
+					$this->cache($relationName, $related_model_object);
1850
+				} else {
1851 1851
 					$related_model_object = $cached_result;
1852 1852
 				}
1853 1853
 			}
1854
-		}else{
1854
+		} else {
1855 1855
 			//this doesn't exist in the Db, but maybe the relation is of type belongs to, and so the related thing might
1856
-			if( $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){
1857
-				$related_model_object =  $this->get_model()->get_first_related($this, $relationName, $query_params);
1858
-			}else{
1856
+			if ($this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation) {
1857
+				$related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params);
1858
+			} else {
1859 1859
 				$related_model_object = null;
1860 1860
 			}
1861 1861
 			//this doesn't exist in the DB and apparently the thing it belongs to doesn't either, just get what's cached on this object
1862
-			if( ! $related_model_object){
1862
+			if ( ! $related_model_object) {
1863 1863
 				$related_model_object = $this->get_one_from_cache($relationName);
1864 1864
 			}
1865 1865
 
@@ -1878,12 +1878,12 @@  discard block
 block discarded – undo
1878 1878
 	 * @param array $query_params like EEM_Base::get_all's
1879 1879
 	 * @return int how many deleted
1880 1880
 	 */
1881
-	public function delete_related($relationName,$query_params = array()){
1882
-		if($this->ID()){
1883
-			$count =  $this->get_model()->delete_related($this, $relationName, $query_params);
1884
-		}else{
1881
+	public function delete_related($relationName, $query_params = array()) {
1882
+		if ($this->ID()) {
1883
+			$count = $this->get_model()->delete_related($this, $relationName, $query_params);
1884
+		} else {
1885 1885
 			$count = count($this->get_all_from_cache($relationName));
1886
-			$this->clear_cache($relationName,NULL,TRUE);
1886
+			$this->clear_cache($relationName, NULL, TRUE);
1887 1887
 		}
1888 1888
 		return $count;
1889 1889
 	}
@@ -1898,13 +1898,13 @@  discard block
 block discarded – undo
1898 1898
 	 * @param array $query_params like EEM_Base::get_all's
1899 1899
 	 * @return int how many deleted (including those soft deleted)
1900 1900
 	 */
1901
-	public function delete_related_permanently($relationName,$query_params = array()){
1902
-		if($this->ID()){
1903
-			$count =  $this->get_model()->delete_related_permanently($this, $relationName, $query_params);
1904
-		}else{
1901
+	public function delete_related_permanently($relationName, $query_params = array()) {
1902
+		if ($this->ID()) {
1903
+			$count = $this->get_model()->delete_related_permanently($this, $relationName, $query_params);
1904
+		} else {
1905 1905
 			$count = count($this->get_all_from_cache($relationName));
1906 1906
 		}
1907
-		$this->clear_cache($relationName,NULL,TRUE);
1907
+		$this->clear_cache($relationName, NULL, TRUE);
1908 1908
 		return $count;
1909 1909
 	}
1910 1910
 
@@ -1920,7 +1920,7 @@  discard block
 block discarded – undo
1920 1920
 	 * @param  string $field_name property to check
1921 1921
 	 * @return bool            				  TRUE if existing,FALSE if not.
1922 1922
 	 */
1923
-	public function is_set( $field_name ) {
1923
+	public function is_set($field_name) {
1924 1924
 		return isset($this->_fields[$field_name]);
1925 1925
 	}
1926 1926
 
@@ -1932,12 +1932,12 @@  discard block
 block discarded – undo
1932 1932
 	 * @throws EE_Error
1933 1933
 	 * @return bool                              TRUE if existing, throw EE_Error if not.
1934 1934
 	 */
1935
-	protected function _property_exists( $properties ) {
1935
+	protected function _property_exists($properties) {
1936 1936
 
1937
-		foreach ( (array) $properties as $property_name ) {
1937
+		foreach ((array) $properties as $property_name) {
1938 1938
 			//first make sure this property exists
1939
-			if ( ! $this->_fields[ $property_name ] )
1940
-				throw new EE_Error( sprintf( __('Trying to retrieve a non-existent property (%s).  Double check the spelling please', 'event_espresso'), $property_name ) );
1939
+			if ( ! $this->_fields[$property_name])
1940
+				throw new EE_Error(sprintf(__('Trying to retrieve a non-existent property (%s).  Double check the spelling please', 'event_espresso'), $property_name));
1941 1941
 		}
1942 1942
 
1943 1943
 		return TRUE;
@@ -1954,7 +1954,7 @@  discard block
 block discarded – undo
1954 1954
 		$fields = $this->get_model()->field_settings(FALSE);
1955 1955
 		$properties = array();
1956 1956
 		//remove prepended underscore
1957
-		foreach ( $fields as $field_name => $settings ) {
1957
+		foreach ($fields as $field_name => $settings) {
1958 1958
 			$properties[$field_name] = $this->get($field_name);
1959 1959
 		}
1960 1960
 		return $properties;
@@ -1984,14 +1984,14 @@  discard block
 block discarded – undo
1984 1984
 	 * @throws EE_Error
1985 1985
 	 * @return mixed whatever the plugin which calls add_filter decides
1986 1986
 	 */
1987
-	public function __call($methodName,$args){
1988
-		$className=get_class($this);
1989
-		$tagName="FHEE__{$className}__{$methodName}";
1990
-		if(!has_filter($tagName)){
1991
-			throw new EE_Error(sprintf(__("Method %s on class %s does not exist! You can create one with the following code in functions.php or in a plugin: add_filter('%s','my_callback',10,3);function my_callback(\$previousReturnValue,EE_Base_Class \$object, \$argsArray){/*function body*/return \$whatever;}","event_espresso"),
1992
-										$methodName,$className,$tagName));
1987
+	public function __call($methodName, $args) {
1988
+		$className = get_class($this);
1989
+		$tagName = "FHEE__{$className}__{$methodName}";
1990
+		if ( ! has_filter($tagName)) {
1991
+			throw new EE_Error(sprintf(__("Method %s on class %s does not exist! You can create one with the following code in functions.php or in a plugin: add_filter('%s','my_callback',10,3);function my_callback(\$previousReturnValue,EE_Base_Class \$object, \$argsArray){/*function body*/return \$whatever;}", "event_espresso"),
1992
+										$methodName, $className, $tagName));
1993 1993
 		}
1994
-		return apply_filters($tagName,null,$this,$args);
1994
+		return apply_filters($tagName, null, $this, $args);
1995 1995
 	}
1996 1996
 
1997 1997
 
@@ -2006,22 +2006,22 @@  discard block
 block discarded – undo
2006 2006
 	 * @return int records updated (or BOOLEAN if we actually ended up inserting the extra meta row)
2007 2007
 	 * NOTE: if the values haven't changed, returns 0
2008 2008
 	 */
2009
-	public function update_extra_meta($meta_key,$meta_value,$previous_value = NULL){
2010
-		$query_params  = array(array(
2009
+	public function update_extra_meta($meta_key, $meta_value, $previous_value = NULL) {
2010
+		$query_params = array(array(
2011 2011
 			'EXM_key'=>$meta_key,
2012 2012
 			'OBJ_ID'=>$this->ID(),
2013 2013
 			'EXM_type'=>$this->get_model()->get_this_model_name()));
2014
-		if($previous_value !== NULL){
2014
+		if ($previous_value !== NULL) {
2015 2015
 			$query_params[0]['EXM_value'] = $meta_value;
2016 2016
 		}
2017 2017
 		$existing_rows_like_that = EEM_Extra_Meta::instance()->get_all($query_params);
2018
-		if( ! $existing_rows_like_that){
2018
+		if ( ! $existing_rows_like_that) {
2019 2019
 			return $this->add_extra_meta($meta_key, $meta_value);
2020
-		}else{
2021
-			foreach( $existing_rows_like_that as $existing_row){
2022
-				$existing_row->save( array( 'EXM_value' => $meta_value ) );
2020
+		} else {
2021
+			foreach ($existing_rows_like_that as $existing_row) {
2022
+				$existing_row->save(array('EXM_value' => $meta_value));
2023 2023
 			}
2024
-			return count( $existing_rows_like_that );
2024
+			return count($existing_rows_like_that);
2025 2025
 		}
2026 2026
 	}
2027 2027
 
@@ -2034,10 +2034,10 @@  discard block
 block discarded – undo
2034 2034
 	 * @param boolean $unique
2035 2035
 	 * @return boolean
2036 2036
 	 */
2037
-	public function add_extra_meta($meta_key,$meta_value,$unique = false){
2038
-		if($unique){
2039
-			$existing_extra_meta = EEM_Extra_Meta::instance()->get_one(array(array('EXM_key'=>$meta_key,'OBJ_ID'=>$this->ID(),'EXM_type'=>$this->_get_model_classname(get_class($this)))));
2040
-			if($existing_extra_meta){
2037
+	public function add_extra_meta($meta_key, $meta_value, $unique = false) {
2038
+		if ($unique) {
2039
+			$existing_extra_meta = EEM_Extra_Meta::instance()->get_one(array(array('EXM_key'=>$meta_key, 'OBJ_ID'=>$this->ID(), 'EXM_type'=>$this->_get_model_classname(get_class($this)))));
2040
+			if ($existing_extra_meta) {
2041 2041
 				return false;
2042 2042
 			}
2043 2043
 		}
@@ -2057,12 +2057,12 @@  discard block
 block discarded – undo
2057 2057
 	 * @param string $meta_value
2058 2058
 	 * @return int number of extra meta rows deleted
2059 2059
 	 */
2060
-	public function delete_extra_meta($meta_key,$meta_value = NULL){
2061
-		$query_params  = array(array(
2060
+	public function delete_extra_meta($meta_key, $meta_value = NULL) {
2061
+		$query_params = array(array(
2062 2062
 			'EXM_key'=>$meta_key,
2063 2063
 			'OBJ_ID'=>$this->ID(),
2064 2064
 			'EXM_type'=>$this->get_model()->get_this_model_name()));
2065
-		if($meta_value !== NULL){
2065
+		if ($meta_value !== NULL) {
2066 2066
 			$query_params[0]['EXM_value'] = $meta_value;
2067 2067
 		}
2068 2068
 		$count_deleted = EEM_Extra_Meta::instance()->delete($query_params);
@@ -2078,25 +2078,25 @@  discard block
 block discarded – undo
2078 2078
 	 * @param mixed $default if we don't find anything, what should we return?
2079 2079
 	 * @return mixed single value if $single; array if ! $single
2080 2080
 	 */
2081
-	public function get_extra_meta($meta_key,$single = FALSE,$default = NULL){
2082
-		if($single){
2083
-			$result = $this->get_first_related('Extra_Meta',array(array('EXM_key'=>$meta_key)));
2084
-			if ( $result instanceof EE_Extra_Meta ){
2081
+	public function get_extra_meta($meta_key, $single = FALSE, $default = NULL) {
2082
+		if ($single) {
2083
+			$result = $this->get_first_related('Extra_Meta', array(array('EXM_key'=>$meta_key)));
2084
+			if ($result instanceof EE_Extra_Meta) {
2085 2085
 				return $result->value();
2086
-			}else{
2086
+			} else {
2087 2087
 				return $default;
2088 2088
 			}
2089
-		}else{
2090
-			$results =  $this->get_many_related('Extra_Meta',array(array('EXM_key'=>$meta_key)));
2091
-			if($results){
2089
+		} else {
2090
+			$results = $this->get_many_related('Extra_Meta', array(array('EXM_key'=>$meta_key)));
2091
+			if ($results) {
2092 2092
 				$values = array();
2093
-				foreach($results as $result){
2094
-					if ( $result instanceof EE_Extra_Meta ){
2093
+				foreach ($results as $result) {
2094
+					if ($result instanceof EE_Extra_Meta) {
2095 2095
 						$values[$result->ID()] = $result->value();
2096 2096
 					}
2097 2097
 				}
2098 2098
 				return $values;
2099
-			}else{
2099
+			} else {
2100 2100
 				return $default;
2101 2101
 			}
2102 2102
 		}
@@ -2113,20 +2113,20 @@  discard block
 block discarded – undo
2113 2113
 	 * @param boolean $one_of_each_key
2114 2114
 	 * @return array
2115 2115
 	 */
2116
-	public function all_extra_meta_array($one_of_each_key = true){
2116
+	public function all_extra_meta_array($one_of_each_key = true) {
2117 2117
 		$return_array = array();
2118
-		if($one_of_each_key){
2118
+		if ($one_of_each_key) {
2119 2119
 			$extra_meta_objs = $this->get_many_related('Extra_Meta', array('group_by'=>'EXM_key'));
2120
-			foreach($extra_meta_objs as $extra_meta_obj){
2121
-				if ( $extra_meta_obj instanceof EE_Extra_Meta ) {
2120
+			foreach ($extra_meta_objs as $extra_meta_obj) {
2121
+				if ($extra_meta_obj instanceof EE_Extra_Meta) {
2122 2122
 					$return_array[$extra_meta_obj->key()] = $extra_meta_obj->value();
2123 2123
 				}
2124 2124
 			}
2125
-		}else{
2125
+		} else {
2126 2126
 			$extra_meta_objs = $this->get_many_related('Extra_Meta');
2127
-			foreach($extra_meta_objs as $extra_meta_obj){
2128
-				if ( $extra_meta_obj instanceof EE_Extra_Meta ) {
2129
-					if( ! isset($return_array[$extra_meta_obj->key()])){
2127
+			foreach ($extra_meta_objs as $extra_meta_obj) {
2128
+				if ($extra_meta_obj instanceof EE_Extra_Meta) {
2129
+					if ( ! isset($return_array[$extra_meta_obj->key()])) {
2130 2130
 						$return_array[$extra_meta_obj->key()] = array();
2131 2131
 					}
2132 2132
 					$return_array[$extra_meta_obj->key()][$extra_meta_obj->ID()] = $extra_meta_obj->value();
@@ -2139,19 +2139,19 @@  discard block
 block discarded – undo
2139 2139
 	 * Gets a pretty nice displayable nice for this model object. Often overridden
2140 2140
 	 * @return string
2141 2141
 	 */
2142
-	public function name(){
2142
+	public function name() {
2143 2143
 		//find a field that's not a text field
2144 2144
 		$field_we_can_use = $this->get_model()->get_a_field_of_type('EE_Text_Field_Base');
2145
-		if($field_we_can_use){
2145
+		if ($field_we_can_use) {
2146 2146
 			return $this->get($field_we_can_use->get_name());
2147
-		}else{
2147
+		} else {
2148 2148
 			$first_few_properties = $this->model_field_array();
2149
-			$first_few_properties = array_slice($first_few_properties,0,3);
2149
+			$first_few_properties = array_slice($first_few_properties, 0, 3);
2150 2150
 			$name_parts = array();
2151
-			foreach( $first_few_properties as $name=> $value ){
2151
+			foreach ($first_few_properties as $name=> $value) {
2152 2152
 				$name_parts[] = "$name:$value";
2153 2153
 			}
2154
-			return implode(",",$name_parts);
2154
+			return implode(",", $name_parts);
2155 2155
 		}
2156 2156
 	}
2157 2157
 
@@ -2160,11 +2160,11 @@  discard block
 block discarded – undo
2160 2160
 	 * Checks if this model object has been proven to already be in the entity map
2161 2161
 	 * @return boolean
2162 2162
 	 */
2163
-	public function in_entity_map(){
2164
-		if( $this->ID() && $this->get_model()->get_from_entity_map( $this->ID() ) === $this ) {
2163
+	public function in_entity_map() {
2164
+		if ($this->ID() && $this->get_model()->get_from_entity_map($this->ID()) === $this) {
2165 2165
 			//well, if we looked, did we find it in the entity map?
2166 2166
 			return TRUE;
2167
-		}else{
2167
+		} else {
2168 2168
 			return FALSE;
2169 2169
 		}
2170 2170
 	}
@@ -2175,21 +2175,21 @@  discard block
 block discarded – undo
2175 2175
 	 * @throws EE_Error if this model object isn't in the entity mapper (because then you should
2176 2176
 	 * just use what's in the entity mapper and refresh it) and WP_DEBUG is TRUE
2177 2177
 	 */
2178
-	public function refresh_from_db(){
2179
-		if( $this->ID() && $this->in_entity_map() ){
2180
-			$this->get_model()->refresh_entity_map_from_db( $this->ID() );
2181
-		}else{
2178
+	public function refresh_from_db() {
2179
+		if ($this->ID() && $this->in_entity_map()) {
2180
+			$this->get_model()->refresh_entity_map_from_db($this->ID());
2181
+		} else {
2182 2182
 			//if it doesn't have ID, you shouldn't be asking to refresh it from teh database (because its not in the database)
2183 2183
 			//if it has an ID but it's not in the map, and you're asking me to refresh it
2184 2184
 			//that's kinda dangerous. You should just use what's in the entity map, or add this to the entity map if there's
2185 2185
 			//absolutely nothing in it for this ID
2186
-			if( WP_DEBUG ) {
2186
+			if (WP_DEBUG) {
2187 2187
 				throw new EE_Error(
2188 2188
 					sprintf(
2189
-						__( 'Trying to refresh a model object with ID "%1$s" that\'s not in the entity map? First off: you should put it in the entity map by calling %2$s. Second off, if you want what\'s in the database right now, you should just call %3$s yourself and discard this model object.', 'event_espresso' ),
2189
+						__('Trying to refresh a model object with ID "%1$s" that\'s not in the entity map? First off: you should put it in the entity map by calling %2$s. Second off, if you want what\'s in the database right now, you should just call %3$s yourself and discard this model object.', 'event_espresso'),
2190 2190
 						$this->ID(),
2191
-						get_class( $this->get_model() ) . '::instance()->add_to_entity_map()',
2192
-						get_class( $this->get_model() ) . '::instance()->refresh_entity_map()'
2191
+						get_class($this->get_model()).'::instance()->add_to_entity_map()',
2192
+						get_class($this->get_model()).'::instance()->refresh_entity_map()'
2193 2193
 					)
2194 2194
 				);
2195 2195
 			}
@@ -2201,8 +2201,8 @@  discard block
 block discarded – undo
2201 2201
 	 * (probably a bad assumption they have made, oh well)
2202 2202
 	 * @return string
2203 2203
 	 */
2204
-	public function __toString(){
2205
-		return sprintf( '%s (%s)', $this->name(), $this->ID() );
2204
+	public function __toString() {
2205
+		return sprintf('%s (%s)', $this->name(), $this->ID());
2206 2206
 	}
2207 2207
 
2208 2208
 	/**
@@ -2234,16 +2234,16 @@  discard block
 block discarded – undo
2234 2234
 	 * @return array
2235 2235
 	 */
2236 2236
 	public function __sleep() {
2237
-		foreach( $this->get_model()->relation_settings() as $relation_name => $relation_obj ) {
2238
-			if( $relation_obj instanceof EE_Belongs_To_Relation ) {
2239
-				$classname = 'EE_' . $this->get_model()->get_this_model_name();
2240
-				if( $this->get_one_from_cache( $relation_name ) instanceof $classname &&
2241
-						$this->get_one_from_cache( $relation_name )->ID() ) {
2242
-					$this->clear_cache( $relation_name, $this->get_one_from_cache( $relation_name )->ID() );
2237
+		foreach ($this->get_model()->relation_settings() as $relation_name => $relation_obj) {
2238
+			if ($relation_obj instanceof EE_Belongs_To_Relation) {
2239
+				$classname = 'EE_'.$this->get_model()->get_this_model_name();
2240
+				if ($this->get_one_from_cache($relation_name) instanceof $classname &&
2241
+						$this->get_one_from_cache($relation_name)->ID()) {
2242
+					$this->clear_cache($relation_name, $this->get_one_from_cache($relation_name)->ID());
2243 2243
 				}
2244 2244
 			}
2245 2245
 		}
2246
-		return array_keys( get_object_vars( $this ) );
2246
+		return array_keys(get_object_vars($this));
2247 2247
 	}
2248 2248
 
2249 2249
 
Please login to merge, or discard this patch.
Braces   +70 added lines, -62 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@  discard block
 block discarded – undo
1
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if (!defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 do_action( 'AHEE_log', __FILE__, ' FILE LOADED', '' );
3 5
 /**
4 6
  *
@@ -170,7 +172,7 @@  discard block
 block discarded – undo
170 172
 		foreach($this->get_model()->relation_settings() as $relation_name=>$relation_obj){
171 173
 			if($relation_obj instanceof EE_Belongs_To_Relation){
172 174
 				$this->_model_relations[$relation_name] = NULL;
173
-			}else{
175
+			} else{
174 176
 				$this->_model_relations[$relation_name] = array();
175 177
 			}
176 178
 		}
@@ -215,7 +217,7 @@  discard block
 block discarded – undo
215 217
 		if( isset( $this->_props_n_values_provided_in_constructor[ $field_name ] ) &&
216 218
 				$field_settings = $this->get_Model()->field_settings_for( $field_name )){
217 219
 			return $field_settings->prepare_for_get( $this->_props_n_values_provided_in_constructor[ $field_name ] );
218
-		}else{
220
+		} else{
219 221
 			return NULL;
220 222
 		}
221 223
 	}
@@ -264,7 +266,7 @@  discard block
 block discarded – undo
264 266
 					empty( $this->_fields[$field_name] ) ? $this->set( $field_name, time() ) : $this->set( $field_name, $this->_fields[$field_name] );
265 267
 				}
266 268
 
267
-			}else{
269
+			} else{
268 270
 				$this->_fields[$field_name] = $holder_of_value;
269 271
 			}
270 272
 
@@ -292,7 +294,7 @@  discard block
 block discarded – undo
292 294
 			}
293 295
 			//let's unset any cache for this field_name from the $_cached_properties property.
294 296
 			$this->_clear_cached_property( $field_name );
295
-		}else{
297
+		} else{
296 298
 			throw new EE_Error( sprintf( __( "A valid EE_Model_Field_Base could not be found for the given field name: %s", "event_espresso" ), $field_name  ) );
297 299
 		}
298 300
 
@@ -588,8 +590,9 @@  discard block
 block discarded – undo
588 590
 	 * @return void
589 591
 	 */
590 592
 	protected function _clear_cached_property( $property_name ) {
591
-		if ( isset( $this->_cached_properties[ $property_name ] ) )
592
-			unset( $this->_cached_properties[ $property_name ] );
593
+		if ( isset( $this->_cached_properties[ $property_name ] ) ) {
594
+					unset( $this->_cached_properties[ $property_name ] );
595
+		}
593 596
 	}
594 597
 
595 598
 
@@ -629,10 +632,10 @@  discard block
 block discarded – undo
629 632
 		if($clear_all){
630 633
 			$obj_removed = true;
631 634
 			$this->_model_relations[$relationName]  = null;
632
-		}elseif($relationship_to_model instanceof EE_Belongs_To_Relation){
635
+		} elseif($relationship_to_model instanceof EE_Belongs_To_Relation){
633 636
 			$obj_removed = $this->_model_relations[$relationName];
634 637
 			$this->_model_relations[$relationName]  = null;
635
-		}else{
638
+		} else{
636 639
 			if($object_to_remove_or_index_into_array instanceof EE_Base_Class && $object_to_remove_or_index_into_array->ID()){
637 640
 				$index_in_cache = $object_to_remove_or_index_into_array->ID();
638 641
 				if( is_array($this->_model_relations[$relationName]) && ! isset($this->_model_relations[$relationName][$index_in_cache])){
@@ -646,20 +649,20 @@  discard block
 block discarded – undo
646 649
 					}
647 650
 					if($index_found_at){
648 651
 						$index_in_cache = $index_found_at;
649
-					}else{
652
+					} else{
650 653
 						//it wasn't found. huh. well obviously it doesn't need to be removed from teh cache
651 654
 						//if it wasn't in it to begin with. So we're done
652 655
 						return $object_to_remove_or_index_into_array;
653 656
 					}
654 657
 				}
655
-			}elseif($object_to_remove_or_index_into_array instanceof EE_Base_Class){
658
+			} elseif($object_to_remove_or_index_into_array instanceof EE_Base_Class){
656 659
 				//so they provided a model object, but it's not yet saved to the DB... so let's go hunting for it!
657 660
 				foreach($this->get_all_from_cache($relationName) as $index => $potentially_obj_we_want){
658 661
 					if($potentially_obj_we_want == $object_to_remove_or_index_into_array){
659 662
 						$index_in_cache = $index;
660 663
 					}
661 664
 				}
662
-			}else{
665
+			} else{
663 666
 				$index_in_cache = $object_to_remove_or_index_into_array;
664 667
 			}
665 668
 			//supposedly we've found it. But it could just be that the client code
@@ -668,7 +671,7 @@  discard block
 block discarded – undo
668 671
 					isset( $this->_model_relations[$relationName][$index_in_cache])){
669 672
 				$obj_removed = $this->_model_relations[$relationName][$index_in_cache];
670 673
 				unset($this->_model_relations[$relationName][$index_in_cache]);
671
-			}else{
674
+			} else{
672 675
 				//that thing was never cached anyways.
673 676
 				$obj_removed = NULL;
674 677
 			}
@@ -724,7 +727,7 @@  discard block
 block discarded – undo
724 727
 		$cached_array_or_object = isset( $this->_model_relations[$relationName] ) ? $this->_model_relations[$relationName] : null;
725 728
 		if(is_array($cached_array_or_object)){
726 729
 			return array_shift($cached_array_or_object);
727
-		}else{
730
+		} else{
728 731
 			return $cached_array_or_object;
729 732
 		}
730 733
 	}
@@ -743,10 +746,10 @@  discard block
 block discarded – undo
743 746
 		$cached_array_or_object =  isset( $this->_model_relations[$relationName] ) ? $this->_model_relations[$relationName] : array();
744 747
 		if(is_array($cached_array_or_object)){
745 748
 			$objects = $cached_array_or_object;
746
-		}elseif($cached_array_or_object){
749
+		} elseif($cached_array_or_object){
747 750
 			//if the result is not an array, but exists, make it an array
748 751
 			$objects = array($cached_array_or_object);
749
-		}else{
752
+		} else{
750 753
 			//if nothing was found, return an empty array
751 754
 			$objects = array();
752 755
 		}
@@ -761,7 +764,7 @@  discard block
 block discarded – undo
761 764
 				if( $model_object->ID() ){
762 765
 					$model->add_to_entity_map( $model_object );
763 766
 				}
764
-			}else{
767
+			} else{
765 768
 				throw new EE_Error( sprintf( __( 'Error retrieving related model objects. Either $1%s is not a model or $2%s is not a model object', 'event_espresso' ), $relationName, gettype( $model_object )));
766 769
 			}
767 770
 		}
@@ -886,10 +889,10 @@  discard block
 block discarded – undo
886 889
 				if( $field_obj->is_nullable()){
887 890
 					//if the field allows nulls, then let it be null
888 891
 					$field_value = NULL;
889
-				}else{
892
+				} else{
890 893
 					$field_value = $field_obj->get_default_value();
891 894
 				}
892
-			}else{
895
+			} else{
893 896
 				$field_value = $field_obj->prepare_for_set_from_db( $field_value_from_db );
894 897
 			}
895 898
 			$this->_fields[$field_name] = $field_value;
@@ -1009,15 +1012,17 @@  discard block
 block discarded – undo
1009 1012
 			$this->_tm_frmt = $in_tm_frmt;
1010 1013
 		}
1011 1014
 
1012
-		if ( $echo )
1013
-			$field->set_pretty_date_format( $in_dt_frmt );
1014
-		else
1015
-			$field->set_date_format( $in_dt_frmt );
1015
+		if ( $echo ) {
1016
+					$field->set_pretty_date_format( $in_dt_frmt );
1017
+		} else {
1018
+					$field->set_date_format( $in_dt_frmt );
1019
+		}
1016 1020
 
1017
-		if ( $echo )
1018
-			$field->set_pretty_time_format( $in_tm_frmt );
1019
-		else
1020
-			$field->set_time_format( $in_tm_frmt );
1021
+		if ( $echo ) {
1022
+					$field->set_pretty_time_format( $in_tm_frmt );
1023
+		} else {
1024
+					$field->set_time_format( $in_tm_frmt );
1025
+		}
1021 1026
 
1022 1027
 		//set timezone in field object
1023 1028
 		$field->set_timezone( $this->_timezone );
@@ -1240,8 +1245,9 @@  discard block
 block discarded – undo
1240 1245
 		EE_Registry::instance()->load_helper('DTT_Helper');
1241 1246
 		$timezone = EEH_DTT_Helper::get_timezone();
1242 1247
 
1243
-		if ( $timezone == $this->_timezone )
1244
-			return '';
1248
+		if ( $timezone == $this->_timezone ) {
1249
+					return '';
1250
+		}
1245 1251
 
1246 1252
 		$original_timezone = $this->_timezone;
1247 1253
 		$this->set_timezone( $timezone );
@@ -1249,8 +1255,9 @@  discard block
 block discarded – undo
1249 1255
 		$fn = (array) $field_name;
1250 1256
 		$args = array_merge( $fn, (array) $args );
1251 1257
 
1252
-		if ( !method_exists( $this, $callback ) )
1253
-			throw new EE_Error(sprintf( __('The method named "%s" given as the callback param in "display_in_my_timezone" does not exist.  Please check your spelling', 'event_espresso'), $callback ) );
1258
+		if ( !method_exists( $this, $callback ) ) {
1259
+					throw new EE_Error(sprintf( __('The method named "%s" given as the callback param in "display_in_my_timezone" does not exist.  Please check your spelling', 'event_espresso'), $callback ) );
1260
+		}
1254 1261
 		$args = (array) $args;
1255 1262
 		$return =  $prepend . call_user_func_array( array( $this, $callback ), $args ) . $append;
1256 1263
 
@@ -1294,7 +1301,7 @@  discard block
 block discarded – undo
1294 1301
 		if($model instanceof EEM_Soft_Delete_Base){
1295 1302
 			$result=$model->delete_permanently_by_ID($this->ID());
1296 1303
                         $this->refresh_cache_of_related_objects();
1297
-		}else{
1304
+		} else{
1298 1305
 			$result = $this->delete();
1299 1306
 		}
1300 1307
 		return $result ? true : false;
@@ -1387,7 +1394,7 @@  discard block
 block discarded – undo
1387 1394
 						$this->_update_cached_related_model_objs_fks();
1388 1395
 					}
1389 1396
 				}
1390
-			}else{//PK is NOT auto-increment
1397
+			} else{//PK is NOT auto-increment
1391 1398
 				//so check if one like it already exists in the db
1392 1399
 				if( $this->get_model()->exists_by_ID( $this->ID() ) ){
1393 1400
 					if( ! $this->in_entity_map() && WP_DEBUG ){
@@ -1402,12 +1409,12 @@  discard block
 block discarded – undo
1402 1409
 						);
1403 1410
 					}
1404 1411
 					$results = $this->get_model()->update_by_ID($save_cols_n_values, $this->ID());
1405
-				}else{
1412
+				} else{
1406 1413
 					$results = $this->get_model()->insert($save_cols_n_values);
1407 1414
 					$this->_update_cached_related_model_objs_fks();
1408 1415
 				}
1409 1416
 			}
1410
-		}else{//there is NO primary key
1417
+		} else{//there is NO primary key
1411 1418
 			$already_in_db = false;
1412 1419
 			foreach($this->get_model()->unique_indexes() as $index){
1413 1420
 				$uniqueness_where_params = array_intersect_key($save_cols_n_values, $index->fields());
@@ -1418,7 +1425,7 @@  discard block
 block discarded – undo
1418 1425
 			if( $already_in_db ){
1419 1426
 				$combined_pk_fields_n_values = array_intersect_key( $save_cols_n_values, $this->get_model()->get_combined_primary_key_fields() );
1420 1427
 				$results = $this->get_model()->update( $save_cols_n_values,$combined_pk_fields_n_values );
1421
-			}else{
1428
+			} else{
1422 1429
 				$results = $this->get_model()->insert( $save_cols_n_values );
1423 1430
 			}
1424 1431
 		}
@@ -1470,7 +1477,7 @@  discard block
 block discarded – undo
1470 1477
 		//make sure this has been saved
1471 1478
 		if( ! $this->ID()){
1472 1479
 			$id = $this->save();
1473
-		}else{
1480
+		} else{
1474 1481
 			$id = $this->ID();
1475 1482
 		}
1476 1483
 		//now save all the NEW cached model objects  (ie they don't exist in the DB)
@@ -1489,7 +1496,7 @@  discard block
 block discarded – undo
1489 1496
 						$this->_add_relation_to($related_model_obj, $relationName);
1490 1497
 						$related_model_obj->save_new_cached_related_model_objs();
1491 1498
 //					}
1492
-				}else{
1499
+				} else{
1493 1500
 					foreach($this->_model_relations[$relationName] as $related_model_obj){
1494 1501
 						//add a relation to that relation type (which saves the appropriate thing in the process)
1495 1502
 						//but ONLY if it DOES NOT exist in the DB
@@ -1548,13 +1555,13 @@  discard block
 block discarded – undo
1548 1555
 
1549 1556
 			if ( array_key_exists( $primary_id_ref, $props_n_values ) && !empty( $props_n_values[$primary_id_ref] ) ) {
1550 1557
 				$existing = self::_get_model( $classname, $timezone )->get_one_by_ID( $props_n_values[$primary_id_ref] );
1551
-			}else{
1558
+			} else{
1552 1559
 				$existing = null;
1553 1560
 			}
1554
-		}elseif( self::_get_model( $classname, $timezone )->has_all_combined_primary_key_fields(  $props_n_values ) ){
1561
+		} elseif( self::_get_model( $classname, $timezone )->has_all_combined_primary_key_fields(  $props_n_values ) ){
1555 1562
 			//no primary key on this model, but there's still a matching item in the DB
1556 1563
 				$existing = self::_get_model($classname, $timezone)->get_one_by_ID( self::_get_model($classname, $timezone)->get_index_primary_key_string( $props_n_values ) );
1557
-		}else{
1564
+		} else{
1558 1565
 			$existing = null;
1559 1566
 		}
1560 1567
 		if ( $existing ) {
@@ -1612,7 +1619,7 @@  discard block
 block discarded – undo
1612 1619
 	private static function _get_model_classname( $model_name = null){
1613 1620
 		if(strpos($model_name,"EE_")===0){
1614 1621
 			$model_classname=str_replace("EE_","EEM_",$model_name);
1615
-		}else{
1622
+		} else{
1616 1623
 			$model_classname = "EEM_".$model_name;
1617 1624
 		}
1618 1625
 		return $model_classname;
@@ -1646,7 +1653,7 @@  discard block
 block discarded – undo
1646 1653
 		//now that we know the name of the variable, use a variable variable to get its value and return its
1647 1654
 		if( $this->get_model()->has_primary_key_field() ) {
1648 1655
 			return $this->_fields[self::_get_primary_key_name( get_class($this) )];
1649
-		}else{
1656
+		} else{
1650 1657
 			return $this->get_model()->get_index_primary_key_string( $this->_fields );
1651 1658
 		}
1652 1659
 	}
@@ -1774,7 +1781,7 @@  discard block
 block discarded – undo
1774 1781
 			//if there are query parameters, forget about caching the related model objects.
1775 1782
 			if( $query_params ){
1776 1783
 				$related_model_objects = $this->get_model()->get_all_related($this, $relationName, $query_params);
1777
-			}else{
1784
+			} else{
1778 1785
 				//did we already cache the result of this query?
1779 1786
 				$cached_results = $this->get_all_from_cache($relationName);
1780 1787
 				if ( ! $cached_results ){
@@ -1784,11 +1791,11 @@  discard block
 block discarded – undo
1784 1791
 					foreach($related_model_objects as $related_model_object){
1785 1792
 						$this->cache($relationName, $related_model_object);
1786 1793
 					}
1787
-				}else{
1794
+				} else{
1788 1795
 					$related_model_objects = $cached_results;
1789 1796
 				}
1790 1797
 			}
1791
-		}else{//this doesn't exist itn eh DB, so just get the related things from the cache
1798
+		} else{//this doesn't exist itn eh DB, so just get the related things from the cache
1792 1799
 			$related_model_objects = $this->get_all_from_cache($relationName);
1793 1800
 		}
1794 1801
 		return $related_model_objects;
@@ -1840,22 +1847,22 @@  discard block
 block discarded – undo
1840 1847
 			//on a relation which should have an array of objects (because the cache might have an array of objects)
1841 1848
 			if ($query_params || ! $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){
1842 1849
 				$related_model_object =  $this->get_model()->get_first_related($this, $relationName, $query_params);
1843
-			}else{
1850
+			} else{
1844 1851
 				//first, check if we've already cached the result of this query
1845 1852
 				$cached_result = $this->get_one_from_cache($relationName);
1846 1853
 				if ( ! $cached_result ){
1847 1854
 
1848 1855
 					$related_model_object = $this->get_model()->get_first_related($this, $relationName, $query_params);
1849 1856
 					$this->cache($relationName,$related_model_object);
1850
-				}else{
1857
+				} else{
1851 1858
 					$related_model_object = $cached_result;
1852 1859
 				}
1853 1860
 			}
1854
-		}else{
1861
+		} else{
1855 1862
 			//this doesn't exist in the Db, but maybe the relation is of type belongs to, and so the related thing might
1856 1863
 			if( $this->get_model()->related_settings_for($relationName) instanceof EE_Belongs_To_Relation){
1857 1864
 				$related_model_object =  $this->get_model()->get_first_related($this, $relationName, $query_params);
1858
-			}else{
1865
+			} else{
1859 1866
 				$related_model_object = null;
1860 1867
 			}
1861 1868
 			//this doesn't exist in the DB and apparently the thing it belongs to doesn't either, just get what's cached on this object
@@ -1881,7 +1888,7 @@  discard block
 block discarded – undo
1881 1888
 	public function delete_related($relationName,$query_params = array()){
1882 1889
 		if($this->ID()){
1883 1890
 			$count =  $this->get_model()->delete_related($this, $relationName, $query_params);
1884
-		}else{
1891
+		} else{
1885 1892
 			$count = count($this->get_all_from_cache($relationName));
1886 1893
 			$this->clear_cache($relationName,NULL,TRUE);
1887 1894
 		}
@@ -1901,7 +1908,7 @@  discard block
 block discarded – undo
1901 1908
 	public function delete_related_permanently($relationName,$query_params = array()){
1902 1909
 		if($this->ID()){
1903 1910
 			$count =  $this->get_model()->delete_related_permanently($this, $relationName, $query_params);
1904
-		}else{
1911
+		} else{
1905 1912
 			$count = count($this->get_all_from_cache($relationName));
1906 1913
 		}
1907 1914
 		$this->clear_cache($relationName,NULL,TRUE);
@@ -1936,8 +1943,9 @@  discard block
 block discarded – undo
1936 1943
 
1937 1944
 		foreach ( (array) $properties as $property_name ) {
1938 1945
 			//first make sure this property exists
1939
-			if ( ! $this->_fields[ $property_name ] )
1940
-				throw new EE_Error( sprintf( __('Trying to retrieve a non-existent property (%s).  Double check the spelling please', 'event_espresso'), $property_name ) );
1946
+			if ( ! $this->_fields[ $property_name ] ) {
1947
+							throw new EE_Error( sprintf( __('Trying to retrieve a non-existent property (%s).  Double check the spelling please', 'event_espresso'), $property_name ) );
1948
+			}
1941 1949
 		}
1942 1950
 
1943 1951
 		return TRUE;
@@ -2017,7 +2025,7 @@  discard block
 block discarded – undo
2017 2025
 		$existing_rows_like_that = EEM_Extra_Meta::instance()->get_all($query_params);
2018 2026
 		if( ! $existing_rows_like_that){
2019 2027
 			return $this->add_extra_meta($meta_key, $meta_value);
2020
-		}else{
2028
+		} else{
2021 2029
 			foreach( $existing_rows_like_that as $existing_row){
2022 2030
 				$existing_row->save( array( 'EXM_value' => $meta_value ) );
2023 2031
 			}
@@ -2083,10 +2091,10 @@  discard block
 block discarded – undo
2083 2091
 			$result = $this->get_first_related('Extra_Meta',array(array('EXM_key'=>$meta_key)));
2084 2092
 			if ( $result instanceof EE_Extra_Meta ){
2085 2093
 				return $result->value();
2086
-			}else{
2094
+			} else{
2087 2095
 				return $default;
2088 2096
 			}
2089
-		}else{
2097
+		} else{
2090 2098
 			$results =  $this->get_many_related('Extra_Meta',array(array('EXM_key'=>$meta_key)));
2091 2099
 			if($results){
2092 2100
 				$values = array();
@@ -2096,7 +2104,7 @@  discard block
 block discarded – undo
2096 2104
 					}
2097 2105
 				}
2098 2106
 				return $values;
2099
-			}else{
2107
+			} else{
2100 2108
 				return $default;
2101 2109
 			}
2102 2110
 		}
@@ -2122,7 +2130,7 @@  discard block
 block discarded – undo
2122 2130
 					$return_array[$extra_meta_obj->key()] = $extra_meta_obj->value();
2123 2131
 				}
2124 2132
 			}
2125
-		}else{
2133
+		} else{
2126 2134
 			$extra_meta_objs = $this->get_many_related('Extra_Meta');
2127 2135
 			foreach($extra_meta_objs as $extra_meta_obj){
2128 2136
 				if ( $extra_meta_obj instanceof EE_Extra_Meta ) {
@@ -2144,7 +2152,7 @@  discard block
 block discarded – undo
2144 2152
 		$field_we_can_use = $this->get_model()->get_a_field_of_type('EE_Text_Field_Base');
2145 2153
 		if($field_we_can_use){
2146 2154
 			return $this->get($field_we_can_use->get_name());
2147
-		}else{
2155
+		} else{
2148 2156
 			$first_few_properties = $this->model_field_array();
2149 2157
 			$first_few_properties = array_slice($first_few_properties,0,3);
2150 2158
 			$name_parts = array();
@@ -2164,7 +2172,7 @@  discard block
 block discarded – undo
2164 2172
 		if( $this->ID() && $this->get_model()->get_from_entity_map( $this->ID() ) === $this ) {
2165 2173
 			//well, if we looked, did we find it in the entity map?
2166 2174
 			return TRUE;
2167
-		}else{
2175
+		} else{
2168 2176
 			return FALSE;
2169 2177
 		}
2170 2178
 	}
@@ -2178,7 +2186,7 @@  discard block
 block discarded – undo
2178 2186
 	public function refresh_from_db(){
2179 2187
 		if( $this->ID() && $this->in_entity_map() ){
2180 2188
 			$this->get_model()->refresh_entity_map_from_db( $this->ID() );
2181
-		}else{
2189
+		} else{
2182 2190
 			//if it doesn't have ID, you shouldn't be asking to refresh it from teh database (because its not in the database)
2183 2191
 			//if it has an ID but it's not in the map, and you're asking me to refresh it
2184 2192
 			//that's kinda dangerous. You should just use what's in the entity map, or add this to the entity map if there's
Please login to merge, or discard this patch.
core/db_classes/EE_Change_Log.class.php 3 patches
Doc Comments   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -47,14 +47,14 @@  discard block
 block discarded – undo
47 47
 	 * @param array $props_n_values  incoming values from the database
48 48
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
49 49
 	 *                          		the website will be used.
50
-	 * @return EE_Attendee
50
+	 * @return EE_Change_Log
51 51
 	 */
52 52
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
53 53
 		return new self( $props_n_values, TRUE, $timezone );
54 54
 	}
55 55
 	/**
56 56
 	 * Gets message
57
-	 * @return mixed
57
+	 * @return boolean
58 58
 	 */
59 59
 	function message() {
60 60
 		return $this->get('LOG_message');
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 	}
70 70
 	/**
71 71
 	 * Gets time
72
-	 * @return string
72
+	 * @return boolean
73 73
 	 */
74 74
 	function time() {
75 75
 		return $this->get('LOG_time');
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 	}
85 85
 	/**
86 86
 	 * Gets log_type
87
-	 * @return string
87
+	 * @return boolean
88 88
 	 */
89 89
 	function log_type() {
90 90
 		return $this->get('LOG_log_type');
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 	}
100 100
 	/**
101 101
 	 * Gets type of the model object related to this log
102
-	 * @return string
102
+	 * @return boolean
103 103
 	 */
104 104
 	function OBJ_type() {
105 105
 		return $this->get('OBJ_type');
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 	}
115 115
 	/**
116 116
 	 * Gets OBJ_ID (the ID of the item related to this log)
117
-	 * @return mixed
117
+	 * @return boolean
118 118
 	 */
119 119
 	function OBJ_ID() {
120 120
 		return $this->get('OBJ_ID');
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
 	}
130 130
 	/**
131 131
 	 * Gets wp_user
132
-	 * @return int
132
+	 * @return boolean
133 133
 	 */
134 134
 	function wp_user() {
135 135
 		return $this->get('LOG_wp_user');
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 
6 6
 /**
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_Change_Log extends EE_Base_Class{
28
+class EE_Change_Log extends EE_Base_Class {
29 29
 
30 30
 	/**
31 31
 	 *
@@ -36,9 +36,9 @@  discard block
 block discarded – undo
36 36
 	 *                             		    date_format and the second value is the time format
37 37
 	 * @return EE_Attendee
38 38
 	 */
39
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
40
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
41
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
39
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
40
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
41
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
42 42
 	}
43 43
 
44 44
 
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
 	 *                          		the website will be used.
50 50
 	 * @return EE_Attendee
51 51
 	 */
52
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
53
-		return new self( $props_n_values, TRUE, $timezone );
52
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
53
+		return new self($props_n_values, TRUE, $timezone);
54 54
 	}
55 55
 	/**
56 56
 	 * Gets message
@@ -147,12 +147,12 @@  discard block
 block discarded – undo
147 147
 	 * Gets the model object attached to this log
148 148
 	 * @return EE_Base_Class
149 149
 	 */
150
-	function object(){
150
+	function object() {
151 151
 		$model_name_of_related_obj = $this->OBJ_type();
152 152
 		$is_model_name = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
153
-		if( ! $is_model_name ){
153
+		if ( ! $is_model_name) {
154 154
 			return null;
155
-		}else{
155
+		} else {
156 156
 			return $this->get_first_related($model_name_of_related_obj);
157 157
 		}
158 158
 	}
@@ -165,17 +165,17 @@  discard block
 block discarded – undo
165 165
 	 * @param boolean $save
166 166
 	 * @return boolean if $save=true, NULL is $save=false
167 167
 	 */
168
-	function set_object($object, $save = TRUE ) {
169
-		if($object instanceof EE_Base_Class){
168
+	function set_object($object, $save = TRUE) {
169
+		if ($object instanceof EE_Base_Class) {
170 170
 			$this->set_OBJ_type($object->get_model()->get_this_model_name());
171 171
 			$this->set_OBJ_ID($object->ID());
172
-		}else{
172
+		} else {
173 173
 			$this->set_OBJ_type(NULL);
174 174
 			$this->set_OBJ_ID(NULL);
175 175
 		}
176
-		if($save){
176
+		if ($save) {
177 177
 			return $this->save();
178
-		}else{
178
+		} else {
179 179
 			return NULL;
180 180
 		}
181 181
 	}
Please login to merge, or discard this patch.
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 
6 7
 /**
7 8
  * Event Espresso
@@ -152,7 +153,7 @@  discard block
 block discarded – undo
152 153
 		$is_model_name = EE_Registry::instance()->is_model_name($model_name_of_related_obj);
153 154
 		if( ! $is_model_name ){
154 155
 			return null;
155
-		}else{
156
+		} else{
156 157
 			return $this->get_first_related($model_name_of_related_obj);
157 158
 		}
158 159
 	}
@@ -169,13 +170,13 @@  discard block
 block discarded – undo
169 170
 		if($object instanceof EE_Base_Class){
170 171
 			$this->set_OBJ_type($object->get_model()->get_this_model_name());
171 172
 			$this->set_OBJ_ID($object->ID());
172
-		}else{
173
+		} else{
173 174
 			$this->set_OBJ_type(NULL);
174 175
 			$this->set_OBJ_ID(NULL);
175 176
 		}
176 177
 		if($save){
177 178
 			return $this->save();
178
-		}else{
179
+		} else{
179 180
 			return NULL;
180 181
 		}
181 182
 	}
Please login to merge, or discard this patch.
core/db_classes/EE_Checkin.class.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -45,7 +45,7 @@
 block discarded – undo
45 45
 	 * @param array $props_n_values  incoming values from the database
46 46
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
47 47
 	 *                          		the website will be used.
48
-	 * @return EE_Attendee
48
+	 * @return EE_Checkin
49 49
 	 */
50 50
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
51 51
 		return new self( $props_n_values, TRUE, $timezone );
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
2
-do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
2
+do_action('AHEE_log', __FILE__, __FUNCTION__, '');
3 3
 /**
4 4
  * Event Espresso
5 5
  *
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
  * @subpackage		includes/classes/EE_Checkin.class.php
24 24
  * @author				Darren Ethier
25 25
  */
26
-class EE_Checkin extends EE_Base_Class{
26
+class EE_Checkin extends EE_Base_Class {
27 27
 
28 28
 	/**
29 29
 	 *
@@ -34,9 +34,9 @@  discard block
 block discarded – undo
34 34
 	 *                             		    date_format and the second value is the time format
35 35
 	 * @return EE_Attendee
36 36
 	 */
37
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
38
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
39
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
37
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
38
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
39
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
40 40
 	}
41 41
 
42 42
 
@@ -47,8 +47,8 @@  discard block
 block discarded – undo
47 47
 	 *                          		the website will be used.
48 48
 	 * @return EE_Attendee
49 49
 	 */
50
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
51
-		return new self( $props_n_values, TRUE, $timezone );
50
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
51
+		return new self($props_n_values, TRUE, $timezone);
52 52
 	}
53 53
 
54 54
 
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@
 block discarded – undo
1
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if (!defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
3 5
 /**
4 6
  * Event Espresso
Please login to merge, or discard this patch.
core/db_classes/EE_Country.class.php 3 patches
Doc Comments   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
51 51
 
52 52
 	/**
53 53
 	 * Gets the country name
54
-	 * @return string
54
+	 * @return boolean
55 55
 	 */
56 56
 	public function name() {
57 57
 		return $this->get( 'CNT_name' );
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 
62 62
 	/**
63 63
 	 * gets the country's currency code
64
-	 * @return string
64
+	 * @return boolean
65 65
 	 */
66 66
 	public function currency_code() {
67 67
 		return $this->get( 'CNT_cur_code' );
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 
83 83
 	/**
84 84
 	 * Currency name singular
85
-	 * @return string
85
+	 * @return boolean
86 86
 	 */
87 87
 	public function currency_name_single() {
88 88
 		return $this->get( 'CNT_cur_single' );
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 
93 93
 	/**
94 94
 	 * Currency name plural
95
-	 * @return string
95
+	 * @return boolean
96 96
 	 */
97 97
 	public function currency_name_plural() {
98 98
 		return $this->get( 'CNT_cur_plural' );
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
 
113 113
 	/**
114 114
 	 * currency_decimal_places : 2 = 0.00   3 = 0.000
115
-	 * @return integer
115
+	 * @return boolean
116 116
 	 */
117 117
 	public function currency_decimal_places() {
118 118
 		return $this->get( 'CNT_cur_dec_plc' );
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 
123 123
 	/**
124 124
 	 * currency_decimal_mark :   (comma) ',' = 0,01   or   (decimal) '.' = 0.01
125
-	 * @return string
125
+	 * @return boolean
126 126
 	 */
127 127
 	public function currency_decimal_mark() {
128 128
 		return $this->get( 'CNT_cur_dec_mrk' );
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 
133 133
 	/**
134 134
 	 * currency thousands separator:   (comma) ',' = 1,000   or   (decimal) '.' = 1.000
135
-	 * @return string
135
+	 * @return boolean
136 136
 	 */
137 137
 	public function currency_thousands_separator() {
138 138
 		return $this->get( 'CNT_cur_thsnds' );
Please login to merge, or discard this patch.
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -2,18 +2,18 @@
 block discarded – undo
2 2
 	exit( 'No direct script access allowed' );
3 3
 }
4 4
 /**
5
- * Event Espresso
6
- *
7
- * Event Registration and Management Plugin for WordPress
8
- *
9
- * @ package            Event Espresso
10
- * @ author            Seth Shoultes
11
- * @ copyright        (c) 2008-2011 Event Espresso  All Rights Reserved.
12
- * @ license            {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
13
- * @ link                    {@link http://www.eventespresso.com}
14
- * @ since                3.2.P
15
- *
16
- */
5
+	 * Event Espresso
6
+	 *
7
+	 * Event Registration and Management Plugin for WordPress
8
+	 *
9
+	 * @ package            Event Espresso
10
+	 * @ author            Seth Shoultes
11
+	 * @ copyright        (c) 2008-2011 Event Espresso  All Rights Reserved.
12
+	 * @ license            {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
13
+	 * @ link                    {@link http://www.eventespresso.com}
14
+	 * @ since                3.2.P
15
+	 *
16
+	 */
17 17
 
18 18
 
19 19
 
Please login to merge, or discard this patch.
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 /**
5 5
  * Event Espresso
@@ -30,9 +30,9 @@  discard block
 block discarded – undo
30 30
 	 * @param array $props_n_values
31 31
 	 * @return EE_Country|mixed
32 32
 	 */
33
-	public static function new_instance( $props_n_values = array() ) {
34
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
35
-		return $has_object ? $has_object : new self( $props_n_values );
33
+	public static function new_instance($props_n_values = array()) {
34
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
35
+		return $has_object ? $has_object : new self($props_n_values);
36 36
 	}
37 37
 
38 38
 
@@ -41,8 +41,8 @@  discard block
 block discarded – undo
41 41
 	 * @param array $props_n_values
42 42
 	 * @return EE_Country
43 43
 	 */
44
-	public static function new_instance_from_db( $props_n_values = array() ) {
45
-		return new self( $props_n_values, TRUE );
44
+	public static function new_instance_from_db($props_n_values = array()) {
45
+		return new self($props_n_values, TRUE);
46 46
 	}
47 47
 
48 48
 
@@ -54,7 +54,7 @@  discard block
 block discarded – undo
54 54
 	 * @return string
55 55
 	 */
56 56
 	public function name() {
57
-		return $this->get( 'CNT_name' );
57
+		return $this->get('CNT_name');
58 58
 	}
59 59
 
60 60
 
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 	 * @return string
65 65
 	 */
66 66
 	public function currency_code() {
67
-		return $this->get( 'CNT_cur_code' );
67
+		return $this->get('CNT_cur_code');
68 68
 	}
69 69
 
70 70
 
@@ -74,7 +74,7 @@  discard block
 block discarded – undo
74 74
 	 * @return string
75 75
 	 */
76 76
 	public function currency_sign() {
77
-		$CNT_cur_sign = $this->get( 'CNT_cur_sign' );
77
+		$CNT_cur_sign = $this->get('CNT_cur_sign');
78 78
 		return $CNT_cur_sign ? $CNT_cur_sign : '&#164;';
79 79
 	}
80 80
 
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 	 * @return string
86 86
 	 */
87 87
 	public function currency_name_single() {
88
-		return $this->get( 'CNT_cur_single' );
88
+		return $this->get('CNT_cur_single');
89 89
 	}
90 90
 
91 91
 
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
 	 * @return string
96 96
 	 */
97 97
 	public function currency_name_plural() {
98
-		return $this->get( 'CNT_cur_plural' );
98
+		return $this->get('CNT_cur_plural');
99 99
 	}
100 100
 
101 101
 
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
 	 * @return boolean
106 106
 	 */
107 107
 	public function currency_sign_before() {
108
-		return $this->get( 'CNT_cur_sign_b4' );
108
+		return $this->get('CNT_cur_sign_b4');
109 109
 	}
110 110
 
111 111
 
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 	 * @return integer
116 116
 	 */
117 117
 	public function currency_decimal_places() {
118
-		return $this->get( 'CNT_cur_dec_plc' );
118
+		return $this->get('CNT_cur_dec_plc');
119 119
 	}
120 120
 
121 121
 
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 	 * @return string
126 126
 	 */
127 127
 	public function currency_decimal_mark() {
128
-		return $this->get( 'CNT_cur_dec_mrk' );
128
+		return $this->get('CNT_cur_dec_mrk');
129 129
 	}
130 130
 
131 131
 
@@ -135,7 +135,7 @@  discard block
 block discarded – undo
135 135
 	 * @return string
136 136
 	 */
137 137
 	public function currency_thousands_separator() {
138
-		return $this->get( 'CNT_cur_thsnds' );
138
+		return $this->get('CNT_cur_thsnds');
139 139
 	}
140 140
 }
141 141
 /* End of file EE_Country.class.php */
Please login to merge, or discard this patch.
core/db_classes/EE_CSV.class.php 4 patches
Doc Comments   +6 added lines, -8 removed lines patch added patch discarded remove patch
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
 	 * Sends HTTP headers to indicate that the browser should download a file,
288 288
 	 * and starts writing the file to PHP's output. Returns the file handle so other functions can
289 289
 	 * also write to it
290
-	 * @param string $new_filename the name of the file that the user will download
290
+	 * @param string|false $filename the name of the file that the user will download
291 291
 	 * @return resource, like the results of fopen(), which can be used for fwrite, fputcsv2, etc.
292 292
 	 */
293 293
 	public function begin_sending_csv($filename){
@@ -343,9 +343,7 @@  discard block
 block discarded – undo
343 343
 	/**
344 344
 	 * Writes $data to the csv file open in $filehandle. uses the array indices of $data for column headers
345 345
 	 * @param array $data 2D array, first numerically-indexed, and next-level-down preferably indexed by string
346
-	 * @param boolean $add_csv_column_names whether or not we should add the keys in the bottom-most array as a row for headers in the CSV.
347
-	 * Eg, if $data looked like array(0=>array('EVT_ID'=>1,'EVT_name'=>'monkey'...), 1=>array(...),...))
348
-	 * then the first row we'd write to the CSV would be "EVT_ID,EVT_name,..."
346
+	 * @param resource $filehandle
349 347
 	 * @return boolean if we successfully wrote to the CSV or not. If there's no $data, we consider that a success (because we wrote everything there was...nothing)
350 348
 	 */
351 349
 	public function write_data_array_to_csv($filehandle, $data){
@@ -427,7 +425,7 @@  discard block
 block discarded – undo
427 425
 	 * @param array $model_data_array is assumed to be a 3d array: 1st layer has keys of model names (eg 'Event'),
428 426
 	 * next layer is numerically indexed to represent each model object (eg, each individual event), and the last layer
429 427
 	 * has all the attributes o fthat model object (eg, the event's id, name, etc)
430
-	 * @return boolean success
428
+	 * @return boolean|null success
431 429
 	 */
432 430
 	public function write_model_data_to_csv($filehandle,$model_data_array){
433 431
 		$this->write_metadata_to_csv($filehandle);
@@ -456,8 +454,8 @@  discard block
 block discarded – undo
456 454
 	 * Writes the CSV file to the output buffer, with rows corresponding to $model_data_array,
457 455
 	 * and dies (in order to avoid other plugins from messing up the csv output)
458 456
 	 * @param string $filename the filename you want to give the file
459
-	 * @param array $model_data_array 3d array, as described in EE_CSV::write_model_data_to_csv()
460
-	 * @return bool | void writes CSV file to output and dies
457
+	 * @param boolean $model_data_array 3d array, as described in EE_CSV::write_model_data_to_csv()
458
+	 * @return boolean|null | void writes CSV file to output and dies
461 459
 	 */
462 460
 	public function export_multiple_model_data_to_csv($filename,$model_data_array){
463 461
 		$filehandle = $this->begin_sending_csv($filename);
@@ -469,7 +467,7 @@  discard block
 block discarded – undo
469 467
 	 *		  @access public
470 468
 	 *			@param array $data - the array of data to be converted to csv and exported
471 469
 	 *			@param string $filename - name for newly created csv file
472
-	 *			@return TRUE on success, FALSE on fail
470
+	 *			@return false|null on success, FALSE on fail
473 471
 	 */
474 472
 	public function export_array_to_csv( $data = FALSE, $filename = FALSE  ) {
475 473
 
Please login to merge, or discard this patch.
Braces   +12 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,4 +1,6 @@  discard block
 block discarded – undo
1
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if (!defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3
+}
2 4
 /**
3 5
  * CSV Import Export class
4 6
  *
@@ -105,8 +107,9 @@  discard block
 block discarded – undo
105 107
 			  $fc = $fc . $c;
106 108
 			}
107 109
 		}
108
-		if ((ord(substr($fc,0,1)) == 255) && (ord(substr($fc,1,1)) == 254))
109
-		$fc = substr($fc,2);
110
+		if ((ord(substr($fc,0,1)) == 255) && (ord(substr($fc,1,1)) == 254)) {
111
+				$fc = substr($fc,2);
112
+		}
110 113
 		return ($fc);
111 114
 }
112 115
 
@@ -144,7 +147,7 @@  discard block
 block discarded – undo
144 147
 				while(($data = fgetcsv($file_handle, 0, ',', '"' )) !== FALSE){
145 148
 					$csvarray[]= $data;
146 149
 				}
147
-			}else{
150
+			} else{
148 151
 				// loop through each row of the file
149 152
 				while (( $data = fgetcsv( $file_handle, 0, ',', '"', '\\' )) !== FALSE ) {
150 153
 					$csvarray[]=$data;
@@ -153,7 +156,7 @@  discard block
 block discarded – undo
153 156
 			# Close the File.
154 157
 			fclose($file_handle);
155 158
 			return $csvarray;
156
-		}else{
159
+		} else{
157 160
 			EE_Error::add_error( sprintf(__("An error occurred - the file: %s could not opened.", "event_espresso"),$path_to_file), __FILE__, __FUNCTION__, __LINE__ );
158 161
 			return false;
159 162
 		}
@@ -234,7 +237,7 @@  discard block
 block discarded – undo
234 237
 						$matches = array();
235 238
 						if($model_name == EE_CSV::metadata_header){
236 239
 							$headers[$i] = $column_name;
237
-						}else{
240
+						} else{
238 241
 							//now get the db table name from it (the part between square brackets)
239 242
 							$success = preg_match('~(.*)\[(.*)\]~', $column_name,$matches);
240 243
 							if (!$success){
@@ -244,7 +247,7 @@  discard block
 block discarded – undo
244 247
 							$headers[$i] = $matches[2];
245 248
 						}
246 249
 
247
-					}else{
250
+					} else{
248 251
 						// no column names means our final array will just use counters for keys
249 252
 						$model_entry[$headers[$i]] = $data[$i];
250 253
 						$headers[$i] = $i;
@@ -371,7 +374,7 @@  discard block
 block discarded – undo
371 374
 				echo $this->fputcsv2($filehandle, $data_row);
372 375
 			}
373 376
 			return true;
374
-		}else{
377
+		} else{
375 378
 			//no data TO write... so we can assume that's a success
376 379
 			return true;
377 380
 		}
@@ -438,7 +441,7 @@  discard block
 block discarded – undo
438 441
 
439 442
 			if( ! empty($model_instance_arrays) ){
440 443
 				$this->write_data_array_to_csv($filehandle, $model_instance_arrays);
441
-			}else{
444
+			} else{
442 445
 //				echo "no data to write... so just write the headers";
443 446
 				//so there's actually NO model objects for that model.
444 447
 				//probably still want to show the columns
Please login to merge, or discard this patch.
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,13 +1,13 @@  discard block
 block discarded – undo
1 1
 <?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
2 2
 /**
3
- * CSV Import Export class
4
- *
5
- * @package				Event Espresso
6
- * @subpackage		includes/functions
7
- * @author					Brent Christensen
8
- *
9
- * ------------------------------------------------------------------------
10
- */
3
+	 * CSV Import Export class
4
+	 *
5
+	 * @package				Event Espresso
6
+	 * @subpackage		includes/functions
7
+	 * @author					Brent Christensen
8
+	 *
9
+	 * ------------------------------------------------------------------------
10
+	 */
11 11
  class EE_CSV {
12 12
 
13 13
   // instance of the EE_CSV object
@@ -315,7 +315,7 @@  discard block
 block discarded – undo
315 315
 //		header("Content-Type: application/download");
316 316
 		header('Content-disposition: attachment; filename='.$filename);
317 317
 		header("Content-Type: text/csv; charset=utf-8");
318
-                do_action( 'AHEE__EE_CSV__begin_sending_csv__headers' );
318
+				do_action( 'AHEE__EE_CSV__begin_sending_csv__headers' );
319 319
 		echo apply_filters('FHEE__EE_CSV__begin_sending_csv__start_writing', "\xEF\xBB\xBF" ); // makes excel open it as UTF-8. UTF-8 BOM, see http://stackoverflow.com/a/4440143/2773835
320 320
 		$fh = fopen('php://output', 'w');
321 321
 		return $fh;
Please login to merge, or discard this patch.
Spacing   +114 added lines, -114 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@  discard block
 block discarded – undo
1
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
2 2
 /**
3 3
  * CSV Import Export class
4 4
  *
@@ -41,31 +41,31 @@  discard block
 block discarded – undo
41 41
 		global $wpdb;
42 42
 
43 43
 		$this->_primary_keys = array(
44
-				$wpdb->prefix . 'esp_answer' => array( 'ANS_ID' ),
45
-				$wpdb->prefix . 'esp_attendee' => array( 'ATT_ID' ),
46
-				$wpdb->prefix . 'esp_datetime'	=> array( 'DTT_ID' ),
47
-				$wpdb->prefix . 'esp_event_question_group'	=> array( 'EQG_ID' ),
48
-				$wpdb->prefix . 'esp_message_template'	=> array( 'MTP_ID' ),
49
-				$wpdb->prefix . 'esp_payment'	=> array( 'PAY_ID' ),
50
-				$wpdb->prefix . 'esp_price'	=> array( 'PRC_ID' ),
51
-				$wpdb->prefix . 'esp_price_type'	=> array( 'PRT_ID' ),
52
-				$wpdb->prefix . 'esp_question'	=> array( 'QST_ID' ),
53
-				$wpdb->prefix . 'esp_question_group'	=> array( 'QSG_ID' ),
54
-				$wpdb->prefix . 'esp_question_group_question'	=> array( 'QGQ_ID' ),
55
-				$wpdb->prefix . 'esp_question_option'	=> array( 'QSO_ID' ),
56
-				$wpdb->prefix . 'esp_registration'	=> array( 'REG_ID' ),
57
-				$wpdb->prefix . 'esp_status'	=> array( 'STS_ID' ),
58
-				$wpdb->prefix . 'esp_transaction'	=> array( 'TXN_ID' ),
59
-				$wpdb->prefix . 'esp_transaction'	=> array( 'TXN_ID' ),
60
-				$wpdb->prefix . 'events_detail'	=> array( 'id' ),
61
-				$wpdb->prefix . 'events_category_detail'	=> array( 'id' ),
62
-				$wpdb->prefix . 'events_category_rel'	=> array( 'id' ),
63
-				$wpdb->prefix . 'events_venue'	=> array( 'id' ),
64
-				$wpdb->prefix . 'events_venue_rel' =>  array( 'emeta_id' ),
65
-				$wpdb->prefix . 'events_locale'	=> array( 'id' ),
66
-				$wpdb->prefix . 'events_locale_rel'	=> array( 'id' ),
67
-				$wpdb->prefix . 'events_personnel' =>  array( 'id' ),
68
-				$wpdb->prefix . 'events_personnel_rel' =>  array( 'id' ),
44
+				$wpdb->prefix.'esp_answer' => array('ANS_ID'),
45
+				$wpdb->prefix.'esp_attendee' => array('ATT_ID'),
46
+				$wpdb->prefix.'esp_datetime'	=> array('DTT_ID'),
47
+				$wpdb->prefix.'esp_event_question_group'	=> array('EQG_ID'),
48
+				$wpdb->prefix.'esp_message_template'	=> array('MTP_ID'),
49
+				$wpdb->prefix.'esp_payment'	=> array('PAY_ID'),
50
+				$wpdb->prefix.'esp_price'	=> array('PRC_ID'),
51
+				$wpdb->prefix.'esp_price_type'	=> array('PRT_ID'),
52
+				$wpdb->prefix.'esp_question'	=> array('QST_ID'),
53
+				$wpdb->prefix.'esp_question_group'	=> array('QSG_ID'),
54
+				$wpdb->prefix.'esp_question_group_question'	=> array('QGQ_ID'),
55
+				$wpdb->prefix.'esp_question_option'	=> array('QSO_ID'),
56
+				$wpdb->prefix.'esp_registration'	=> array('REG_ID'),
57
+				$wpdb->prefix.'esp_status'	=> array('STS_ID'),
58
+				$wpdb->prefix.'esp_transaction'	=> array('TXN_ID'),
59
+				$wpdb->prefix.'esp_transaction'	=> array('TXN_ID'),
60
+				$wpdb->prefix.'events_detail'	=> array('id'),
61
+				$wpdb->prefix.'events_category_detail'	=> array('id'),
62
+				$wpdb->prefix.'events_category_rel'	=> array('id'),
63
+				$wpdb->prefix.'events_venue'	=> array('id'),
64
+				$wpdb->prefix.'events_venue_rel' =>  array('emeta_id'),
65
+				$wpdb->prefix.'events_locale'	=> array('id'),
66
+				$wpdb->prefix.'events_locale_rel'	=> array('id'),
67
+				$wpdb->prefix.'events_personnel' =>  array('id'),
68
+				$wpdb->prefix.'events_personnel_rel' =>  array('id'),
69 69
 			);
70 70
 
71 71
 	}
@@ -77,9 +77,9 @@  discard block
 block discarded – undo
77 77
 	 *		@ access public
78 78
 	 *		@return EE_CSV
79 79
 	 */
80
-	public static function instance ( ) {
80
+	public static function instance( ) {
81 81
 		// check if class object is instantiated
82
-		if ( self::$_instance === NULL  or ! is_object( self::$_instance ) or ! ( self::$_instance instanceof EE_CSV )) {
82
+		if (self::$_instance === NULL or ! is_object(self::$_instance) or ! (self::$_instance instanceof EE_CSV)) {
83 83
 			self::$_instance = new self();
84 84
 		}
85 85
 		return self::$_instance;
@@ -91,22 +91,22 @@  discard block
 block discarded – undo
91 91
 	 * @return string
92 92
 	 * @throws EE_Error
93 93
 	 */
94
-	private function read_unicode_file($file_path){
94
+	private function read_unicode_file($file_path) {
95 95
 		$fc = "";
96
-		$fh = fopen($file_path,"rb");
97
-		if( ! $fh ){
98
-			throw new EE_Error( sprintf( __("Cannot open file for read: %s<br>\n", 'event_espresso'), $file_path ) );
96
+		$fh = fopen($file_path, "rb");
97
+		if ( ! $fh) {
98
+			throw new EE_Error(sprintf(__("Cannot open file for read: %s<br>\n", 'event_espresso'), $file_path));
99 99
 		}
100 100
 		$flen = filesize($file_path);
101 101
 		$bc = fread($fh, $flen);
102
-		for ($i=0; $i<$flen; $i++){
103
-			$c = substr($bc,$i,1);
104
-			if ((ord($c) != 0) && (ord($c) != 13)){
105
-			  $fc = $fc . $c;
102
+		for ($i = 0; $i < $flen; $i++) {
103
+			$c = substr($bc, $i, 1);
104
+			if ((ord($c) != 0) && (ord($c) != 13)) {
105
+			  $fc = $fc.$c;
106 106
 			}
107 107
 		}
108
-		if ((ord(substr($fc,0,1)) == 255) && (ord(substr($fc,1,1)) == 254))
109
-		$fc = substr($fc,2);
108
+		if ((ord(substr($fc, 0, 1)) == 255) && (ord(substr($fc, 1, 1)) == 254))
109
+		$fc = substr($fc, 2);
110 110
 		return ($fc);
111 111
 }
112 112
 
@@ -118,15 +118,15 @@  discard block
 block discarded – undo
118 118
 	 * @param string $path_to_file
119 119
 	 * @return array of arrays. Top-level array has rows, second-level array has each item
120 120
 	 */
121
-	public function import_csv_to_multi_dimensional_array($path_to_file){
121
+	public function import_csv_to_multi_dimensional_array($path_to_file) {
122 122
 		// needed to deal with Mac line endings
123
-		ini_set('auto_detect_line_endings',TRUE);
123
+		ini_set('auto_detect_line_endings', TRUE);
124 124
 
125 125
 		// because fgetcsv does not correctly deal with backslashed quotes such as \"
126 126
 		// we'll read the file into a string
127
-		$file_contents = $this->read_unicode_file( $path_to_file );
127
+		$file_contents = $this->read_unicode_file($path_to_file);
128 128
 		// replace backslashed quotes with CSV enclosures
129
-		$file_contents = str_replace ( '\\"', '"""', $file_contents );
129
+		$file_contents = str_replace('\\"', '"""', $file_contents);
130 130
 		// HEY YOU! PUT THAT FILE BACK!!!
131 131
 		file_put_contents($path_to_file, $file_contents);
132 132
 
@@ -136,25 +136,25 @@  discard block
 block discarded – undo
136 136
 			$csvarray = array();
137 137
 
138 138
 			// in PHP 5.3 fgetcsv accepts a 5th parameter, but the pre 5.3 versions of fgetcsv choke if passed more than 4 - is that crazy or what?
139
-			if ( version_compare( PHP_VERSION, '5.3.0' ) < 0 ) {
139
+			if (version_compare(PHP_VERSION, '5.3.0') < 0) {
140 140
 
141 141
 				//  PHP 5.2- version
142 142
 
143 143
 				// loop through each row of the file
144
-				while(($data = fgetcsv($file_handle, 0, ',', '"' )) !== FALSE){
145
-					$csvarray[]= $data;
144
+				while (($data = fgetcsv($file_handle, 0, ',', '"')) !== FALSE) {
145
+					$csvarray[] = $data;
146 146
 				}
147
-			}else{
147
+			} else {
148 148
 				// loop through each row of the file
149
-				while (( $data = fgetcsv( $file_handle, 0, ',', '"', '\\' )) !== FALSE ) {
150
-					$csvarray[]=$data;
149
+				while (($data = fgetcsv($file_handle, 0, ',', '"', '\\')) !== FALSE) {
150
+					$csvarray[] = $data;
151 151
 				}
152 152
 			}
153 153
 			# Close the File.
154 154
 			fclose($file_handle);
155 155
 			return $csvarray;
156
-		}else{
157
-			EE_Error::add_error( sprintf(__("An error occurred - the file: %s could not opened.", "event_espresso"),$path_to_file), __FILE__, __FUNCTION__, __LINE__ );
156
+		} else {
157
+			EE_Error::add_error(sprintf(__("An error occurred - the file: %s could not opened.", "event_espresso"), $path_to_file), __FILE__, __FUNCTION__, __LINE__);
158 158
 			return false;
159 159
 		}
160 160
 	}
@@ -184,9 +184,9 @@  discard block
 block discarded – undo
184 184
 	 *						...
185 185
 	 *						)
186 186
 	 */
187
-	public function import_csv_to_model_data_array( $path_to_file, $model_name = FALSE, $first_row_is_headers = TRUE ) {
187
+	public function import_csv_to_model_data_array($path_to_file, $model_name = FALSE, $first_row_is_headers = TRUE) {
188 188
 		$multi_dimensional_array = $this->import_csv_to_multi_dimensional_array($path_to_file);
189
-		if( ! $multi_dimensional_array ){
189
+		if ( ! $multi_dimensional_array) {
190 190
 			return false;
191 191
 		}
192 192
 		// gotta start somewhere
@@ -195,9 +195,9 @@  discard block
 block discarded – undo
195 195
 		$ee_formatted_data = array();
196 196
 		// array to store headers (column names)
197 197
 		$headers = array();
198
-		foreach($multi_dimensional_array as $data){
198
+		foreach ($multi_dimensional_array as $data) {
199 199
 			// if first cell is MODEL, then second cell is the MODEL name
200
-			if ( $data[0]	== 'MODEL' ) {
200
+			if ($data[0] == 'MODEL') {
201 201
 				$model_name = $data[1];
202 202
 				//don't bother looking for model data in this row. The rest of this
203 203
 				//row should be blank
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
 				$headers = array();
208 208
 				continue;
209 209
 			}
210
-			if( strpos( $data[0], EE_CSV::metadata_header ) !==FALSE ){
210
+			if (strpos($data[0], EE_CSV::metadata_header) !== FALSE) {
211 211
 				$model_name = EE_CSV::metadata_header;
212 212
 				//store like model data, we just won't try importing it etc.
213 213
 				$row = 1;
@@ -220,31 +220,31 @@  discard block
 block discarded – undo
220 220
 
221 221
 			$model_entry = array();
222 222
 			// loop through each column
223
-			for ( $i=0; $i < $columns; $i++ ) {
223
+			for ($i = 0; $i < $columns; $i++) {
224 224
 
225 225
 				//replace csv_enclosures with backslashed quotes
226
-				$data[$i] = str_replace ( '"""', '\\"', $data[$i] );
226
+				$data[$i] = str_replace('"""', '\\"', $data[$i]);
227 227
 				// do we need to grab the column names?
228
-				if ( $row === 1){
229
-					if( $first_row_is_headers ) {
228
+				if ($row === 1) {
229
+					if ($first_row_is_headers) {
230 230
 						// store the column names to use for keys
231 231
 						$column_name = $data[$i];
232 232
 						//check it's not blank... sometimes CSV editign programs adda bunch of empty columns onto the end...
233
-						if(!$column_name){continue;}
233
+						if ( ! $column_name) {continue; }
234 234
 						$matches = array();
235
-						if($model_name == EE_CSV::metadata_header){
235
+						if ($model_name == EE_CSV::metadata_header) {
236 236
 							$headers[$i] = $column_name;
237
-						}else{
237
+						} else {
238 238
 							//now get the db table name from it (the part between square brackets)
239
-							$success = preg_match('~(.*)\[(.*)\]~', $column_name,$matches);
240
-							if (!$success){
241
-								EE_Error::add_error( sprintf(__("The column titled %s is invalid for importing. It must be be in the format of 'Nice Name[model_field_name]' in row %s", "event_espresso"),$column_name,implode(",",$data)), __FILE__, __FUNCTION__, __LINE__ );
239
+							$success = preg_match('~(.*)\[(.*)\]~', $column_name, $matches);
240
+							if ( ! $success) {
241
+								EE_Error::add_error(sprintf(__("The column titled %s is invalid for importing. It must be be in the format of 'Nice Name[model_field_name]' in row %s", "event_espresso"), $column_name, implode(",", $data)), __FILE__, __FUNCTION__, __LINE__);
242 242
 								return false;
243 243
 							}
244 244
 							$headers[$i] = $matches[2];
245 245
 						}
246 246
 
247
-					}else{
247
+					} else {
248 248
 						// no column names means our final array will just use counters for keys
249 249
 						$model_entry[$headers[$i]] = $data[$i];
250 250
 						$headers[$i] = $i;
@@ -252,14 +252,14 @@  discard block
 block discarded – undo
252 252
 					// and we need to store csv data
253 253
 				} else {
254 254
 					// this column isn' ta header, store it if there is a header for it
255
-					if(isset($headers[$i])){
255
+					if (isset($headers[$i])) {
256 256
 						$model_entry[$headers[$i]] = $data[$i];
257 257
 					}
258 258
 				}
259 259
 
260 260
 			}
261 261
 			//save the row's data IF it's a non-header-row
262
-			if( ! $first_row_is_headers || ($first_row_is_headers && $row > 1)){
262
+			if ( ! $first_row_is_headers || ($first_row_is_headers && $row > 1)) {
263 263
 				$ee_formatted_data[$model_name][] = $model_entry;
264 264
 			}
265 265
 			// advance to next row
@@ -278,9 +278,9 @@  discard block
 block discarded – undo
278 278
 	}
279 279
 
280 280
 
281
-	public function save_csv_to_db( $csv_data_array, $model_name = FALSE ) {
282
-		EE_Error::doing_it_wrong('save_csv_to_db', __( 'Function moved to EE_Import and renamed to save_csv_data_array_to_db', 'event_espresso' ), '4.6.7' );
283
-		return EE_Import::instance()->save_csv_data_array_to_db( $csv_data_array, $model_name );
281
+	public function save_csv_to_db($csv_data_array, $model_name = FALSE) {
282
+		EE_Error::doing_it_wrong('save_csv_to_db', __('Function moved to EE_Import and renamed to save_csv_data_array_to_db', 'event_espresso'), '4.6.7');
283
+		return EE_Import::instance()->save_csv_data_array_to_db($csv_data_array, $model_name);
284 284
 	}
285 285
 
286 286
 	/**
@@ -290,11 +290,11 @@  discard block
 block discarded – undo
290 290
 	 * @param string $new_filename the name of the file that the user will download
291 291
 	 * @return resource, like the results of fopen(), which can be used for fwrite, fputcsv2, etc.
292 292
 	 */
293
-	public function begin_sending_csv($filename){
293
+	public function begin_sending_csv($filename) {
294 294
 		// grab file extension
295 295
 		$ext = substr(strrchr($filename, '.'), 1);
296
-		if ( $ext == '.csv' or  $ext == '.xls' ) {
297
-			str_replace( $ext, '', $filename );
296
+		if ($ext == '.csv' or $ext == '.xls') {
297
+			str_replace($ext, '', $filename);
298 298
 		}
299 299
 		$filename .= '.csv';
300 300
 
@@ -315,8 +315,8 @@  discard block
 block discarded – undo
315 315
 //		header("Content-Type: application/download");
316 316
 		header('Content-disposition: attachment; filename='.$filename);
317 317
 		header("Content-Type: text/csv; charset=utf-8");
318
-                do_action( 'AHEE__EE_CSV__begin_sending_csv__headers' );
319
-		echo apply_filters('FHEE__EE_CSV__begin_sending_csv__start_writing', "\xEF\xBB\xBF" ); // makes excel open it as UTF-8. UTF-8 BOM, see http://stackoverflow.com/a/4440143/2773835
318
+                do_action('AHEE__EE_CSV__begin_sending_csv__headers');
319
+		echo apply_filters('FHEE__EE_CSV__begin_sending_csv__start_writing', "\xEF\xBB\xBF"); // makes excel open it as UTF-8. UTF-8 BOM, see http://stackoverflow.com/a/4440143/2773835
320 320
 		$fh = fopen('php://output', 'w');
321 321
 		return $fh;
322 322
 	}
@@ -326,12 +326,12 @@  discard block
 block discarded – undo
326 326
 	 * mentioning the version and timezone
327 327
 	 * @param resource $filehandle
328 328
 	 */
329
-	public function write_metadata_to_csv($filehandle){
329
+	public function write_metadata_to_csv($filehandle) {
330 330
 		EE_Registry::instance()->load_helper('DTT_Helper');
331
-		$data_row = array(EE_CSV::metadata_header);//do NOT translate because this exact string is used when importing
331
+		$data_row = array(EE_CSV::metadata_header); //do NOT translate because this exact string is used when importing
332 332
 		$this->fputcsv2($filehandle, $data_row);
333 333
 		EE_Registry::instance()->load_helper('DTT_Helper');
334
-		$meta_data = array( 0=> array(
334
+		$meta_data = array(0=> array(
335 335
 			'version'=>espresso_version(),
336 336
 			'timezone'=>  EEH_DTT_Helper::get_timezone(),
337 337
 			'time_of_export'=>current_time('mysql'),
@@ -349,30 +349,30 @@  discard block
 block discarded – undo
349 349
 	 * then the first row we'd write to the CSV would be "EVT_ID,EVT_name,..."
350 350
 	 * @return boolean if we successfully wrote to the CSV or not. If there's no $data, we consider that a success (because we wrote everything there was...nothing)
351 351
 	 */
352
-	public function write_data_array_to_csv($filehandle, $data){
352
+	public function write_data_array_to_csv($filehandle, $data) {
353 353
 		EE_Registry::instance()->load_helper('Array');
354 354
 
355 355
 
356 356
 		//determine if $data is actually a 2d array
357
-		if ( $data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))){
357
+		if ($data && is_array($data) && is_array(EEH_Array::get_one_item_from_array($data))) {
358 358
 			//make sure top level is numerically indexed,
359 359
 
360
-			if( EEH_Array::is_associative_array($data)){
361
-				throw new EE_Error(sprintf(__("top-level array must be numerically indexed. Does these look like numbers to you? %s","event_espresso"),implode(",",array_keys($data))));
360
+			if (EEH_Array::is_associative_array($data)) {
361
+				throw new EE_Error(sprintf(__("top-level array must be numerically indexed. Does these look like numbers to you? %s", "event_espresso"), implode(",", array_keys($data))));
362 362
 			}
363 363
 			$item_in_top_level_array = EEH_Array::get_one_item_from_array($data);
364 364
 			//now, is the last item in the top-level array of $data an associative or numeric array?
365
-			if(EEH_Array::is_associative_array($item_in_top_level_array)){
365
+			if (EEH_Array::is_associative_array($item_in_top_level_array)) {
366 366
 				//its associative, so we want to output its keys as column headers
367 367
 				$keys = array_keys($item_in_top_level_array);
368 368
 				echo $this->fputcsv2($filehandle, $keys);
369 369
 			}
370 370
 			//start writing data
371
-			foreach($data as $data_row){
371
+			foreach ($data as $data_row) {
372 372
 				echo $this->fputcsv2($filehandle, $data_row);
373 373
 			}
374 374
 			return true;
375
-		}else{
375
+		} else {
376 376
 			//no data TO write... so we can assume that's a success
377 377
 			return true;
378 378
 		}
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
417 417
 	 * Calls exit to prevent polluting the CSV file with other junk
418 418
 	 * @param resource $fh filehandle where we're writing the CSV to
419 419
 	 */
420
-	public function end_sending_csv($fh){
420
+	public function end_sending_csv($fh) {
421 421
 		fclose($fh);
422 422
 		exit(0);
423 423
 	}
@@ -430,23 +430,23 @@  discard block
 block discarded – undo
430 430
 	 * has all the attributes o fthat model object (eg, the event's id, name, etc)
431 431
 	 * @return boolean success
432 432
 	 */
433
-	public function write_model_data_to_csv($filehandle,$model_data_array){
433
+	public function write_model_data_to_csv($filehandle, $model_data_array) {
434 434
 		$this->write_metadata_to_csv($filehandle);
435
-		foreach($model_data_array as $model_name => $model_instance_arrays){
435
+		foreach ($model_data_array as $model_name => $model_instance_arrays) {
436 436
 			//first: output a special row stating the model
437
-			echo $this->fputcsv2($filehandle,array('MODEL',$model_name));
437
+			echo $this->fputcsv2($filehandle, array('MODEL', $model_name));
438 438
 			//if we have items to put in the CSV, do it normally
439 439
 
440
-			if( ! empty($model_instance_arrays) ){
440
+			if ( ! empty($model_instance_arrays)) {
441 441
 				$this->write_data_array_to_csv($filehandle, $model_instance_arrays);
442
-			}else{
442
+			} else {
443 443
 //				echo "no data to write... so just write the headers";
444 444
 				//so there's actually NO model objects for that model.
445 445
 				//probably still want to show the columns
446 446
 				$model = EE_Registry::instance()->load_model($model_name);
447 447
 				$column_names = array();
448
-				foreach($model->field_settings() as $field){
449
-					$column_names[$field->get_nicename()."[".$field->get_name()."]"] = null ;
448
+				foreach ($model->field_settings() as $field) {
449
+					$column_names[$field->get_nicename()."[".$field->get_name()."]"] = null;
450 450
 				}
451 451
 				$this->write_data_array_to_csv($filehandle, array($column_names));
452 452
 			}
@@ -460,7 +460,7 @@  discard block
 block discarded – undo
460 460
 	 * @param array $model_data_array 3d array, as described in EE_CSV::write_model_data_to_csv()
461 461
 	 * @return bool | void writes CSV file to output and dies
462 462
 	 */
463
-	public function export_multiple_model_data_to_csv($filename,$model_data_array){
463
+	public function export_multiple_model_data_to_csv($filename, $model_data_array) {
464 464
 		$filehandle = $this->begin_sending_csv($filename);
465 465
 		$this->write_model_data_to_csv($filehandle, $model_data_array);
466 466
 		$this->end_sending_csv($filehandle);
@@ -472,15 +472,15 @@  discard block
 block discarded – undo
472 472
 	 *			@param string $filename - name for newly created csv file
473 473
 	 *			@return TRUE on success, FALSE on fail
474 474
 	 */
475
-	public function export_array_to_csv( $data = FALSE, $filename = FALSE  ) {
475
+	public function export_array_to_csv($data = FALSE, $filename = FALSE) {
476 476
 
477 477
 		// no data file?? get outta here
478
-		if ( ! $data or ! is_array( $data ) or empty( $data ) ) {
478
+		if ( ! $data or ! is_array($data) or empty($data)) {
479 479
 			return FALSE;
480 480
 		}
481 481
 
482 482
 		// no filename?? get outta here
483
-		if ( ! $filename ) {
483
+		if ( ! $filename) {
484 484
 			return FALSE;
485 485
 		}
486 486
 
@@ -506,11 +506,11 @@  discard block
 block discarded – undo
506 506
 	 *			@param int $percent_of_max - desired percentage of the max upload_mb
507 507
 	 *			@return int KB
508 508
 	 */
509
-	public function get_max_upload_size ( $percent_of_max = FALSE ) {
509
+	public function get_max_upload_size($percent_of_max = FALSE) {
510 510
 
511
-		$max_upload = (int)(ini_get('upload_max_filesize'));
512
-		$max_post = (int)(ini_get('post_max_size'));
513
-		$memory_limit = (int)(ini_get('memory_limit'));
511
+		$max_upload = (int) (ini_get('upload_max_filesize'));
512
+		$max_post = (int) (ini_get('post_max_size'));
513
+		$memory_limit = (int) (ini_get('memory_limit'));
514 514
 
515 515
 		// determine the smallest of the three values from above
516 516
 		$upload_mb = min($max_upload, $max_post, $memory_limit);
@@ -519,9 +519,9 @@  discard block
 block discarded – undo
519 519
 		$upload_mb = $upload_mb * 1024;
520 520
 
521 521
 		// don't want the full monty? then reduce the max uplaod size
522
-		if ( $percent_of_max ) {
522
+		if ($percent_of_max) {
523 523
 			// is percent_of_max like this -> 50 or like this -> 0.50 ?
524
-			if ( $percent_of_max > 1 ) {
524
+			if ($percent_of_max > 1) {
525 525
 				// chnages 50 to 0.50
526 526
 				$percent_of_max = $percent_of_max / 100;
527 527
 			}
@@ -543,17 +543,17 @@  discard block
 block discarded – undo
543 543
 	 *			@param string $mysql_null - allows php NULL to be overridden with MySQl's insertable NULL value
544 544
 	 *			@return void
545 545
 	 */
546
-	private function fputcsv2 ($fh, array $row, $delimiter = ',', $enclosure = '"', $mysql_null = FALSE) {
546
+	private function fputcsv2($fh, array $row, $delimiter = ',', $enclosure = '"', $mysql_null = FALSE) {
547 547
 		//Allow user to filter the csv delimiter and enclosure for other countries csv standards
548
-		$delimiter = apply_filters( 'FHEE__EE_CSV__fputcsv2__delimiter', $delimiter );
549
-		$enclosure = apply_filters( 'FHEE__EE_CSV__fputcsv2__enclosure', $enclosure );
548
+		$delimiter = apply_filters('FHEE__EE_CSV__fputcsv2__delimiter', $delimiter);
549
+		$enclosure = apply_filters('FHEE__EE_CSV__fputcsv2__enclosure', $enclosure);
550 550
 
551 551
 		$delimiter_esc = preg_quote($delimiter, '/');
552 552
 		$enclosure_esc = preg_quote($enclosure, '/');
553 553
 
554 554
 		$output = array();
555 555
 		foreach ($row as $field_value) {
556
-			if(is_object($field_value) || is_array($field_value)){
556
+			if (is_object($field_value) || is_array($field_value)) {
557 557
 				$field_value = serialize($field_value);
558 558
 			}
559 559
 			if ($field_value === null && $mysql_null) {
@@ -562,10 +562,10 @@  discard block
 block discarded – undo
562 562
 			}
563 563
 
564 564
 			$output[] = preg_match("/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $field_value) ?
565
-				( $enclosure . str_replace($enclosure, $enclosure . $enclosure, $field_value) . $enclosure ) : $field_value;
565
+				($enclosure.str_replace($enclosure, $enclosure.$enclosure, $field_value).$enclosure) : $field_value;
566 566
 		}
567 567
 
568
-		fwrite($fh, join($delimiter, $output) . PHP_EOL);
568
+		fwrite($fh, join($delimiter, $output).PHP_EOL);
569 569
 	}
570 570
 
571 571
 
@@ -603,8 +603,8 @@  discard block
 block discarded – undo
603 603
 	 * @param string $current_format
604 604
 	 * @return string
605 605
 	 */
606
-	public function get_date_format_for_csv( $current_format = null ) {
607
-		return apply_filters( 'FHEE__EE_CSV__get_date_format_for_csv__format', 'Y-m-d', $current_format );
606
+	public function get_date_format_for_csv($current_format = null) {
607
+		return apply_filters('FHEE__EE_CSV__get_date_format_for_csv__format', 'Y-m-d', $current_format);
608 608
 	}
609 609
 
610 610
 	/**
@@ -612,8 +612,8 @@  discard block
 block discarded – undo
612 612
 	 * @param string $current_format
613 613
 	 * @return string
614 614
 	 */
615
-	public function get_time_format_for_csv( $current_format = null ) {
616
-		return apply_filters( 'FHEE__EE_CSV__get_time_format_for_csv__format', 'H:i:s', $current_format );
615
+	public function get_time_format_for_csv($current_format = null) {
616
+		return apply_filters('FHEE__EE_CSV__get_time_format_for_csv__format', 'H:i:s', $current_format);
617 617
 	}
618 618
 
619 619
 
Please login to merge, or discard this patch.
core/db_classes/EE_Currency.class.php 3 patches
Doc Comments   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -54,14 +54,14 @@  discard block
 block discarded – undo
54 54
 	 * @param array $props_n_values  incoming values from the database
55 55
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
56 56
 	 *                          		the website will be used.
57
-	 * @return EE_Attendee
57
+	 * @return EE_Currency
58 58
 	 */
59 59
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
60 60
 		return new self( $props_n_values, TRUE, $timezone );
61 61
 	}
62 62
 	/**
63 63
 	 * Gets code
64
-	 * @return string
64
+	 * @return boolean
65 65
 	 */
66 66
 	function code() {
67 67
 		return $this->get('CUR_code');
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 	/**
71 71
 	 * Sets code
72 72
 	 * @param string $code
73
-	 * @return boolean
73
+	 * @return boolean|null
74 74
 	 */
75 75
 	function set_code($code) {
76 76
 		return $this->set('CUR_code', $code);
@@ -86,14 +86,14 @@  discard block
 block discarded – undo
86 86
 	/**
87 87
 	 * Sets active
88 88
 	 * @param boolean $active
89
-	 * @return boolean
89
+	 * @return boolean|null
90 90
 	 */
91 91
 	function set_active($active) {
92 92
 		return $this->set('CUR_active', $active);
93 93
 	}
94 94
 	/**
95 95
 	 * Gets dec_plc
96
-	 * @return int
96
+	 * @return boolean
97 97
 	 */
98 98
 	function dec_plc() {
99 99
 		return $this->get('CUR_dec_plc');
@@ -102,14 +102,14 @@  discard block
 block discarded – undo
102 102
 	/**
103 103
 	 * Sets dec_plc
104 104
 	 * @param int $dec_plc
105
-	 * @return boolean
105
+	 * @return boolean|null
106 106
 	 */
107 107
 	function set_dec_plc($dec_plc) {
108 108
 		return $this->set('CUR_dec_plc', $dec_plc);
109 109
 	}
110 110
 	/**
111 111
 	 * Gets plural
112
-	 * @return string
112
+	 * @return boolean
113 113
 	 */
114 114
 	function plural_name() {
115 115
 		return $this->get('CUR_plural');
@@ -118,14 +118,14 @@  discard block
 block discarded – undo
118 118
 	/**
119 119
 	 * Sets plural
120 120
 	 * @param string $plural
121
-	 * @return boolean
121
+	 * @return boolean|null
122 122
 	 */
123 123
 	function set_plural_name($plural) {
124 124
 		return $this->set('CUR_plural', $plural);
125 125
 	}
126 126
 	/**
127 127
 	 * Gets sign
128
-	 * @return string
128
+	 * @return boolean
129 129
 	 */
130 130
 	function sign() {
131 131
 		return $this->get('CUR_sign');
@@ -134,14 +134,14 @@  discard block
 block discarded – undo
134 134
 	/**
135 135
 	 * Sets sign
136 136
 	 * @param string $sign
137
-	 * @return boolean
137
+	 * @return boolean|null
138 138
 	 */
139 139
 	function set_sign($sign) {
140 140
 		return $this->set('CUR_sign', $sign);
141 141
 	}
142 142
 	/**
143 143
 	 * Gets single
144
-	 * @return string
144
+	 * @return boolean
145 145
 	 */
146 146
 	function singular_name() {
147 147
 		return $this->get('CUR_single');
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 	/**
151 151
 	 * Sets single
152 152
 	 * @param string $single
153
-	 * @return boolean
153
+	 * @return boolean|null
154 154
 	 */
155 155
 	function set_singular_name($single) {
156 156
 		return $this->set('CUR_single', $single);
Please login to merge, or discard this patch.
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 
6 6
 /**
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_Currency extends EE_Base_Class{
28
+class EE_Currency extends EE_Base_Class {
29 29
 
30 30
 		/** Currency COde @var CUR_code*/ protected $_CUR_code = NULL;
31 31
 		/** Currency Name Singular @var CUR_single*/ protected $_CUR_single = NULL;
@@ -43,9 +43,9 @@  discard block
 block discarded – undo
43 43
 	 *                             		    date_format and the second value is the time format
44 44
 	 * @return EE_Attendee
45 45
 	 */
46
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
47
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
48
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
46
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
47
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
48
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
49 49
 	}
50 50
 
51 51
 
@@ -56,8 +56,8 @@  discard block
 block discarded – undo
56 56
 	 *                          		the website will be used.
57 57
 	 * @return EE_Attendee
58 58
 	 */
59
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
60
-		return new self( $props_n_values, TRUE, $timezone );
59
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
60
+		return new self($props_n_values, TRUE, $timezone);
61 61
 	}
62 62
 	/**
63 63
 	 * Gets code
@@ -159,8 +159,8 @@  discard block
 block discarded – undo
159 159
 	 * Gets a prettier name
160 160
 	 * @return string
161 161
 	 */
162
-	function name(){
163
-		return sprintf(__("%s (%s)", "event_espresso"),$this->code(),$this->plural_name());
162
+	function name() {
163
+		return sprintf(__("%s (%s)", "event_espresso"), $this->code(), $this->plural_name());
164 164
 	}
165 165
 
166 166
 }
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 /**
6 7
  * Event Espresso
7 8
  *
Please login to merge, or discard this patch.
core/db_classes/EE_Currency_Payment_Method.class.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
 	 * @param array $props_n_values  incoming values from the database
60 60
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
61 61
 	 *                          		the website will be used.
62
-	 * @return EE_Attendee
62
+	 * @return EE_Currency_Payment_Method
63 63
 	 */
64 64
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
65 65
 		return new self( $props_n_values, TRUE, $timezone );
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 
6 6
 /**
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
  *
27 27
  * ------------------------------------------------------------------------
28 28
  */
29
-class EE_Currency_Payment_Method extends EE_Base_Class{
29
+class EE_Currency_Payment_Method extends EE_Base_Class {
30 30
 
31 31
 	/** Currency to Payment Method Link ID @var CPM_ID*/
32 32
 	protected $_CPM_ID = NULL;
@@ -48,9 +48,9 @@  discard block
 block discarded – undo
48 48
 	 *                             		    date_format and the second value is the time format
49 49
 	 * @return EE_Attendee
50 50
 	 */
51
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
52
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
53
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
51
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
52
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
53
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
54 54
 	}
55 55
 
56 56
 
@@ -61,8 +61,8 @@  discard block
 block discarded – undo
61 61
 	 *                          		the website will be used.
62 62
 	 * @return EE_Attendee
63 63
 	 */
64
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
65
-		return new self( $props_n_values, TRUE, $timezone );
64
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
65
+		return new self($props_n_values, TRUE, $timezone);
66 66
 	}
67 67
 
68 68
 }
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 /**
6 7
  * Event Espresso
7 8
  *
Please login to merge, or discard this patch.
core/db_classes/EE_Datetime.class.php 4 patches
Doc Comments   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
 
220 220
 	/**
221 221
 	 * returns the datetime name
222
-	 * @return string
222
+	 * @return boolean
223 223
 	 */
224 224
 	public function name() {
225 225
 		return $this->get( 'DTT_name' );
@@ -229,7 +229,7 @@  discard block
 block discarded – undo
229 229
 
230 230
 	/**
231 231
 	 * returns the datetime description
232
-	 * @return string
232
+	 * @return boolean
233 233
 	 */
234 234
 	public function description() {
235 235
 		return $this->get( 'DTT_description' );
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
 
250 250
 	/**
251 251
 	 * This helper simply returns the order for the datetime
252
-	 * @return int         The order of the datetime for this event.
252
+	 * @return boolean         The order of the datetime for this event.
253 253
 	 */
254 254
 	public function order() {
255 255
 		return $this->get( 'DTT_order' );
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
 
260 260
 	/**
261 261
 	 * This helper simply returns the parent id for the datetime
262
-	 * @return int
262
+	 * @return boolean
263 263
 	 */
264 264
 	public function parent() {
265 265
 		return $this->get( 'DTT_parent' );
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 	 * @param    string $dt_frmt
277 277
 	 * @param    string $tm_frmt
278 278
 	 * @param    bool   $echo         - whether we echo or return (note echoing uses "pretty" formats, otherwise we use the standard formats)
279
-	 * @return    string|bool|void  string on success, FALSE on fail
279
+	 * @return    string|boolean  string on success, FALSE on fail
280 280
 	 */
281 281
 	private function _show_datetime( $date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE ) {
282 282
 		$field_name = "DTT_EVT_{$start_or_end}";
@@ -294,8 +294,8 @@  discard block
 block discarded – undo
294 294
 	 * last-used format, or '' to use the default date format
295 295
 	 *
296 296
 	 * @access        public
297
-	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
298
-	 * @return        mixed        string on success, FALSE on fail
297
+	 * @param string $dt_frmt - string representation of date format defaults to 'F j, Y'
298
+	 * @return        string|boolean        string on success, FALSE on fail
299 299
 	 */
300 300
 	public function start_date( $dt_frmt = NULL ) {
301 301
 		return $this->_show_datetime( 'D', 'start', $dt_frmt );
@@ -318,8 +318,8 @@  discard block
 block discarded – undo
318 318
 	 * last-used format, or '' to use the default date format
319 319
 	 *
320 320
 	 * @access        public
321
-	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
322
-	 * @return        mixed        string on success, FALSE on fail
321
+	 * @param string $dt_frmt - string representation of date format defaults to 'F j, Y'
322
+	 * @return        string|boolean        string on success, FALSE on fail
323 323
 	 */
324 324
 	public function end_date( $dt_frmt = NULL ) {
325 325
 		return $this->_show_datetime( 'D', 'end', $dt_frmt );
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
 	 * @access        public
344 344
 	 * @param null          $dt_frmt - string representation of date format defaults to WP settings
345 345
 	 * @param        string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
346
-	 * @return        mixed        string on success, FALSE on fail
346
+	 * @return        string        string on success, FALSE on fail
347 347
 	 */
348 348
 	public function date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
349 349
 		$dt_frmt = ! empty( $dt_frmt ) ? $dt_frmt : $this->_dt_frmt;
@@ -369,7 +369,7 @@  discard block
 block discarded – undo
369 369
 	 *
370 370
 	 * @access        public
371 371
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
372
-	 * @return        mixed        string on success, FALSE on fail
372
+	 * @return        string|boolean        string on success, FALSE on fail
373 373
 	 */
374 374
 	public function start_time( $tm_format = NULL ) {
375 375
 		return $this->_show_datetime( 'T', 'start', NULL, $tm_format );
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 	 *
392 392
 	 * @access        public
393 393
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
394
-	 * @return        mixed        string on success, FALSE on fail
394
+	 * @return        string|boolean        string on success, FALSE on fail
395 395
 	 */
396 396
 	public function end_time( $tm_format = NULL ) {
397 397
 		return $this->_show_datetime( 'T', 'end', NULL, $tm_format );
@@ -414,7 +414,7 @@  discard block
 block discarded – undo
414 414
 	 * @access        public
415 415
 	 * @param        string $tm_format   - string representation of time format defaults to 'g:i a'
416 416
 	 * @param        string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
417
-	 * @return        mixed        string on success, FALSE on fail
417
+	 * @return        string        string on success, FALSE on fail
418 418
 	 */
419 419
 	public function time_range( $tm_format = NULL, $conjunction = ' - ' ) {
420 420
 		$tm_format = !empty( $tm_format ) ? $tm_format : $this->_tm_frmt;
@@ -442,7 +442,7 @@  discard block
 block discarded – undo
442 442
 	 * @access        public
443 443
 	 * @param 	string 	$dt_format - string representation of date format defaults to 'F j, Y'
444 444
 	 * @param 	string 	$tm_format - string representation of time format defaults to 'g:i a'
445
-	 * @return 	mixed 	string on success, FALSE on fail
445
+	 * @return 	string|boolean 	string on success, FALSE on fail
446 446
 	 */
447 447
 	public function start_date_and_time( $dt_format = NULL, $tm_format = NULL ) {
448 448
 		return $this->_show_datetime( '', 'start', $dt_format, $tm_format );
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
 	 * @access        public
503 503
 	 * @param bool | string 	$dt_frmt- string representation of date format defaults to 'F j, Y'
504 504
 	 * @param bool | string 	$tm_format - string representation of time format defaults to 'g:i a'
505
-	 * @return 	mixed        		string on success, FALSE on fail
505
+	 * @return 	string|boolean        		string on success, FALSE on fail
506 506
 	 */
507 507
 	public function end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
508 508
 		return $this->_show_datetime( '', 'end', $dt_frmt, $tm_format );
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -708,12 +708,10 @@
 block discarded – undo
708 708
 		if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) ) {
709 709
 			$display_date = $this->start_date( 'M j\, Y g:i a' ) . ' - ' . $this->end_date( 'M j\, Y g:i a' );
710 710
 			//next condition is if its the same month but different day
711
-		}
712
-		else {
711
+		} else {
713 712
 			if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) == date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) && date( 'd', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'd', $this->get_raw( 'DTT_EVT_end' ) ) ) {
714 713
 				$display_date = $this->start_date( 'M j\, g:i a' ) . ' - ' . $this->end_date( 'M j\, g:i a Y' );
715
-			}
716
-			else {
714
+			} else {
717 715
 				$display_date = $this->start_date( 'F j\, Y' ) . ' @ ' . $this->start_date( 'g:i a' ) . ' - ' . $this->end_date( 'g:i a' );
718 716
 			}
719 717
 		}
Please login to merge, or discard this patch.
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -2,18 +2,18 @@
 block discarded – undo
2 2
 	exit( 'No direct script access allowed' );
3 3
 }
4 4
 /**
5
- * Event Espresso
6
- *
7
- * Event Registration and Management Plugin for WordPress
8
- *
9
- * @ package        Event Espresso
10
- * @ author        Event Espresso
11
- * @ copyright    (c) 2008-2011 Event Espresso  All Rights Reserved.
12
- * @ license        {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
13
- * @ link                {@link http://www.eventespresso.com}
14
- * @ since            4.0
15
- *
16
- */
5
+	 * Event Espresso
6
+	 *
7
+	 * Event Registration and Management Plugin for WordPress
8
+	 *
9
+	 * @ package        Event Espresso
10
+	 * @ author        Event Espresso
11
+	 * @ copyright    (c) 2008-2011 Event Espresso  All Rights Reserved.
12
+	 * @ license        {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
13
+	 * @ link                {@link http://www.eventespresso.com}
14
+	 * @ since            4.0
15
+	 *
16
+	 */
17 17
 
18 18
 
19 19
 
Please login to merge, or discard this patch.
Spacing   +126 added lines, -126 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 /**
5 5
  * Event Espresso
@@ -74,9 +74,9 @@  discard block
 block discarded – undo
74 74
 	 *                             		    date_format and the second value is the time format
75 75
 	 * @return EE_Datetime
76 76
 	 */
77
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
78
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
79
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
77
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
78
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
79
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
80 80
 	}
81 81
 
82 82
 
@@ -87,8 +87,8 @@  discard block
 block discarded – undo
87 87
 	 *                          		the website will be used.
88 88
 	 * @return EE_Datetime
89 89
 	 */
90
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
91
-		return new self( $props_n_values, TRUE, $timezone );
90
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
91
+		return new self($props_n_values, TRUE, $timezone);
92 92
 	}
93 93
 
94 94
 
@@ -96,8 +96,8 @@  discard block
 block discarded – undo
96 96
 	/**
97 97
 	 * @param $name
98 98
 	 */
99
-	public function set_name( $name ) {
100
-		$this->set( 'DTT_name', $name );
99
+	public function set_name($name) {
100
+		$this->set('DTT_name', $name);
101 101
 	}
102 102
 
103 103
 
@@ -105,8 +105,8 @@  discard block
 block discarded – undo
105 105
 	/**
106 106
 	 * @param $description
107 107
 	 */
108
-	public function set_description( $description ) {
109
-		$this->set( 'DTT_description', $description );
108
+	public function set_description($description) {
109
+		$this->set('DTT_description', $description);
110 110
 	}
111 111
 
112 112
 
@@ -119,8 +119,8 @@  discard block
 block discarded – undo
119 119
 	 * @access        public
120 120
 	 * @param        string $date a string representation of the event's date ex:  Dec. 25, 2025 or 12-25-2025
121 121
 	 */
122
-	public function set_start_date( $date ) {
123
-		$this->_set_date_for( $date, 'DTT_EVT_start' );
122
+	public function set_start_date($date) {
123
+		$this->_set_date_for($date, 'DTT_EVT_start');
124 124
 	}
125 125
 
126 126
 
@@ -133,8 +133,8 @@  discard block
 block discarded – undo
133 133
 	 * @access        public
134 134
 	 * @param        string $time a string representation of the event time ex:  9am  or  7:30 PM
135 135
 	 */
136
-	public function set_start_time( $time ) {
137
-		$this->_set_time_for( $time, 'DTT_EVT_start' );
136
+	public function set_start_time($time) {
137
+		$this->_set_time_for($time, 'DTT_EVT_start');
138 138
 	}
139 139
 
140 140
 
@@ -147,8 +147,8 @@  discard block
 block discarded – undo
147 147
 	 * @access        public
148 148
 	 * @param        string $date a string representation of the event's date ex:  Dec. 25, 2025 or 12-25-2025
149 149
 	 */
150
-	public function set_end_date( $date ) {
151
-		$this->_set_date_for( $date, 'DTT_EVT_end' );
150
+	public function set_end_date($date) {
151
+		$this->_set_date_for($date, 'DTT_EVT_end');
152 152
 	}
153 153
 
154 154
 
@@ -161,8 +161,8 @@  discard block
 block discarded – undo
161 161
 	 * @access        public
162 162
 	 * @param        string $time a string representation of the event time ex:  9am  or  7:30 PM
163 163
 	 */
164
-	public function set_end_time( $time ) {
165
-		$this->_set_time_for( $time, 'DTT_EVT_end' );
164
+	public function set_end_time($time) {
165
+		$this->_set_time_for($time, 'DTT_EVT_end');
166 166
 	}
167 167
 
168 168
 
@@ -175,8 +175,8 @@  discard block
 block discarded – undo
175 175
 	 * @access        public
176 176
 	 * @param        int $reg_limit
177 177
 	 */
178
-	public function set_reg_limit( $reg_limit ) {
179
-		$this->set( 'DTT_reg_limit', $reg_limit );
178
+	public function set_reg_limit($reg_limit) {
179
+		$this->set('DTT_reg_limit', $reg_limit);
180 180
 	}
181 181
 
182 182
 
@@ -187,10 +187,10 @@  discard block
 block discarded – undo
187 187
 	 * @access        public
188 188
 	 * @param        int $sold
189 189
 	 */
190
-	public function set_sold( $sold ) {
190
+	public function set_sold($sold) {
191 191
 		// sold can not go below zero
192
-		$sold = max( 0, $sold );
193
-		$this->set( 'DTT_sold', $sold );
192
+		$sold = max(0, $sold);
193
+		$this->set('DTT_sold', $sold);
194 194
 	}
195 195
 
196 196
 
@@ -199,9 +199,9 @@  discard block
 block discarded – undo
199 199
 	 * increments sold by amount passed by $qty
200 200
 	 * @param int $qty
201 201
 	 */
202
-	function increase_sold( $qty = 1 ) {
202
+	function increase_sold($qty = 1) {
203 203
 		$sold = $this->sold() + $qty;
204
-		$this->set_sold( $sold );
204
+		$this->set_sold($sold);
205 205
 	}
206 206
 
207 207
 
@@ -210,9 +210,9 @@  discard block
 block discarded – undo
210 210
 	 * decrements (subtracts) sold amount passed by $qty
211 211
 	 * @param int $qty
212 212
 	 */
213
-	function decrease_sold( $qty = 1 ) {
213
+	function decrease_sold($qty = 1) {
214 214
 		$sold = $this->sold() - $qty;
215
-		$this->set_sold( $sold );
215
+		$this->set_sold($sold);
216 216
 	}
217 217
 
218 218
 
@@ -222,7 +222,7 @@  discard block
 block discarded – undo
222 222
 	 * @return string
223 223
 	 */
224 224
 	public function name() {
225
-		return $this->get( 'DTT_name' );
225
+		return $this->get('DTT_name');
226 226
 	}
227 227
 
228 228
 
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
 	 * @return string
233 233
 	 */
234 234
 	public function description() {
235
-		return $this->get( 'DTT_description' );
235
+		return $this->get('DTT_description');
236 236
 	}
237 237
 
238 238
 
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 	 * @return boolean          TRUE if is primary, FALSE if not.
243 243
 	 */
244 244
 	public function is_primary() {
245
-		return $this->get( 'DTT_is_primary' );
245
+		return $this->get('DTT_is_primary');
246 246
 	}
247 247
 
248 248
 
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
 	 * @return int         The order of the datetime for this event.
253 253
 	 */
254 254
 	public function order() {
255
-		return $this->get( 'DTT_order' );
255
+		return $this->get('DTT_order');
256 256
 	}
257 257
 
258 258
 
@@ -262,7 +262,7 @@  discard block
 block discarded – undo
262 262
 	 * @return int
263 263
 	 */
264 264
 	public function parent() {
265
-		return $this->get( 'DTT_parent' );
265
+		return $this->get('DTT_parent');
266 266
 	}
267 267
 
268 268
 
@@ -278,10 +278,10 @@  discard block
 block discarded – undo
278 278
 	 * @param    bool   $echo         - whether we echo or return (note echoing uses "pretty" formats, otherwise we use the standard formats)
279 279
 	 * @return    string|bool|void  string on success, FALSE on fail
280 280
 	 */
281
-	private function _show_datetime( $date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE ) {
281
+	private function _show_datetime($date_or_time = NULL, $start_or_end = 'start', $dt_frmt = '', $tm_frmt = '', $echo = FALSE) {
282 282
 		$field_name = "DTT_EVT_{$start_or_end}";
283
-		$dtt = $this->_get_datetime( $field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo );
284
-		if ( ! $echo ) {
283
+		$dtt = $this->_get_datetime($field_name, $dt_frmt, $tm_frmt, $date_or_time, $echo);
284
+		if ( ! $echo) {
285 285
 			return $dtt;
286 286
 		}
287 287
 		return '';
@@ -297,8 +297,8 @@  discard block
 block discarded – undo
297 297
 	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
298 298
 	 * @return        mixed        string on success, FALSE on fail
299 299
 	 */
300
-	public function start_date( $dt_frmt = NULL ) {
301
-		return $this->_show_datetime( 'D', 'start', $dt_frmt );
300
+	public function start_date($dt_frmt = NULL) {
301
+		return $this->_show_datetime('D', 'start', $dt_frmt);
302 302
 	}
303 303
 
304 304
 
@@ -307,8 +307,8 @@  discard block
 block discarded – undo
307 307
 	 * Echoes start_date()
308 308
 	 * @param string $dt_frmt
309 309
 	 */
310
-	public function e_start_date( $dt_frmt = NULL ) {
311
-		$this->_show_datetime( 'D', 'start', $dt_frmt, NULL, TRUE );
310
+	public function e_start_date($dt_frmt = NULL) {
311
+		$this->_show_datetime('D', 'start', $dt_frmt, NULL, TRUE);
312 312
 	}
313 313
 
314 314
 
@@ -321,8 +321,8 @@  discard block
 block discarded – undo
321 321
 	 * @param null $dt_frmt - string representation of date format defaults to 'F j, Y'
322 322
 	 * @return        mixed        string on success, FALSE on fail
323 323
 	 */
324
-	public function end_date( $dt_frmt = NULL ) {
325
-		return $this->_show_datetime( 'D', 'end', $dt_frmt );
324
+	public function end_date($dt_frmt = NULL) {
325
+		return $this->_show_datetime('D', 'end', $dt_frmt);
326 326
 	}
327 327
 
328 328
 
@@ -331,8 +331,8 @@  discard block
 block discarded – undo
331 331
 	 * Echoes the end date. See end_date()
332 332
 	 * @param string $dt_frmt
333 333
 	 */
334
-	public function e_end_date( $dt_frmt = NULL ) {
335
-		$this->_show_datetime( 'D', 'end', $dt_frmt, NULL, TRUE );
334
+	public function e_end_date($dt_frmt = NULL) {
335
+		$this->_show_datetime('D', 'end', $dt_frmt, NULL, TRUE);
336 336
 	}
337 337
 
338 338
 
@@ -345,11 +345,11 @@  discard block
 block discarded – undo
345 345
 	 * @param        string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
346 346
 	 * @return        mixed        string on success, FALSE on fail
347 347
 	 */
348
-	public function date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
349
-		$dt_frmt = ! empty( $dt_frmt ) ? $dt_frmt : $this->_dt_frmt;
350
-		$start = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_start', $dt_frmt ) );
351
-		$end = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_end', $dt_frmt ) );
352
-		return $start != $end ? $start . $conjunction . $end : $start;
348
+	public function date_range($dt_frmt = NULL, $conjunction = ' - ') {
349
+		$dt_frmt = ! empty($dt_frmt) ? $dt_frmt : $this->_dt_frmt;
350
+		$start = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_start', $dt_frmt));
351
+		$end = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_end', $dt_frmt));
352
+		return $start != $end ? $start.$conjunction.$end : $start;
353 353
 	}
354 354
 
355 355
 
@@ -358,8 +358,8 @@  discard block
 block discarded – undo
358 358
 	 * @param null   $dt_frmt
359 359
 	 * @param string $conjunction
360 360
 	 */
361
-	public function e_date_range( $dt_frmt = NULL, $conjunction = ' - ' ) {
362
-		echo $this->date_range( $dt_frmt, $conjunction );
361
+	public function e_date_range($dt_frmt = NULL, $conjunction = ' - ') {
362
+		echo $this->date_range($dt_frmt, $conjunction);
363 363
 	}
364 364
 
365 365
 
@@ -371,8 +371,8 @@  discard block
 block discarded – undo
371 371
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
372 372
 	 * @return        mixed        string on success, FALSE on fail
373 373
 	 */
374
-	public function start_time( $tm_format = NULL ) {
375
-		return $this->_show_datetime( 'T', 'start', NULL, $tm_format );
374
+	public function start_time($tm_format = NULL) {
375
+		return $this->_show_datetime('T', 'start', NULL, $tm_format);
376 376
 	}
377 377
 
378 378
 
@@ -380,8 +380,8 @@  discard block
 block discarded – undo
380 380
 	/**
381 381
 	 * @param null $tm_format
382 382
 	 */
383
-	public function e_start_time( $tm_format = NULL ) {
384
-		$this->_show_datetime( 'T', 'start', NULL, $tm_format, TRUE );
383
+	public function e_start_time($tm_format = NULL) {
384
+		$this->_show_datetime('T', 'start', NULL, $tm_format, TRUE);
385 385
 	}
386 386
 
387 387
 
@@ -393,8 +393,8 @@  discard block
 block discarded – undo
393 393
 	 * @param        string $tm_format - string representation of time format defaults to 'g:i a'
394 394
 	 * @return        mixed        string on success, FALSE on fail
395 395
 	 */
396
-	public function end_time( $tm_format = NULL ) {
397
-		return $this->_show_datetime( 'T', 'end', NULL, $tm_format );
396
+	public function end_time($tm_format = NULL) {
397
+		return $this->_show_datetime('T', 'end', NULL, $tm_format);
398 398
 	}
399 399
 
400 400
 
@@ -402,8 +402,8 @@  discard block
 block discarded – undo
402 402
 	/**
403 403
 	 * @param null $tm_format
404 404
 	 */
405
-	public function e_end_time( $tm_format = NULL ) {
406
-		$this->_show_datetime( 'T', 'end', NULL, $tm_format, TRUE );
405
+	public function e_end_time($tm_format = NULL) {
406
+		$this->_show_datetime('T', 'end', NULL, $tm_format, TRUE);
407 407
 	}
408 408
 
409 409
 
@@ -416,12 +416,12 @@  discard block
 block discarded – undo
416 416
 	 * @param        string $conjunction - conjunction junction what's your function ? this string joins the start date with the end date ie: Jan 01 "to" Dec 31
417 417
 	 * @return        mixed        string on success, FALSE on fail
418 418
 	 */
419
-	public function time_range( $tm_format = NULL, $conjunction = ' - ' ) {
420
-		$tm_format = !empty( $tm_format ) ? $tm_format : $this->_tm_frmt;
419
+	public function time_range($tm_format = NULL, $conjunction = ' - ') {
420
+		$tm_format = ! empty($tm_format) ? $tm_format : $this->_tm_frmt;
421 421
 
422
-		$start = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_start', $tm_format ) );
423
-		$end = str_replace( ' ', '&nbsp;', $this->get_i18n_datetime( 'DTT_EVT_end',  $tm_format ) );
424
-		return $start != $end ? $start . $conjunction . $end : $start;
422
+		$start = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_start', $tm_format));
423
+		$end = str_replace(' ', '&nbsp;', $this->get_i18n_datetime('DTT_EVT_end', $tm_format));
424
+		return $start != $end ? $start.$conjunction.$end : $start;
425 425
 	}
426 426
 
427 427
 
@@ -430,8 +430,8 @@  discard block
 block discarded – undo
430 430
 	 * @param null   $tm_format
431 431
 	 * @param string $conjunction
432 432
 	 */
433
-	public function e_time_range( $tm_format = NULL, $conjunction = ' - ' ) {
434
-		echo $this->time_range( $tm_format, $conjunction );
433
+	public function e_time_range($tm_format = NULL, $conjunction = ' - ') {
434
+		echo $this->time_range($tm_format, $conjunction);
435 435
 	}
436 436
 
437 437
 
@@ -444,8 +444,8 @@  discard block
 block discarded – undo
444 444
 	 * @param 	string 	$tm_format - string representation of time format defaults to 'g:i a'
445 445
 	 * @return 	mixed 	string on success, FALSE on fail
446 446
 	 */
447
-	public function start_date_and_time( $dt_format = NULL, $tm_format = NULL ) {
448
-		return $this->_show_datetime( '', 'start', $dt_format, $tm_format );
447
+	public function start_date_and_time($dt_format = NULL, $tm_format = NULL) {
448
+		return $this->_show_datetime('', 'start', $dt_format, $tm_format);
449 449
 	}
450 450
 
451 451
 
@@ -454,8 +454,8 @@  discard block
 block discarded – undo
454 454
 	 * @param null $dt_frmt
455 455
 	 * @param null $tm_format
456 456
 	 */
457
-	public function e_start_date_and_time( $dt_frmt = NULL, $tm_format = NULL ) {
458
-		$this->_show_datetime( '', 'start', $dt_frmt, $tm_format, TRUE );
457
+	public function e_start_date_and_time($dt_frmt = NULL, $tm_format = NULL) {
458
+		$this->_show_datetime('', 'start', $dt_frmt, $tm_format, TRUE);
459 459
 	}
460 460
 
461 461
 
@@ -469,11 +469,11 @@  discard block
 block discarded – undo
469 469
 	 * @param bool   $round_up
470 470
 	 * @return float|int|mixed
471 471
 	 */
472
-	public function length( $units = 'seconds', $round_up = FALSE ) {
473
-		$start = $this->get_raw( 'DTT_EVT_start' );
474
-		$end = $this->get_raw( 'DTT_EVT_end' );
472
+	public function length($units = 'seconds', $round_up = FALSE) {
473
+		$start = $this->get_raw('DTT_EVT_start');
474
+		$end = $this->get_raw('DTT_EVT_end');
475 475
 		$length_in_units = $end - $start;
476
-		switch ( $units ) {
476
+		switch ($units) {
477 477
 			//NOTE: We purposefully don't use "break;" in order to chain the divisions
478 478
 			/** @noinspection PhpMissingBreakStatementInspection */
479 479
 			case 'days':
@@ -486,10 +486,10 @@  discard block
 block discarded – undo
486 486
 				$length_in_units /= 60;
487 487
 			case 'seconds':
488 488
 			default:
489
-				$length_in_units = ceil( $length_in_units );
489
+				$length_in_units = ceil($length_in_units);
490 490
 		}
491
-		if ( $round_up ) {
492
-			$length_in_units = max( $length_in_units, 1 );
491
+		if ($round_up) {
492
+			$length_in_units = max($length_in_units, 1);
493 493
 		}
494 494
 		return $length_in_units;
495 495
 	}
@@ -504,8 +504,8 @@  discard block
 block discarded – undo
504 504
 	 * @param bool | string 	$tm_format - string representation of time format defaults to 'g:i a'
505 505
 	 * @return 	mixed        		string on success, FALSE on fail
506 506
 	 */
507
-	public function end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
508
-		return $this->_show_datetime( '', 'end', $dt_frmt, $tm_format );
507
+	public function end_date_and_time($dt_frmt = FALSE, $tm_format = FALSE) {
508
+		return $this->_show_datetime('', 'end', $dt_frmt, $tm_format);
509 509
 	}
510 510
 
511 511
 
@@ -514,8 +514,8 @@  discard block
 block discarded – undo
514 514
 	 * @param bool $dt_frmt
515 515
 	 * @param bool $tm_format
516 516
 	 */
517
-	public function e_end_date_and_time( $dt_frmt = FALSE, $tm_format = FALSE ) {
518
-		$this->_show_datetime( '', 'end', $dt_frmt, $tm_format, TRUE );
517
+	public function e_end_date_and_time($dt_frmt = FALSE, $tm_format = FALSE) {
518
+		$this->_show_datetime('', 'end', $dt_frmt, $tm_format, TRUE);
519 519
 	}
520 520
 
521 521
 
@@ -527,7 +527,7 @@  discard block
 block discarded – undo
527 527
 	 * @return        int
528 528
 	 */
529 529
 	public function start() {
530
-		return $this->get_raw( 'DTT_EVT_start' );
530
+		return $this->get_raw('DTT_EVT_start');
531 531
 	}
532 532
 
533 533
 
@@ -539,7 +539,7 @@  discard block
 block discarded – undo
539 539
 	 * @return        int
540 540
 	 */
541 541
 	public function end() {
542
-		return $this->get_raw( 'DTT_EVT_end' );
542
+		return $this->get_raw('DTT_EVT_end');
543 543
 	}
544 544
 
545 545
 
@@ -551,7 +551,7 @@  discard block
 block discarded – undo
551 551
 	 * @return        mixed        int on success, FALSE on fail
552 552
 	 */
553 553
 	public function reg_limit() {
554
-		return $this->get_raw( 'DTT_reg_limit' );
554
+		return $this->get_raw('DTT_reg_limit');
555 555
 	}
556 556
 
557 557
 
@@ -563,7 +563,7 @@  discard block
 block discarded – undo
563 563
 	 * @return        mixed        int on success, FALSE on fail
564 564
 	 */
565 565
 	public function sold() {
566
-		return $this->get_raw( 'DTT_sold' );
566
+		return $this->get_raw('DTT_sold');
567 567
 	}
568 568
 
569 569
 
@@ -592,15 +592,15 @@  discard block
 block discarded – undo
592 592
 	 * 																	the spaces remaining for this particular datetime, hence the flag.
593 593
 	 * @return 	int
594 594
 	 */
595
-	public function spaces_remaining( $consider_tickets = FALSE ) {
595
+	public function spaces_remaining($consider_tickets = FALSE) {
596 596
 		// tickets remaining available for purchase
597 597
 		//no need for special checks for infinite, because if DTT_reg_limit == INF, then INF - x = INF
598 598
 		$dtt_remaining = $this->reg_limit() - $this->sold();
599
-		if ( ! $consider_tickets ) {
599
+		if ( ! $consider_tickets) {
600 600
 			return $dtt_remaining;
601 601
 		}
602 602
 		$tickets_remaining = $this->tickets_remaining();
603
-		return min( $dtt_remaining, $tickets_remaining );
603
+		return min($dtt_remaining, $tickets_remaining);
604 604
 	}
605 605
 
606 606
 
@@ -611,19 +611,19 @@  discard block
 block discarded – undo
611 611
 	 * @param array $query_params like EEM_Base::get_all's
612 612
 	 * @return int
613 613
 	 */
614
-	public function tickets_remaining( $query_params = array() ) {
614
+	public function tickets_remaining($query_params = array()) {
615 615
 		$sum = 0;
616
-		$tickets = $this->tickets( $query_params );
617
-		if ( ! empty( $tickets ) ) {
618
-			foreach ( $tickets as $ticket ) {
619
-				if ( $ticket instanceof EE_Ticket ) {
616
+		$tickets = $this->tickets($query_params);
617
+		if ( ! empty($tickets)) {
618
+			foreach ($tickets as $ticket) {
619
+				if ($ticket instanceof EE_Ticket) {
620 620
 					// get the actual amount of tickets that can be sold
621
-					$qty = $ticket->qty( 'saleable' );
622
-					if ( $qty === INF ) {
621
+					$qty = $ticket->qty('saleable');
622
+					if ($qty === INF) {
623 623
 						return INF;
624 624
 					}
625 625
 					// no negative ticket quantities plz
626
-					if ( $qty > 0 ) {
626
+					if ($qty > 0) {
627 627
 						$sum += $qty;
628 628
 					}
629 629
 				}
@@ -640,8 +640,8 @@  discard block
 block discarded – undo
640 640
 	 * @param array $query_params like EEM_Base::get_all's
641 641
 	 * @return int
642 642
 	 */
643
-	public function sum_tickets_initially_available( $query_params = array() ) {
644
-		return $this->sum_related( 'Ticket', $query_params, 'TKT_qty' );
643
+	public function sum_tickets_initially_available($query_params = array()) {
644
+		return $this->sum_related('Ticket', $query_params, 'TKT_qty');
645 645
 	}
646 646
 
647 647
 
@@ -653,7 +653,7 @@  discard block
 block discarded – undo
653 653
 	 * @return int
654 654
 	 */
655 655
 	public function total_tickets_available_at_this_datetime() {
656
-		return $this->spaces_remaining( true );
656
+		return $this->spaces_remaining(true);
657 657
 	}
658 658
 
659 659
 
@@ -664,7 +664,7 @@  discard block
 block discarded – undo
664 664
 	 * @return boolean
665 665
 	 */
666 666
 	public function is_upcoming() {
667
-		return ( $this->get_raw( 'DTT_EVT_start' ) > time() );
667
+		return ($this->get_raw('DTT_EVT_start') > time());
668 668
 	}
669 669
 
670 670
 
@@ -674,7 +674,7 @@  discard block
 block discarded – undo
674 674
 	 * @return boolean
675 675
 	 */
676 676
 	public function is_active() {
677
-		return ( $this->get_raw( 'DTT_EVT_start' ) < time() && $this->get_raw( 'DTT_EVT_end' ) > time() );
677
+		return ($this->get_raw('DTT_EVT_start') < time() && $this->get_raw('DTT_EVT_end') > time());
678 678
 	}
679 679
 
680 680
 
@@ -684,7 +684,7 @@  discard block
 block discarded – undo
684 684
 	 * @return boolean
685 685
 	 */
686 686
 	public function is_expired() {
687
-		return ( $this->get_raw( 'DTT_EVT_end' ) < time() );
687
+		return ($this->get_raw('DTT_EVT_end') < time());
688 688
 	}
689 689
 
690 690
 
@@ -695,16 +695,16 @@  discard block
 block discarded – undo
695 695
 	 */
696 696
 	public function get_active_status() {
697 697
 		$total_tickets_for_this_dtt = $this->total_tickets_available_at_this_datetime();
698
-		if ( $total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1 ) {
698
+		if ($total_tickets_for_this_dtt !== FALSE && $total_tickets_for_this_dtt < 1) {
699 699
 			return EE_Datetime::sold_out;
700 700
 		}
701
-		if ( $this->is_expired() ) {
701
+		if ($this->is_expired()) {
702 702
 			return EE_Datetime::expired;
703 703
 		}
704
-		if ( $this->is_upcoming() ) {
704
+		if ($this->is_upcoming()) {
705 705
 			return EE_Datetime::upcoming;
706 706
 		}
707
-		if ( $this->is_active() ) {
707
+		if ($this->is_active()) {
708 708
 			return EE_Datetime::active;
709 709
 		}
710 710
 		return NULL;
@@ -718,24 +718,24 @@  discard block
 block discarded – undo
718 718
 	 * @param  boolean $use_dtt_name if TRUE then we'll use DTT->name() if its not empty.
719 719
 	 * @return string
720 720
 	 */
721
-	public function get_dtt_display_name( $use_dtt_name = FALSE ) {
722
-		if ( $use_dtt_name ) {
721
+	public function get_dtt_display_name($use_dtt_name = FALSE) {
722
+		if ($use_dtt_name) {
723 723
 			$dtt_name = $this->name();
724
-			if ( !empty( $dtt_name ) ) {
724
+			if ( ! empty($dtt_name)) {
725 725
 				return $dtt_name;
726 726
 			}
727 727
 		}
728 728
 		//first condition is to see if the months are different
729
-		if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) ) {
730
-			$display_date = $this->start_date( 'M j\, Y g:i a' ) . ' - ' . $this->end_date( 'M j\, Y g:i a' );
729
+		if (date('m', $this->get_raw('DTT_EVT_start')) != date('m', $this->get_raw('DTT_EVT_end'))) {
730
+			$display_date = $this->start_date('M j\, Y g:i a').' - '.$this->end_date('M j\, Y g:i a');
731 731
 			//next condition is if its the same month but different day
732 732
 		}
733 733
 		else {
734
-			if ( date( 'm', $this->get_raw( 'DTT_EVT_start' ) ) == date( 'm', $this->get_raw( 'DTT_EVT_end' ) ) && date( 'd', $this->get_raw( 'DTT_EVT_start' ) ) != date( 'd', $this->get_raw( 'DTT_EVT_end' ) ) ) {
735
-				$display_date = $this->start_date( 'M j\, g:i a' ) . ' - ' . $this->end_date( 'M j\, g:i a Y' );
734
+			if (date('m', $this->get_raw('DTT_EVT_start')) == date('m', $this->get_raw('DTT_EVT_end')) && date('d', $this->get_raw('DTT_EVT_start')) != date('d', $this->get_raw('DTT_EVT_end'))) {
735
+				$display_date = $this->start_date('M j\, g:i a').' - '.$this->end_date('M j\, g:i a Y');
736 736
 			}
737 737
 			else {
738
-				$display_date = $this->start_date( 'F j\, Y' ) . ' @ ' . $this->start_date( 'g:i a' ) . ' - ' . $this->end_date( 'g:i a' );
738
+				$display_date = $this->start_date('F j\, Y').' @ '.$this->start_date('g:i a').' - '.$this->end_date('g:i a');
739 739
 			}
740 740
 		}
741 741
 		return $display_date;
@@ -749,8 +749,8 @@  discard block
 block discarded – undo
749 749
 *@param array $query_params see EEM_Base::get_all()
750 750
 	 * @return EE_Ticket[]
751 751
 	 */
752
-	public function tickets( $query_params = array() ) {
753
-		return $this->get_many_related( 'Ticket', $query_params );
752
+	public function tickets($query_params = array()) {
753
+		return $this->get_many_related('Ticket', $query_params);
754 754
 	}
755 755
 
756 756
 
@@ -760,21 +760,21 @@  discard block
 block discarded – undo
760 760
 	 * @param array $query_params like EEM_Base::get_all's
761 761
 	 * @return EE_Ticket[]
762 762
 	 */
763
-	public function ticket_types_available_for_purchase( $query_params = array() ) {
763
+	public function ticket_types_available_for_purchase($query_params = array()) {
764 764
 		// first check if datetime is valid
765
-		if ( !( $this->is_upcoming() || $this->is_active() ) || $this->sold_out() ) {
765
+		if ( ! ($this->is_upcoming() || $this->is_active()) || $this->sold_out()) {
766 766
 			return array();
767 767
 		}
768
-		if ( empty( $query_params ) ) {
768
+		if (empty($query_params)) {
769 769
 			$query_params = array(
770 770
 				array(
771
-					'TKT_start_date' => array( '<=', EEM_Ticket::instance()->current_time_for_query( 'TKT_start_date' ) ),
772
-					'TKT_end_date'   => array( '>=', EEM_Ticket::instance()->current_time_for_query( 'TKT_end_date' ) ),
771
+					'TKT_start_date' => array('<=', EEM_Ticket::instance()->current_time_for_query('TKT_start_date')),
772
+					'TKT_end_date'   => array('>=', EEM_Ticket::instance()->current_time_for_query('TKT_end_date')),
773 773
 					'TKT_deleted'    => false
774 774
 				)
775 775
 			);
776 776
 		}
777
-		return $this->tickets( $query_params );
777
+		return $this->tickets($query_params);
778 778
 	}
779 779
 
780 780
 
@@ -784,7 +784,7 @@  discard block
 block discarded – undo
784 784
 	 * @return EE_Event
785 785
 	 */
786 786
 	public function event() {
787
-		return $this->get_first_related( 'Event' );
787
+		return $this->get_first_related('Event');
788 788
 	}
789 789
 
790 790
 
@@ -796,13 +796,13 @@  discard block
 block discarded – undo
796 796
 	 */
797 797
 	public function update_sold() {
798 798
 		$count_regs_for_this_datetime = EEM_Registration::instance()->count(
799
-			array( array(
799
+			array(array(
800 800
 				'STS_ID' 					=> EEM_Registration::status_id_approved,
801 801
 				'REG_deleted' 				=> 0,
802 802
 				'Ticket.Datetime.DTT_ID' 	=> $this->ID(),
803
-			) )
803
+			))
804 804
 		);
805
-		$this->set( 'DTT_sold', $count_regs_for_this_datetime );
805
+		$this->set('DTT_sold', $count_regs_for_this_datetime);
806 806
 		$this->save();
807 807
 		return $count_regs_for_this_datetime;
808 808
 	}
Please login to merge, or discard this patch.
core/db_classes/EE_Datetime_Ticket.class.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -46,7 +46,7 @@
 block discarded – undo
46 46
 	 * @param array $props_n_values  incoming values from the database
47 47
 	 * @param string $timezone  incoming timezone as set by the model.  If not set the timezone for
48 48
 	 *                          		the website will be used.
49
-	 * @return EE_Attendee
49
+	 * @return EE_Datetime_Ticket
50 50
 	 */
51 51
 	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
52 52
 		return new self( $props_n_values, TRUE, $timezone );
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 /**
5 5
  * Event Espresso
@@ -35,9 +35,9 @@  discard block
 block discarded – undo
35 35
 	 *                             		    date_format and the second value is the time format
36 36
 	 * @return EE_Attendee
37 37
 	 */
38
-	public static function new_instance( $props_n_values = array(), $timezone = null, $date_formats = array() ) {
39
-		$has_object = parent::_check_for_object( $props_n_values, __CLASS__ );
40
-		return $has_object ? $has_object : new self( $props_n_values, false, $timezone, $date_formats );
38
+	public static function new_instance($props_n_values = array(), $timezone = null, $date_formats = array()) {
39
+		$has_object = parent::_check_for_object($props_n_values, __CLASS__);
40
+		return $has_object ? $has_object : new self($props_n_values, false, $timezone, $date_formats);
41 41
 	}
42 42
 
43 43
 
@@ -48,7 +48,7 @@  discard block
 block discarded – undo
48 48
 	 *                          		the website will be used.
49 49
 	 * @return EE_Attendee
50 50
 	 */
51
-	public static function new_instance_from_db( $props_n_values = array(), $timezone = null ) {
52
-		return new self( $props_n_values, TRUE, $timezone );
51
+	public static function new_instance_from_db($props_n_values = array(), $timezone = null) {
52
+		return new self($props_n_values, TRUE, $timezone);
53 53
 	}
54 54
 } //end EE_Datetime_Ticket class
Please login to merge, or discard this patch.
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -2,18 +2,18 @@
 block discarded – undo
2 2
 	exit( 'No direct script access allowed' );
3 3
 }
4 4
 /**
5
- * Event Espresso
6
- *
7
- * Event Registration and Management Plugin for WordPress
8
- *
9
- * @ package        Event Espresso
10
- * @ author        Event Espresso
11
- * @ copyright    (c) 2008-2011 Event Espresso  All Rights Reserved.
12
- * @ license        {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
13
- * @ link                {@link http://www.eventespresso.com}
14
- * @ since            4.0
15
- *
16
- */
5
+	 * Event Espresso
6
+	 *
7
+	 * Event Registration and Management Plugin for WordPress
8
+	 *
9
+	 * @ package        Event Espresso
10
+	 * @ author        Event Espresso
11
+	 * @ copyright    (c) 2008-2011 Event Espresso  All Rights Reserved.
12
+	 * @ license        {@link http://eventespresso.com/support/terms-conditions/}   * see Plugin Licensing *
13
+	 * @ link                {@link http://www.eventespresso.com}
14
+	 * @ since            4.0
15
+	 *
16
+	 */
17 17
 
18 18
 
19 19
 
Please login to merge, or discard this patch.