Completed
Branch FET/paypal-pro-cardinal-integr... (d98144)
by
unknown
26:37 queued 18:23
created
admin_pages/about/templates/credits.template.php 2 patches
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
1 1
 <p class="about-description">
2 2
     <?php esc_html_e(
3
-        'Event Espresso is created by an international team of passionate individuals with a drive to empower your events!',
4
-        'event_espresso'
5
-    ); ?></p>
3
+		'Event Espresso is created by an international team of passionate individuals with a drive to empower your events!',
4
+		'event_espresso'
5
+	); ?></p>
6 6
 <h3 class="wp-people-group"><?php esc_html_e('Founders', 'event_espresso'); ?></h3>
7 7
 <ul class="wp-people-group" id="ee-people-group-owners">
8 8
     <li class="wp-person" id="ee-person-sshoultes">
@@ -85,13 +85,13 @@  discard block
 block discarded – undo
85 85
 <h3 class="wp-people-group"><?php esc_html_e('Contributor Recognition', 'event_espresso'); ?></h3>
86 86
 <p class="description">
87 87
     <?php printf(
88
-        esc_html__(
89
-            'For every major release we want to recognize the people who contributed to the release via a GitHub pull request. Want to see your name listed here? %sWhen you submit a pull request that gets included in a major release%s, we\'ll add your name here linked to your GitHub profile.',
90
-            'event_espresso'
91
-        ),
92
-        '<a href="https://github.com/eventespresso/event-espresso-core" title="Contribute to Event Espresso by making a pull request via GitHub">',
93
-        '</a>'
94
-    ); ?>
88
+		esc_html__(
89
+			'For every major release we want to recognize the people who contributed to the release via a GitHub pull request. Want to see your name listed here? %sWhen you submit a pull request that gets included in a major release%s, we\'ll add your name here linked to your GitHub profile.',
90
+			'event_espresso'
91
+		),
92
+		'<a href="https://github.com/eventespresso/event-espresso-core" title="Contribute to Event Espresso by making a pull request via GitHub">',
93
+		'</a>'
94
+	); ?>
95 95
 </p>
96 96
 <p class="wp-credits-list">
97 97
 <ul>
@@ -106,13 +106,13 @@  discard block
 block discarded – undo
106 106
 <h3 class="wp-people-group"><?php esc_html_e('External Libraries', 'event_espresso'); ?></h3>
107 107
 <p class="description">
108 108
     <?php printf(
109
-        esc_html__(
110
-            'Along with the libraries %sincluded with WordPress%s, Event Espresso utilizes the following third party libraries:',
111
-            'event_espresso'
112
-        ),
113
-        '<a href="credits.php">',
114
-        '</a>'
115
-    ); ?>
109
+		esc_html__(
110
+			'Along with the libraries %sincluded with WordPress%s, Event Espresso utilizes the following third party libraries:',
111
+			'event_espresso'
112
+		),
113
+		'<a href="credits.php">',
114
+		'</a>'
115
+	); ?>
116 116
 </p>
117 117
 <p class="wp-credits-list">
118 118
     <a href="https://openexchangerates.github.io/accounting.js/">accounting.js</a>,
@@ -129,12 +129,12 @@  discard block
 block discarded – undo
129 129
 <?php
130 130
 function esp_gravatar_profile($email)
131 131
 {
132
-    echo 'https://www.gravatar.com/' . md5($email);
132
+	echo 'https://www.gravatar.com/' . md5($email);
133 133
 }
134 134
 
135 135
 function esp_gravatar_image($email, $name)
136 136
 {
137
-    echo '<img src="https://0.gravatar.com/avatar/' . md5($email) . '?s=60" class="gravatar" alt="' . $name . '"/>';
137
+	echo '<img src="https://0.gravatar.com/avatar/' . md5($email) . '?s=60" class="gravatar" alt="' . $name . '"/>';
138 138
 }
139 139
 
140 140
 ?>
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -129,12 +129,12 @@
 block discarded – undo
129 129
 <?php
130 130
 function esp_gravatar_profile($email)
131 131
 {
132
-    echo 'https://www.gravatar.com/' . md5($email);
132
+    echo 'https://www.gravatar.com/'.md5($email);
133 133
 }
134 134
 
135 135
 function esp_gravatar_image($email, $name)
