Completed
Branch BUG-5580-mike-implementation (468206)
by
unknown
312:06 queued 299:08
created
payments/help_tabs/payment_methods_overview_mijireh.help_tab.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,10 +2,10 @@
 block discarded – undo
2 2
 <?php _e('Mijireh Gateway', 'event_espresso'); ?>
3 3
 </h3>
4 4
 <p>
5
-<?php printf(__('Mijireh is basically a middle-man between Event Espresso and over 90 payment gateways. Most of the configuration occurs on %sMijireh\' website%s, where you configure your Mijireh store with the %spayment gateway of your choice%s.', 'event_espresso'),'<a href="http://www.mijireh.com/">','</a>','<a href="http://www.mijireh.com/docs/payment-gateways/">','</a>'); ?>
5
+<?php printf(__('Mijireh is basically a middle-man between Event Espresso and over 90 payment gateways. Most of the configuration occurs on %sMijireh\' website%s, where you configure your Mijireh store with the %spayment gateway of your choice%s.', 'event_espresso'), '<a href="http://www.mijireh.com/">', '</a>', '<a href="http://www.mijireh.com/docs/payment-gateways/">', '</a>'); ?>
6 6
 </p>
7 7
 <h3><?php _e('Mijireh Checkout Page Design', 'event_espresso'); ?></h3>
8 8
 <p>
9
-<?php _e("As you're probably aware, when users pay with Mijireh Gateway, they are taken to a secure offsite page, hosted by Mijireh. This page can easily be made to have the look-and-feel of your website through a process called 'slurping', where Mijireh 'slurps' up your website's design and uses it on their checkout page. ", 'event_espresso');?>
10
-<?php printf(__("In order to do this, we automatically create a new WordPress page which is design to be slurped by Mijireh. You can customize the page like any other, but the page must contain Mijireh's special '{{mijireh-checkout-form}}' shortcode. Once you have finished designing the page, publish it, and %s then click the special 'slurp now' button%s. Mijireh may take several minutes to slurp the page. Once Mijireh is finished slurping, you can delete the page, or mark it as a draft. ", 'event_espresso'),'<a href="https://docs.google.com/a/eventespresso.com/file/d/0B5P8GXTvZgfMdjREYUtGM18wSms/edit?usp=drivesdk">','</a>');?>
9
+<?php _e("As you're probably aware, when users pay with Mijireh Gateway, they are taken to a secure offsite page, hosted by Mijireh. This page can easily be made to have the look-and-feel of your website through a process called 'slurping', where Mijireh 'slurps' up your website's design and uses it on their checkout page. ", 'event_espresso'); ?>
10
+<?php printf(__("In order to do this, we automatically create a new WordPress page which is design to be slurped by Mijireh. You can customize the page like any other, but the page must contain Mijireh's special '{{mijireh-checkout-form}}' shortcode. Once you have finished designing the page, publish it, and %s then click the special 'slurp now' button%s. Mijireh may take several minutes to slurp the page. Once Mijireh is finished slurping, you can delete the page, or mark it as a draft. ", 'event_espresso'), '<a href="https://docs.google.com/a/eventespresso.com/file/d/0B5P8GXTvZgfMdjREYUtGM18wSms/edit?usp=drivesdk">', '</a>'); ?>
11 11
 </p>
12 12
\ No newline at end of file
Please login to merge, or discard this patch.
payments/help_tours/Payment_Methods_Selection_Help_Tour.class.php 2 patches
Spacing   +6 added lines, -6 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
 /**
@@ -68,21 +68,21 @@  discard block
 block discarded – undo
68 68
 
69 69
 
70 70
 	protected function _start() {
71
-		$content = '<h3>' . __('Payment Methods', 'event_espresso') . '</h3>';
72
-		$content .= '<p>' . __('This tour of the Payment Methods page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
71
+		$content = '<h3>'.__('Payment Methods', 'event_espresso').'</h3>';
72
+		$content .= '<p>'.__('This tour of the Payment Methods page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
73 73
 		return $content;
74 74
 	}
75 75
 
76 76
 	protected function _gateway_links_stop() {
77
-		return '<p>' . __('Available payment methods are shown here. Clicking on a payment method will provide you with an option to activate that payment gateway.', 'event_espresso') . '</p>';
77
+		return '<p>'.__('Available payment methods are shown here. Clicking on a payment method will provide you with an option to activate that payment gateway.', 'event_espresso').'</p>';
78 78
 	}
79 79
 
80 80
 	protected function _gateway_settings_metabox_stop() {
81
-		return '<p>' . __('A payment gateway must first be enabled. You will then be able to configure the payment gateway. Be sure to save settings after configuring your payment gateway.', 'event_espresso') . '</p>';
81
+		return '<p>'.__('A payment gateway must first be enabled. You will then be able to configure the payment gateway. Be sure to save settings after configuring your payment gateway.', 'event_espresso').'</p>';
82 82
 	}
83 83
 
84 84
 	protected function _end_tour_stop() {
85
-		return '<p>' . __('After configuring your payment gateway, go to the Event Editor to create your first event with Event Espresso.', 'event_espresso') . '</p>';
85
+		return '<p>'.__('After configuring your payment gateway, go to the Event Editor to create your first event with Event Espresso.', 'event_espresso').'</p>';
86 86
 	}
87 87
 
88 88
 }
89 89
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,8 +6,9 @@
 block discarded – undo
6 6
  * @package Event Espresso
7 7
  * @subpackage messages
8 8
  */
9
-if (!defined('EVENT_ESPRESSO_VERSION') )
9
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
10 10
 	exit('NO direct script access allowed');
11
+}
11 12
 
12 13
 /**
13 14
  *
Please login to merge, or discard this patch.
payments/help_tours/Payment_Methods_Settings_Help_Tour.class.php 2 patches
Spacing   +4 added lines, -4 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
 /**
@@ -53,12 +53,12 @@  discard block
 block discarded – undo
53 53
 
54 54
 
55 55
 	protected function _start() {
56
-		$content = '<h3>' . __('Payment Settings', 'event_espresso') . '</h3>';
57
-		$content .= '<p>' . __('This tour of the Payment Settings page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso') . '</p>';
56
+		$content = '<h3>'.__('Payment Settings', 'event_espresso').'</h3>';
57
+		$content .= '<p>'.__('This tour of the Payment Settings page will go over different areas of the screen to help you understand what they are used for.', 'event_espresso').'</p>';
58 58
 		return $content;
59 59
 	}
60 60
 
61 61
 	protected function _show_pending_options_stop() {
62
-		return '<p>' . __('Specify whether to provide your registrants with the option to retry payments.', 'event_espresso') . '</p>';
62
+		return '<p>'.__('Specify whether to provide your registrants with the option to retry payments.', 'event_espresso').'</p>';
63 63
 	}
64 64
 }
65 65
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,8 +6,9 @@
 block discarded – undo
6 6
  * @package Event Espresso
7 7
  * @subpackage messages
8 8
  */
9
-if (!defined('EVENT_ESPRESSO_VERSION') )
9
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
10 10
 	exit('NO direct script access allowed');
11
+}
11 12
 
