Completed
Branch fix-dummy-related-question-qst... (e5efcf)
by
unknown
07:49 queued 03:45
created
email/EE_Messages_Email_Not_Approved_Registration_Validator.class.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
         $this->_messenger->set_validator_config($new_config);
39 39
 
40 40
         if ($this->_context != 'admin') {
41
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
41
+            $this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
42 42
         }
43 43
 
44 44
         $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
Please login to merge, or discard this patch.
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -13,30 +13,30 @@
 block discarded – undo
13 13
  */
14 14
 class EE_Messages_Email_Not_Approved_Registration_Validator extends EE_Messages_Validator
15 15
 {
16
-    public function __construct($fields, $context)
17
-    {
18
-        $this->_m_name = 'email';
19
-        $this->_mt_name = 'not_approved_registration';
16
+	public function __construct($fields, $context)
17
+	{
18
+		$this->_m_name = 'email';
19
+		$this->_mt_name = 'not_approved_registration';
20 20
 
21
-        parent::__construct($fields, $context);
22
-    }
21
+		parent::__construct($fields, $context);
22
+	}
23 23
 
24
-    /**
25
-     * custom validator (restricting what was originally set by the messenger)
26
-     */
27
-    protected function _modify_validator()
28
-    {
29
-        $new_config = $this->_messenger->get_validator_config();
30
-        $new_config['event_list'] = array(
31
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
32
-            'required' => array('[EVENT_LIST]')
33
-            );
34
-        $this->_messenger->set_validator_config($new_config);
24
+	/**
25
+	 * custom validator (restricting what was originally set by the messenger)
26
+	 */
27
+	protected function _modify_validator()
28
+	{
29
+		$new_config = $this->_messenger->get_validator_config();
30
+		$new_config['event_list'] = array(
31
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
32
+			'required' => array('[EVENT_LIST]')
33
+			);
34
+		$this->_messenger->set_validator_config($new_config);
35 35
 
36
-        if ($this->_context != 'admin') {
37
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
38
-        }
36
+		if ($this->_context != 'admin') {
37
+			$this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
38
+		}
39 39
 
40
-        $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
41
-    }
40
+		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
41
+	}
42 42
 }
Please login to merge, or discard this patch.
validators/email/EE_Messages_Email_Pending_Approval_Validator.class.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
         $this->_messenger->set_validator_config($new_config);
39 39
 
40 40
         if ($this->_context != 'admin') {
41
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
41
+            $this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
42 42
         }
43 43
 
44 44
         $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
Please login to merge, or discard this patch.
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -13,31 +13,31 @@
 block discarded – undo
13 13
  */
14 14
 class EE_Messages_Email_Pending_Approval_Validator extends EE_Messages_Validator
15 15
 {
16
-    public function __construct($fields, $context)
17
-    {
18
-        $this->_m_name = 'email';
19
-        $this->_mt_name = 'pending_approval';
16
+	public function __construct($fields, $context)
17
+	{
18
+		$this->_m_name = 'email';
19
+		$this->_mt_name = 'pending_approval';
20 20
 
21
-        parent::__construct($fields, $context);
22
-    }
21
+		parent::__construct($fields, $context);
22
+	}
23 23
 
24
-    /**
25
-     * custom validator (restricting what was originally set by the messenger)
26
-     */
27
-    protected function _modify_validator()
28
-    {
29
-        $new_config = $this->_messenger->get_validator_config();
30
-        // modify just event_list
31
-        $new_config['event_list'] = array(
32
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
33
-            'required' => array('[EVENT_LIST]')
34
-            );
35
-        $this->_messenger->set_validator_config($new_config);
24
+	/**
25
+	 * custom validator (restricting what was originally set by the messenger)
26
+	 */
27
+	protected function _modify_validator()
28
+	{
29
+		$new_config = $this->_messenger->get_validator_config();
30
+		// modify just event_list
31
+		$new_config['event_list'] = array(
32
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
33
+			'required' => array('[EVENT_LIST]')
34
+			);
35
+		$this->_messenger->set_validator_config($new_config);
36 36
 
37
-        if ($this->_context != 'admin') {
38
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
39
-        }
37
+		if ($this->_context != 'admin') {
38
+			$this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
39
+		}
40 40
 
41
-        $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
42
-    }
41
+		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
42
+	}
43 43
 }
Please login to merge, or discard this patch.
messages/validators/email/EE_Messages_Email_Payment_Validator.class.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -32,18 +32,18 @@
 block discarded – undo