136 136
 {
137
-    echo '<img src="https://0.gravatar.com/avatar/' . md5($email) . '?s=60" class="gravatar" alt="' . $name . '"/>';
137
+    echo '<img src="https://0.gravatar.com/avatar/'.md5($email).'?s=60" class="gravatar" alt="'.$name.'"/>';
138 138
 }
139 139
 
140 140
 ?>
Please login to merge, or discard this patch.
espresso.php 1 patch
Indentation   +80 added lines, -80 removed lines patch added patch discarded remove patch
@@ -38,103 +38,103 @@
 block discarded – undo
38 38
  * @since           4.0
39 39
  */
40 40
 if (function_exists('espresso_version')) {
41
-    if (! function_exists('espresso_duplicate_plugin_error')) {
42
-        /**
43
-         *    espresso_duplicate_plugin_error
44
-         *    displays if more than one version of EE is activated at the same time
45
-         */
46
-        function espresso_duplicate_plugin_error()
47
-        {
48
-            ?>
41
+	if (! function_exists('espresso_duplicate_plugin_error')) {
42
+		/**
43
+		 *    espresso_duplicate_plugin_error
44
+		 *    displays if more than one version of EE is activated at the same time
45
+		 */
46
+		function espresso_duplicate_plugin_error()
47
+		{
48
+			?>
49 49
             <div class="error">
50 50
                 <p>
51 51
                     <?php
52
-                    echo esc_html__(
53
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
54
-                        'event_espresso'
55
-                    ); ?>
52
+					echo esc_html__(
53
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
54
+						'event_espresso'
55
+					); ?>
56 56
                 </p>
57 57
             </div>
58 58
             <?php
59
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
60
-        }
61
-    }
62
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
59
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
60
+		}
61
+	}
62
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
63 63
 } else {
64
-    define('EE_MIN_PHP_VER_REQUIRED', '5.4.0');
65
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
66
-        /**
67
-         * espresso_minimum_php_version_error
68
-         *
69
-         * @return void
70
-         */
71
-        function espresso_minimum_php_version_error()
72
-        {
73
-            ?>
64
+	define('EE_MIN_PHP_VER_REQUIRED', '5.4.0');
65
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
66
+		/**
67
+		 * espresso_minimum_php_version_error
68
+		 *
69
+		 * @return void
70
+		 */
71
+		function espresso_minimum_php_version_error()
72
+		{
73
+			?>
74 74
             <div class="error">
75 75
                 <p>
76 76
                     <?php
77
-                    printf(
78
-                        esc_html__(
79
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
80
-                            'event_espresso'
81
-                        ),
82
-                        EE_MIN_PHP_VER_REQUIRED,
83
-                        PHP_VERSION,
84
-                        '<br/>',
85
-                        '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
86
-                    );
87
-                    ?>
77
+					printf(
78
+						esc_html__(
79
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
80
+							'event_espresso'
81
+						),
82
+						EE_MIN_PHP_VER_REQUIRED,
83
+						PHP_VERSION,
84
+						'<br/>',
85
+						'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
86
+					);
87
+					?>
88 88
                 </p>
89 89
             </div>
90 90
             <?php
91
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
92
-        }
91
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
92
+		}
93 93
 
94
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
95
-    } else {
96
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
97
-        /**
98
-         * espresso_version
99
-         * Returns the plugin version
100
-         *
101
-         * @return string
102
-         */
103
-        function espresso_version()
104
-        {
105
-            return apply_filters('FHEE__espresso__espresso_version', '4.10.1.rc.011');
106
-        }
94
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
95
+	} else {
96
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
97
+		/**
98
+		 * espresso_version
99
+		 * Returns the plugin version
100
+		 *
101
+		 * @return string
102
+		 */
103
+		function espresso_version()
104
+		{
105
+			return apply_filters('FHEE__espresso__espresso_version', '4.10.1.rc.011');
106
+		}
107 107
 
108
-        /**
109
-         * espresso_plugin_activation
110
-         * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
111
-         */
112
-        function espresso_plugin_activation()
113
-        {
114
-            update_option('ee_espresso_activation', true);
115
-        }
108
+		/**
109
+		 * espresso_plugin_activation
110
+		 * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
111
+		 */
112
+		function espresso_plugin_activation()
113
+		{
114
+			update_option('ee_espresso_activation', true);
115
+		}
116 116
 
117
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
117
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
118 118
 
119
-        require_once __DIR__ . '/core/bootstrap_espresso.php';
120
-        bootstrap_espresso();
121
-    }
119
+		require_once __DIR__ . '/core/bootstrap_espresso.php';
120
+		bootstrap_espresso();
121
+	}
122 122
 }