12 13
 /**
13 14
  *
Please login to merge, or discard this patch.
admin_pages/payments/templates/payment_log_details.template.php 3 patches
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -3,27 +3,27 @@
 block discarded – undo
3 3
 if (!defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 /**
6
- * Event Espresso
7
- *
8
- * Event Registration and Management Plugin for WordPress
9
- *
10
- * @ package			Event Espresso
11
- * @ author			Seth Shoultes
12
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
13
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
14
- * @ link					http://www.eventespresso.com
15
- * @ version		 	4.3
16
- *
17
- * ------------------------------------------------------------------------
18
- *
19
- * payment_log_details
20
- *
21
- * @package			Event Espresso
22
- * @subpackage
23
- * @author				Mike Nelson
24
- *
25
- * ------------------------------------------------------------------------
26
- */
6
+	 * Event Espresso
7
+	 *
8
+	 * Event Registration and Management Plugin for WordPress
9
+	 *
10
+	 * @ package			Event Espresso
11
+	 * @ author			Seth Shoultes
12
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
13
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
14
+	 * @ link					http://www.eventespresso.com
15
+	 * @ version		 	4.3
16
+	 *
17
+	 * ------------------------------------------------------------------------
18
+	 *
19
+	 * payment_log_details
20
+	 *
21
+	 * @package			Event Espresso
22
+	 * @subpackage
23
+	 * @author				Mike Nelson
24
+	 *
25
+	 * ------------------------------------------------------------------------
26
+	 */
27 27
 /*@var EE_Change_Log $payment_Log */
28 28
 /*@var EE_Payment_Method $payment_Method*/
29 29
 /*@var EE_Transaction $transaction*/
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 /**
6 6
  * Event Espresso
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
 					</label>
62 62
 				</th>
63 63
 				<td>
64
-					<?php echo $transaction ? $transaction->ID() : __("Could not be determined", 'event_espresso');?>
64
+					<?php echo $transaction ? $transaction->ID() : __("Could not be determined", 'event_espresso'); ?>
65 65
 
66 66
 				</td>
67 67
 			</tr>
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
 					</label>
73 73
 				</th>
74 74
 				<td>
75
-					<?php echo $payment_log->e('LOG_message','as_table');//EEH_Template::layout_array_as_table($payment_log->content())?>
75
+					<?php echo $payment_log->e('LOG_message', 'as_table'); //EEH_Template::layout_array_as_table($payment_log->content())?>
76 76
 				</td>
77 77
 			</tr>
78 78
 		</tbody>
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION'))
3
+if (!defined('EVENT_ESPRESSO_VERSION')) {
4 4
 	exit('No direct script access allowed');
5
+}
5 6
 /**
6 7
  * Event Espresso
7 8
  *
Please login to merge, or discard this patch.
admin_pages/payments/templates/payment_method_activate.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,7 +14,7 @@
 block discarded – undo
14 14
 				<td>
15 15
 					
16 16
 					<a id="activate_<?php echo $payment_method->slug()?>" class="espresso-button-green button-primary" href="<?php echo $activate_url?>">
17
-						<?php printf(__("Activate %s Payment Method?", "event_espresso"),$payment_method->admin_name()); ?>
17
+						<?php printf(__("Activate %s Payment Method?", "event_espresso"), $payment_method->admin_name()); ?>
18 18
 					</a>
19 19
 				</td>
20 20
 			</tr>
Please login to merge, or discard this patch.
admin_pages/payments/templates/payment_settings.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -9,7 +9,7 @@
 block discarded – undo
9 9
 					</label>
10 10
 				</th>
11 11
 				<td>
12
-					<?php echo EEH_Form_Fields::select_input('show_pending_payment_options', $values, $show_pending_payment_options ); ?>
12
+					<?php echo EEH_Form_Fields::select_input('show_pending_payment_options', $values, $show_pending_payment_options); ?>
13 13
 
14 14
 				</td>
15 15
 			</tr>
Please login to merge, or discard this patch.
admin_pages/registration_form/Registration_Form_Admin_Page.core.php 3 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 					),
140 140
 				'list_table' => 'Registration_Form_Questions_Admin_List_Table',
141 141
 				'metaboxes' => $this->_default_espresso_metaboxes,
142
-                'help_tabs' => array(
142
+				'help_tabs' => array(
143 143
 					'registration_form_questions_overview_help_tab' => array(
144 144
 						'title' => __('Questions Overview', 'event_espresso'),
145 145
 						'filename' => 'registration_form_questions_overview'
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
 						'filename' => 'registration_form_edit_question'
191 191
 						),
192 192
 					),
193
-                'help_tour' => array( 'Registration_Form_Edit_Question_Help_Tour'),
193
+				'help_tour' => array( 'Registration_Form_Edit_Question_Help_Tour'),
194 194
 				'require_nonce' => FALSE
195 195
 				),
196 196
 			);
Please login to merge, or discard this patch.
Spacing   +135 added lines, -135 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
 /**
@@ -58,12 +58,12 @@  discard block
 block discarded – undo
58 58
 
59 59
 
60 60
 
61
-	public function __construct( $routing = TRUE ) {
62
-		require_once( EE_MODELS . 'EEM_Question.model.php' );
63
-		require_once( EE_MODELS . 'EEM_Question_Group.model.php' );
64
-		$this->_question_model=  EEM_Question::instance();
65
-		$this->_question_group_model=EEM_Question_Group::instance();
66
-		parent::__construct( $routing );
61
+	public function __construct($routing = TRUE) {
62
+		require_once(EE_MODELS.'EEM_Question.model.php');
63
+		require_once(EE_MODELS.'EEM_Question_Group.model.php');
64
+		$this->_question_model = EEM_Question::instance();
65
+		$this->_question_group_model = EEM_Question_Group::instance();
66
+		parent::__construct($routing);
67 67
 	}
68 68
 
69 69
 
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 
98 98
 
99 99
 	protected function _set_page_routes() {
100
-		$qst_id = ! empty( $this->_req_data['QST_ID'] ) ? $this->_req_data['QST_ID'] : 0;
100
+		$qst_id = ! empty($this->_req_data['QST_ID']) ? $this->_req_data['QST_ID'] : 0;
101 101
 		$this->_page_routes = array(
102 102
 			'default' => array(
103 103
 				'func' => '_questions_overview_list_table',
@@ -118,7 +118,7 @@  discard block
 block discarded – undo
118 118
 
119 119
 			'update_question' => array(
120 120
 				'func' => '_insert_or_update_question',
121
-				'args' => array('new_question' => FALSE ),
121
+				'args' => array('new_question' => FALSE),
122 122
 				'capability' => 'ee_edit_question',
123 123
 				'obj_id' => $qst_id,
124 124
 				'noheader' => TRUE,
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 						'filename' => 'registration_form_questions_overview_views_bulk_actions_search'
154 154
 						)
155 155
 					),
156
-				'help_tour' => array( 'Registration_Form_Questions_Overview_Help_Tour'),
156
+				'help_tour' => array('Registration_Form_Questions_Overview_Help_Tour'),
157 157
 				'require_nonce' => FALSE,
158 158
 				'qtips' => array(
159 159
 					'EE_Registration_Form_Tips'
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 						'filename' => 'registration_form_question_groups'
173 173
 						),
174 174
 					),
175
-				'help_tour' => array( 'Registration_Form_Question_Groups_Help_Tour'),
175
+				'help_tour' => array('Registration_Form_Question_Groups_Help_Tour'),
176 176
 				'require_nonce' => FALSE
177 177
 				),
178 178
 
@@ -181,16 +181,16 @@  discard block
 block discarded – undo
181 181
 					'label' => __('Edit Question', 'event_espresso'),
182 182
 					'order' => 15,
183 183
 					'persistent' => FALSE,
184
-					'url' => isset($this->_req_data['question_id']) ? add_query_arg(array('question_id' => $this->_req_data['question_id'] ), $this->_current_page_view_url )  : $this->_admin_base_url
184
+					'url' => isset($this->_req_data['question_id']) ? add_query_arg(array('question_id' => $this->_req_data['question_id']), $this->_current_page_view_url) : $this->_admin_base_url
185 185
 					),
186
-				'metaboxes' => array_merge( $this->_default_espresso_metaboxes, array('_publish_post_box' ) ),
186
+				'metaboxes' => array_merge($this->_default_espresso_metaboxes, array('_publish_post_box')),
187 187
 				'help_tabs' => array(
188 188
 					'registration_form_edit_question_group_help_tab' => array(
189 189
 						'title' => __('Edit Question', 'event_espresso'),
190 190
 						'filename' => 'registration_form_edit_question'
191 191
 						),
192 192
 					),
193
-                'help_tour' => array( 'Registration_Form_Edit_Question_Help_Tour'),
193
+                'help_tour' => array('Registration_Form_Edit_Question_Help_Tour'),
194 194
 				'require_nonce' => FALSE
195 195
 				),
196 196
 			);
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 	//none of the below group are currently used for Event Categories
219 219
 	protected function _add_feature_pointers() {}
220 220
 	public function load_scripts_styles() {
221
-		wp_register_style( 'espresso_registration', REGISTRATION_FORM_ASSETS_URL . 'espresso_registration_form_admin.css', array(), EVENT_ESPRESSO_VERSION );
221
+		wp_register_style('espresso_registration', REGISTRATION_FORM_ASSETS_URL.'espresso_registration_form_admin.css', array(), EVENT_ESPRESSO_VERSION);
222 222
 		wp_enqueue_style('espresso_registration');
223 223
 	}
224 224
 	public function admin_init() {}
@@ -234,20 +234,20 @@  discard block
 block discarded – undo
234 234
 
235 235
 	public function load_scripts_styles_add_question() {
236 236
 		$this->load_scripts_styles_forms();
237
-		wp_register_script( 'espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL . 'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE );
238
-		wp_enqueue_script( 'espresso_registration_form_single' );
237
+		wp_register_script('espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL.'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
238
+		wp_enqueue_script('espresso_registration_form_single');
239 239
 	}
240 240
 	public function load_scripts_styles_edit_question() {
241 241
 		$this->load_scripts_styles_forms();
242
-		wp_register_script( 'espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL . 'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE );
243
-		wp_enqueue_script( 'espresso_registration_form_single' );
242
+		wp_register_script('espresso_registration_form_single', REGISTRATION_FORM_ASSETS_URL.'espresso_registration_form_admin.js', array('jquery-ui-sortable'), EVENT_ESPRESSO_VERSION, TRUE);
243
+		wp_enqueue_script('espresso_registration_form_single');
244 244
 	}
245 245
 
246 246
 
247 247
 
248 248
 
249 249
 	public function recaptcha_info_help_tab() {
250
-		$template = REGISTRATION_FORM_TEMPLATE_PATH . 'recaptcha_info_help_tab.template.php';
250
+		$template = REGISTRATION_FORM_TEMPLATE_PATH.'recaptcha_info_help_tab.template.php';
251 251
 		EEH_Template::display_template($template, array());
252 252
 	}
253 253
 
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
 				)
280 280
 		);
281 281
 
282
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_questions', 'espresso_registration_form_trash_questions' ) ) {
282
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_questions', 'espresso_registration_form_trash_questions')) {
283 283
 			$this->_views['trash'] = array(
284 284
 				'slug' => 'trash',
285 285
 				'label' => __('Trash', 'event_espresso'),
@@ -297,9 +297,9 @@  discard block
 block discarded – undo
297 297
 	 */
