@@ -22,24 +22,24 @@ discard block |
||
22 | 22 | * @param null $timezone |
23 | 23 | * @throws \EE_Error |
24 | 24 | */ |
25 | - protected function __construct( $timezone = NULL ){ |
|
26 | - $this->singular_item = __('WP_User','event_espresso'); |
|
27 | - $this->plural_item = __('WP_Users','event_espresso'); |
|
25 | + protected function __construct($timezone = NULL) { |
|
26 | + $this->singular_item = __('WP_User', 'event_espresso'); |
|
27 | + $this->plural_item = __('WP_Users', 'event_espresso'); |
|
28 | 28 | global $wpdb; |
29 | 29 | $this->_tables = array( |
30 | - 'WP_User'=> new EE_Primary_Table( $wpdb->users, 'ID', true) |
|
30 | + 'WP_User'=> new EE_Primary_Table($wpdb->users, 'ID', true) |
|
31 | 31 | ); |
32 | 32 | $this->_fields = array( |
33 | 33 | 'WP_User'=>array( |
34 | - 'ID'=> new EE_Primary_Key_Int_Field('ID', __('WP_User ID','event_espresso')), |
|
35 | - 'user_login'=>new EE_Plain_Text_Field('user_login', __('User Login','event_espresso'), false, '' ), |
|
36 | - 'user_pass'=>new EE_Plain_Text_Field('user_pass', __('User Password','event_espresso'), false, '' ), |
|
37 | - 'user_nicename'=>new EE_Plain_Text_Field('user_nicename', __(' User Nice Name','event_espresso'), false, ''), |
|
38 | - 'user_email' => new EE_Email_Field('user_email', __( 'User Email', 'event_espresso' ), false), |
|
39 | - 'user_registered' => new EE_Datetime_Field( 'user_registered', __( 'Date User Registered', 'event_espresso' ), false, current_time('timestamp'), $timezone ), |
|
40 | - 'user_activation_key' => new EE_Plain_Text_Field( 'user_activation_key', __( 'User Activation Key', 'event_espresso' ), false, '' ), |
|
41 | - 'user_status' => new EE_Integer_Field( 'user_status', __( 'User Status', 'event_espresso' ), false, 0 ), |
|
42 | - 'display_name' => new EE_Plain_Text_Field( 'display_name', __( 'Display Name', 'event_espresso' ), false, '' ) |
|
34 | + 'ID'=> new EE_Primary_Key_Int_Field('ID', __('WP_User ID', 'event_espresso')), |
|
35 | + 'user_login'=>new EE_Plain_Text_Field('user_login', __('User Login', 'event_espresso'), false, ''), |
|
36 | + 'user_pass'=>new EE_Plain_Text_Field('user_pass', __('User Password', 'event_espresso'), false, ''), |
|
37 | + 'user_nicename'=>new EE_Plain_Text_Field('user_nicename', __(' User Nice Name', 'event_espresso'), false, ''), |
|
38 | + 'user_email' => new EE_Email_Field('user_email', __('User Email', 'event_espresso'), false), |
|
39 | + 'user_registered' => new EE_Datetime_Field('user_registered', __('Date User Registered', 'event_espresso'), false, current_time('timestamp'), $timezone), |
|
40 | + 'user_activation_key' => new EE_Plain_Text_Field('user_activation_key', __('User Activation Key', 'event_espresso'), false, ''), |
|
41 | + 'user_status' => new EE_Integer_Field('user_status', __('User Status', 'event_espresso'), false, 0), |
|
42 | + 'display_name' => new EE_Plain_Text_Field('display_name', __('Display Name', 'event_espresso'), false, '') |
|
43 | 43 | )); |
44 | 44 | $this->_model_relations = array( |
45 | 45 | 'Attendee' => new EE_Has_Many_Relation(), |
@@ -55,14 +55,14 @@ discard block |
||
55 | 55 | ); |
56 | 56 | $this->_wp_core_model = true; |
57 | 57 | $this->_caps_slug = 'users'; |
58 | - $this->_cap_contexts_to_cap_action_map[ EEM_Base::caps_read ] = 'list'; |
|
59 | - $this->_cap_contexts_to_cap_action_map[ EEM_Base::caps_read_admin ] = 'list'; |
|
60 | - foreach( $this->_cap_contexts_to_cap_action_map as $context => $action ) { |
|
61 | - $this->_cap_restriction_generators[ $context ] = new EE_Restriction_Generator_WP_User(); |
|
58 | + $this->_cap_contexts_to_cap_action_map[EEM_Base::caps_read] = 'list'; |
|
59 | + $this->_cap_contexts_to_cap_action_map[EEM_Base::caps_read_admin] = 'list'; |
|
60 | + foreach ($this->_cap_contexts_to_cap_action_map as $context => $action) { |
|
61 | + $this->_cap_restriction_generators[$context] = new EE_Restriction_Generator_WP_User(); |
|
62 | 62 | } |
63 | 63 | //@todo: account for create_users controls whether they can create users at all |
64 | 64 | |
65 | - parent::__construct( $timezone ); |
|
65 | + parent::__construct($timezone); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | /** |
@@ -1,4 +1,6 @@ |
||
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 | * Event Espresso |
4 | 6 | * |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
2 | 2 | /** |
3 | - * WP User Model. Not intended to replace WP_User, but this just allows |
|
4 | - * for EE model queries to more easily integrate with the WP User table |
|
5 | - * |
|
6 | - * @package Event Espresso |
|
7 | - * @subpackage includes/models/ |
|
8 | - * @author Michael Nelson |
|
9 | - */ |
|
3 | + * WP User Model. Not intended to replace WP_User, but this just allows |
|
4 | + * for EE model queries to more easily integrate with the WP User table |
|
5 | + * |
|
6 | + * @package Event Espresso |
|
7 | + * @subpackage includes/models/ |
|
8 | + * @author Michael Nelson |
|
9 | + */ |
|
10 | 10 | class EEM_WP_User extends EEM_Base { |
11 | 11 | |
12 | 12 | /** |
@@ -2,8 +2,8 @@ discard block |
||
2 | 2 | /** |
3 | 3 | * Text_Fields is a base class for any fields which are have text value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...) |
4 | 4 | */ |
5 | -class EE_All_Caps_Text_Field extends EE_Text_Field_Base{ |
|
6 | - function get_wpdb_data_type(){ |
|
5 | +class EE_All_Caps_Text_Field extends EE_Text_Field_Base { |
|
6 | + function get_wpdb_data_type() { |
|
7 | 7 | return '%s'; |
8 | 8 | } |
9 | 9 | |
@@ -13,6 +13,6 @@ discard block |
||
13 | 13 | * @return string |
14 | 14 | */ |
15 | 15 | function prepare_for_set($value_inputted_for_field_on_model_object) { |
16 | - return strtoupper( sanitize_key($value_inputted_for_field_on_model_object)); |
|
16 | + return strtoupper(sanitize_key($value_inputted_for_field_on_model_object)); |
|
17 | 17 | } |
18 | 18 | } |
19 | 19 | \ No newline at end of file |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | 2 | /** |
3 | - * Text_Fields is a base class for any fields which are have text value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...) |
|
4 | - */ |
|
3 | + * Text_Fields is a base class for any fields which are have text value. (Exception: foreign and private key fields. Wish PHP had multiple-inheritance for this...) |
|
4 | + */ |
|
5 | 5 | abstract class EE_Text_Field_Base extends EE_Model_Field_Base{ |
6 | 6 | function get_wpdb_data_type(){ |
7 | 7 | return '%s'; |
@@ -1,13 +1,13 @@ |
||
1 | 1 | <?php |
2 | 2 | require_once( EE_MODELS . 'fields/EE_DB_Only_Field_Base.php'); |
3 | 3 | /** |
4 | - * Used by EE_Belongs_To_Any_Relations and EE_Has_Many_Any_Relations to identify the model the foreign key points to. |
|
5 | - * Note: the array of model names on this field should match the array of model names on the |
|
6 | - * foreign key this field works with. Eg |
|
7 | - * $this->_fields = array( |
|
8 | - * 'obj_id'=>new EE_Foreign_Key_Int_Field('obj_id_column',__('Related Object ID'),false,0,array('Registration','Transaction')), |
|
9 | - * 'obj_type'=>new EE_Any_Foreign_Model_Name_Field('obj_type_column',__('Related Object type'),false,null,array('Registration','Transaction'))); |
|
10 | - */ |
|
4 | + * Used by EE_Belongs_To_Any_Relations and EE_Has_Many_Any_Relations to identify the model the foreign key points to. |
|
5 | + * Note: the array of model names on this field should match the array of model names on the |
|
6 | + * foreign key this field works with. Eg |
|
7 | + * $this->_fields = array( |
|
8 | + * 'obj_id'=>new EE_Foreign_Key_Int_Field('obj_id_column',__('Related Object ID'),false,0,array('Registration','Transaction')), |
|
9 | + * 'obj_type'=>new EE_Any_Foreign_Model_Name_Field('obj_type_column',__('Related Object type'),false,null,array('Registration','Transaction'))); |
|
10 | + */ |
|
11 | 11 | class EE_Any_Foreign_Model_Name_Field extends EE_Field_With_Model_Name{ |
12 | 12 | function get_wpdb_data_type(){ |
13 | 13 | return '%s'; |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php |
2 | -require_once( EE_MODELS . 'fields/EE_DB_Only_Field_Base.php'); |
|
2 | +require_once(EE_MODELS.'fields/EE_DB_Only_Field_Base.php'); |
|
3 | 3 | /** |
4 | 4 | * Used by EE_Belongs_To_Any_Relations and EE_Has_Many_Any_Relations to identify the model the foreign key points to. |
5 | 5 | * Note: the array of model names on this field should match the array of model names on the |
@@ -8,8 +8,8 @@ discard block |
||
8 | 8 | * 'obj_id'=>new EE_Foreign_Key_Int_Field('obj_id_column',__('Related Object ID'),false,0,array('Registration','Transaction')), |
9 | 9 | * 'obj_type'=>new EE_Any_Foreign_Model_Name_Field('obj_type_column',__('Related Object type'),false,null,array('Registration','Transaction'))); |
10 | 10 | */ |
11 | -class EE_Any_Foreign_Model_Name_Field extends EE_Field_With_Model_Name{ |
|
12 | - function get_wpdb_data_type(){ |
|
11 | +class EE_Any_Foreign_Model_Name_Field extends EE_Field_With_Model_Name { |
|
12 | + function get_wpdb_data_type() { |
|
13 | 13 | return '%s'; |
14 | 14 | } |
15 | 15 | } |
16 | 16 | \ No newline at end of file |
@@ -7,7 +7,7 @@ |
||
7 | 7 | * special default values for them, or some other column-specific functionality. So we can add them as fields, |
8 | 8 | * but db-only ones |
9 | 9 | */ |
10 | -abstract class EE_DB_Only_Field_Base extends EE_Model_Field_Base{ |
|
10 | +abstract class EE_DB_Only_Field_Base extends EE_Model_Field_Base { |
|
11 | 11 | /** |
12 | 12 | * All these children classes are for the db-only (meaning, we should select them |
13 | 13 | * on get_all queries, update, delete, and will still want to set their default value |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | -require_once( EE_MODELS . 'fields/EE_DB_Only_Field_Base.php'); |
|
3 | -class EE_DB_Only_Float_Field extends EE_DB_Only_Field_Base{ |
|
4 | - function get_wpdb_data_type(){ |
|
2 | +require_once(EE_MODELS.'fields/EE_DB_Only_Field_Base.php'); |
|
3 | +class EE_DB_Only_Float_Field extends EE_DB_Only_Field_Base { |
|
4 | + function get_wpdb_data_type() { |
|
5 | 5 | return '%f'; |
6 | 6 | } |
7 | 7 | } |
@@ -1,8 +1,8 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -require_once( EE_MODELS . 'fields/EE_DB_Only_Field_Base.php'); |
|
4 | -class EE_DB_Only_Int_Field extends EE_DB_Only_Field_Base{ |
|
5 | - function get_wpdb_data_type(){ |
|
3 | +require_once(EE_MODELS.'fields/EE_DB_Only_Field_Base.php'); |
|
4 | +class EE_DB_Only_Int_Field extends EE_DB_Only_Field_Base { |
|
5 | + function get_wpdb_data_type() { |
|
6 | 6 | return '%d'; |
7 | 7 | } |
8 | 8 | } |
9 | 9 | \ No newline at end of file |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php |
2 | -require_once( EE_MODELS . 'fields/EE_DB_Only_Field_Base.php'); |
|
3 | -class EE_DB_Only_Text_Field extends EE_DB_Only_Field_Base{ |
|
4 | - function get_wpdb_data_type(){ |
|
2 | +require_once(EE_MODELS.'fields/EE_DB_Only_Field_Base.php'); |
|
3 | +class EE_DB_Only_Text_Field extends EE_DB_Only_Field_Base { |
|
4 | + function get_wpdb_data_type() { |
|
5 | 5 | return '%s'; |
6 | 6 | } |
7 | 7 | } |
8 | 8 | \ No newline at end of file |
@@ -1,5 +1,5 @@ |
||
1 | 1 | <?php |
2 | -class EE_Email_Field extends EE_Text_Field_Base{ |
|
2 | +class EE_Email_Field extends EE_Text_Field_Base { |
|
3 | 3 | function prepare_for_set($value_inputted_for_field_on_model_object) { |
4 | 4 | return sanitize_email($value_inputted_for_field_on_model_object); |
5 | 5 | } |
@@ -1,13 +1,13 @@ |
||
1 | 1 | <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
2 | 2 | require_once( EE_MODELS . 'fields/EE_Integer_Field.php' ); |
3 | 3 | /** |
4 | - * Class EE_Enum_Integer_Field |
|
5 | - * |
|
6 | - * @package Event Espresso |
|
7 | - * @subpackage includes/models/ |
|
8 | - * @author Mike Nelson |
|
9 | - * |
|
10 | - */ |
|
4 | + * Class EE_Enum_Integer_Field |
|
5 | + * |
|
6 | + * @package Event Espresso |
|
7 | + * @subpackage includes/models/ |
|
8 | + * @author Mike Nelson |
|
9 | + * |
|
10 | + */ |
|
11 | 11 | class EE_Enum_Integer_Field extends EE_Integer_Field{ |
12 | 12 | |
13 | 13 | var $_allowed_enum_values; |
@@ -1,5 +1,5 @@ discard block |
||
1 | 1 | <?php if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed'); |
2 | -require_once( EE_MODELS . 'fields/EE_Integer_Field.php' ); |
|
2 | +require_once(EE_MODELS.'fields/EE_Integer_Field.php'); |
|
3 | 3 | /** |
4 | 4 | * Class EE_Enum_Integer_Field |
5 | 5 | * |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | * @author Mike Nelson |
9 | 9 | * |
10 | 10 | */ |
11 | -class EE_Enum_Integer_Field extends EE_Integer_Field{ |
|
11 | +class EE_Enum_Integer_Field extends EE_Integer_Field { |
|
12 | 12 | |
13 | 13 | var $_allowed_enum_values; |
14 | 14 | |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | * @param int $default_value |
21 | 21 | * @param array $allowed_enum_values keys are values to be used in the DB, values are how they should be displayed |
22 | 22 | */ |
23 | - function __construct($table_column, $nicename, $nullable, $default_value, $allowed_enum_values){ |
|
23 | + function __construct($table_column, $nicename, $nullable, $default_value, $allowed_enum_values) { |
|
24 | 24 | $this->_allowed_enum_values = $allowed_enum_values; |
25 | 25 | parent::__construct($table_column, $nicename, $nullable, $default_value); |
26 | 26 | } |
@@ -32,20 +32,20 @@ discard block |
||
32 | 32 | * @throws EE_Error |
33 | 33 | */ |
34 | 34 | function prepare_for_set($value_inputted_for_field_on_model_object) { |
35 | - if( $value_inputted_for_field_on_model_object !== NULL && ! array_key_exists( $value_inputted_for_field_on_model_object, $this->_allowed_enum_values )){ |
|
36 | - if( defined( 'WP_DEBUG' ) && WP_DEBUG ){ |
|
35 | + if ($value_inputted_for_field_on_model_object !== NULL && ! array_key_exists($value_inputted_for_field_on_model_object, $this->_allowed_enum_values)) { |
|
36 | + if (defined('WP_DEBUG') && WP_DEBUG) { |
|
37 | 37 | $msg = sprintf( |
38 | - __('System is assigning incompatible value "%1$s" to field "%2$s"','event_espresso'), |
|
38 | + __('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'), |
|
39 | 39 | $value_inputted_for_field_on_model_object, |
40 | 40 | $this->_name |
41 | 41 | ); |
42 | 42 | $msg2 = sprintf( |
43 | - __('Allowed values for "%1$s" are "%2$s". You provided "%3$s"','event_espresso'), |
|
43 | + __('Allowed values for "%1$s" are "%2$s". You provided "%3$s"', 'event_espresso'), |
|
44 | 44 | $this->_name, |
45 | - implode( ', ', array_keys( $this->_allowed_enum_values )), |
|
45 | + implode(', ', array_keys($this->_allowed_enum_values)), |
|
46 | 46 | $value_inputted_for_field_on_model_object |
47 | 47 | ); |
48 | - EE_Error::add_error("$msg||$msg2", __FILE__, __FUNCTION__, __LINE__ ); |
|
48 | + EE_Error::add_error("$msg||$msg2", __FILE__, __FUNCTION__, __LINE__); |
|
49 | 49 | } |
50 | 50 | return $this->get_default_value(); |
51 | 51 | |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | * @param null $schema |
63 | 63 | * @return string |
64 | 64 | */ |
65 | - function prepare_for_pretty_echoing( $value_on_field_to_be_outputted, $schema = NULL ) { |
|
65 | + function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = NULL) { |
|
66 | 66 | return $this->_allowed_enum_values[$value_on_field_to_be_outputted]; |
67 | 67 | } |
68 | 68 | } |
@@ -1,4 +1,6 @@ |
||
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 | * Event Espresso |
4 | 6 | * |