123 123
 if (! function_exists('espresso_deactivate_plugin')) {
124
-    /**
125
-     *    deactivate_plugin
126
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
127
-     *
128
-     * @access public
129
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
130
-     * @return    void
131
-     */
132
-    function espresso_deactivate_plugin($plugin_basename = '')
133
-    {
134
-        if (! function_exists('deactivate_plugins')) {
135
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
136
-        }
137
-        unset($_GET['activate'], $_REQUEST['activate']);
138
-        deactivate_plugins($plugin_basename);
139
-    }
124
+	/**
125
+	 *    deactivate_plugin
126
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
127
+	 *
128
+	 * @access public
129
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
130
+	 * @return    void
131
+	 */
132
+	function espresso_deactivate_plugin($plugin_basename = '')
133
+	{
134
+		if (! function_exists('deactivate_plugins')) {
135
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
136
+		}
137
+		unset($_GET['activate'], $_REQUEST['activate']);
138
+		deactivate_plugins($plugin_basename);
139
+	}
140 140
 }
Please login to merge, or discard this patch.
core/libraries/form_sections/payment_methods/EE_Billing_Info_Form.form.php 2 patches
Indentation   +97 added lines, -97 removed lines patch added patch discarded remove patch
@@ -14,108 +14,108 @@
 block discarded – undo
14 14
 class EE_Billing_Info_Form extends EE_Form_Section_Proper