298 298
 	protected function _questions_groups_preview() {
299 299
 		$this->_admin_page_title = __('Question Groups (Preview)', 'event_espresso');
300
-		$this->_template_args['preview_img'] = '<img src="' . REGISTRATION_FORM_ASSETS_URL . 'caf_reg_form_preview.jpg" alt="' . esc_attr__( 'Preview Question Groups Overview List Table screenshot', 'event_espresso' ) . '" />';
301
-		$this->_template_args['preview_text'] = '<strong>'.__( 'Question Groups is a feature that is only available in the Caffeinated version of Event Espresso.  With the Question Groups feature you are able to: create new question groups, edit existing question groups, and also create and edit new questions and add them to question groups.', 'event_espresso' ).'</strong>';
302
-		$this->display_admin_caf_preview_page( 'question_groups_tab' );
300
+		$this->_template_args['preview_img'] = '<img src="'.REGISTRATION_FORM_ASSETS_URL.'caf_reg_form_preview.jpg" alt="'.esc_attr__('Preview Question Groups Overview List Table screenshot', 'event_espresso').'" />';
301
+		$this->_template_args['preview_text'] = '<strong>'.__('Question Groups is a feature that is only available in the Caffeinated version of Event Espresso.  With the Question Groups feature you are able to: create new question groups, edit existing question groups, and also create and edit new questions and add them to question groups.', 'event_espresso').'</strong>';
302
+		$this->display_admin_caf_preview_page('question_groups_tab');
303 303
 	}
304 304
 
305 305
 
@@ -308,41 +308,41 @@  discard block
 block discarded – undo
308 308
 	 * Extracts the question field's values from the POST request to update or insert them
309 309
 	 * @return array where each key is the name of a model's field/db column, and each value is its value.
310 310
 	 */