32 32
 
33 33
         // modify just event_list
34 34
         $new_config['event_list'] = array(
35
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
35
+            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
36 36
             );
37 37
         $new_config['ticket_list'] = array(
38 38
             'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
39 39
             );
40 40
         $new_config['content'] = array(
41
-            'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
41
+            'shortcodes' => array('event_list', 'attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
42 42
             );
43 43
         $this->_messenger->set_validator_config($new_config);
44 44
 
45 45
         if ($this->_context != 'admin') {
46
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
46
+            $this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
47 47
         }
48 48
 
49 49
         $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
Please login to merge, or discard this patch.
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -13,37 +13,37 @@
 block discarded – undo
13 13
  */
14 14
 class EE_Messages_Email_Payment_Validator extends EE_Messages_Validator
15 15
 {
16
-    public function __construct($fields, $context)
17
-    {
18
-        $this->_m_name = 'email';
19
-        $this->_mt_name = 'payment';
16
+	public function __construct($fields, $context)
17
+	{
18
+		$this->_m_name = 'email';
19
+		$this->_mt_name = 'payment';
20 20
 
21
-        parent::__construct($fields, $context);
22
-    }
21
+		parent::__construct($fields, $context);
22
+	}
23 23
 
24
-    /**
25
-     * at this point no custom validation needed for this messenger/message_type combo.
26
-     */
27
-    protected function _modify_validator()
28
-    {
29
-        $new_config = $this->_messenger->get_validator_config();
24
+	/**
25
+	 * at this point no custom validation needed for this messenger/message_type combo.
26
+	 */
27
+	protected function _modify_validator()
28
+	{
29
+		$new_config = $this->_messenger->get_validator_config();
30 30
 
31
-        // modify just event_list
32
-        $new_config['event_list'] = array(
33
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
34
-            );
35
-        $new_config['ticket_list'] = array(
36
-            'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
37
-            );
38
-        $new_config['content'] = array(
39
-            'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
40
-            );
41
-        $this->_messenger->set_validator_config($new_config);
31
+		// modify just event_list
32
+		$new_config['event_list'] = array(
33
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization','recipient_details', 'recipient_list', 'event_author', 'primary_registration_details', 'primary_registration_list')
34
+			);
35
+		$new_config['ticket_list'] = array(
36
+			'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'recipient_details', 'transaction')
37
+			);
38
+		$new_config['content'] = array(
39
+			'shortcodes' => array('event_list','attendee_list', 'ticket_list', 'organization', 'recipient_details', 'recipient_list', 'transaction', 'primary_registration_details', 'primary_registration_list', 'messenger')
40
+			);
41
+		$this->_messenger->set_validator_config($new_config);
42 42
 
43
-        if ($this->_context != 'admin') {
44
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
45
-        }
43
+		if ($this->_context != 'admin') {
44
+			$this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
45
+		}
46 46
 
47
-        $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
48
-    }
47
+		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
48
+	}
49 49
 }
Please login to merge, or discard this patch.
validators/email/EE_Messages_Email_Registration_Validator.class.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -38,7 +38,7 @@
 block discarded – undo
38 38
         $this->_messenger->set_validator_config($new_config);
39 39
 
40 40
         if ($this->_context != 'admin') {
41
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
41
+            $this->_valid_shortcodes_modifier[$this->_context]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
42 42
         }
43 43
 
44 44
         $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
Please login to merge, or discard this patch.
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -13,31 +13,31 @@
 block discarded – undo
13 13
  */
14 14
 class EE_Messages_Email_Registration_Validator extends EE_Messages_Validator
15 15
 {
16
-    public function __construct($fields, $context)
17
-    {
18
-        $this->_m_name = 'email';
19
-        $this->_mt_name = 'registration';
16
+	public function __construct($fields, $context)
17
+	{
18
+		$this->_m_name = 'email';
19
+		$this->_mt_name = 'registration';
20 20
 
21
-        parent::__construct($fields, $context);
22
-    }
21
+		parent::__construct($fields, $context);
22
+	}
23 23
 
24
-    /**
25
-     * custom validator (restricting what was originally set by the messenger)
26
-     */
27
-    protected function _modify_validator()
28
-    {
29
-        $new_config = $this->_messenger->get_validator_config();
30
-        // modify just event_list
31
-        $new_config['event_list'] = array(
32
-            'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
33
-            'required' => array('[EVENT_LIST]')
34
-            );
35
-        $this->_messenger->set_validator_config($new_config);
24
+	/**
25
+	 * custom validator (restricting what was originally set by the messenger)
26
+	 */
27
+	protected function _modify_validator()
28
+	{
29
+		$new_config = $this->_messenger->get_validator_config();
30
+		// modify just event_list
31
+		$new_config['event_list'] = array(
32
+			'shortcodes' => array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list'),
33
+			'required' => array('[EVENT_LIST]')
34
+			);
35
+		$this->_messenger->set_validator_config($new_config);
36 36
 
37
-        if ($this->_context != 'admin') {
38
-            $this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
39
-        }
37
+		if ($this->_context != 'admin') {
38
+			$this->_valid_shortcodes_modifier[ $this->_context ]['event_list'] = array('event', 'attendee_list', 'ticket_list', 'datetime_list', 'venue', 'organization', 'event_author', 'primary_registration_details', 'primary_registration_list', 'recipient_details', 'recipient_list');
39
+		}
40 40
 
41
-        $this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
42
-    }
41
+		$this->_specific_shortcode_excludes['content'] = array('[DISPLAY_PDF_URL]', '[DISPLAY_PDF_BUTTON]');
42
+	}
43 43
 }
Please login to merge, or discard this patch.
core/db_models/fields/EE_Enum_Text_Field.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -89,8 +89,8 @@
 block discarded – undo
89 89
     public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
90 90
     {
91 91
         $options = $this->_allowed_enum_values();
92
-        if (isset($options[ $value_on_field_to_be_outputted ])) {
93
-            return $options[ $value_on_field_to_be_outputted ];
92
+        if (isset($options[$value_on_field_to_be_outputted])) {
93
+            return $options[$value_on_field_to_be_outputted];
94 94
         } else {
95 95
             return $value_on_field_to_be_outputted;
96 96
         }
Please login to merge, or discard this patch.
Indentation   +113 added lines, -113 removed lines patch added patch discarded remove patch
@@ -10,131 +10,131 @@
 block discarded – undo
10 10
  */
11 11
 class EE_Enum_Text_Field extends EE_Text_Field_Base
12 12
 {
13
-    /**
14
-     * @var array $_allowed_enum_values
15
-     */
16
-    public $_allowed_enum_values;
13
+	/**
14
+	 * @var array $_allowed_enum_values
15
+	 */
16
+	public $_allowed_enum_values;
17 17
 
18
-    /**
19
-     * @param string  $table_column
20
-     * @param string  $nice_name
21
-     * @param boolean $nullable
22
-     * @param mixed   $default_value
23
-     * @param array   $allowed_enum_values keys are values to be used in the DB, values are how they should be displayed
24
-     */
25
-    public function __construct($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values)
26
-    {
27
-        $this->_allowed_enum_values = $allowed_enum_values;
28
-        parent::__construct($table_column, $nice_name, $nullable, $default_value);
29
-        $this->setSchemaType('object');
30
-    }
18
+	/**
19
+	 * @param string  $table_column
20
+	 * @param string  $nice_name
21
+	 * @param boolean $nullable
22
+	 * @param mixed   $default_value
23
+	 * @param array   $allowed_enum_values keys are values to be used in the DB, values are how they should be displayed
24
+	 */
25
+	public function __construct($table_column, $nice_name, $nullable, $default_value, $allowed_enum_values)
26
+	{
27
+		$this->_allowed_enum_values = $allowed_enum_values;
28
+		parent::__construct($table_column, $nice_name, $nullable, $default_value);
29
+		$this->setSchemaType('object');
30
+	}
31 31
 
32 32
 
33 33
 
34
-    /**
35
-     * Returns the list of allowed enum options, but filterable.
36
-     * This is used internally
37
-     *
38
-     * @return array
39
-     */
40
-    protected function _allowed_enum_values()
41
-    {
42
-        return apply_filters(
43
-            'FHEE__EE_Enum_Text_Field___allowed_enum_options',
44
-            $this->_allowed_enum_values,
45
-            $this
46
-        );
47
-    }
34
+	/**
35
+	 * Returns the list of allowed enum options, but filterable.
36
+	 * This is used internally
37
+	 *
38
+	 * @return array
39
+	 */
40
+	protected function _allowed_enum_values()
41
+	{
42
+		return apply_filters(
43
+			'FHEE__EE_Enum_Text_Field___allowed_enum_options',
44
+			$this->_allowed_enum_values,
45
+			$this
46
+		);
47
+	}
48 48
 
49 49
 
50 50
 
51
-    /**
52
-     * When setting, just verify that the value being used matches what we've defined as allowable enum values.
53
-     * If not, throw an error (but if WP_DEBUG is false, just set the value to default).
54
-     *
55
-     * @param string $value_inputted_for_field_on_model_object
56
-     * @return string
57
-     * @throws EE_Error
58
-     */
59
-    public function prepare_for_set($value_inputted_for_field_on_model_object)
60
-    {
61
-        if (
62
-            $value_inputted_for_field_on_model_object !== null
63
-            && ! array_key_exists($value_inputted_for_field_on_model_object, $this->_allowed_enum_values())
64
-        ) {
65
-            if (defined('WP_DEBUG') && WP_DEBUG) {
66
-                $msg = sprintf(
67
-                    esc_html__('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
68
-                    $value_inputted_for_field_on_model_object,
69
-                    $this->_name
70
-                );
71
-                $msg2 = sprintf(
72
-                    esc_html__('Allowed values for "%1$s" are "%2$s". You provided: "%3$s"', 'event_espresso'),
73
-                    $this->_name,
74
-                    implode(', ', array_keys($this->_allowed_enum_values())),
75
-                    $value_inputted_for_field_on_model_object
76
-                );
77
-                EE_Error::add_error("{$msg}||{$msg2}", __FILE__, __FUNCTION__, __LINE__);
78
-            }
79
-            return $this->get_default_value();
80
-        }
81
-        return $value_inputted_for_field_on_model_object;
82
-    }
51
+	/**
52
+	 * When setting, just verify that the value being used matches what we've defined as allowable enum values.
53
+	 * If not, throw an error (but if WP_DEBUG is false, just set the value to default).
54
+	 *
55
+	 * @param string $value_inputted_for_field_on_model_object
56
+	 * @return string
57
+	 * @throws EE_Error
58
+	 */
59
+	public function prepare_for_set($value_inputted_for_field_on_model_object)
60
+	{
61
+		if (
62
+			$value_inputted_for_field_on_model_object !== null
63
+			&& ! array_key_exists($value_inputted_for_field_on_model_object, $this->_allowed_enum_values())
64
+		) {
65
+			if (defined('WP_DEBUG') && WP_DEBUG) {
66
+				$msg = sprintf(
67
+					esc_html__('System is assigning incompatible value "%1$s" to field "%2$s"', 'event_espresso'),
68
+					$value_inputted_for_field_on_model_object,
69
+					$this->_name
70
+				);
71
+				$msg2 = sprintf(
72
+					esc_html__('Allowed values for "%1$s" are "%2$s". You provided: "%3$s"', 'event_espresso'),
73
+					$this->_name,
74
+					implode(', ', array_keys($this->_allowed_enum_values())),
75
+					$value_inputted_for_field_on_model_object
76
+				);
77
+				EE_Error::add_error("{$msg}||{$msg2}", __FILE__, __FUNCTION__, __LINE__);
78
+			}
79
+			return $this->get_default_value();
80
+		}
81
+		return $value_inputted_for_field_on_model_object;
82
+	}
83 83
 
84 84
 
85
-    /**
86
-     * Gets the pretty version of the enum's value.
87
-     *
88
-     * @param     int |string $value_on_field_to_be_outputted
89
-     * @param    null         $schema
90
-     * @return    string
91
-     */
92
-    public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
93
-    {
94
-        $options = $this->_allowed_enum_values();
95
-        if (isset($options[ $value_on_field_to_be_outputted ])) {
96
-            return $options[ $value_on_field_to_be_outputted ];
97
-        } else {
98
-            return $value_on_field_to_be_outputted;
99
-        }
100
-    }
85
+	/**
86
+	 * Gets the pretty version of the enum's value.
87
+	 *
88
+	 * @param     int |string $value_on_field_to_be_outputted
89
+	 * @param    null         $schema
90
+	 * @return    string
91
+	 */
92
+	public function prepare_for_pretty_echoing($value_on_field_to_be_outputted, $schema = null)
93
+	{
94
+		$options = $this->_allowed_enum_values();
95
+		if (isset($options[ $value_on_field_to_be_outputted ])) {
96
+			return $options[ $value_on_field_to_be_outputted ];
97
+		} else {
98
+			return $value_on_field_to_be_outputted;
99
+		}
100
+	}
101 101
 
102 102
 
103 103
 
104
-    /**
105
-     * When retrieving something from the DB, don't enforce the enum's options. If it's in the DB, we just have to live
106
-     * with that. Note also: when we're saving to the DB again, we also don't enforce the enum options. It's ONLY
107
-     * when we're receiving USER input from prepare_for_set() that we enforce the enum options.
108
-     *
109
-     * @param mixed $value_in_db
110
-     * @return mixed
111
-     */
112
-    public function prepare_for_set_from_db($value_in_db)
113
-    {
114
-        return $value_in_db;
115
-    }
104
+	/**
105
+	 * When retrieving something from the DB, don't enforce the enum's options. If it's in the DB, we just have to live
106
+	 * with that. Note also: when we're saving to the DB again, we also don't enforce the enum options. It's ONLY
107
+	 * when we're receiving USER input from prepare_for_set() that we enforce the enum options.
108
+	 *
109
+	 * @param mixed $value_in_db
110
+	 * @return mixed
111
+	 */
112
+	public function prepare_for_set_from_db($value_in_db)
113
+	{
114
+		return $value_in_db;
115
+	}
116 116
 
117 117
 
118
-    public function getSchemaProperties()
119
-    {
120
-        return array(
121
-            'raw' => array(
122
-                'description' =>  sprintf(
123
-                    esc_html__('%s - the value in the database.', 'event_espresso'),
124
-                    $this->get_nicename()
125
-                ),
126
-                'type' => 'string',
127
-                'enum' => array_keys($this->_allowed_enum_values)
128
-            ),
129
-            'pretty' => array(
130
-                'description' =>  sprintf(
131
-                    esc_html__('%s - the value for display.', 'event_espresso'),
132
-                    $this->get_nicename()
133
-                ),
134
-                'type' => 'string',
135
-                'enum' => array_values($this->_allowed_enum_values),
136
-                'read_only' => true
137
-            )
138
-        );
139
-    }
118
+	public function getSchemaProperties()
119
+	{
120
+		return array(
121
+			'raw' => array(
122
+				'description' =>  sprintf(
123
+					esc_html__('%s - the value in the database.', 'event_espresso'),
124
+					$this->get_nicename()
125
+				),
126
+				'type' => 'string',
127
+				'enum' => array_keys($this->_allowed_enum_values)
128
+			),
129
+			'pretty' => array(
130
+				'description' =>  sprintf(
131
+					esc_html__('%s - the value for display.', 'event_espresso'),
132
+					$this->get_nicename()
133
+				),
134
+				'type' => 'string',
135
+				'enum' => array_values($this->_allowed_enum_values),
136
+				'read_only' => true
137
+			)
138
+		);
139
+	}
140 140
 }
Please login to merge, or discard this patch.
modules/thank_you_page/templates/thank-you-page-overview.template.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@  discard block
 block discarded – undo
9 9
 
10 10
 <div id="espresso-thank-you-page-overview-dv" class="width-100">
11 11
 
12
-    <?php if (! $revisit) : ?>
12
+    <?php if ( ! $revisit) : ?>
13 13
         <div class="ee-attention">
14 14
             <div class="extra-padding-sides">
15 15
                 <?php echo apply_filters(
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
                         '<br />'
22 22
                     )
23 23
                 );
24
-                if (! empty($TXN_receipt_url)) : ?>
24
+                if ( ! empty($TXN_receipt_url)) : ?>
25 25
                     <br/>
26 26
                     <div class="jst-rght">
27 27
                         <a class="ee-button ee-roundish indented-text big-text"
Please login to merge, or discard this patch.
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -13,15 +13,15 @@  discard block
 block discarded – undo
13 13
         <div class="ee-attention">
14 14
             <div class="extra-padding-sides">
15 15
                 <?php echo apply_filters(
16
-                    'FHEE__thank_you_page_overview_template__order_conf_desc',
17
-                    sprintf(
18
-                        $order_conf_desc,
19
-                        '<h3 class="">',
20
-                        '</h3>',
21
-                        '<br />'
22
-                    )
23
-                );
24
-                if (! empty($TXN_receipt_url)) : ?>
16
+					'FHEE__thank_you_page_overview_template__order_conf_desc',
17
+					sprintf(
18
+						$order_conf_desc,
19
+						'<h3 class="">',
20
+						'</h3>',
21
+						'<br />'
22
+					)
23
+				);
24
+				if (! empty($TXN_receipt_url)) : ?>
25 25
                     <br/>
26 26
                     <div class="jst-rght">
27 27
                         <a class="ee-button ee-roundish indented-text big-text"
@@ -29,9 +29,9 @@  discard block
 block discarded – undo
29 29
                         >
30 30
                             <span class="ee-icon ee-icon-PDF-file-type"></span>
31 31
                             <?php echo apply_filters(
32
-                                'FHEE__thank_you_page_overview_template__order_conf_button_text',
33
-                                esc_html__('View Full Order Confirmation Receipt', 'event_espresso')
34
-                            ); ?>
32
+								'FHEE__thank_you_page_overview_template__order_conf_button_text',
33
+								esc_html__('View Full Order Confirmation Receipt', 'event_espresso')
34
+							); ?>
35 35
                         </a>
36 36
                     </div>
37 37
                 <?php endif; ?>
Please login to merge, or discard this patch.
thank_you_page/templates/thank-you-page-payment-details.template.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,7 @@
 block discarded – undo
5 5
 
6 6
 <div id="espresso-thank-you-page-payment-details-dv">
7 7
     <?php
8
-    if (! empty($payments)) { ?>
8
+    if ( ! empty($payments)) { ?>
9 9
         <table class="ee-table">
10 10
             <thead>
11 11
             <tr>
Please login to merge, or discard this patch.
Indentation   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -16,7 +16,7 @@  discard block
 block discarded – undo
16 16
 
17 17
 <div id="espresso-thank-you-page-payment-details-dv">
18 18
     <?php
19
-    if (! empty($payments)) { ?>
19
+	if (! empty($payments)) { ?>
20 20
         <table class="ee-table">
21 21
             <thead>
22 22
             <tr>
@@ -36,37 +36,37 @@  discard block
 block discarded – undo
36 36
             </thead>
37 37
             <tbody>
38 38
             <?php
39
-            foreach ($payments as $payment) {
40
-                echo wp_kses($payment, AllowedTags::getWithFormTags());
41
-            }
42
-            ?>
39
+			foreach ($payments as $payment) {
40
+				echo wp_kses($payment, AllowedTags::getWithFormTags());
41
+			}
42
+			?>
43 43
             </tbody>
44 44
         </table>
45 45
         <?php
46
-    } else {
47
-        if ($transaction->total()) {
48
-            echo apply_filters(
49
-                'FHEE__payment_overview_template__no_payments_made',
50
-                sprintf(
51
-                    esc_html__('%sNo payments towards this transaction have been received.%s', 'event_espresso'),
52
-                    '<p class="important-notice">',
53
-                    '</p>'
54
-                )
55
-            );
56
-            do_action('AHEE__thank_you_page_payment_details_template__no_payments_made', $transaction);
57
-        } else {
58
-            echo apply_filters(
59
-                'FHEE__payment_overview_template__no_payment_required',
60
-                sprintf(
61
-                    esc_html__('%sNo payment is required for this transaction.%s', 'event_espresso'),
62
-                    '<p>',
63
-                    '</p>'
64
-                )
65
-            );
66
-            do_action('AHEE__thank_you_page_payment_details_template__no_payment_required');
67
-        }
68
-    }
69
-    echo wp_kses($gateway_content, AllowedTags::getWithFormTags());
70
-    do_action('AHEE__thank_you_page_payment_details_template__after_gateway_content', $gateway_content);
71
-    echo '<br/>';
72
-    do_action('AHEE__thank_you_page_payment_details_template__after_payment_details');
46
+	} else {
47
+		if ($transaction->total()) {
48
+			echo apply_filters(
49
+				'FHEE__payment_overview_template__no_payments_made',
50
+				sprintf(
51
+					esc_html__('%sNo payments towards this transaction have been received.%s', 'event_espresso'),
52
+					'<p class="important-notice">',
53
+					'</p>'
54
+				)
55
+			);
56
+			do_action('AHEE__thank_you_page_payment_details_template__no_payments_made', $transaction);
57
+		} else {
58
+			echo apply_filters(
59
+				'FHEE__payment_overview_template__no_payment_required',
60
+				sprintf(
61
+					esc_html__('%sNo payment is required for this transaction.%s', 'event_espresso'),
62
+					'<p>',
63
+					'</p>'
64
+				)
65
+			);
66
+			do_action('AHEE__thank_you_page_payment_details_template__no_payment_required');
67
+		}
68
+	}
69
+	echo wp_kses($gateway_content, AllowedTags::getWithFormTags());
70
+	do_action('AHEE__thank_you_page_payment_details_template__after_gateway_content', $gateway_content);
71
+	echo '<br/>';
72
+	do_action('AHEE__thank_you_page_payment_details_template__after_payment_details');
Please login to merge, or discard this patch.
core/domain/services/admin/privacy/policy/PrivacyPolicy.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@
 block discarded – undo
73 73
         }
74 74
         $session_lifespan_in_hours = round($this->session_lifespan->inSeconds() / HOUR_IN_SECONDS);
75 75
         return (string) EEH_Template::display_template(
76
-            __DIR__ . '/privacy_policy.template.php',
76
+            __DIR__.'/privacy_policy.template.php',
77 77
             array(
78 78
                 'active_onsite_payment_methods' => $active_onsite_pms,
79 79
                 'active_offsite_payment_methods' => $active_offsite_pms,
Please login to merge, or discard this patch.
Indentation   +68 added lines, -68 removed lines patch added patch discarded remove patch
@@ -19,80 +19,80 @@
 block discarded – undo
19 19
  */
20 20
 class PrivacyPolicy implements PrivacyPolicyInterface
21 21
 {
22
-    /**
23
-     * @var EEM_Payment_Method
24
-     */
25
-    protected $payment_method_model;
22
+	/**
23
+	 * @var EEM_Payment_Method
24
+	 */
25
+	protected $payment_method_model;
26 26
 
27
-    /**
28
-     * @var SessionLifespan
29
-     */
30
-    protected $session_lifespan;
27
+	/**
28
+	 * @var SessionLifespan
29
+	 */
30
+	protected $session_lifespan;
31 31
 
32
-    /**
33
-     * PrivacyPolicy constructor.
34
-     *
35
-     * @param EEM_Payment_Method $payment_method_model
36
-     * @param SessionLifespan    $session_lifespan
37
-     */
38
-    public function __construct(EEM_Payment_Method $payment_method_model, SessionLifespan $session_lifespan)
39
-    {
40
-        $this->payment_method_model = $payment_method_model;
41
-        $this->session_lifespan = $session_lifespan;
42
-    }
32
+	/**
33
+	 * PrivacyPolicy constructor.
34
+	 *
35
+	 * @param EEM_Payment_Method $payment_method_model
36
+	 * @param SessionLifespan    $session_lifespan
37
+	 */
38
+	public function __construct(EEM_Payment_Method $payment_method_model, SessionLifespan $session_lifespan)
39
+	{
40
+		$this->payment_method_model = $payment_method_model;
41
+		$this->session_lifespan = $session_lifespan;
42
+	}
43 43
 
44 44
 
45
-    /**
46
-     * Returns the name of the plugin and will be shown in the privacy policy's postbox header
47
-     *
48
-     * @return string
49
-     */
50
-    public function getName()
51
-    {
52
-        return esc_html__('Event Espresso', 'event_espresso');
53
-    }
45
+	/**
46
+	 * Returns the name of the plugin and will be shown in the privacy policy's postbox header
47
+	 *
48
+	 * @return string
49
+	 */
50
+	public function getName()
51
+	{
52
+		return esc_html__('Event Espresso', 'event_espresso');
53
+	}
54 54
 
55 55
 
56
-    /**
57
-     * Gets the HTML for the privacy policy. May be dynamic
58
-     *
59
-     * @return string
60
-     */
61
-    public function getContent()
62
-    {
63
-        // do they have any offsite payment methods? or onsite payment methods?
64
-        $active_payment_methods = $this->payment_method_model->get_all_active(EEM_Payment_Method::scope_cart);
65
-        $active_onsite_pms = array();
66
-        $active_offsite_pms = array();
67
-        foreach ($active_payment_methods as $payment_method) {
68
-            if ($payment_method->type_obj() instanceof \EE_PMT_Base) {
69
-                if ($payment_method->type_obj()->get_gateway() instanceof EE_Onsite_Gateway) {
70
-                    $active_onsite_pms[] = $payment_method->name();
71
-                } elseif ($payment_method->type_obj()->get_gateway() instanceof EE_Offsite_Gateway) {
72
-                    $active_offsite_pms[] = $payment_method->name();
73
-                }
74
-            }
75
-        }
76
-        $session_lifespan_in_hours = round($this->session_lifespan->inSeconds() / HOUR_IN_SECONDS);
77
-        return (string) EEH_Template::display_template(
78
-            __DIR__ . '/privacy_policy.template.php',
79
-            array(
80
-                'active_onsite_payment_methods' => $active_onsite_pms,
81
-                'active_offsite_payment_methods' => $active_offsite_pms,
82
-                'session_lifespan' => sprintf(
83
-                    _nx(
84
-                        '%1$s hour',
85
-                        '%1$s hours',
86
-                        $session_lifespan_in_hours,
87
-                        '2 hours',
88
-                        'event_espresso'
89
-                    ),
90
-                    $session_lifespan_in_hours
91
-                )
92
-            ),
93
-            true
94
-        );
95
-    }
56
+	/**
57
+	 * Gets the HTML for the privacy policy. May be dynamic
58
+	 *
59
+	 * @return string
60
+	 */
61
+	public function getContent()
62
+	{
63
+		// do they have any offsite payment methods? or onsite payment methods?
64
+		$active_payment_methods = $this->payment_method_model->get_all_active(EEM_Payment_Method::scope_cart);
65
+		$active_onsite_pms = array();
66
+		$active_offsite_pms = array();
67
+		foreach ($active_payment_methods as $payment_method) {
68
+			if ($payment_method->type_obj() instanceof \EE_PMT_Base) {
69
+				if ($payment_method->type_obj()->get_gateway() instanceof EE_Onsite_Gateway) {
70
+					$active_onsite_pms[] = $payment_method->name();
71
+				} elseif ($payment_method->type_obj()->get_gateway() instanceof EE_Offsite_Gateway) {
72
+					$active_offsite_pms[] = $payment_method->name();
73
+				}
74
+			}
75
+		}
76
+		$session_lifespan_in_hours = round($this->session_lifespan->inSeconds() / HOUR_IN_SECONDS);
77
+		return (string) EEH_Template::display_template(
78
+			__DIR__ . '/privacy_policy.template.php',
79
+			array(
80
+				'active_onsite_payment_methods' => $active_onsite_pms,
81
+				'active_offsite_payment_methods' => $active_offsite_pms,
82
+				'session_lifespan' => sprintf(
83
+					_nx(
84
+						'%1$s hour',
85
+						'%1$s hours',
86
+						$session_lifespan_in_hours,
87
+						'2 hours',
88
+						'event_espresso'
89
+					),
90
+					$session_lifespan_in_hours
91
+				)
92
+			),
93
+			true
94
+		);
95
+	}
96 96
 }
97 97
 // End of file PrivacyPolicy.php
98 98
 // Location: EventEspresso\core\domain\services\admin\privacy\policy\PrivacyPolicy.php
Please login to merge, or discard this patch.
core/services/assets/BlockAssetManagerCollection.php 1 patch
Indentation   +37 added lines, -37 removed lines patch added patch discarded remove patch
@@ -16,41 +16,41 @@
 block discarded – undo
16 16
 class BlockAssetManagerCollection extends Collection
17 17
 {
18 18
 
19
-    /**
20
-     * Collection constructor
21
-     *
22
-     * @throws InvalidInterfaceException
23
-     */
24
-    public function __construct()
25
-    {
26
-        parent::__construct('EventEspresso\core\services\assets\BlockAssetManager');
27
-    }
28
-
29
-
30
-    /**
31
-     * @return  void
32
-     */
33
-    public function addAssets()
34
-    {
35
-        $this->rewind();
36
-        while ($this->valid()) {
37
-            $this->current()->addAssets();
38
-            $this->next();
39
-        }
40
-        $this->rewind();
41
-    }
42
-
43
-
44
-    /**
45
-     * @return  void
46
-     */
47
-    public function enqueueAssets()
48
-    {
49
-        $this->rewind();
50
-        while ($this->valid()) {
51
-            $this->current()->enqueueAssets();
52
-            $this->next();
53
-        }
54
-        $this->rewind();
55
-    }
19
+	/**
20
+	 * Collection constructor
21
+	 *
22
+	 * @throws InvalidInterfaceException
23
+	 */
24
+	public function __construct()
25
+	{
26
+		parent::__construct('EventEspresso\core\services\assets\BlockAssetManager');
27
+	}
28
+
29
+
30
+	/**
31
+	 * @return  void
32
+	 */
33
+	public function addAssets()
34
+	{
35
+		$this->rewind();
36
+		while ($this->valid()) {
37
+			$this->current()->addAssets();
38
+			$this->next();
39
+		}
40
+		$this->rewind();
41
+	}
42
+
43
+
44
+	/**
45
+	 * @return  void
46
+	 */
47
+	public function enqueueAssets()
48
+	{
49
+		$this->rewind();
50
+		while ($this->valid()) {
51
+			$this->current()->enqueueAssets();
52
+			$this->next();
53
+		}
54
+		$this->rewind();
55
+	}
56 56
 }
Please login to merge, or discard this patch.