15 15
 {
16 16
 
17
-    /**
18
-     * The payment method this billing form is for
19
-     * @var EE_Payment_Method
20
-     */
21
-    protected $_pm_instance;
22
-
23
-
24
-
25
-    /**
26
-     *
27
-     * @param EE_Payment_Method $payment_method
28
-     * @param array $options_array @see EE_Form_Section_Proper::__construct()
29
-     */
30
-    public function __construct(EE_Payment_Method $payment_method, $options_array = array())
31
-    {
32
-        $this->_pm_instance = $payment_method;
33
-        $this->_layout_strategy = new EE_Div_Per_Section_Layout();
34
-        parent::__construct($options_array);
35
-    }
36
-
37
-
38
-
39
-    /**
40
-     * Sets the payment method for this billing form
41
-     * @param EE_Payment_Method $payment_method
42
-     * @return void
43
-     */
44
-    public function set_payment_method(EE_Payment_Method $payment_method)
45
-    {
46
-        $this->_pm_instance = $payment_method;
47
-    }
48
-
49
-
50
-
51
-    /**
52
-     * Returns the instance of the payment method this billing form is for
53
-     * @return EE_Payment_Method
54
-     */
55
-    public function payment_method()
56
-    {
57
-        return $this->_pm_instance;
58
-    }
59
-
60
-
61
-
62
-    /**
63
-     * payment_fields_autofilled_notice_html
64
-     * @return string
65
-     */
66
-    public function payment_fields_autofilled_notice_html()
67
-    {
68
-        return  new EE_Form_Section_HTML(
69
-            EEH_HTML::p(
70
-                apply_filters('FHEE__EE_Billing_Info_Form__payment_fields_autofilled_notice_html_text', __('Payment fields have been autofilled because you are in debug mode', 'event_espresso')),
71
-                '',
72
-                'important-notice'
73
-            )
74
-        );
75
-    }
76
-
77
-
78
-
79
-    /**
80
-     * @return string
81
-     */
82
-    public function html_class()
83
-    {
84
-        return ! empty($this->_html_class) ? $this->_html_class . ' ee-billing-form' : 'ee-billing-form';
85
-    }
86
-
87
-
88
-
89
-    public function enqueue_js()
90
-    {
91
-        parent::enqueue_js();
92
-        // In the future this feature may be available to other payment methods, but for now it's only PayPal Pro.
93
-        if ($this->_pm_instance->type() === 'Paypal_Pro') {
94
-            $this->enqueueCardinalCommerceJs();
95
-        }
96
-    }
97
-
98
-    /**
99
-     * Enqueues JS for Cardinal Commerce to do 3D Secure Authorization.
100
-     * @since $VID:$
101
-     */
102
-    protected function enqueueCardinalCommerceJs()
103
-    {
104
-        $on_staging = $this->_pm_instance->debug_mode();
105
-        if ($on_staging) {
106
-            $songbird_domain = 'songbirdstag.cardinalcommerce.com';
107
-        } else {
108
-            $songbird_domain = 'songbird.cardinalcommerce.com';
109
-        }
110
-        wp_enqueue_script(
111
-            'ee-cardinalcommerce-songbird',
112
-            "https://{$songbird_domain}/edge/v1/songbird.js");
17
+	/**
18
+	 * The payment method this billing form is for
19
+	 * @var EE_Payment_Method
20
+	 */
21
+	protected $_pm_instance;
22
+
23
+
24
+
25
+	/**
26
+	 *
27
+	 * @param EE_Payment_Method $payment_method
28
+	 * @param array $options_array @see EE_Form_Section_Proper::__construct()
29
+	 */
30
+	public function __construct(EE_Payment_Method $payment_method, $options_array = array())
31
+	{
32
+		$this->_pm_instance = $payment_method;
33
+		$this->_layout_strategy = new EE_Div_Per_Section_Layout();
34
+		parent::__construct($options_array);
35
+	}
36
+
37
+
38
+
39
+	/**
40
+	 * Sets the payment method for this billing form
41
+	 * @param EE_Payment_Method $payment_method
42
+	 * @return void
43
+	 */
44
+	public function set_payment_method(EE_Payment_Method $payment_method)
45
+	{
46
+		$this->_pm_instance = $payment_method;
47
+	}
48
+
49
+
50
+
51
+	/**
52
+	 * Returns the instance of the payment method this billing form is for
53
+	 * @return EE_Payment_Method
54
+	 */
55
+	public function payment_method()
56
+	{
57
+		return $this->_pm_instance;
58
+	}
59
+
60
+
61
+
62
+	/**
63
+	 * payment_fields_autofilled_notice_html
64
+	 * @return string
65
+	 */
66
+	public function payment_fields_autofilled_notice_html()
67
+	{
68
+		return  new EE_Form_Section_HTML(
69
+			EEH_HTML::p(
70
+				apply_filters('FHEE__EE_Billing_Info_Form__payment_fields_autofilled_notice_html_text', __('Payment fields have been autofilled because you are in debug mode', 'event_espresso')),
71
+				'',
72
+				'important-notice'
73
+			)
74
+		);
75
+	}
76
+
77
+
78
+
79
+	/**
80
+	 * @return string
81
+	 */
82
+	public function html_class()
83
+	{
84
+		return ! empty($this->_html_class) ? $this->_html_class . ' ee-billing-form' : 'ee-billing-form';
85
+	}
86
+
87
+
88
+
89
+	public function enqueue_js()
90
+	{
91
+		parent::enqueue_js();
92
+		// In the future this feature may be available to other payment methods, but for now it's only PayPal Pro.
93
+		if ($this->_pm_instance->type() === 'Paypal_Pro') {
94
+			$this->enqueueCardinalCommerceJs();
95
+		}
96
+	}
97
+
98
+	/**
99
+	 * Enqueues JS for Cardinal Commerce to do 3D Secure Authorization.
100
+	 * @since $VID:$
101
+	 */
102
+	protected function enqueueCardinalCommerceJs()
103
+	{
104
+		$on_staging = $this->_pm_instance->debug_mode();
105
+		if ($on_staging) {
106
+			$songbird_domain = 'songbirdstag.cardinalcommerce.com';
107
+		} else {
108
+			$songbird_domain = 'songbird.cardinalcommerce.com';
109
+		}
110
+		wp_enqueue_script(
111
+			'ee-cardinalcommerce-songbird',
112
+			"https://{$songbird_domain}/edge/v1/songbird.js");
113 113
 //        wp_register_script(
114 114
 //            'ee-cardinalcommerce',
115 115
 //            plugins_url('cardinalcommerce-oneconnect.js',
116 116
 //                CARDINAL_ONECONNECT_PLUGIN_FILE),
117 117
 //            array('jquery', 'cardinalcommerce-oneconnect-songbird'),
118 118
 //            CARDINAL_ONECONNECT_VERSION, true);
119
-    }
119
+	}
120 120
 }
121 121
 // End of file EE_Billing_Info_Form.form.php
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
      */
82 82
     public function html_class()
83 83
     {
84
-        return ! empty($this->_html_class) ? $this->_html_class . ' ee-billing-form' : 'ee-billing-form';
84
+        return ! empty($this->_html_class) ? $this->_html_class.' ee-billing-form' : 'ee-billing-form';
85 85
     }
86 86
 
87 87
 
Please login to merge, or discard this patch.