311
-	protected function _set_column_values_for(EEM_Base $model){
312
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
313
-		$set_column_values=array();
311
+	protected function _set_column_values_for(EEM_Base $model) {
312
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
313
+		$set_column_values = array();
314 314
 
315 315
 		//some initial checks for proper values.
316 316
 		//if QST_admin_only, then no matter what QST_required is we disable.
317
-		if ( !empty( $this->_req_data['QST_admin_only'] ) ) {
317
+		if ( ! empty($this->_req_data['QST_admin_only'])) {
318 318
 			$this->_req_data['QST_required'] = 0;
319 319
 		}
320
-		foreach($model->field_settings() as $fieldName=>$settings){
320
+		foreach ($model->field_settings() as $fieldName=>$settings) {
321 321
 			// basically if QSG_identifier is empty or not set
322
-			if ( $fieldName == 'QSG_identifier' && ( isset( $this->_req_data['QSG_identifier'] ) && empty( $this->_req_data['QSG_identifier'] ) )) {
323
-				$QSG_name = isset( $this->_req_data['QSG_name'] ) ? $this->_req_data['QSG_name'] : '' ;
324
-				$set_column_values[$fieldName] = sanitize_title($QSG_name ) . '-' . uniqid();
322
+			if ($fieldName == 'QSG_identifier' && (isset($this->_req_data['QSG_identifier']) && empty($this->_req_data['QSG_identifier']))) {
323
+				$QSG_name = isset($this->_req_data['QSG_name']) ? $this->_req_data['QSG_name'] : '';
324
+				$set_column_values[$fieldName] = sanitize_title($QSG_name).'-'.uniqid();
325 325
 //				dd($set_column_values);
326 326
 			}
327 327
 			//if the admin label is blank, use a slug version of the question text
328
-			else if ( $fieldName == 'QST_admin_label' && ( isset( $this->_req_data['QST_admin_label'] ) && empty( $this->_req_data['QST_admin_label'] )  )) {
329
-				$QST_text = isset( $this->_req_data['QST_display_text'] ) ? $this->_req_data['QST_display_text'] : '' ;
330
-				$set_column_values[$fieldName] = sanitize_title(wp_trim_words($QST_text,10));
328
+			else if ($fieldName == 'QST_admin_label' && (isset($this->_req_data['QST_admin_label']) && empty($this->_req_data['QST_admin_label']))) {
329
+				$QST_text = isset($this->_req_data['QST_display_text']) ? $this->_req_data['QST_display_text'] : '';
330
+				$set_column_values[$fieldName] = sanitize_title(wp_trim_words($QST_text, 10));
331 331
 			}
332 332
 
333 333
 
334
-			else if ( $fieldName == 'QST_admin_only' && ( !isset( $this->_req_data['QST_admin_only'] ) ) ) {
334
+			else if ($fieldName == 'QST_admin_only' && ( ! isset($this->_req_data['QST_admin_only']))) {
335 335
 				$set_column_values[$fieldName] = 0;
336 336
 			}
337 337
 
338 338
 
339 339
 			//only add a property to the array if it's not null (otherwise the model should just use the default value)
340
-			else if(isset($this->_req_data[$fieldName])){
341
-				$set_column_values[$fieldName]=$this->_req_data[$fieldName];
340
+			else if (isset($this->_req_data[$fieldName])) {
341
+				$set_column_values[$fieldName] = $this->_req_data[$fieldName];
342 342
 			}
343 343
 
344 344
 		}
345
-		return $set_column_values;//validation fo this data to be performed by the model before insertion.
345
+		return $set_column_values; //validation fo this data to be performed by the model before insertion.
346 346
 	}
347 347
 
348 348
 
@@ -355,29 +355,29 @@  discard block
 block discarded – undo
355 355
 
356 356
 
357 357
 
358
-	protected function _edit_question( $action= 'add' ) {
359
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
360
-		$ID=isset( $this->_req_data['QST_ID'] ) && ! empty( $this->_req_data['QST_ID'] ) ? absint( $this->_req_data['QST_ID'] ) : FALSE;
358
+	protected function _edit_question($action = 'add') {
359
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
360
+		$ID = isset($this->_req_data['QST_ID']) && ! empty($this->_req_data['QST_ID']) ? absint($this->_req_data['QST_ID']) : FALSE;
361 361
 
362
-		$this->_admin_page_title = ucwords( str_replace( '_', ' ', $this->_req_action ));
362
+		$this->_admin_page_title = ucwords(str_replace('_', ' ', $this->_req_action));
363 363
 		// add PRC_ID to title if editing
364
-		$this->_admin_page_title = $ID ? $this->_admin_page_title . ' # ' . $ID : $this->_admin_page_title;
365
-		if($ID){
366
-			$question=$this->_question_model->get_one_by_ID($ID);
367
-			$additional_hidden_fields=array('QST_ID'=>array('type'=>'hidden','value'=>$ID));
364
+		$this->_admin_page_title = $ID ? $this->_admin_page_title.' # '.$ID : $this->_admin_page_title;
365
+		if ($ID) {
366
+			$question = $this->_question_model->get_one_by_ID($ID);
367
+			$additional_hidden_fields = array('QST_ID'=>array('type'=>'hidden', 'value'=>$ID));
368 368
 			$this->_set_add_edit_form_tags('update_question', $additional_hidden_fields);
369
-		}else{
370
-			$question= EE_Question::new_instance();
369
+		} else {
370
+			$question = EE_Question::new_instance();
371 371
 			$question->set_order_to_latest();
372 372
 			$this->_set_add_edit_form_tags('insert_question');
373 373
 		}
374
-		$question_types = $question->has_answers() ?  $this->_question_model->question_types_in_same_category( $question->type() ) : $this->_question_model->allowed_question_types();
375
-		$this->_template_args['QST_ID']=$ID;
376
-		$this->_template_args['question']=$question;
377
-		$this->_template_args['question_types']= $question_types;;
374
+		$question_types = $question->has_answers() ? $this->_question_model->question_types_in_same_category($question->type()) : $this->_question_model->allowed_question_types();
375
+		$this->_template_args['QST_ID'] = $ID;
376
+		$this->_template_args['question'] = $question;
377
+		$this->_template_args['question_types'] = $question_types; ;
378 378
 
379
-		$this->_set_publish_post_box_vars( 'id', $ID );
380
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( REGISTRATION_FORM_TEMPLATE_PATH . 'questions_main_meta_box.template.php', $this->_template_args, TRUE );
379
+		$this->_set_publish_post_box_vars('id', $ID);
380
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_TEMPLATE_PATH.'questions_main_meta_box.template.php', $this->_template_args, TRUE);
381 381
 
382 382
 		// the details template wrapper
383 383
 		$this->display_admin_page_with_sidebar();
@@ -395,57 +395,57 @@  discard block
 block discarded – undo
395 395
 
396 396
 
397 397
 	protected function _insert_or_update_question($new_question = TRUE) {
398
-		do_action( 'AHEE_log', __FILE__, __FUNCTION__, '' );
399
-		$set_column_values=$this->_set_column_values_for($this->_question_model);
400
-		if($new_question){
401
-			$ID=$this->_question_model->insert($set_column_values);
398
+		do_action('AHEE_log', __FILE__, __FUNCTION__, '');
399
+		$set_column_values = $this->_set_column_values_for($this->_question_model);
400
+		if ($new_question) {
401
+			$ID = $this->_question_model->insert($set_column_values);
402 402
 			$success = $ID ? true : false;
403 403
 			$action_desc = 'added';
404
-		}else{
405
-			$ID=absint($this->_req_data['QST_ID']);
406
-			$pk=$this->_question_model->primary_key_name();
407
-			$wheres=array($pk=>$ID);
404
+		} else {
405
+			$ID = absint($this->_req_data['QST_ID']);
406
+			$pk = $this->_question_model->primary_key_name();
407
+			$wheres = array($pk=>$ID);
408 408
 			unset($set_column_values[$pk]);
409
-			$success= $this->_question_model->update($set_column_values,array($wheres));
410
-			$action_desc='updated';
409
+			$success = $this->_question_model->update($set_column_values, array($wheres));
410
+			$action_desc = 'updated';
411 411
 		}
412 412
 
413
-		if ($ID){
413
+		if ($ID) {
414 414
 			//save the related options
415 415
 			//trash removed options, save old ones
416 416
 			//get list of all options
417 417
 			/** @type EE_Question $question */
418
-			$question=$this->_question_model->get_one_by_ID($ID);
419
-			$options=$question->options();
420
-			if(! empty($options)){
421
-				foreach($options as $option_ID=>$option){
422
-					$option_req_index=$this->_get_option_req_data_index($option_ID);
423
-					if($option_req_index!==FALSE){
418
+			$question = $this->_question_model->get_one_by_ID($ID);
419
+			$options = $question->options();
420
+			if ( ! empty($options)) {
421
+				foreach ($options as $option_ID=>$option) {
422
+					$option_req_index = $this->_get_option_req_data_index($option_ID);
423
+					if ($option_req_index !== FALSE) {
424 424
 						$option->save($this->_req_data['question_options'][$option_req_index]);
425
-					}else{
425
+					} else {
426 426
 						//not found, remove it
427 427
 						$option->delete();
428 428
 					}
429 429
 				}
430 430
 			}
431 431
 			//save new related options
432
-			foreach($this->_req_data['question_options'] as $index=>$option_req_data){
433
-				if( empty($option_req_data['QSO_ID'] ) && (  ( isset( $option_req_data['QSO_value'] ) && $option_req_data['QSO_value'] !== '' ) || ! empty( $option_req_data['QSO_desc'] ) ) ) {//no ID! save it!
434
-					if( ! isset( $option_req_data['QSO_value'] ) || $option_req_data['QSO_value'] === ''  ){
435
-						$option_req_data['QSO_value']=$option_req_data['QSO_desc'];
432
+			foreach ($this->_req_data['question_options'] as $index=>$option_req_data) {
433
+				if (empty($option_req_data['QSO_ID']) && ((isset($option_req_data['QSO_value']) && $option_req_data['QSO_value'] !== '') || ! empty($option_req_data['QSO_desc']))) {//no ID! save it!
434
+					if ( ! isset($option_req_data['QSO_value']) || $option_req_data['QSO_value'] === '') {
435
+						$option_req_data['QSO_value'] = $option_req_data['QSO_desc'];
436 436
 					}
437
-					$new_option=EE_Question_Option::new_instance( array( 'QSO_value' => $option_req_data['QSO_value'], 'QSO_desc' => $option_req_data['QSO_desc'], 'QSO_order' => $option_req_data['QSO_order'], 'QST_ID' => $question->ID()));
437
+					$new_option = EE_Question_Option::new_instance(array('QSO_value' => $option_req_data['QSO_value'], 'QSO_desc' => $option_req_data['QSO_desc'], 'QSO_order' => $option_req_data['QSO_order'], 'QST_ID' => $question->ID()));
438 438
 					$new_option->save();
439 439
 				}
440 440
 			}
441 441
 		}
442
-		$query_args = array( 'action' => 'edit_question', 'QST_ID' => $ID );
443
-		if ( $success !== FALSE ) {
444
-			$msg = $new_question ? sprintf( __('The %s has been created', 'event_espresso'), $this->_question_model->item_name() ) : sprintf( __('The %s has been updated', 'event_espresso' ), $this->_question_model->item_name() );
445
-			EE_Error::add_success( $msg );
442
+		$query_args = array('action' => 'edit_question', 'QST_ID' => $ID);
443
+		if ($success !== FALSE) {
444
+			$msg = $new_question ? sprintf(__('The %s has been created', 'event_espresso'), $this->_question_model->item_name()) : sprintf(__('The %s has been updated', 'event_espresso'), $this->_question_model->item_name());
445
+			EE_Error::add_success($msg);
446 446
 		}
447 447
 
448
-		$this->_redirect_after_action( FALSE, '', $action_desc, $query_args, TRUE);
448
+		$this->_redirect_after_action(FALSE, '', $action_desc, $query_args, TRUE);
449 449
 	}
450 450
 
451 451
 
@@ -458,10 +458,10 @@  discard block
 block discarded – undo
458 458
 	 * @param int $ID of the question option to find
459 459
 	 * @return int index in question_options array if successful, FALSE if unsuccessful
460 460
 	 */
461
-	protected function _get_option_req_data_index($ID){
462
-		$req_data_for_question_options=$this->_req_data['question_options'];
463
-		foreach($req_data_for_question_options as $num=>$option_data){
464
-			if(array_key_exists('QSO_ID',$option_data) && intval($option_data['QSO_ID'])==$ID){
461
+	protected function _get_option_req_data_index($ID) {
462
+		$req_data_for_question_options = $this->_req_data['question_options'];
463
+		foreach ($req_data_for_question_options as $num=>$option_data) {
464
+			if (array_key_exists('QSO_ID', $option_data) && intval($option_data['QSO_ID']) == $ID) {
465 465
 				return $num;
466 466
 			}
467 467
 		}
@@ -482,25 +482,25 @@  discard block
 block discarded – undo
482 482
 	 * @param EEM_Base $model either EEM_Question or EEM_Question_Group
483 483
 	 * @return array lik EEM_Base::get_all's $query_params parameter
484 484
 	 */
485
-	protected function get_query_params($model, $per_page=10,$current_page=10){
485
+	protected function get_query_params($model, $per_page = 10, $current_page = 10) {
486 486
 		$query_params = array();
487
-		$offset=($current_page-1)*$per_page;
488
-		$query_params['limit']=array($offset,$per_page);
489
-		$order = ( isset( $this->_req_data['order'] ) && ! empty( $this->_req_data['order'] )) ? $this->_req_data['order'] : 'ASC';
487
+		$offset = ($current_page - 1) * $per_page;
488
+		$query_params['limit'] = array($offset, $per_page);
489
+		$order = (isset($this->_req_data['order']) && ! empty($this->_req_data['order'])) ? $this->_req_data['order'] : 'ASC';
490 490
 		$orderby_field = $model instanceof EEM_Question ? 'QST_ID' : 'QSG_order';
491 491
 		$field_to_order_by = empty($this->_req_data['orderby']) ? $orderby_field : $this->_req_data['orderby'];
492
-		$query_params['order_by']=array( $field_to_order_by => $order );
493
-		$search_string = array_key_exists('s',$this->_req_data) ? $this->_req_data['s'] : null;
494
-		if(! empty($search_string)){
495
-			if($model instanceof EEM_Question_Group){
496
-				$query_params[0]=array(
492
+		$query_params['order_by'] = array($field_to_order_by => $order);
493
+		$search_string = array_key_exists('s', $this->_req_data) ? $this->_req_data['s'] : null;
494
+		if ( ! empty($search_string)) {
495
+			if ($model instanceof EEM_Question_Group) {
496
+				$query_params[0] = array(
497 497
 					'OR'=>array(
498
-						'QSG_name'=>array('LIKE',"%$search_string%"),
499
-						'QSG_desc'=>array('LIKE',"%$search_string%"))
498
+						'QSG_name'=>array('LIKE', "%$search_string%"),
499
+						'QSG_desc'=>array('LIKE', "%$search_string%"))
500 500
 					);
501
-			}else{
502
-				$query_params[0]=array(
503
-					'QST_display_text'=>array('LIKE',"%$search_string%")
501
+			} else {
502
+				$query_params[0] = array(
503
+					'QST_display_text'=>array('LIKE', "%$search_string%")
504 504
 					);
505 505
 			}
506 506
 		}
@@ -542,13 +542,13 @@  discard block
 block discarded – undo
542 542
 
543 543
 
544 544
 
545
-	public function get_questions( $per_page=10,$current_page = 1, $count = FALSE ) {
545
+	public function get_questions($per_page = 10, $current_page = 1, $count = FALSE) {
546 546
 		$QST = EEM_Question::instance();
547 547
 		$query_params = $this->get_query_params($QST, $per_page, $current_page);
548
-		if ($count){
549
-			$where = isset( $query_params[0] ) ? array( $query_params[0] ) : array();
548
+		if ($count) {
549
+			$where = isset($query_params[0]) ? array($query_params[0]) : array();
550 550
 			$results = $QST->count($where);
551
-		}else{
551
+		} else {
552 552
 			$results = $QST->get_all($query_params);
553 553
 		}
554 554
 		return $results;
@@ -557,20 +557,20 @@  discard block
 block discarded – undo
557 557
 
558 558
 
559 559
 
560
-	public function get_trashed_questions( $per_page,$current_page = 1, $count = FALSE ) {
561
-		$query_params=$this->get_query_params(EEM_Question::instance(),$per_page,$current_page);
562
-		$where = isset( $query_params[0] ) ? array($query_params[0]) : array();
563
-		$questions=$count ? EEM_Question::instance()->count_deleted($where) : EEM_Question::instance()->get_all_deleted($query_params);
560
+	public function get_trashed_questions($per_page, $current_page = 1, $count = FALSE) {
561
+		$query_params = $this->get_query_params(EEM_Question::instance(), $per_page, $current_page);
562
+		$where = isset($query_params[0]) ? array($query_params[0]) : array();
563
+		$questions = $count ? EEM_Question::instance()->count_deleted($where) : EEM_Question::instance()->get_all_deleted($query_params);
564 564
 		return $questions;
565 565
 	}
566 566
 
567 567
 
568 568
 
569
-	public function get_question_groups( $per_page,$current_page = 1, $count = FALSE ) {
569
+	public function get_question_groups($per_page, $current_page = 1, $count = FALSE) {
570 570
 		/** @type EEM_Question_Group $questionGroupModel */
571
-		$questionGroupModel=EEM_Question_Group::instance();
572
-		$query_params=$this->get_query_params( $questionGroupModel, $per_page, $current_page );
573
-		$questionGroups=$questionGroupModel->get_all($query_params);//note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
571
+		$questionGroupModel = EEM_Question_Group::instance();
572
+		$query_params = $this->get_query_params($questionGroupModel, $per_page, $current_page);
573
+		$questionGroups = $questionGroupModel->get_all($query_params); //note: this a subclass of EEM_Soft_Delete_Base, so this is actually only getting non-trashed items
574 574
 		return $questionGroups;
575 575
 	}
576 576
 
@@ -587,36 +587,36 @@  discard block
 block discarded – undo
587 587
 
588 588
 		$this->_template_args['values'] = $this->_yes_no_values;
589 589
 
590
-		$this->_template_args['use_captcha'] = isset( EE_Registry::instance()->CFG->registration->use_captcha ) ? EE_Registry::instance()->CFG->registration->use_captcha : FALSE;
591
-		$this->_template_args['show_captcha_settings'] = $this->_template_args['use_captcha'] ? 'style="display:table-row;"': '';
590
+		$this->_template_args['use_captcha'] = isset(EE_Registry::instance()->CFG->registration->use_captcha) ? EE_Registry::instance()->CFG->registration->use_captcha : FALSE;
591
+		$this->_template_args['show_captcha_settings'] = $this->_template_args['use_captcha'] ? 'style="display:table-row;"' : '';
592 592
 
593
-		$this->_template_args['recaptcha_publickey'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_publickey ) ? stripslashes( EE_Registry::instance()->CFG->registration->recaptcha_publickey ) : '';
594
-		$this->_template_args['recaptcha_privatekey'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_privatekey ) ? stripslashes( EE_Registry::instance()->CFG->registration->recaptcha_privatekey ) : '';
595
-		$this->_template_args['recaptcha_width'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_width ) ? absint( EE_Registry::instance()->CFG->registration->recaptcha_width ) : 500;
593
+		$this->_template_args['recaptcha_publickey'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_publickey) ? stripslashes(EE_Registry::instance()->CFG->registration->recaptcha_publickey) : '';
594
+		$this->_template_args['recaptcha_privatekey'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_privatekey) ? stripslashes(EE_Registry::instance()->CFG->registration->recaptcha_privatekey) : '';
595
+		$this->_template_args['recaptcha_width'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_width) ? absint(EE_Registry::instance()->CFG->registration->recaptcha_width) : 500;
596 596
 
597 597
 		$this->_template_args['recaptcha_theme_options'] = array(
598
-				array('id'  => 'red','text'=> __('Red', 'event_espresso')),
599
-				array('id'  => 'white','text'=> __('White', 'event_espresso')),
600
-				array('id'  => 'blackglass','text'=> __('Blackglass', 'event_espresso')),
601
-				array('id'  => 'clean','text'=> __('Clean', 'event_espresso'))
598
+				array('id'  => 'red', 'text'=> __('Red', 'event_espresso')),
599
+				array('id'  => 'white', 'text'=> __('White', 'event_espresso')),
600
+				array('id'  => 'blackglass', 'text'=> __('Blackglass', 'event_espresso')),
601
+				array('id'  => 'clean', 'text'=> __('Clean', 'event_espresso'))
602 602
 			);
603
-		$this->_template_args['recaptcha_theme'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_theme ) ? EE_Registry::instance()->CFG->registration->get_pretty( 'recaptcha_theme' ) : 'clean';
603
+		$this->_template_args['recaptcha_theme'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_theme) ? EE_Registry::instance()->CFG->registration->get_pretty('recaptcha_theme') : 'clean';
604 604
 
605 605
 		$this->_template_args['recaptcha_language_options'] = array(
606
-				array('id'  => 'en','text'=> __('English', 'event_espresso')),
607
-				array('id'  => 'es','text'=> __('Spanish', 'event_espresso')),
608
-				array('id'  => 'nl','text'=> __('Dutch', 'event_espresso')),
609
-				array('id'  => 'fr','text'=> __('French', 'event_espresso')),
610
-				array('id'  => 'de','text'=> __('German', 'event_espresso')),
611
-				array('id'  => 'pt','text'=> __('Portuguese', 'event_espresso')),
612
-				array('id'  => 'ru','text'=> __('Russian', 'event_espresso')),
613
-				array('id'  => 'tr','text'=> __('Turkish', 'event_espresso'))
606
+				array('id'  => 'en', 'text'=> __('English', 'event_espresso')),
607
+				array('id'  => 'es', 'text'=> __('Spanish', 'event_espresso')),
608
+				array('id'  => 'nl', 'text'=> __('Dutch', 'event_espresso')),
609
+				array('id'  => 'fr', 'text'=> __('French', 'event_espresso')),
610
+				array('id'  => 'de', 'text'=> __('German', 'event_espresso')),
611
+				array('id'  => 'pt', 'text'=> __('Portuguese', 'event_espresso')),
612
+				array('id'  => 'ru', 'text'=> __('Russian', 'event_espresso')),
613
+				array('id'  => 'tr', 'text'=> __('Turkish', 'event_espresso'))
614 614
 			);
615
-		$this->_template_args['recaptcha_language'] = isset( EE_Registry::instance()->CFG->registration->recaptcha_language ) ? EE_Registry::instance()->CFG->registration->recaptcha_language : 'en';
615
+		$this->_template_args['recaptcha_language'] = isset(EE_Registry::instance()->CFG->registration->recaptcha_language) ? EE_Registry::instance()->CFG->registration->recaptcha_language : 'en';
616 616
 
617
-		$this->_set_add_edit_form_tags( 'update_reg_form_settings' );
618
-		$this->_set_publish_post_box_vars( NULL, FALSE, FALSE, NULL, FALSE );
619
-		$this->_template_args['admin_page_content'] = EEH_Template::display_template( REGISTRATION_FORM_TEMPLATE_PATH . 'reg_form_settings.template.php', $this->_template_args, TRUE );
617
+		$this->_set_add_edit_form_tags('update_reg_form_settings');
618
+		$this->_set_publish_post_box_vars(NULL, FALSE, FALSE, NULL, FALSE);
619
+		$this->_template_args['admin_page_content'] = EEH_Template::display_template(REGISTRATION_FORM_TEMPLATE_PATH.'reg_form_settings.template.php', $this->_template_args, TRUE);
620 620
 		$this->display_admin_page_with_sidebar();
621 621
 	}
622 622
 
Please login to merge, or discard this patch.
Braces   +8 added lines, -10 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
  * Event Espresso
@@ -328,10 +329,7 @@  discard block
 block discarded – undo
328 329
 			else if ( $fieldName == 'QST_admin_label' && ( isset( $this->_req_data['QST_admin_label'] ) && empty( $this->_req_data['QST_admin_label'] )  )) {
329 330
 				$QST_text = isset( $this->_req_data['QST_display_text'] ) ? $this->_req_data['QST_display_text'] : '' ;
330 331
 				$set_column_values[$fieldName] = sanitize_title(wp_trim_words($QST_text,10));
331
-			}
332
-
333
-
334
-			else if ( $fieldName == 'QST_admin_only' && ( !isset( $this->_req_data['QST_admin_only'] ) ) ) {
332
+			} else if ( $fieldName == 'QST_admin_only' && ( !isset( $this->_req_data['QST_admin_only'] ) ) ) {
335 333
 				$set_column_values[$fieldName] = 0;
336 334
 			}
337 335
 
@@ -366,7 +364,7 @@  discard block
 block discarded – undo
366 364
 			$question=$this->_question_model->get_one_by_ID($ID);
367 365
 			$additional_hidden_fields=array('QST_ID'=>array('type'=>'hidden','value'=>$ID));
368 366
 			$this->_set_add_edit_form_tags('update_question', $additional_hidden_fields);
369
-		}else{
367
+		} else{
370 368
 			$question= EE_Question::new_instance();
371 369
 			$question->set_order_to_latest();
372 370
 			$this->_set_add_edit_form_tags('insert_question');
@@ -401,7 +399,7 @@  discard block
 block discarded – undo
401 399
 			$ID=$this->_question_model->insert($set_column_values);
402 400
 			$success = $ID ? true : false;
403 401
 			$action_desc = 'added';
404
-		}else{
402
+		} else{
405 403
 			$ID=absint($this->_req_data['QST_ID']);
406 404
 			$pk=$this->_question_model->primary_key_name();
407 405
 			$wheres=array($pk=>$ID);
@@ -422,7 +420,7 @@  discard block
 block discarded – undo
422 420
 					$option_req_index=$this->_get_option_req_data_index($option_ID);
423 421
 					if($option_req_index!==FALSE){
424 422
 						$option->save($this->_req_data['question_options'][$option_req_index]);
425
-					}else{
423
+					} else{
426 424
 						//not found, remove it
427 425
 						$option->delete();
428 426
 					}
@@ -498,7 +496,7 @@  discard block
 block discarded – undo
498 496
 						'QSG_name'=>array('LIKE',"%$search_string%"),
499 497
 						'QSG_desc'=>array('LIKE',"%$search_string%"))
500 498
 					);
501
-			}else{
499
+			} else{
502 500
 				$query_params[0]=array(
503 501
 					'QST_display_text'=>array('LIKE',"%$search_string%")
504 502
 					);
@@ -548,7 +546,7 @@  discard block
 block discarded – undo
548 546
 		if ($count){
549 547
 			$where = isset( $query_params[0] ) ? array( $query_params[0] ) : array();
550 548
 			$results = $QST->count($where);
551
-		}else{
549
+		} else{
552 550
 			$results = $QST->get_all($query_params);
553 551
 		}
554 552
 		return $results;
Please login to merge, or discard this patch.
admin_pages/registration_form/Registration_Form_Admin_Page_Init.core.php 2 patches
Spacing   +12 added lines, -12 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
 /**
@@ -33,16 +33,16 @@  discard block
 block discarded – undo
33 33
 
34 34
 	public function __construct() {
35 35
 		//define some constants
36
-		define( 'REGISTRATION_FORM_PG_SLUG', 'espresso_registration_form' );
37
-		define( 'REGISTRATION_FORM_LABEL', __('Registration Form', 'event_espresso'));
38
-		define( 'REGISTRATION_FORM_PG_NAME', REGISTRATION_FORM_LABEL );
39
-		define( 'REGISTRATION_FORM_ADMIN', EE_ADMIN_PAGES . 'registration_form' . DS );
40
-		define( 'REGISTRATION_FORM_ADMIN_URL', admin_url( 'admin.php?page=' . REGISTRATION_FORM_PG_SLUG ));
41
-		define( 'EE_FORMS_ADMIN_URL', admin_url('admin.php?page=' . REGISTRATION_FORM_PG_SLUG ));
42
-		define( 'REGISTRATION_FORM_ASSETS_PATH', REGISTRATION_FORM_ADMIN . 'assets' . DS );
43
-		define( 'REGISTRATION_FORM_ASSETS_URL', EE_ADMIN_PAGES_URL . 'registration_form/assets/' );
44
-		define( 'REGISTRATION_FORM_TEMPLATE_PATH', REGISTRATION_FORM_ADMIN . 'templates' . DS );
45
-		define( 'REGISTRATION_FORM_TEMPLATE_URL', EE_ADMIN_PAGES_URL . 'registration_form/templates/' );
36
+		define('REGISTRATION_FORM_PG_SLUG', 'espresso_registration_form');
37
+		define('REGISTRATION_FORM_LABEL', __('Registration Form', 'event_espresso'));
38
+		define('REGISTRATION_FORM_PG_NAME', REGISTRATION_FORM_LABEL);
39
+		define('REGISTRATION_FORM_ADMIN', EE_ADMIN_PAGES.'registration_form'.DS);
40
+		define('REGISTRATION_FORM_ADMIN_URL', admin_url('admin.php?page='.REGISTRATION_FORM_PG_SLUG));
41
+		define('EE_FORMS_ADMIN_URL', admin_url('admin.php?page='.REGISTRATION_FORM_PG_SLUG));
42
+		define('REGISTRATION_FORM_ASSETS_PATH', REGISTRATION_FORM_ADMIN.'assets'.DS);
43
+		define('REGISTRATION_FORM_ASSETS_URL', EE_ADMIN_PAGES_URL.'registration_form/assets/');
44
+		define('REGISTRATION_FORM_TEMPLATE_PATH', REGISTRATION_FORM_ADMIN.'templates'.DS);
45
+		define('REGISTRATION_FORM_TEMPLATE_URL', EE_ADMIN_PAGES_URL.'registration_form/templates/');
46 46
 		parent::__construct();
47 47
 	}
48 48
 
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
53 53
 
54 54
 
55 55
 	protected function _set_menu_map() {
56
-		$this->_menu_map = new EE_Admin_Page_Sub_Menu( array(
56
+		$this->_menu_map = new EE_Admin_Page_Sub_Menu(array(
57 57
 			'menu_group' => 'management',
58 58
 			'menu_order' => 30,
59 59
 			'show_on_menu' => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,8 +6,9 @@
 block discarded – undo
6 6
  * @package Event Espresso
7 7
  * @subpackage messages
8 8
  */
9
-if (!defined('EVENT_ESPRESSO_VERSION') )
9
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
10 10
 	exit('NO direct script access allowed');
11
+}
11 12
 
12 13
 /**
13 14
  *
Please login to merge, or discard this patch.
registration_form/Registration_Form_Questions_Admin_List_Table.class.php 2 patches
Braces   +7 added lines, -5 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
  * Event Espresso
@@ -42,7 +43,7 @@  discard block
 block discarded – undo
42 43
 	protected function _setup_data() {
43 44
 		if(isset($this->_req_data['status'] ) && $this->_req_data['status'] == 'trash'){
44 45
 			$this->_data = $this->_admin_page->get_trashed_questions( $this->_per_page,$this->_current_page, FALSE );
45
-		}else{
46
+		} else{
46 47
 			$this->_data = $this->_admin_page->get_questions( $this->_per_page,$this->_current_page, FALSE );
47 48
 		}
48 49
 		$this->_all_data_count = $this->_admin_page->get_questions( $this->_per_page,$this->_current_page, TRUE );
@@ -117,8 +118,9 @@  discard block
 block discarded – undo
117 118
 	public function column_display_text(EE_Question $item) {
118 119
 		$system_question = $item->is_system_question();
119 120
 
120
-		if ( !defined('REG_ADMIN_URL') )
121
-			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
121
+		if ( !defined('REG_ADMIN_URL') ) {
122
+					define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
123
+		}
122 124
 
123 125
 		$edit_query_args = array(
124 126
 				'action' => 'edit_question',
@@ -152,7 +154,7 @@  discard block
 block discarded – undo
152 154
 		$options= $item->options();
153 155
 		if(empty($options)){
154 156
 			return "N/A";
155
-		}else{
157
+		} else{
156 158
 			foreach($options as $optionID=>$option){
157 159
 				/* @var $option EE_Question_Option */
158 160
 				$optionNames[]=$option->value();
Please login to merge, or discard this patch.
Spacing   +28 added lines, -28 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
 /**
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 class Registration_Form_Questions_Admin_List_Table extends EE_Admin_List_Table {
33 33
 
34 34
 
35
-	public function __construct( $admin_page ) {
35
+	public function __construct($admin_page) {
36 36
 		parent::__construct($admin_page);
37 37
 	}
38 38
 
@@ -40,12 +40,12 @@  discard block
 block discarded – undo
40 40
 
41 41
 
42 42
 	protected function _setup_data() {
43
-		if(isset($this->_req_data['status'] ) && $this->_req_data['status'] == 'trash'){
44
-			$this->_data = $this->_admin_page->get_trashed_questions( $this->_per_page,$this->_current_page, FALSE );
45
-		}else{
46
-			$this->_data = $this->_admin_page->get_questions( $this->_per_page,$this->_current_page, FALSE );
43
+		if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'trash') {
44
+			$this->_data = $this->_admin_page->get_trashed_questions($this->_per_page, $this->_current_page, FALSE);
45
+		} else {
46
+			$this->_data = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, FALSE);
47 47
 		}
48
-		$this->_all_data_count = $this->_admin_page->get_questions( $this->_per_page,$this->_current_page, TRUE );
48
+		$this->_all_data_count = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, TRUE);
49 49
 	}
50 50
 
51 51
 
@@ -54,8 +54,8 @@  discard block
 block discarded – undo
54 54
 
55 55
 	protected function _set_properties() {
56 56
 		$this->_wp_list_args = array(
57
-			'singular' => __('question', 'event_espresso' ),
58
-			'plural' => __('questions', 'event_espresso' ),
57
+			'singular' => __('question', 'event_espresso'),
58
+			'plural' => __('questions', 'event_espresso'),
59 59
 			'ajax' => TRUE, //for now,
60 60
 			'screen' => $this->_admin_page->get_current_screen()->id
61 61
 			);
@@ -71,8 +71,8 @@  discard block
 block discarded – undo
71 71
 			);
72 72
 
73 73
 		$this->_sortable_columns = array(
74
-			'id' => array( 'QST_ID' => FALSE ),
75
-			'display_text' => array( 'QST_display_text' => FALSE )
74
+			'id' => array('QST_ID' => FALSE),
75
+			'display_text' => array('QST_display_text' => FALSE)
76 76
 			);
77 77
 
78 78
 		$this->_hidden_columns = array(
@@ -90,8 +90,8 @@  discard block
 block discarded – undo
90 90
 
91 91
 
92 92
 	protected function _add_view_counts() {
93
-		$this->_views['all']['count'] = $this->_admin_page->get_questions( $this->_per_page,$this->_current_page, TRUE );
94
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_questions', 'espresso_registration_form_trash_question' ) ) {
93
+		$this->_views['all']['count'] = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, TRUE);
94
+		if (EE_Registry::instance()->CAP->current_user_can('ee_delete_questions', 'espresso_registration_form_trash_question')) {
95 95
 			$this->_views['trash']['count'] = $this->_admin_page->get_trashed_questions( -1, $this->_current_page, TRUE);
96 96
 		}
97 97
 	}
@@ -101,8 +101,8 @@  discard block
 block discarded – undo
101 101
 	public function column_cb($item) {
102 102
 		$system_question = $item->is_system_question();
103 103
 		$related_answer_count = $item->count_related('Answer');
104
-		$lock_icon = ( !$system_question && $related_answer_count > 0 && $this->_view == 'trash' ) ? 'ee-lock-icon ee-alternate-color' : 'ee-lock-icon ee-system-lock';
105
-		return $system_question || (!$system_question && $related_answer_count > 0 && $this->_view == 'trash' ) ? '<span class="' . $lock_icon . '"></span>' . sprintf( '<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />', $item->ID() )  : sprintf( '<input type="checkbox" class="QST_ID" name="checkbox[%1$d]" value="%1$d" />', $item->ID() );
104
+		$lock_icon = ( ! $system_question && $related_answer_count > 0 && $this->_view == 'trash') ? 'ee-lock-icon ee-alternate-color' : 'ee-lock-icon ee-system-lock';
105
+		return $system_question || ( ! $system_question && $related_answer_count > 0 && $this->_view == 'trash') ? '<span class="'.$lock_icon.'"></span>'.sprintf('<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />', $item->ID()) : sprintf('<input type="checkbox" class="QST_ID" name="checkbox[%1$d]" value="%1$d" />', $item->ID());
106 106
 	}
107 107
 
108 108
 
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
 
111 111
 	public function column_id(EE_Question $item) {
112 112
 		$content = $item->ID();
113
-		$content .= '  <span class="show-on-mobile-view-only">' . $item->display_text() . '</span>';
113
+		$content .= '  <span class="show-on-mobile-view-only">'.$item->display_text().'</span>';
114 114
 		return $content;
115 115
 	}
116 116
 
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 	public function column_display_text(EE_Question $item) {
120 120
 		$system_question = $item->is_system_question();
121 121
 
122
-		if ( !defined('REG_ADMIN_URL') )
122
+		if ( ! defined('REG_ADMIN_URL'))
123 123
 			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
124 124
 
125 125
 		$edit_query_args = array(
@@ -127,16 +127,16 @@  discard block
 block discarded – undo
127 127
 				'QST_ID' => $item->ID()
128 128
 			);
129 129
 
130
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_question', 'espresso_registration_form_edit_question', $item->ID() ) ) {
131
-			$edit_link = EE_Admin_Page::add_query_args_and_nonce( $edit_query_args, EE_FORMS_ADMIN_URL );
130
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_question', 'espresso_registration_form_edit_question', $item->ID())) {
131
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
132 132
 
133 133
 			$actions = array(
134
-				'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__('Edit Event', 'event_espresso') . '">' . __('Edit', 'event_espresso') . '</a>'
134
+				'edit' => '<a href="'.$edit_link.'" title="'.esc_attr__('Edit Event', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>'
135 135
 				);
136 136
 		}
137 137
 
138 138
 
139
-		$content = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_question', 'espresso_registration_form_edit_question', $item->ID() ) ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->display_text() . '</a></strong>' : $item->display_text();
139
+		$content = EE_Registry::instance()->CAP->current_user_can('ee_edit_question', 'espresso_registration_form_edit_question', $item->ID()) ? '<strong><a class="row-title" href="'.$edit_link.'">'.$item->display_text().'</a></strong>' : $item->display_text();
140 140
 		$content .= $this->row_actions($actions);
141 141
 		return $content;
142 142
 	}
@@ -150,16 +150,16 @@  discard block
 block discarded – undo
150 150
 
151 151
 
152 152
 	public function column_values(EE_Question $item) {
153
-		$optionNames=array();
154
-		$options= $item->options();
155
-		if(empty($options)){
153
+		$optionNames = array();
154
+		$options = $item->options();
155
+		if (empty($options)) {
156 156
 			return "N/A";
157
-		}else{
158
-			foreach($options as $optionID=>$option){
157
+		} else {
158
+			foreach ($options as $optionID=>$option) {
159 159
 				/* @var $option EE_Question_Option */
160
-				$optionNames[]=$option->value();
160
+				$optionNames[] = $option->value();
161 161
 			}
162
-			return implode(', ',$optionNames);
162
+			return implode(', ', $optionNames);
163 163
 		}
164 164
 	}
165 165
 
Please login to merge, or discard this patch.