Completed
Branch TASK-10272-slack-badge (91344b)
by
unknown
165:51 queued 150:46
created
4_7_0_stages/EE_DMS_4_7_0_Registration_Payments.dmsstage.php 2 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@
 block discarded – undo
125 125
 	 *
126 126
 	 * @param stdClass $payment
127 127
 	 * @param array $registrations
128
-	 * @return bool
128
+	 * @return boolean|null
129 129
 	 */
130 130
 	protected function _process_registration_payments( $payment, $registrations = array() ){
131 131
 		// how much is available to apply to registrations?
Please login to merge, or discard this patch.
Spacing   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 
6 6
 /**
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
  * @author				Brent Christensen
13 13
  *
14 14
  */
15
-class EE_DMS_4_7_0_Registration_Payments extends EE_Data_Migration_Script_Stage_Table{
15
+class EE_DMS_4_7_0_Registration_Payments extends EE_Data_Migration_Script_Stage_Table {
16 16
 
17 17
 	protected $_payment_table;
18 18
 
@@ -20,15 +20,15 @@  discard block
 block discarded – undo
20 20
 
21 21
 	protected $_registration_payment_table;
22 22
 
23
-	function __construct(){
23
+	function __construct() {
24 24
 		/** @type WPDB $wpdb */
25 25
 		global $wpdb;
26
-		$this->_pretty_name = __( 'Registration Payment Record Generation', 'event_espresso' );
26
+		$this->_pretty_name = __('Registration Payment Record Generation', 'event_espresso');
27 27
 		// define tables
28
-		$this->_old_table 									= $wpdb->prefix . 'esp_transaction';
29
-		$this->_payment_table 						= $wpdb->prefix . 'esp_payment';
30
-		$this->_registration_table 					= $wpdb->prefix . 'esp_registration';
31
-		$this->_registration_payment_table 	= $wpdb->prefix . 'esp_registration_payment';
28
+		$this->_old_table = $wpdb->prefix.'esp_transaction';
29
+		$this->_payment_table = $wpdb->prefix.'esp_payment';
30
+		$this->_registration_table = $wpdb->prefix.'esp_registration';
31
+		$this->_registration_payment_table = $wpdb->prefix.'esp_registration_payment';
32 32
 		// build SQL WHERE clauses
33 33
 		$this->_extra_where_sql = "WHERE STS_ID IN ( 'TIN', 'TCM' ) AND TXN_Total != '0.000'";
34 34
 		parent::__construct();
@@ -40,14 +40,14 @@  discard block
 block discarded – undo
40 40
 	 * @param array $transaction
41 41
 	 * @return void
42 42
 	 */
43
-	protected function _migrate_old_row( $transaction ) {
43
+	protected function _migrate_old_row($transaction) {
44 44
 		/** @type WPDB $wpdb */
45 45
 		global $wpdb;
46
-		$TXN_ID = absint( $transaction[ 'TXN_ID' ] );
47
-		if ( ! $TXN_ID ) {
46
+		$TXN_ID = absint($transaction['TXN_ID']);
47
+		if ( ! $TXN_ID) {
48 48
 			$this->add_error(
49 49
 				sprintf(
50
-					__( 'Invalid transaction with ID=%1$d. Error: "%2$s"', 'event_espresso' ),
50
+					__('Invalid transaction with ID=%1$d. Error: "%2$s"', 'event_espresso'),
51 51
 					$TXN_ID,
52 52
 					$wpdb->last_error
53 53
 				)
@@ -55,19 +55,19 @@  discard block
 block discarded – undo
55 55
 			return;
56 56
 		}
57 57
 		// get all payments for the TXN
58
-		$payments = $this->_get_payments( $TXN_ID );
59
-		if ( empty( $payments ) ) {
58
+		$payments = $this->_get_payments($TXN_ID);
59
+		if (empty($payments)) {
60 60
 			return;
61 61
 		}
62 62
 		// then the registrants
63
-		$registrations = $this->_get_registrations( $TXN_ID );
64
-		if ( empty( $registrations ) ) {
63
+		$registrations = $this->_get_registrations($TXN_ID);
64
+		if (empty($registrations)) {
65 65
 			return;
66 66
 		}
67 67
 		// now loop thru each payment and apply it to each of the registrations
68
-		foreach ( $payments as $PAY_ID => $payment ) {
69
-			if ( $payment->STS_ID === 'PAP' && $payment->PAY_amount > 0 ) {
70
-				$this->_process_registration_payments( $payment, $registrations );
68
+		foreach ($payments as $PAY_ID => $payment) {
69
+			if ($payment->STS_ID === 'PAP' && $payment->PAY_amount > 0) {
70
+				$this->_process_registration_payments($payment, $registrations);
71 71
 			}
72 72
 		}
73 73
 	}
@@ -80,11 +80,11 @@  discard block
 block discarded – undo
80 80
 	 * @param int $TXN_ID
81 81
 	 * @return array
82 82
 	 */
83
-	protected function _get_registrations( $TXN_ID ) {
83
+	protected function _get_registrations($TXN_ID) {
84 84
 		/** @type WPDB $wpdb */
85 85
 		global $wpdb;
86 86
 		$SQL = "SELECT * FROM {$this->_registration_table} WHERE TXN_ID = %d AND STS_ID IN ( 'RPP', 'RAP' )";
87
-		return $wpdb->get_results( $wpdb->prepare( $SQL, $TXN_ID ), OBJECT_K );
87
+		return $wpdb->get_results($wpdb->prepare($SQL, $TXN_ID), OBJECT_K);
88 88
 	}
89 89
 
90 90
 
@@ -95,10 +95,10 @@  discard block
 block discarded – undo
95 95
 	 * @param int $TXN_ID
96 96
 	 * @return array
97 97
 	 */
98
-	protected function _get_payments( $TXN_ID ) {
98
+	protected function _get_payments($TXN_ID) {
99 99
 		/** @type WPDB $wpdb */
100 100
 		global $wpdb;
101
-		return $wpdb->get_results( $wpdb->prepare( "SELECT * FROM {$this->_payment_table} WHERE TXN_ID = %d", $TXN_ID ), OBJECT_K );
101
+		return $wpdb->get_results($wpdb->prepare("SELECT * FROM {$this->_payment_table} WHERE TXN_ID = %d", $TXN_ID), OBJECT_K);
102 102
 	}
103 103
 
104 104
 
@@ -109,10 +109,10 @@  discard block
 block discarded – undo
109 109
 	 * @param int $REG_ID
110 110
 	 * @return array
111 111
 	 */
112
-	protected function _get_possibly_updated_REG_paid( $REG_ID ) {
112
+	protected function _get_possibly_updated_REG_paid($REG_ID) {
113 113
 		/** @type WPDB $wpdb */
114 114
 		global $wpdb;
115
-		return $wpdb->get_var( $wpdb->prepare( "SELECT REG_paid FROM {$this->_registration_table} WHERE REG_ID = %d", $REG_ID ) );
115
+		return $wpdb->get_var($wpdb->prepare("SELECT REG_paid FROM {$this->_registration_table} WHERE REG_ID = %d", $REG_ID));
116 116
 	}
117 117
 
118 118
 
@@ -127,40 +127,40 @@  discard block
 block discarded – undo
127 127
 	 * @param array $registrations
128 128
 	 * @return bool
129 129
 	 */
130
-	protected function _process_registration_payments( $payment, $registrations = array() ){
130
+	protected function _process_registration_payments($payment, $registrations = array()) {
131 131
 		// how much is available to apply to registrations?
132 132
 		$available_payment_amount = $payment->PAY_amount;
133
-		foreach ( $registrations as $REG_ID => $registration ) {
133
+		foreach ($registrations as $REG_ID => $registration) {
134 134
 			// nothing left, then we are done here?
135
-			if ( ! $available_payment_amount > 0 ) {
135
+			if ( ! $available_payment_amount > 0) {
136 136
 				break;
137 137
 			}
138 138
 			// ensure REG_final_price has a valid value, and skip if it turns out to be zero
139
-			$registration->REG_final_price = ! empty( $registration->REG_final_price ) ? (float)$registration->REG_final_price : 0.00;
140
-			if ( ! $registration->REG_final_price > 0 ) {
139
+			$registration->REG_final_price = ! empty($registration->REG_final_price) ? (float) $registration->REG_final_price : 0.00;
140
+			if ( ! $registration->REG_final_price > 0) {
141 141
 				continue;
142 142
 			}
143 143
 			// because REG_paid may have been updated by a previous payment, we need to retrieve the value from the db
144
-			$possibly_updated_REG_paid = $this->_get_possibly_updated_REG_paid( $REG_ID );
145
-			if ( is_float( $possibly_updated_REG_paid ) ) {
144
+			$possibly_updated_REG_paid = $this->_get_possibly_updated_REG_paid($REG_ID);
145
+			if (is_float($possibly_updated_REG_paid)) {
146 146
 				$registration->REG_paid = $possibly_updated_REG_paid;
147 147
 			}
148 148
 			// and ensure REG_paid has a valid value
149
-			$registration->REG_paid = ! empty( $registration->REG_paid ) ? (float)$registration->REG_paid : 0.00;
149
+			$registration->REG_paid = ! empty($registration->REG_paid) ? (float) $registration->REG_paid : 0.00;
150 150
 			// calculate amount owing, and skip if it turns out to be zero
151 151
 			$owing = $registration->REG_final_price - $registration->REG_paid;
152
-			if ( ! $owing > 0 ) {
152
+			if ( ! $owing > 0) {
153 153
 				continue;
154 154
 			}
155 155
 			// don't allow payment amount to exceed the available payment amount, OR the amount owing
156
-			$payment_amount = min( $available_payment_amount, $owing );
156
+			$payment_amount = min($available_payment_amount, $owing);
157 157
 			// update $available_payment_amount
158 158
 			$available_payment_amount = $available_payment_amount - $payment_amount;
159 159
 			// add relation between registration and payment and set amount
160
-			if ( $this->_insert_registration_payment( $registration->REG_ID, $payment->PAY_ID, $payment_amount )) {
160
+			if ($this->_insert_registration_payment($registration->REG_ID, $payment->PAY_ID, $payment_amount)) {
161 161
 				//calculate and set new REG_paid
162 162
 				$registration->REG_paid = $registration->REG_paid + $payment_amount;
163
-				$this->_update_registration_paid( $registration->REG_ID, $registration->REG_paid );
163
+				$this->_update_registration_paid($registration->REG_ID, $registration->REG_paid);
164 164
 			}
165 165
 		}
166 166
 	}
@@ -175,18 +175,18 @@  discard block
 block discarded – undo
175 175
 	 * @param float $PAY_amount
176 176
 	 * @return bool
177 177
 	 */
178
-	protected function _insert_registration_payment( $REG_ID = 0, $PAY_ID = 0, $PAY_amount = 0.00 ){
178
+	protected function _insert_registration_payment($REG_ID = 0, $PAY_ID = 0, $PAY_amount = 0.00) {
179 179
 		/** @type WPDB $wpdb */
180 180
 		global $wpdb;
181 181
 		$success = $wpdb->insert(
182 182
 			$this->_registration_payment_table,
183
-			array( 'REG_ID' => $REG_ID, 'PAY_ID' => $PAY_ID, 'RPY_amount' => $PAY_amount, ),  // data
184
-			array( '%f' )   // data format
183
+			array('REG_ID' => $REG_ID, 'PAY_ID' => $PAY_ID, 'RPY_amount' => $PAY_amount,), // data
184
+			array('%f')   // data format
185 185
 		);
186
-		if ( $success === false ) {
186
+		if ($success === false) {
187 187
 			$this->add_error(
188 188
 				sprintf(
189
-					__( 'Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso' ),
189
+					__('Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso'),
190 190
 					$REG_ID,
191 191
 					$wpdb->last_error
192 192
 				)
@@ -205,20 +205,20 @@  discard block
 block discarded – undo
205 205
 	 * @param float $REG_paid
206 206
 	 * @return bool
207 207
 	 */
208
-	protected function _update_registration_paid( $REG_ID = 0, $REG_paid = 0.00 ) {
208
+	protected function _update_registration_paid($REG_ID = 0, $REG_paid = 0.00) {
209 209
 		/** @type WPDB $wpdb */
210 210
 		global $wpdb;
211 211
 		$success = $wpdb->update(
212 212
 			$this->_registration_table,
213
-			array( 'REG_paid' => $REG_paid ),  // data
214
-			array( 'REG_ID' => $REG_ID ),  // where
215
-			array( '%f' ),   // data format
216
-			array( '%d' )  // where format
213
+			array('REG_paid' => $REG_paid), // data
214
+			array('REG_ID' => $REG_ID), // where
215
+			array('%f'), // data format
216
+			array('%d')  // where format
217 217
 		);
218
-		if ( $success === false ) {
218
+		if ($success === false) {
219 219
 			$this->add_error(
220 220
 				sprintf(
221
-					__( 'Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso' ),
221
+					__('Could not update registration paid value for registration ID=%1$d because "%2$s"', 'event_espresso'),
222 222
 					$REG_ID,
223 223
 					$wpdb->last_error
224 224
 				)
Please login to merge, or discard this patch.
core/data_migration_scripts/EE_Data_Migration_Class_Base.core.php 4 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -234,7 +234,7 @@
 block discarded – undo
234 234
 	 * @param array $old_row_as_array
235 235
 	 * @param string $new_table
236 236
 	 * @param array $new_row_as_array columns=>values like used in wpdb->insert
237
-	 * @param array $data_types numerically indexed
237
+	 * @param string[] $data_types numerically indexed
238 238
 	 * @return string
239 239
 	 */
240 240
 	protected function _create_error_message_for_db_insertion($old_table, $old_row_as_array, $new_table, $new_row_as_array, $data_types){
Please login to merge, or discard this patch.
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -264,9 +264,9 @@
 block discarded – undo
264 264
 	/**
265 265
 	 * Same as json_encode, just avoids putting
266 266
 	 * serialized arrays into the http build query, as that would
267
-	* @param array $array_of_data
268
-	* @return string
269
-	*/
267
+	 * @param array $array_of_data
268
+	 * @return string
269
+	 */
270 270
 	protected function _json_encode($array_of_data){
271 271
 		//we'd rather NOT serialize the transaction details
272 272
 		$fields_to_include = array();
Please login to merge, or discard this patch.
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 		$errors = $this->get_errors();
120 120
 		if($errors){
121 121
 			return end($errors);
122
-		}else{
122
+		} else{
123 123
 			return null;
124 124
 		}
125 125
 	}
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	public function add_error($error, $force = FALSE ){
132 132
 		if( ! defined( 'EE_DMS_ERROR_LIMIT' ) ){
133 133
 			$limit = 50;
134
-		}else{
134
+		} else{
135 135
 			$limit = EE_DMS_ERROR_LIMIT;
136 136
 		}
137 137
 		//make sure errors is an array, see ticket #8261
@@ -144,10 +144,10 @@  discard block
 block discarded – undo
144 144
 				$this->_errors = array_slice( $this->_errors, $limit / 2, $limit / 2 );
145 145
 				$this->_errors[] = "Limit reached; removed first half of errors to save space";
146 146
 				$this->_errors[] = $error;
147
-			}else{
147
+			} else{
148 148
 				$this->_errors[ $limit ] = 'More, but limit reached...';
149 149
 			}
150
-		}else{
150
+		} else{
151 151
 			$this->_errors[] = $error;
152 152
 		}
153 153
 	}
Please login to merge, or discard this patch.
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
 
21 21
 
22 22
 
23
-abstract class EE_Data_Migration_Class_Base{
23
+abstract class EE_Data_Migration_Class_Base {
24 24
 
25 25
 	/**
26 26
 	 * @var $records_to_migrate int count of all that have been migrated
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 	 * @param TableManager  $table_manager
73 73
 	 * @param TableAnalysis $table_analysis
74 74
 	 */
75
-	public function __construct( TableManager $table_manager = null, TableAnalysis $table_analysis = null ){
75
+	public function __construct(TableManager $table_manager = null, TableAnalysis $table_analysis = null) {
76 76
 		$this->_table_manager = $table_manager;
77 77
 		$this->_table_analysis = $table_analysis;
78 78
 		$this->set_status(EE_Data_Migration_Manager::status_continue);
@@ -85,9 +85,9 @@  discard block
 block discarded – undo
85 85
 	 * @throws EE_Error
86 86
 	 * @return string
87 87
 	 */
88
-	public function pretty_name(){
89
-		if($this->_pretty_name === null){
90
-			throw new EE_Error(sprintf(__("Please give a pretty name to the migration script stage %s by assigning the property _pretty_name in the constructor", "event_espresso"),get_class($this)));
88
+	public function pretty_name() {
89
+		if ($this->_pretty_name === null) {
90
+			throw new EE_Error(sprintf(__("Please give a pretty name to the migration script stage %s by assigning the property _pretty_name in the constructor", "event_espresso"), get_class($this)));
91 91
 		}
92 92
 		return $this->_pretty_name;
93 93
 	}
@@ -95,8 +95,8 @@  discard block
 block discarded – undo
95 95
 	 *
96 96
 	 * @return int
97 97
 	 */
98
-	public function count_records_to_migrate(){
99
-		if( $this->_records_to_migrate == null){
98
+	public function count_records_to_migrate() {
99
+		if ($this->_records_to_migrate == null) {
100 100
 			$this->_records_to_migrate = $this->_count_records_to_migrate();
101 101
 		}
102 102
 		return $this->_records_to_migrate;
@@ -116,9 +116,9 @@  discard block
 block discarded – undo
116 116
 	 * @return string one of EE_Data_Migration_Manager::status_* constants
117 117
 	 * @throws EE_Error
118 118
 	 */
119
-	public function get_status(){
120
-		if($this->_status === null){
121
-			throw new EE_Error(sprintf(__("Trying to get status of Migration class %s, but it has not been initialized yet. It should be set in the constructor.", "event_espresso"),get_class($this)));
119
+	public function get_status() {
120
+		if ($this->_status === null) {
121
+			throw new EE_Error(sprintf(__("Trying to get status of Migration class %s, but it has not been initialized yet. It should be set in the constructor.", "event_espresso"), get_class($this)));
122 122
 		}
123 123
 		return $this->_status;
124 124
 	}
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 	 * @param string $status
128 128
 	 * @return void
129 129
 	 */
130
-	protected function set_status($status){
130
+	protected function set_status($status) {
131 131
 		$this->_status = $status;
132 132
 	}
133 133
 	/**
@@ -139,11 +139,11 @@  discard block
 block discarded – undo
139 139
 	 * Returns the last error that occurred. If none occurred, returns null
140 140
 	 * @return string
141 141
 	 */
142
-	public function get_last_error(){
142
+	public function get_last_error() {
143 143
 		$errors = $this->get_errors();
144
-		if($errors){
144
+		if ($errors) {
145 145
 			return end($errors);
146
-		}else{
146
+		} else {
147 147
 			return null;
148 148
 		}
149 149
 	}
@@ -152,26 +152,26 @@  discard block
 block discarded – undo
152 152
 	 * @param string $error a string describing the error that will be useful for debugging. Consider including all the data that led to the error, and a stack trace etc.
153 153
 	 * @param boolean $force force the error to be added (because otherwise we have a limit). If forcing and errors are already at their limit, we will purposefully forget the first half
154 154
 	 */
155
-	public function add_error($error, $force = FALSE ){
156
-		if( ! defined( 'EE_DMS_ERROR_LIMIT' ) ){
155
+	public function add_error($error, $force = FALSE) {
156
+		if ( ! defined('EE_DMS_ERROR_LIMIT')) {
157 157
 			$limit = 50;
158
-		}else{
158
+		} else {
159 159
 			$limit = EE_DMS_ERROR_LIMIT;
160 160
 		}
161 161
 		//make sure errors is an array, see ticket #8261
162
-		if( is_string( $this->_errors ) ){
163
-			$this->_errors = array( $this->_errors );
162
+		if (is_string($this->_errors)) {
163
+			$this->_errors = array($this->_errors);
164 164
 		}
165
-		if(count($this->_errors) >= $limit ){
166
-			if( $force ){
165
+		if (count($this->_errors) >= $limit) {
166
+			if ($force) {
167 167
 				//get rid of the first half of the errors and any above the limit
168
-				$this->_errors = array_slice( $this->_errors, $limit / 2, $limit / 2 );
168
+				$this->_errors = array_slice($this->_errors, $limit / 2, $limit / 2);
169 169
 				$this->_errors[] = "Limit reached; removed first half of errors to save space";
170 170
 				$this->_errors[] = $error;
171
-			}else{
172
-				$this->_errors[ $limit ] = 'More, but limit reached...';
171
+			} else {
172
+				$this->_errors[$limit] = 'More, but limit reached...';
173 173
 			}
174
-		}else{
174
+		} else {
175 175
 			$this->_errors[] = $error;
176 176
 		}
177 177
 	}
@@ -180,57 +180,57 @@  discard block
 block discarded – undo
180 180
 	 * Indicates there was a fatal error and the migration cannot possibly continue
181 181
 	 * @return boolean
182 182
 	 */
183
-	public function is_broken(){
183
+	public function is_broken() {
184 184
 		return $this->get_status() == EE_Data_Migration_Manager::status_fatal_error;
185 185
 	}
186 186
 	/**
187 187
 	 * @deprecated since 4.6.12
188 188
 	 */
189
-	public function is_borked(){
190
-		EE_Error::doing_it_wrong('is_borked', __( 'The cheeky "is_borked" method had been replaced with the more proper "is_broken"', 'event_espresso' ), '4.6.12');
189
+	public function is_borked() {
190
+		EE_Error::doing_it_wrong('is_borked', __('The cheeky "is_borked" method had been replaced with the more proper "is_broken"', 'event_espresso'), '4.6.12');
191 191
 		return $this->is_broken();
192 192
 	}
193 193
 	/**
194 194
 	 * Sets the status to as having a fatal error
195 195
 	 */
196
-	public function set_broken(){
196
+	public function set_broken() {
197 197
 		$this->_status = EE_Data_Migration_Manager::status_fatal_error;
198 198
 	}
199 199
 	/**
200 200
 	 *
201 201
 	 * @deprecated since 4.6.12
202 202
 	 */
203
-	public function set_borked(){
204
-		EE_Error::doing_it_wrong('is_borked', __( 'The cheeky "is_borked" method had been replaced with the more proper "is_broken"', 'event_espresso' ), '4.6.12');
203
+	public function set_borked() {
204
+		EE_Error::doing_it_wrong('is_borked', __('The cheeky "is_borked" method had been replaced with the more proper "is_broken"', 'event_espresso'), '4.6.12');
205 205
 		return $this->set_broken();
206 206
 	}
207 207
 	/**
208 208
 	 * Checks if this thing believes it is completed
209 209
 	 * @return boolean
210 210
 	 */
211
-	public function is_completed(){
211
+	public function is_completed() {
212 212
 		return $this->get_status() == EE_Data_Migration_Manager::status_completed;
213 213
 	}
214 214
 	/**
215 215
 	 * Checks if the current script has more to do or not (ie, if it's status is CONTINUE)
216 216
 	 * @return boolean
217 217
 	 */
218
-	public function has_more_to_do(){
218
+	public function has_more_to_do() {
219 219
 		return $this->get_status() == EE_Data_Migration_Manager::status_continue;
220 220
 	}
221 221
 	/**
222 222
 	 * Marks that we believe this migration thing is completed
223 223
 	 */
224
-	public function set_completed(){
224
+	public function set_completed() {
225 225
 		$this->_status = EE_Data_Migration_Manager::status_completed;
226 226
 	}
227 227
 
228 228
 	/**
229 229
 	 * Marks that we think this migration class can continue to migrate
230 230
 	 */
231
-	public function reattempt(){
231
+	public function reattempt() {
232 232
 		$this->_status = EE_Data_Migration_Manager::status_continue;
233
-		$this->add_error( __( 'Reattempt migration', 'event_espresso' ), TRUE );
233
+		$this->add_error(__('Reattempt migration', 'event_espresso'), TRUE);
234 234
 	}
235 235
 
236 236
 	/**
@@ -239,8 +239,8 @@  discard block
 block discarded – undo
239 239
 	 * possible that this class is defined when it goes to sleep, but NOT available when it
240 240
 	 * awakes (eg, this class is part of an addon that is deactivated at some point).
241 241
 	 */
242
-	public function properties_as_array(){
243
-		$properties =  get_object_vars($this);
242
+	public function properties_as_array() {
243
+		$properties = get_object_vars($this);
244 244
 		$properties['class'] = get_class($this);
245 245
 		unset($properties['_migration_script']);
246 246
 		return $properties;
@@ -261,22 +261,22 @@  discard block
 block discarded – undo
261 261
 	 * @param array $data_types numerically indexed
262 262
 	 * @return string
263 263
 	 */
264
-	protected function _create_error_message_for_db_insertion($old_table, $old_row_as_array, $new_table, $new_row_as_array, $data_types){
264
+	protected function _create_error_message_for_db_insertion($old_table, $old_row_as_array, $new_table, $new_row_as_array, $data_types) {
265 265
 		global $wpdb;
266 266
 		$old_columns_and_values_for_string = array();
267
-		foreach($old_row_as_array as $column => $value){
267
+		foreach ($old_row_as_array as $column => $value) {
268 268
 			$old_columns_and_values_for_string[] = "$column => $value";
269 269
 		}
270 270
 		$new_columns_and_values_for_string = array();
271 271
 		$count = 0;
272
-		foreach($new_row_as_array as $column => $value){
272
+		foreach ($new_row_as_array as $column => $value) {
273 273
 			$new_columns_and_values_for_string[] = " $column => $value (".$data_types[$count++].")";
274 274
 		}
275 275
 		return sprintf(
276 276
 			__('Received error "%6$s" inserting row %5$s %1$s %5$s into table %2$s.%5$s Data used was %5$s %3$s %5$s from table %4%s.', "event_espresso"),
277
-			implode(", ",$new_columns_and_values_for_string),
277
+			implode(", ", $new_columns_and_values_for_string),
278 278
 			$new_table,
279
-			implode(", ",$old_columns_and_values_for_string),
279
+			implode(", ", $old_columns_and_values_for_string),
280 280
 			$old_table,
281 281
 			'<br/>',
282 282
 			$wpdb->last_error
@@ -291,12 +291,12 @@  discard block
 block discarded – undo
291 291
 	* @param array $array_of_data
292 292
 	* @return string
293 293
 	*/
294
-	protected function _json_encode($array_of_data){
294
+	protected function _json_encode($array_of_data) {
295 295
 		//we'd rather NOT serialize the transaction details
296 296
 		$fields_to_include = array();
297
-		foreach($array_of_data as $name => $value){
297
+		foreach ($array_of_data as $name => $value) {
298 298
 			$unserialized_data = @unserialize($value);
299
-			if($unserialized_data === FALSE){
299
+			if ($unserialized_data === FALSE) {
300 300
 				$fields_to_include[$name] = $value;
301 301
 			}
302 302
 		}
@@ -309,13 +309,13 @@  discard block
 block discarded – undo
309 309
 	 * @throws EE_Error
310 310
 	 */
311 311
 	protected function _get_table_manager() {
312
-		if( $this->_table_manager instanceof TableManager ) {
312
+		if ($this->_table_manager instanceof TableManager) {
313 313
 			return $this->_table_manager;
314 314
 		} else {
315 315
 			throw new EE_Error( 
316 316
 				sprintf( 
317
-					__( 'Table manager on migration class %1$s is not set properly.', 'event_espresso'), 
318
-					get_class( $this ) 
317
+					__('Table manager on migration class %1$s is not set properly.', 'event_espresso'), 
318
+					get_class($this) 
319 319
 				) 	
320 320
 			);
321 321
 		}
@@ -327,13 +327,13 @@  discard block
 block discarded – undo
327 327
 	 * @throws EE_Error
328 328
 	 */
329 329
 	protected function _get_table_analysis() {
330
-		if( $this->_table_analysis instanceof TableAnalysis ) {
330
+		if ($this->_table_analysis instanceof TableAnalysis) {
331 331
 			return $this->_table_analysis;
332 332
 		} else {
333 333
 			throw new EE_Error( 
334 334
 				sprintf( 
335
-					__( 'Table analysis class on migration class %1$s is not set properly.', 'event_espresso'), 
336
-					get_class( $this ) 
335
+					__('Table analysis class on migration class %1$s is not set properly.', 'event_espresso'), 
336
+					get_class($this) 
337 337
 				) 
338 338
 			);
339 339
 		}
Please login to merge, or discard this patch.
admin_pages/about/About_Admin_Page.core.php 2 patches
Braces   +5 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  *
@@ -152,8 +153,9 @@  discard block
 block discarded – undo
152 153
 		$done_step_three = EE_Registry::instance()->load_model('Event')->count() > 0 ? TRUE : FALSE;
153 154
 
154 155
 		//if ALL steps are done, let's just return FALSE so we don't display anything
155
-		if ( $done_step_one && $done_step_two && $done_step_three )
156
-			return FALSE;
156
+		if ( $done_step_one && $done_step_two && $done_step_three ) {
157
+					return FALSE;
158
+		}
157 159
 
158 160
 		//now let's put it together
159 161
 		$steps .= sprintf( '%s' . $step_one . '%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>': '' );
Please login to merge, or discard this patch.
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 /**
@@ -117,11 +117,11 @@  discard block
 block discarded – undo
117 117
 		//Copied from _whats_new()
118 118
 		$steps = EE_Maintenance_Mode::instance()->level() != EE_Maintenance_Mode::level_2_complete_maintenance ? $this->_get_started_steps() : FALSE;
119 119
 		$steps = $steps !== FALSE ? $steps : '';
120
-		$this->_admin_page_title = sprintf( __('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
120
+		$this->_admin_page_title = sprintf(__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION);
121 121
 		$settings_message = $steps;
122
-		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso' ) . $settings_message;
123
-		$template = EE_ABOUT_TEMPLATE_PATH . 'ee4-overview.template.php';
124
-		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
122
+		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso').$settings_message;
123
+		$template = EE_ABOUT_TEMPLATE_PATH.'ee4-overview.template.php';
124
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
125 125
 		$this->display_about_admin_page();
126 126
 	}
127 127
 
@@ -129,36 +129,36 @@  discard block
 block discarded – undo
129 129
 
130 130
 	protected function _get_started_steps() {
131 131
 		$steps = '<h2>'.__('Getting Started').'</h2>';
132
-		$step_one = '<p>'.sprintf( __('%sStep 1%s: Visit your %sOrganization Settings%s and add/update your details.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_general_settings">', '</a>') .'</strong></p>';
133
-		$step_two = '<p>'.sprintf( __('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_payment_settings">', '</a>') .'</strong></p>';
134
-		$step_three = '<p>'.sprintf( __('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_events&action=create_new">', '</a>') .'</strong></p>';
132
+		$step_one = '<p>'.sprintf(__('%sStep 1%s: Visit your %sOrganization Settings%s and add/update your details.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_general_settings">', '</a>').'</strong></p>';
133
+		$step_two = '<p>'.sprintf(__('%sStep 2%s: Setup your %sPayment Methods%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_payment_settings">', '</a>').'</strong></p>';
134
+		$step_three = '<p>'.sprintf(__('%sStep 3%s: Create your %sFirst Event%s.', 'event_espresso'), '<strong>', '</strong>', '<a href="admin.php?page=espresso_events&action=create_new">', '</a>').'</strong></p>';
135 135
 
136 136
 		//done?
137 137
 		$done_step_one = EE_Registry::instance()->CFG->organization->address_1 == '123 Onna Road' ? FALSE : TRUE;
138
-		$active_invoice_pm = EEM_Payment_Method::instance()->get_one_active( EEM_Payment_Method::scope_cart, array( array( 'PMD_type' => 'Invoice' ) ) );
139
-		$active_pms_count = EEM_Payment_Method::instance()->count_active( EEM_Payment_Method::scope_cart );
138
+		$active_invoice_pm = EEM_Payment_Method::instance()->get_one_active(EEM_Payment_Method::scope_cart, array(array('PMD_type' => 'Invoice')));
139
+		$active_pms_count = EEM_Payment_Method::instance()->count_active(EEM_Payment_Method::scope_cart);
140 140
 		//done step two if a non-invoice paymetn method is active; or there is more than one PM active, or
141 141
 		//if only the invoice is active but it's clearly been updated
142
-		$done_step_two = $active_pms_count > 1  ||
143
-						 ( $active_pms_count === 1 && ! $active_invoice_pm )	||
144
-						 ( $active_invoice_pm instanceof EE_Payment_Method && (
145
-								 $active_invoice_pm->get_extra_meta( 'pdf_payee_name', TRUE, '' ) ||
146
-								 $active_invoice_pm->get_extra_meta( 'pdf_payee_email', TRUE, '' ) ||
147
-								 $active_invoice_pm->get_extra_meta( 'pdf_payee_tax_number', TRUE, '' ) ||
148
-								 $active_invoice_pm->get_extra_meta( 'pdf_payee_address', TRUE, '' ) ||
149
-								 $active_invoice_pm->get_extra_meta( 'page_extra_info', TRUE, '' )
142
+		$done_step_two = $active_pms_count > 1 ||
143
+						 ($active_pms_count === 1 && ! $active_invoice_pm) ||
144
+						 ($active_invoice_pm instanceof EE_Payment_Method && (
145
+								 $active_invoice_pm->get_extra_meta('pdf_payee_name', TRUE, '') ||
146
+								 $active_invoice_pm->get_extra_meta('pdf_payee_email', TRUE, '') ||
147
+								 $active_invoice_pm->get_extra_meta('pdf_payee_tax_number', TRUE, '') ||
148
+								 $active_invoice_pm->get_extra_meta('pdf_payee_address', TRUE, '') ||
149
+								 $active_invoice_pm->get_extra_meta('page_extra_info', TRUE, '')
150 150
 								)
151 151
 				);
152 152
 		$done_step_three = EE_Registry::instance()->load_model('Event')->count() > 0 ? TRUE : FALSE;
153 153
 
154 154
 		//if ALL steps are done, let's just return FALSE so we don't display anything
155
-		if ( $done_step_one && $done_step_two && $done_step_three )
155
+		if ($done_step_one && $done_step_two && $done_step_three)
156 156
 			return FALSE;
157 157
 
158 158
 		//now let's put it together
159
-		$steps .= sprintf( '%s' . $step_one . '%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>': '' );
160
-		$steps .= sprintf( '%s' . $step_two . '%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>': '' );
161
-		$steps .= sprintf( '%s' . $step_three . '%s', $done_step_three ? '<strike>' : '', $done_step_three ? '</strike>': '' );
159
+		$steps .= sprintf('%s'.$step_one.'%s', $done_step_one ? '<strike>' : '', $done_step_one ? '</strike>' : '');
160
+		$steps .= sprintf('%s'.$step_two.'%s', $done_step_two ? '<strike>' : '', $done_step_two ? '</strike>' : '');
161
+		$steps .= sprintf('%s'.$step_three.'%s', $done_step_three ? '<strike>' : '', $done_step_three ? '</strike>' : '');
162 162
 
163 163
 		return $steps;
164 164
 	}
@@ -166,10 +166,10 @@  discard block
 block discarded – undo
166 166
 
167 167
 
168 168
 	protected function _credits() {
169
-		$this->_template_args['admin_page_title'] = sprintf( __('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION );
169
+		$this->_template_args['admin_page_title'] = sprintf(__('Welcome to Event Espresso %s', 'event_espresso'), EVENT_ESPRESSO_VERSION);
170 170
 		$this->_template_args['admin_page_subtitle'] = __('Thank you for choosing Event Espresso Decaf, the most powerful, and free, Event Management plugin for WordPress.', 'event_espresso');
171
-		$template = EE_ABOUT_TEMPLATE_PATH . 'credits.template.php';
172
-		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template( $template, $this->_template_args, TRUE );
171
+		$template = EE_ABOUT_TEMPLATE_PATH.'credits.template.php';
172
+		$this->_template_args['about_admin_page_content'] = EEH_Template::display_template($template, $this->_template_args, TRUE);
173 173
 		$this->display_about_admin_page();
174 174
 	}
175 175
 
Please login to merge, or discard this patch.
admin_pages/about/About_Admin_Page_Init.core.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -30,12 +30,12 @@  discard block
 block discarded – undo
30 30
 
31 31
 	public function __construct() {
32 32
 		//define some events related constants
33
-		define( 'EE_ABOUT_PG_SLUG', 'espresso_about' );
34
-		define( 'EE_ABOUT_LABEL', __('About', 'event_espresso'));
35
-		define( 'EE_ABOUT_ADMIN', EE_ADMIN_PAGES . 'about' . DS );
36
-		define( 'EE_ABOUT_ADMIN_URL', admin_url( 'admin.php?page=' . EE_ABOUT_PG_SLUG ));
37
-		define( 'EE_ABOUT_TEMPLATE_PATH', EE_ABOUT_ADMIN . 'templates' . DS );
38
-		define( 'EE_ABOUT_ASSETS_URL', EE_ADMIN_PAGES_URL . 'about/assets/' );
33
+		define('EE_ABOUT_PG_SLUG', 'espresso_about');
34
+		define('EE_ABOUT_LABEL', __('About', 'event_espresso'));
35
+		define('EE_ABOUT_ADMIN', EE_ADMIN_PAGES.'about'.DS);
36
+		define('EE_ABOUT_ADMIN_URL', admin_url('admin.php?page='.EE_ABOUT_PG_SLUG));
37
+		define('EE_ABOUT_TEMPLATE_PATH', EE_ABOUT_ADMIN.'templates'.DS);
38
+		define('EE_ABOUT_ASSETS_URL', EE_ADMIN_PAGES_URL.'about/assets/');
39 39
 		parent::__construct();
40 40
 	}
41 41
 
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 	}
45 45
 
46 46
 	protected function _set_menu_map() {
47
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
47
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
48 48
 			'menu_group' => 'extras',
49 49
 			'menu_order' => 40,
50 50
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_AND_NETWORK_ADMIN,
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
 /**
3 5
  * Event Espresso
4 6
  *
Please login to merge, or discard this patch.
admin_pages/about/templates/ee4-overview.template.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@  discard block
 block discarded – undo
1 1
 <div class="changelog">
2 2
 	<?php
3 3
 	//maintenance mode on?
4
-	if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) {
4
+	if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
5 5
 		?>
6 6
 		<div class="ee-attention">
7
-			<h2 class="ee-maintenance-mode-callout"><?php  _e('Event Espresso is in full maintenance mode.' , 'event_espresso'); ?></h2>
7
+			<h2 class="ee-maintenance-mode-callout"><?php  _e('Event Espresso is in full maintenance mode.', 'event_espresso'); ?></h2>
8 8
 			<p>
9 9
 				<?php
10 10
 				printf(
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 			<h3><?php _e('Turn your blog into a complete event registration and management system', 'event_espresso'); ?></h3>
83 83
 			<p><?php _e('Create a beautiful event page with ticket selection, venue details, and an integrated single page checkout system. With WordPress, Event Espresso, and Espresso Arabica 2014 (based on the "Twenty Fourteen" theme by WordPress), your events will certainly sell out faster than ever!', 'event_espresso'); ?></p>
84 84
 			<p><?php _e('With a striking design that does not compromise the simplicity of WordPress and Event Espresso 4, Espresso Arabica 2014 will be the best event theme on the market.', 'event_espresso'); ?></p>
85
-			<p><?php echo sprintf( __('%sLearn more >>%s', 'event_espresso'), '<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">', '</a>' ); ?></p>
85
+			<p><?php echo sprintf(__('%sLearn more >>%s', 'event_espresso'), '<a href="http://eventespresso.com/wiki/setup-event-espresso-arabica-theme/">', '</a>'); ?></p>
86 86
 		</div>
87 87
 	</div>
88 88
 	<img src="<?php echo EE_GLOBAL_ASSETS_URL; ?>images/screenshots/single-event-page.jpg">
Please login to merge, or discard this patch.
admin_pages/about/templates/whats_new.template.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,25 +1,25 @@
 block discarded – undo
1 1
 <div class="changelog point-releases">
2
-	<h3><?php echo _n( 'Minor Release Information', 'Minor Releases', 1 ); ?></h3>
3
-	<!-- <h3><?php echo _n( 'Major Release Information', 'Major Releases', 1 ); ?></h3>-->
2
+	<h3><?php echo _n('Minor Release Information', 'Minor Releases', 1); ?></h3>
3
+	<!-- <h3><?php echo _n('Major Release Information', 'Major Releases', 1); ?></h3>-->
4 4
 	<?php $type = 'minor'; ?>
5 5
 	<?php //$type = 'major'; ?>
6
-	<p><?php printf( __( '<strong>Version %1$s</strong> is a %2$s bug fix/enhancement release.', 'event_espresso'), EVENT_ESPRESSO_VERSION, $type ); ?>
6
+	<p><?php printf(__('<strong>Version %1$s</strong> is a %2$s bug fix/enhancement release.', 'event_espresso'), EVENT_ESPRESSO_VERSION, $type); ?>
7 7
 		<?php
8
-			$ver = explode( '.', EVENT_ESPRESSO_VERSION );
9
-			array_pop( $ver );
10
-			$ver = implode( '.', $ver );
8
+			$ver = explode('.', EVENT_ESPRESSO_VERSION);
9
+			array_pop($ver);
10
+			$ver = implode('.', $ver);
11 11
 		?>
12
-		<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://eventespresso.com/wiki/ee4-changelog/#' . $ver ); ?>
12
+		<?php printf(__('For more information, see <a href="%s">the release notes</a>.'), 'http://eventespresso.com/wiki/ee4-changelog/#'.$ver); ?>
13 13
  	</p>
14 14
 </div>
15 15
 
16 16
 <div class="changelog">
17 17
 	<?php
18 18
 	//maintenance mode on?
19
-	if ( EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance ) {
19
+	if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
20 20
 		?>
21 21
 		<div class="ee-attention">
22
-			<h2 class="ee-maintenance-mode-callout"><?php  _e('Event Espresso is in full maintenance mode.' , 'event_espresso'); ?></h2>
22
+			<h2 class="ee-maintenance-mode-callout"><?php  _e('Event Espresso is in full maintenance mode.', 'event_espresso'); ?></h2>
23 23
 			<p>
24 24
 			<?php
25 25
 				printf(
Please login to merge, or discard this patch.
admin_pages/events/Event_Categories_Admin_List_Table.class.php 2 patches
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 /**
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 
32 32
 class Event_Categories_Admin_List_Table extends EE_Admin_List_Table {
33 33
 
34
-	public function __construct( $admin_page ) {
34
+	public function __construct($admin_page) {
35 35
 		parent::__construct($admin_page);
36 36
 	}
37 37
 
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
 
40 40
 
41 41
 	protected function _setup_data() {
42
-		$this->_data = $this->_admin_page->get_categories( $this->_per_page, $this->_current_page);
43
-		$this->_all_data_count = EEM_Term_Taxonomy::instance()->count( array( array( 'taxonomy' => 'espresso_event_categories' ) ) );
42
+		$this->_data = $this->_admin_page->get_categories($this->_per_page, $this->_current_page);
43
+		$this->_all_data_count = EEM_Term_Taxonomy::instance()->count(array(array('taxonomy' => 'espresso_event_categories')));
44 44
 	}
45 45
 
46 46
 
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
 
50 50
 	protected function _set_properties() {
51 51
 		$this->_wp_list_args = array(
52
-			'singular' => __('event category', 'event_espresso' ),
53
-			'plural' => __('event categories', 'event_espresso' ),
52
+			'singular' => __('event category', 'event_espresso'),
53
+			'plural' => __('event categories', 'event_espresso'),
54 54
 			'ajax' => TRUE, //for now,
55 55
 			'screen' => $this->_admin_page->get_current_screen()->id
56 56
 			);
@@ -64,9 +64,9 @@  discard block
 block discarded – undo
64 64
 			);
65 65
 
66 66
 		$this->_sortable_columns = array(
67
-			'id' => array( 'Term.term_id' => true ),
68
-			'name' => array( 'Term.slug' => false ),
69
-			'count' => array( 'term_count' => false )
67
+			'id' => array('Term.term_id' => true),
68
+			'name' => array('Term.slug' => false),
69
+			'count' => array('term_count' => false)
70 70
 			);
71 71
 
72 72
 		$this->_primary_column = 'id';
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 
99 99
 
100 100
 	public function column_cb($item) {
101
-		return sprintf( '<input type="checkbox" name="EVT_CAT_ID[]" value="%s" />', $item->get('term_id') );
101
+		return sprintf('<input type="checkbox" name="EVT_CAT_ID[]" value="%s" />', $item->get('term_id'));
102 102
 	}
103 103
 
104 104
 
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
 
108 108
 	public function column_id($item) {
109 109
 		$content = $item->get('term_id');
110
-		$content .= '  <span class="show-on-mobile-view-only">' . $item->get_first_related('Term')->get('name') . '</span>';
110
+		$content .= '  <span class="show-on-mobile-view-only">'.$item->get_first_related('Term')->get('name').'</span>';
111 111
 		return $content;
112 112
 	}
113 113
 
@@ -127,17 +127,17 @@  discard block
 block discarded – undo
127 127
 			'EVT_CAT_ID' => $item->get('term_id')
128 128
 		);
129 129
 
130
-		$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EVENTS_ADMIN_URL );
131
-		$delete_link = EE_Admin_Page::add_query_args_and_nonce( $delete_query_args, EVENTS_ADMIN_URL );
130
+		$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EVENTS_ADMIN_URL);
131
+		$delete_link = EE_Admin_Page::add_query_args_and_nonce($delete_query_args, EVENTS_ADMIN_URL);
132 132
 
133 133
 		$actions = array(
134
-			'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Category', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>'
134
+			'edit' => '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Category', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>'
135 135
 			);
136 136
 
137 137
 
138
-		$actions['delete'] = '<a href="' . $delete_link . '" title="' . esc_attr__('Delete Category', 'event_espresso') . '">' . __('Delete', 'event_espresso') . '</a>';
138
+		$actions['delete'] = '<a href="'.$delete_link.'" title="'.esc_attr__('Delete Category', 'event_espresso').'">'.__('Delete', 'event_espresso').'</a>';
139 139
 
140
-		$content = '<strong><a class="row-title" href="' . $edit_link . '">' . $item->get_first_related('Term')->get('name') . '</a></strong>';
140
+		$content = '<strong><a class="row-title" href="'.$edit_link.'">'.$item->get_first_related('Term')->get('name').'</a></strong>';
141 141
 		$content .= $this->row_actions($actions);
142 142
 		return $content;
143 143
 	}
@@ -146,20 +146,20 @@  discard block
 block discarded – undo
146 146
 
147 147
 
148 148
 	public function column_shortcode($item) {
149
-		$content = '[ESPRESSO_EVENTS category_slug=' . $item->get_first_related('Term')->get('slug') . ']';
149
+		$content = '[ESPRESSO_EVENTS category_slug='.$item->get_first_related('Term')->get('slug').']';
150 150
 		return $content;
151 151
 	}
152 152
 
153 153
 
154 154
 
155 155
 
156
-	public function column_count( $item ) {
156
+	public function column_count($item) {
157 157
 		$e_args = array(
158 158
 			'action' => 'default',
159 159
 			'EVT_CAT' => $item->get_first_related('Term')->ID()
160 160
 			);
161
-		$e_link = EE_Admin_Page::add_query_args_and_nonce( $e_args, EVENTS_ADMIN_URL );
162
-		$content = '<a href="' . $e_link . '">' . $item->get('term_count') . '</a>';
161
+		$e_link = EE_Admin_Page::add_query_args_and_nonce($e_args, EVENTS_ADMIN_URL);
162
+		$content = '<a href="'.$e_link.'">'.$item->get('term_count').'</a>';
163 163
 		return $content;
164 164
 	}
165 165
 }
Please login to merge, or discard this patch.
admin_pages/events/Events_Admin_Page_Init.core.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -33,13 +33,13 @@  discard block
 block discarded – undo
33 33
 		 * define some events related constants but only if not defined (need to check because unit tests
34 34
 		 *  may load)
35 35
 		 */
36
-		if ( ! defined( 'EVENTS_PG_SLUG' ) ) {
37
-			define( 'EVENTS_PG_SLUG', 'espresso_events' );
38
-			define( 'EVENTS_LABEL', __('Events', 'event_espresso'));
39
-			define( 'EVENTS_ADMIN', EE_ADMIN_PAGES . 'events' . DS );
40
-			define( 'EVENTS_ADMIN_URL', admin_url( 'admin.php?page=' . EVENTS_PG_SLUG ));
41
-			define( 'EVENTS_TEMPLATE_PATH', EVENTS_ADMIN . 'templates' . DS );
42
-			define( 'EVENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'events/assets/' );
36
+		if ( ! defined('EVENTS_PG_SLUG')) {
37
+			define('EVENTS_PG_SLUG', 'espresso_events');
38
+			define('EVENTS_LABEL', __('Events', 'event_espresso'));
39
+			define('EVENTS_ADMIN', EE_ADMIN_PAGES.'events'.DS);
40
+			define('EVENTS_ADMIN_URL', admin_url('admin.php?page='.EVENTS_PG_SLUG));
41
+			define('EVENTS_TEMPLATE_PATH', EVENTS_ADMIN.'templates'.DS);
42
+			define('EVENTS_ASSETS_URL', EE_ADMIN_PAGES_URL.'events/assets/');
43 43
 		}
44 44
 		parent::__construct();
45 45
 	}
@@ -49,7 +49,7 @@  discard block
 block discarded – undo
49 49
 	}
50 50
 
51 51
 	protected function _set_menu_map() {
52
-		$this->_menu_map = new EE_Admin_Page_Main_Menu( array(
52
+		$this->_menu_map = new EE_Admin_Page_Main_Menu(array(
53 53
 			'menu_group' => 'main',
54 54
 			'menu_order' => 10,
55 55
 			'subtitle' => __('Events', 'event_espresso'),
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
 /**
3 5
  * Event Espresso
4 6
  *
Please login to merge, or discard this patch.
admin_pages/events/help_tabs/general_settings_templates.help_tab.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@
 block discarded – undo
33 33
 </li>
34 34
 <li>
35 35
 <strong><?php _e('Display Descriptions', 'event_espresso'); ?></strong><br />
36
-<?php printf( __('Whether descriptions should be shown on the event list page.%sSelecting "none" will NOT display any of the text content you entered into the main text editor on the event admin page.%sSelecting "excerpt" will display the text you entered into the "Excerpt" textarea on the event admin page, OR, any text in the main text editor above the "' . htmlentities( '<!--more-->' ) . '" tag.%sSelecting "full description" will display ALL of the text content you entered into the main text editor on the event admin page.', 'event_espresso'), '<br/>', '<br/>', '<br/>' );?>
36
+<?php printf(__('Whether descriptions should be shown on the event list page.%sSelecting "none" will NOT display any of the text content you entered into the main text editor on the event admin page.%sSelecting "excerpt" will display the text you entered into the "Excerpt" textarea on the event admin page, OR, any text in the main text editor above the "'.htmlentities('<!--more-->').'" tag.%sSelecting "full description" will display ALL of the text content you entered into the main text editor on the event admin page.', 'event_espresso'), '<br/>', '<br/>', '<br/>'); ?>
37 37
 </li>
38 38
 <li>
39 39
 <strong><?php _e('Display Ticket Selector', 'event_espresso'); ?></strong><br />
Please login to merge, or discard this patch.