Completed
Branch FET-8365-add-indexes (4b9253)
by
unknown
527:08 queued 512:28
created
extend/events/templates/event_datetime_metabox_clone_button.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,3 +1,3 @@
 block discarded – undo
1 1
 <a class='clone-date-time dtm-inp-btn' rel='<?php echo $row; ?>' title='<?php esc_attr_e('Clone this Event Date and Time', 'event_espresso'); ?>' style='position:relative; top:5px; margin:0 0 0 10px; font-size:.9em; cursor:pointer;'>
2
-	<img src='<?php echo EE_IMAGES_URL;?>clone-trooper-16x16.png' width='16' height='16' alt='<?php esc_attr_e('clone', 'event_espresso'); ?>'/>
2
+	<img src='<?php echo EE_IMAGES_URL; ?>clone-trooper-16x16.png' width='16' height='16' alt='<?php esc_attr_e('clone', 'event_espresso'); ?>'/>
3 3
 </a>
Please login to merge, or discard this patch.
admin/extend/events/templates/event_datetime_timezones.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@
 block discarded – undo
1
-<?php if ( EE_Registry::instance()->CFG->admin->use_event_timezones ) : ?>
1
+<?php if (EE_Registry::instance()->CFG->admin->use_event_timezones) : ?>
2 2
 <div id="timezones-datetimes-dv" class="">
3 3
 	<span class="run-in"> <?php _e('Current Time for Event Timezone:', 'event_espresso'); ?> </span>
4 4
 	<span class="current-date"> <?php echo $current_date; ?></span>
Please login to merge, or discard this patch.
admin/extend/events/templates/event_registration_options.template.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -6,27 +6,27 @@
 block discarded – undo
6 6
 <?php
7 7
 	$settings_array = array(
8 8
 		'max_registrants' => '<p>
9
-			<label for="max-registrants">' .  __('Maximum number of tickets allowed per order for this event: ', 'event_espresso') . '</label>
10
-			<input class="ee-numeric" type="text" id="max-registrants" name="additional_limit" value="' . $additional_limit . '" size="4" />
9
+			<label for="max-registrants">' .  __('Maximum number of tickets allowed per order for this event: ', 'event_espresso').'</label>
10
+			<input class="ee-numeric" type="text" id="max-registrants" name="additional_limit" value="' . $additional_limit.'" size="4" />
11 11
 			</p>',
12 12
 		'additional_registration_options' => $additional_registration_options,
13 13
 		'display_ticket_selector' => '<p>
14
-			<label>' . __('Display Ticket Selector', 'event_espresso') . '</label>' . $display_ticket_selector . '</p>',
14
+			<label>' . __('Display Ticket Selector', 'event_espresso').'</label>'.$display_ticket_selector.'</p>',
15 15
 		'alternative_registration_page' => '<p>
16
-			<label>' . __('Alternative Registration Page', 'event_espresso') . '</label>
17
-			<input name="externalURL" size="20" type="text" value="' . $_event->external_url() . '">
16
+			<label>' . __('Alternative Registration Page', 'event_espresso').'</label>
17
+			<input name="externalURL" size="20" type="text" value="' . $_event->external_url().'">
18 18
 			</p>',
19 19
 		'event_phone_number' => '<p>
20
-			<label>' . __('Event Phone Number', 'event_espresso') . '</label>
21
-			<input name="event_phone" size="20" type="text" value="' . $_event->phone() . '">
20
+			<label>' . __('Event Phone Number', 'event_espresso').'</label>
21
+			<input name="event_phone" size="20" type="text" value="' . $_event->phone().'">
22 22
 			</p>',
23 23
 		'default_registration_status' => '<p>
24
-			<label>' . __('Default Registration Status', 'event_espresso') . '</label>' . $EVT_default_registration_status . '</p>'
24
+			<label>' . __('Default Registration Status', 'event_espresso').'</label>'.$EVT_default_registration_status.'</p>'
25 25
 		);
26 26
 	//filter
27
-	$settings_array = apply_filters( 'FHEE__caffeinated_event_registration_options__template__settings', $settings_array );
27
+	$settings_array = apply_filters('FHEE__caffeinated_event_registration_options__template__settings', $settings_array);
28 28
 
29 29
 	//echo
30
-	foreach ( $settings_array as $item ) {
30
+	foreach ($settings_array as $item) {
31 31
 		echo $item;
32 32
 	}
Please login to merge, or discard this patch.
admin/extend/events/templates/event_type_metabox_contents.template.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -4,9 +4,9 @@  discard block
 block discarded – undo
4 4
 	</ul>
5 5
 	<div id="espresso_event_type-all" class="tabs-panel">
6 6
 		<?php
7
-        $name = 'tax_input[espresso_event_type]';
8
-        echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
9
-        ?>
7
+		$name = 'tax_input[espresso_event_type]';
8
+		echo "<input type='hidden' name='{$name}[]' value='0' />"; // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks.
9
+		?>
10 10
 		<ul id="espresso_event_typechecklist" data-wp-lists="list:espresso_event_type" class="categorychecklist form-no-clear">
11 11
 			<?php echo $radio_list; ?>
12 12
 		</ul>
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
14 14
 </div>
15 15
 <?php
16 16
 /**
17
- * Template vars in use:
18
- *
19
- * $radio_list;
20
- */
21 17
\ No newline at end of file
18
+		 * Template vars in use:
19
+		 *
20
+		 * $radio_list;
21
+		 */
22 22
\ No newline at end of file
Please login to merge, or discard this patch.
caffeinated/admin/extend/events/templates/import_page.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <div class="import-area">
2 2
 	<div class="important-notice">
3
-		<?php _e( 'The import feature has been disabled because of bugs. It is expected to be put back in place soon.', 'event_espresso' );?>
3
+		<?php _e('The import feature has been disabled because of bugs. It is expected to be put back in place soon.', 'event_espresso'); ?>
4 4
 	</div>
5 5
 <?php // echo $form?>
6 6
 </div>
Please login to merge, or discard this patch.
caffeinated/admin/extend/events/templates/template_settings.template.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <?php
2 2
 /**
3
- * Template for General Settings Template Tab
4
- */
3
+		 * Template for General Settings Template Tab
4
+		 */
5 5
 ?>
6 6
 <div class="padding">
7 7
 
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,6 +5,6 @@
 block discarded – undo
5 5
 ?>
6 6
 <div class="padding">
7 7
 
8
-	<?php do_action( 'AHEE__template_settings__template__before_settings_form' ); ?>
8
+	<?php do_action('AHEE__template_settings__template__before_settings_form'); ?>
9 9
 
10 10
 </div>
Please login to merge, or discard this patch.
admin/extend/general_settings/Extend_General_Settings_Admin_Page.core.php 2 patches
Spacing   +47 added lines, -47 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,30 +32,30 @@  discard block
 block discarded – undo
32 32
 
33 33
 
34 34
 
35
-	public function __construct( $routing = TRUE ) {
36
-		parent::__construct( $routing );
37
-		define( 'GEN_SET_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND . 'general_settings/templates/' );
35
+	public function __construct($routing = TRUE) {
36
+		parent::__construct($routing);
37
+		define('GEN_SET_CAF_TEMPLATE_PATH', EE_CORE_CAF_ADMIN_EXTEND.'general_settings/templates/');
38 38
 	}
39 39
 
40 40
 
41 41
 
42 42
 	protected function _extend_page_config() {
43 43
 
44
-		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND . 'general_settings';
44
+		$this->_admin_base_path = EE_CORE_CAF_ADMIN_EXTEND.'general_settings';
45 45
 
46 46
 		//filters and action hooks here
47
-		add_action('AHEE__admin_option_settings__template__before', array( $this, 'use_venue_and_staff_manager_settings'), 10 );
48
-		add_action( 'AHEE__admin_option_settings__template__before', array( $this, 'debug_logging_options' ), 9 );
49
-		add_filter( 'FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin', array( $this, 'update_debug_logging_options' ), 10, 1 );
47
+		add_action('AHEE__admin_option_settings__template__before', array($this, 'use_venue_and_staff_manager_settings'), 10);
48
+		add_action('AHEE__admin_option_settings__template__before', array($this, 'debug_logging_options'), 9);
49
+		add_filter('FHEE__General_Settings_Admin_Page___update_admin_option_settings__CFG_admin', array($this, 'update_debug_logging_options'), 10, 1);
50 50
 
51 51
 	}
52 52
 
53 53
 
54 54
 
55
-	public function use_venue_and_staff_manager_settings( $template_args ) {
56
-		$_args['use_personnel_manager_select'] = EEH_Form_Fields::select_input('use_personnel_manager', $template_args['values'], $template_args['use_personnel_manager'] );
57
-		$template = GEN_SET_CAF_TEMPLATE_PATH . 'use_venue_and_staff_manager_settings.template.php';
58
-		EEH_Template::display_template( $template, $_args );
55
+	public function use_venue_and_staff_manager_settings($template_args) {
56
+		$_args['use_personnel_manager_select'] = EEH_Form_Fields::select_input('use_personnel_manager', $template_args['values'], $template_args['use_personnel_manager']);
57
+		$template = GEN_SET_CAF_TEMPLATE_PATH.'use_venue_and_staff_manager_settings.template.php';
58
+		EEH_Template::display_template($template, $_args);
59 59
 	}
60 60
 
61 61
 
@@ -72,31 +72,31 @@  discard block
 block discarded – undo
72 72
 	 * @param bool $show_errors
73 73
 	 * @return bool
74 74
 	 */
75
-	protected function _request_filesystem_credentials( $show_errors = TRUE ) {
76
-
77
-		require_once( ABSPATH . 'wp-admin/includes/file.php' );
78
-		$url = EE_Admin_Page::add_query_args_and_nonce( array( 'action' => 'request_filesystem_credentials' ), $this->_admin_base_url );
79
-		$credentials = request_filesystem_credentials( $url );
80
-		if ( $credentials == FALSE ) {
81
-			if ( $show_errors ) {
82
-				EE_Error::get_notices( FALSE );
75
+	protected function _request_filesystem_credentials($show_errors = TRUE) {
76
+
77
+		require_once(ABSPATH.'wp-admin/includes/file.php');
78
+		$url = EE_Admin_Page::add_query_args_and_nonce(array('action' => 'request_filesystem_credentials'), $this->_admin_base_url);
79
+		$credentials = request_filesystem_credentials($url);
80
+		if ($credentials == FALSE) {
81
+			if ($show_errors) {
82
+				EE_Error::get_notices(FALSE);
83 83
 				EE_Error::reset_notices();
84
-				EE_Error::add_error( __('Connection settings are missing or incorrect. Please verify that the connection settings below are correct.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
85
-				add_filter( 'FHEE__General_Settings_Admin_Page___update_admin_option_settings__success', '__return_false' );
84
+				EE_Error::add_error(__('Connection settings are missing or incorrect. Please verify that the connection settings below are correct.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
85
+				add_filter('FHEE__General_Settings_Admin_Page___update_admin_option_settings__success', '__return_false');
86 86
 			}
87 87
 			return FALSE;
88 88
 		}
89 89
 		// now we have some credentials, try to get the wp_filesystem running
90
-		$WP_Filesystem = WP_Filesystem( $credentials );
91
-		if ( ! $WP_Filesystem ) {
92
-			if ( $show_errors ) {
93
-				EE_Error::get_notices( FALSE );
90
+		$WP_Filesystem = WP_Filesystem($credentials);
91
+		if ( ! $WP_Filesystem) {
92
+			if ($show_errors) {
93
+				EE_Error::get_notices(FALSE);
94 94
 				EE_Error::reset_notices();
95
-				EE_Error::add_error( __('There was an error connecting to the server. Please verify that the connection settings below are correct.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
96
-				add_filter( 'FHEE__General_Settings_Admin_Page___update_admin_option_settings__success', '__return_false' );
95
+				EE_Error::add_error(__('There was an error connecting to the server. Please verify that the connection settings below are correct.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
96
+				add_filter('FHEE__General_Settings_Admin_Page___update_admin_option_settings__success', '__return_false');
97 97
 			}
98 98
 			// our credentials were no good, ask the user for them again
99
-			request_filesystem_credentials( $url );
99
+			request_filesystem_credentials($url);
100 100
 			return FALSE;
101 101
 		}
102 102
 		EE_Registry::instance()->CFG->admin->use_full_logging = TRUE;
@@ -111,21 +111,21 @@  discard block
 block discarded – undo
111 111
 	 * @param array $template_args
112 112
 	 * @return void
113 113
 	 */
114
-	public function debug_logging_options( $template_args = array() ) {
115
-		if ( EE_Registry::instance()->CFG->admin->use_full_logging === NULL ) {
116
-			$this->_request_filesystem_credentials( FALSE );
114
+	public function debug_logging_options($template_args = array()) {
115
+		if (EE_Registry::instance()->CFG->admin->use_full_logging === NULL) {
116
+			$this->_request_filesystem_credentials(FALSE);
117 117
 			$template_args['use_full_logging'] = TRUE;
118
-			EE_Error::get_notices( FALSE );
118
+			EE_Error::get_notices(FALSE);
119 119
 			EE_Error::reset_notices();
120
-			EE_Error::add_attention( __('In order to enable Full Logging, the connection settings below are required.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__ );
120
+			EE_Error::add_attention(__('In order to enable Full Logging, the connection settings below are required.', 'event_espresso'), __FILE__, __FUNCTION__, __LINE__);
121 121
 			echo EE_Error::get_notices();
122 122
 		} else {
123 123
 			$template_args['use_full_logging'] = EE_Registry::instance()->CFG->admin->use_full_logging;
124 124
 		}
125
-		$template_args['use_remote_logging'] = isset( EE_Registry::instance()->CFG->admin->use_remote_logging ) ? absint( EE_Registry::instance()->CFG->admin->use_remote_logging ) : FALSE;
126
-		$template_args['remote_logging_url'] = isset( EE_Registry::instance()->CFG->admin->remote_logging_url ) && ! empty( EE_Registry::instance()->CFG->admin->remote_logging_url ) ? stripslashes( EE_Registry::instance()->CFG->admin->remote_logging_url ) : '';
127
-		$template = GEN_SET_CAF_TEMPLATE_PATH . 'debug_log_settings.template.php';
128
-		EEH_Template::display_template( $template, $template_args );
125
+		$template_args['use_remote_logging'] = isset(EE_Registry::instance()->CFG->admin->use_remote_logging) ? absint(EE_Registry::instance()->CFG->admin->use_remote_logging) : FALSE;
126
+		$template_args['remote_logging_url'] = isset(EE_Registry::instance()->CFG->admin->remote_logging_url) && ! empty(EE_Registry::instance()->CFG->admin->remote_logging_url) ? stripslashes(EE_Registry::instance()->CFG->admin->remote_logging_url) : '';
127
+		$template = GEN_SET_CAF_TEMPLATE_PATH.'debug_log_settings.template.php';
128
+		EEH_Template::display_template($template, $template_args);
129 129
 	}
130 130
 
131 131
 
@@ -136,24 +136,24 @@  discard block
 block discarded – undo
136 136
 	 * @param array $admin_options
137 137
 	 * @return array
138 138
 	 */
139
-	public function update_debug_logging_options( $admin_options = array() ) {
140
-		$use_full_logging = isset( $this->_req_data['use_full_logging'] ) ? (bool)absint( $this->_req_data['use_full_logging'] ) : $admin_options->use_full_logging;
139
+	public function update_debug_logging_options($admin_options = array()) {
140
+		$use_full_logging = isset($this->_req_data['use_full_logging']) ? (bool) absint($this->_req_data['use_full_logging']) : $admin_options->use_full_logging;
141 141
 		// trying to enable full logging for the first time?
142
-		if ( $use_full_logging && $use_full_logging !== $admin_options->use_full_logging ) {
142
+		if ($use_full_logging && $use_full_logging !== $admin_options->use_full_logging) {
143 143
 			$admin_options->use_full_logging = $this->_request_filesystem_credentials() ? TRUE : NULL;
144
-			if ( $admin_options->use_full_logging === NULL ) {
145
-				add_filter( 'FHEE__General_Settings_Admin_Page___update_admin_option_settings__success', '__return_false' );
144
+			if ($admin_options->use_full_logging === NULL) {
145
+				add_filter('FHEE__General_Settings_Admin_Page___update_admin_option_settings__success', '__return_false');
146 146
 			}
147 147
 		} else {
148 148
 			$admin_options->use_full_logging = $use_full_logging;
149 149
 		}
150
-		if ( $use_full_logging === FALSE ) {
151
-			EE_Error::get_notices( FALSE );
150
+		if ($use_full_logging === FALSE) {
151
+			EE_Error::get_notices(FALSE);
152 152
 			EE_Error::reset_notices();
153 153
 		}
154 154
 
155
-		$admin_options->use_remote_logging = isset( $this->_req_data['use_remote_logging'] ) ? absint( $this->_req_data['use_remote_logging'] ) : $admin_options->use_remote_logging;
156
-		$admin_options->remote_logging_url = isset( $this->_req_data['remote_logging_url'] ) ? esc_url_raw( $this->_req_data['remote_logging_url'] ) : $admin_options->remote_logging_url;
155
+		$admin_options->use_remote_logging = isset($this->_req_data['use_remote_logging']) ? absint($this->_req_data['use_remote_logging']) : $admin_options->use_remote_logging;
156
+		$admin_options->remote_logging_url = isset($this->_req_data['remote_logging_url']) ? esc_url_raw($this->_req_data['remote_logging_url']) : $admin_options->remote_logging_url;
157 157
 		return $admin_options;
158 158
 	}
159 159
 
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/extend/general_settings/templates/debug_log_settings.template.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -11,12 +11,12 @@  discard block
 block discarded – undo
11 11
 				<?php echo EEH_Template::get_help_tab_link('full_logging_info'); ?>
12 12
 			</th>
13 13
 			<td>
14
-				<?php echo EEH_Form_Fields::select_input('use_full_logging', $values, $use_full_logging ); ?>
14
+				<?php echo EEH_Form_Fields::select_input('use_full_logging', $values, $use_full_logging); ?>
15 15
 				<p class="description">
16 16
 					<span class="reminder-spn">
17 17
 						<?php _e('Please use caution when using this feature. These files may be publicly available.', 'event_espresso'); ?>
18 18
 					</span><br/>
19
-					<?php echo sprintf( __('Once saved, this file will be available at: %s', 'event_espresso'), '<br /><b>/wp-content/uploads/espresso/logs/' . EE_Registry::instance()->CFG->admin->log_file_name() . '</b>' ); ?>
19
+					<?php echo sprintf(__('Once saved, this file will be available at: %s', 'event_espresso'), '<br /><b>/wp-content/uploads/espresso/logs/'.EE_Registry::instance()->CFG->admin->log_file_name().'</b>'); ?>
20 20
 				</p>
21 21
 
22 22
 			</td>
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 				<?php echo EEH_Template::get_help_tab_link('remote_logging_info'); ?>
29 29
 			</th>
30 30
 			<td>
31
-				<?php echo EEH_Form_Fields::select_input('use_remote_logging', $values, $use_remote_logging ); ?>
31
+				<?php echo EEH_Form_Fields::select_input('use_remote_logging', $values, $use_remote_logging); ?>
32 32
 				<p class="description">
33 33
 					<?php _e('Send debugging data to the remote URL below.', 'event_espresso'); ?>
34 34
 				</p>
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
 				<?php echo EEH_Template::get_help_tab_link('remote_logging_url_info'); ?>
42 42
 			</th>
43 43
 			<td>
44
-				<input name="remote_logging_url" id="remote_logging_url" size="20" class="regular-text" type="text" value="<?php echo $remote_logging_url;?>" />
44
+				<input name="remote_logging_url" id="remote_logging_url" size="20" class="regular-text" type="text" value="<?php echo $remote_logging_url; ?>" />
45 45
 				<p class="description">
46 46
 					<?php _e('Example: http://requestb.in/MY_UNIQUE_ID', 'event_espresso'); ?>
47 47
 
Please login to merge, or discard this patch.
admin/extend/messages/Custom_Messages_Template_List_Table.class.php 2 patches
Spacing   +65 added lines, -65 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
 /**
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 class Custom_Messages_Template_List_Table extends EE_Admin_List_Table {
31 31
 
32 32
 
33
-	public function __construct( $admin_page ) {
33
+	public function __construct($admin_page) {
34 34
 		//Set parent defaults
35 35
 		parent::__construct($admin_page);
36 36
 	}
@@ -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_message_templates( $this->_per_page, $this->_view, FALSE, FALSE, FALSE );
43
-		$this->_all_data_count = $this->_admin_page->get_message_templates( $this->_per_page, $this->_view, TRUE, TRUE, FALSE );
42
+		$this->_data = $this->_admin_page->get_message_templates($this->_per_page, $this->_view, FALSE, FALSE, FALSE);
43
+		$this->_all_data_count = $this->_admin_page->get_message_templates($this->_per_page, $this->_view, TRUE, TRUE, FALSE);
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' => __('Message Template Group', 'event_espresso' ),
53
-			'plural' => __('Message Template', 'event_espresso' ),
52
+			'singular' => __('Message Template Group', 'event_espresso'),
53
+			'plural' => __('Message Template', 'event_espresso'),
54 54
 			'ajax' => TRUE, //for now,
55 55
 			'screen' => $this->_admin_page->get_current_screen()->id
56 56
 			);
@@ -59,15 +59,15 @@  discard block
 block discarded – undo
59 59
 			'cb' => '<input type="checkbox" />',
60 60
 			'name' => __('Template Name', 'event_espresso'),
61 61
 			'message_type' => __('Message Type', 'event_espresso'),
62
-			'messenger' => __( 'Messenger', 'event_espresso'),
63
-			'description' => __( 'Description', 'event_espresso' ),
64
-			'events' => __( 'Events', 'event_espresso'), //count of events using this template.
62
+			'messenger' => __('Messenger', 'event_espresso'),
63
+			'description' => __('Description', 'event_espresso'),
64
+			'events' => __('Events', 'event_espresso'), //count of events using this template.
65 65
 			'actions' => ''
66 66
 			//'messages_sent' => __( 'Total Sent', 'event_espresso' ) //todo this will come later when we've got message tracking in place.
67 67
 			);
68 68
 
69 69
 		$this->_sortable_columns = array(
70
-			'messenger' => array( 'MTP_messenger' => TRUE ),
70
+			'messenger' => array('MTP_messenger' => TRUE),
71 71
 			//'message_type' => array( 'MTP_message_type' => FALSE )
72 72
 			);
73 73
 
@@ -86,16 +86,16 @@  discard block
 block discarded – undo
86 86
 	 *
87 87
 	 * @return string
88 88
 	 */
89
-	public function single_row( $item ) {
89
+	public function single_row($item) {
90 90
 		$message_type = $item->message_type_obj();
91 91
 		$messenger = $item->messenger_obj();
92 92
 
93
-		if ( ! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger ) {
93
+		if ( ! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger) {
94 94
 			echo '';
95 95
 			return;
96 96
 		}
97 97
 
98
-		parent::single_row( $item );
98
+		parent::single_row($item);
99 99
 	}
100 100
 
101 101
 
@@ -103,29 +103,29 @@  discard block
 block discarded – undo
103 103
 
104 104
 	protected function _get_table_filters() {
105 105
 		$filters = array();
106
-		EE_Registry::instance()->load_helper( 'Form_Fields' );
106
+		EE_Registry::instance()->load_helper('Form_Fields');
107 107
 		$messengers = $this->_admin_page->get_active_messengers();
108 108
 		$message_types = $this->_admin_page->get_installed_message_types();
109 109
 
110 110
 
111 111
 		//setup messengers for selects
112
-		$i=1;
112
+		$i = 1;
113 113
 		$m_values[0]['id'] = 'all';
114
-		$m_values[0]['text'] = __('All Messengers', 'event_espresso' );
115
-		foreach ( $messengers as $messenger => $args ) {
114
+		$m_values[0]['text'] = __('All Messengers', 'event_espresso');
115
+		foreach ($messengers as $messenger => $args) {
116 116
 			$m_values[$i]['id'] = $messenger;
117 117
 			$m_values[$i]['text'] = ucwords($args['obj']->label['singular']);
118 118
 			$i++;
119 119
 		}
120
-		foreach ( $messengers as $messenger => $args ) {
120
+		foreach ($messengers as $messenger => $args) {
121 121
 			$m_values[$i]['id'] = $messenger;
122 122
 			$m_values[$i]['text'] = ucwords($args['obj']->label['singular']);
123 123
 			$i++;
124 124
 		}
125 125
 
126 126
 		//lets do the same for message types
127
-		$i=1;
128
-		foreach ( $message_types as $message_type => $args ) {
127
+		$i = 1;
128
+		foreach ($message_types as $message_type => $args) {
129 129
 			$mt_values[$i]['id'] = $message_type;
130 130
 			$mt_values[$i]['text'] = ucwords($args['obj']->label['singular']);
131 131
 			$i++;
@@ -141,28 +141,28 @@  discard block
 block discarded – undo
141 141
 			'text' => __('Show All', 'event_espresso')
142 142
 			);
143 143
 
144
-		$msgr_filters = !empty($m_values) ? array_merge( $msgr_default, $m_values ) : array();
145
-		$mt_filters = !empty($mt_values) ? array_merge( $mt_default, $mt_values ) : array();
144
+		$msgr_filters = ! empty($m_values) ? array_merge($msgr_default, $m_values) : array();
145
+		$mt_filters = ! empty($mt_values) ? array_merge($mt_default, $mt_values) : array();
146 146
 
147
-		if ( empty( $m_values ) )
147
+		if (empty($m_values))
148 148
 			$msgr_filters[0] = array(
149 149
 				'id' => 'no_messenger_options',
150 150
 				'text' => __('No Messengers active', 'event_espresso')
151 151
 				);
152 152
 
153
-		if ( empty($mt_values) )
153
+		if (empty($mt_values))
154 154
 			$mt_filters[0] = array(
155 155
 				'id' => 'no_message_type_options',
156 156
 				'text' => __('No Message Types active', 'event_espresso')
157 157
 				);
158 158
 
159
-		if ( count( $messengers ) >= 1  && !empty( $m_values ) ) {
160
-			unset( $msgr_filters[0] );
161
-			$msgr_filters = array_values( $msgr_filters ); //reindex keys
159
+		if (count($messengers) >= 1 && ! empty($m_values)) {
160
+			unset($msgr_filters[0]);
161
+			$msgr_filters = array_values($msgr_filters); //reindex keys
162 162
 		}
163 163
 
164
-		$filters[] = EEH_Form_Fields::select_input('ee_messenger_filter_by', $msgr_filters, isset($this->_req_data['ee_messenger_filter_by']) ? sanitize_key( $this->_req_data['ee_messenger_filter_by']) : '' );
165
-		$filters[] = EEH_Form_Fields::select_input('ee_message_type_filter_by', $mt_filters, isset($this->_req_data['ee_message_type_filter_by']) ? sanitize_key( $this->_req_data['ee_message_type_filter_by']) : '');
164
+		$filters[] = EEH_Form_Fields::select_input('ee_messenger_filter_by', $msgr_filters, isset($this->_req_data['ee_messenger_filter_by']) ? sanitize_key($this->_req_data['ee_messenger_filter_by']) : '');
165
+		$filters[] = EEH_Form_Fields::select_input('ee_message_type_filter_by', $mt_filters, isset($this->_req_data['ee_message_type_filter_by']) ? sanitize_key($this->_req_data['ee_message_type_filter_by']) : '');
166 166
 		return $filters;
167 167
 	}
168 168
 
@@ -170,14 +170,14 @@  discard block
 block discarded – undo
170 170
 	 * we're just removing the search box for message templates, not needed.
171 171
 	 * @return string (empty);
172 172
 	 */
173
-	function search_box( $text, $input_id ) {
173
+	function search_box($text, $input_id) {
174 174
 		return '';
175 175
 	}
176 176
 
177 177
 
178 178
 	protected function _add_view_counts() {
179
-		foreach ( $this->_views as $view => $args )  {
180
-			$this->_views[$view]['count'] = $this->_admin_page->get_message_templates( $this->_per_page, $view, TRUE, TRUE, FALSE );
179
+		foreach ($this->_views as $view => $args) {
180
+			$this->_views[$view]['count'] = $this->_admin_page->get_message_templates($this->_per_page, $view, TRUE, TRUE, FALSE);
181 181
 		}
182 182
 	}
183 183
 
@@ -191,16 +191,16 @@  discard block
 block discarded – undo
191 191
 	 * @return string
192 192
 	 */
193 193
 	public function no_items() {
194
-		if ( $this->_view !== 'trashed' )
195
-			printf( __('%sNo Custom Templates found.%s To create your first custom message template, go to the "Default Message Templates" tab and click the "Create Custom" button next to the template you want to use as a base for the new one.', 'event_espresso'), '<strong>', '</strong>' );
194
+		if ($this->_view !== 'trashed')
195
+			printf(__('%sNo Custom Templates found.%s To create your first custom message template, go to the "Default Message Templates" tab and click the "Create Custom" button next to the template you want to use as a base for the new one.', 'event_espresso'), '<strong>', '</strong>');
196 196
 		else
197 197
 			parent::no_items();
198 198
 	}
199 199
 
200 200
 
201 201
 
202
-	public function column_cb( $item ) {
203
-		return sprintf( '<input type="checkbox" name="checkbox[%s] value="1" />', $item->GRP_ID() );
202
+	public function column_cb($item) {
203
+		return sprintf('<input type="checkbox" name="checkbox[%s] value="1" />', $item->GRP_ID());
204 204
 	}
205 205
 
206 206
 
@@ -208,29 +208,29 @@  discard block
 block discarded – undo
208 208
 
209 209
 
210 210
 
211
-	function column_name( $item ) {
212
-		return '<p>' . $item->name() . '</p>';
211
+	function column_name($item) {
212
+		return '<p>'.$item->name().'</p>';
213 213
 	}
214 214
 
215 215
 
216 216
 
217 217
 
218
-	function column_description( $item ) {
219
-		return '<p>' . $item->description() . '</p>';
218
+	function column_description($item) {
219
+		return '<p>'.$item->description().'</p>';
220 220
 	}
221 221
 
222 222
 
223 223
 
224
-	function column_actions( $item ) {
225
-		if ( EE_Registry::instance()->CAP->current_user_can( 'ee_edit_messages', 'espresso_messages_add_new_message_template' ) ) {
224
+	function column_actions($item) {
225
+		if (EE_Registry::instance()->CAP->current_user_can('ee_edit_messages', 'espresso_messages_add_new_message_template')) {
226 226
 			$create_args = array(
227 227
 				'GRP_ID' => $item->ID(),
228 228
 				'messenger' => $item->messenger(),
229 229
 				'message_type' => $item->message_type(),
230 230
 				'action' => 'add_new_message_template'
231 231
 				);
232
-			$create_link = EE_Admin_Page::add_query_args_and_nonce( $create_args, EE_MSG_ADMIN_URL );
233
-			return sprintf( '<p><a href="%s" class="button button-small">%s</a></p>', $create_link, __('Create Custom', 'event_espresso') );
232
+			$create_link = EE_Admin_Page::add_query_args_and_nonce($create_args, EE_MSG_ADMIN_URL);
233
+			return sprintf('<p><a href="%s" class="button button-small">%s</a></p>', $create_link, __('Create Custom', 'event_espresso'));
234 234
 		}
235 235
 		return '';
236 236
 	}
@@ -247,27 +247,27 @@  discard block
 block discarded – undo
247 247
 		$actions = array();
248 248
 
249 249
 		// edit link but only if item isn't trashed.
250
-		if ( !$item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ) {
251
-			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'edit_message_template', 'id'=>$item->GRP_ID() ), EE_MSG_ADMIN_URL );
252
-			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Template', 'event_espresso' ) . '">' . __( 'Edit', 'event_espresso' ) . '</a>';
250
+		if ( ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID())) {
251
+			$edit_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_message_template', 'id'=>$item->GRP_ID()), EE_MSG_ADMIN_URL);
252
+			$actions['edit'] = '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Template', 'event_espresso').'">'.__('Edit', 'event_espresso').'</a>';
253 253
 		}
254 254
 
255
-		$name_link = ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() )? '<a href="'.$edit_lnk_url.'" title="' . esc_attr__( 'Edit Template', 'event_espresso' ) . '">' . ucwords( $item->messenger_obj()->label['singular'] ) . '</a>' : ucwords( $item->messenger_obj()->label['singular'] );
256
-		$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'trash_message_template', 'id'=>$item->GRP_ID(), 'noheader' => TRUE ), EE_MSG_ADMIN_URL );
255
+		$name_link = ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID()) ? '<a href="'.$edit_lnk_url.'" title="'.esc_attr__('Edit Template', 'event_espresso').'">'.ucwords($item->messenger_obj()->label['singular']).'</a>' : ucwords($item->messenger_obj()->label['singular']);
256
+		$trash_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'trash_message_template', 'id'=>$item->GRP_ID(), 'noheader' => TRUE), EE_MSG_ADMIN_URL);
257 257
 		// restore link
258
-		$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'restore_message_template', 'id'=>$item->GRP_ID(), 'noheader' => TRUE ), EE_MSG_ADMIN_URL );
258
+		$restore_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'restore_message_template', 'id'=>$item->GRP_ID(), 'noheader' => TRUE), EE_MSG_ADMIN_URL);
259 259
 		// delete price link
260
-		$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce( array( 'action'=>'delete_message_template', 'id'=>$item->GRP_ID(), 'noheader' => TRUE ), EE_MSG_ADMIN_URL );
260
+		$delete_lnk_url = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'delete_message_template', 'id'=>$item->GRP_ID(), 'noheader' => TRUE), EE_MSG_ADMIN_URL);
261 261
 
262
-		if ( !$item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_delete_message', 'espresso_messages_trash_message_template', $item->ID() ) ) {
263
-			$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="' . esc_attr__( 'Move Template Group to Trash', 'event_espresso' ) . '">' . __( 'Move to Trash', 'event_espresso' ) . '</a>';
262
+		if ( ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_delete_message', 'espresso_messages_trash_message_template', $item->ID())) {
263
+			$actions['trash'] = '<a href="'.$trash_lnk_url.'" title="'.esc_attr__('Move Template Group to Trash', 'event_espresso').'">'.__('Move to Trash', 'event_espresso').'</a>';
264 264
 		} else {
265
-			if ( EE_Registry::instance()->CAP->current_user_can( 'ee_delete_message', 'espresso_messages_restore_message_template', $item->ID() ) ) {
266
-				$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="' . esc_attr__( 'Restore Message Template', 'event_espresso' ) . '">' . __( 'Restore', 'event_espresso' ) . '</a>';
265
+			if (EE_Registry::instance()->CAP->current_user_can('ee_delete_message', 'espresso_messages_restore_message_template', $item->ID())) {
266
+				$actions['restore'] = '<a href="'.$restore_lnk_url.'" title="'.esc_attr__('Restore Message Template', 'event_espresso').'">'.__('Restore', 'event_espresso').'</a>';
267 267
 			}
268 268
 
269
-			if ( $this->_view == 'trashed' && EE_Registry::instance()->CAP->current_user_can( 'ee_delete_message', 'espresso_messages_delete_message_template', $item->ID() ) ) {
270
-				$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="' . esc_attr__( 'Delete Template Group Permanently', 'event_espresso' ) . '">' . __( 'Delete Permanently', 'event_espresso' ) . '</a>';
269
+			if ($this->_view == 'trashed' && EE_Registry::instance()->CAP->current_user_can('ee_delete_message', 'espresso_messages_delete_message_template', $item->ID())) {
270
+				$actions['delete'] = '<a href="'.$delete_lnk_url.'" title="'.esc_attr__('Delete Template Group Permanently', 'event_espresso').'">'.__('Delete Permanently', 'event_espresso').'</a>';
271 271
 			}
272 272
 		}
273 273
 
@@ -276,15 +276,15 @@  discard block
 block discarded – undo
276 276
 		$c_configs = $item->contexts_config();
277 277
 		$ctxt = array();
278 278
 		$context_templates = $item->context_templates();
279
-		foreach ( $context_templates as $context => $template_fields ) {
280
-			$mtp_to = !empty( $context_templates[$context]['to'] ) && $context_templates[$context]['to'] instanceof EE_Message_Template ? $context_templates[$context]['to']->get('MTP_content') : NULL;
281
-			$inactive = empty( $mtp_to ) && !empty( $context_templates[$context]['to'] ) ? ' class="mtp-inactive"' : '';
279
+		foreach ($context_templates as $context => $template_fields) {
280
+			$mtp_to = ! empty($context_templates[$context]['to']) && $context_templates[$context]['to'] instanceof EE_Message_Template ? $context_templates[$context]['to']->get('MTP_content') : NULL;
281
+			$inactive = empty($mtp_to) && ! empty($context_templates[$context]['to']) ? ' class="mtp-inactive"' : '';
282 282
 			$context_title = ucwords($c_configs[$context]['label']);
283
-			$edit_link = EE_Admin_Page::add_query_args_and_nonce( array('action'=>'edit_message_template', 'id'=>$item->GRP_ID(), 'context' => $context), EE_MSG_ADMIN_URL );
284
-			$ctxt[] = EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ? '<a' . $inactive . ' href="'. $edit_link . '" title="' . esc_attr__('Edit Context', 'event_espresso') . '">' . $context_title . '</a>' : $context_title;
283
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce(array('action'=>'edit_message_template', 'id'=>$item->GRP_ID(), 'context' => $context), EE_MSG_ADMIN_URL);
284
+			$ctxt[] = EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID()) ? '<a'.$inactive.' href="'.$edit_link.'" title="'.esc_attr__('Edit Context', 'event_espresso').'">'.$context_title.'</a>' : $context_title;
285 285
 		}
286 286
 
287
-		$ctx_content = !$item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can( 'ee_edit_message', 'espresso_messages_edit_message_template', $item->ID() ) ? sprintf( __('<strong>%s:</strong> ', 'event_espresso'), ucwords($c_label['plural']) ) . implode(' | ', $ctxt) : '';
287
+		$ctx_content = ! $item->get('MTP_deleted') && EE_Registry::instance()->CAP->current_user_can('ee_edit_message', 'espresso_messages_edit_message_template', $item->ID()) ? sprintf(__('<strong>%s:</strong> ', 'event_espresso'), ucwords($c_label['plural'])).implode(' | ', $ctxt) : '';
288 288
 
289 289
 
290 290
 		//Return the name contents
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
 										/* $1%s */ $name_link,
293 293
 										/* $2%s */ $item->GRP_ID(),
294 294
 										/* %4$s */ $ctx_content,
295
-										/* $3%s */ $this->row_actions( $actions )
295
+										/* $3%s */ $this->row_actions($actions)
296 296
 		);
297 297
 	}
298 298
 
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
 	 * @return string       message_type name
314 314
 	 */
315 315
 	function column_message_type($item) {
316
-		return ucwords($item->message_type_obj()->label['singular'] );
316
+		return ucwords($item->message_type_obj()->label['singular']);
317 317
 	}
318 318
 
319 319
 
Please login to merge, or discard this patch.
Braces   +13 added lines, -9 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
@@ -144,17 +145,19 @@  discard block
 block discarded – undo
144 145
 		$msgr_filters = !empty($m_values) ? array_merge( $msgr_default, $m_values ) : array();
145 146
 		$mt_filters = !empty($mt_values) ? array_merge( $mt_default, $mt_values ) : array();
146 147
 
147
-		if ( empty( $m_values ) )
148
-			$msgr_filters[0] = array(
148
+		if ( empty( $m_values ) ) {
149
+					$msgr_filters[0] = array(
149 150
 				'id' => 'no_messenger_options',
150 151
 				'text' => __('No Messengers active', 'event_espresso')
151 152
 				);
153
+		}
152 154
 
153
-		if ( empty($mt_values) )
154
-			$mt_filters[0] = array(
155
+		if ( empty($mt_values) ) {
156
+					$mt_filters[0] = array(
155 157
 				'id' => 'no_message_type_options',
156 158
 				'text' => __('No Message Types active', 'event_espresso')
157 159
 				);
160
+		}
158 161
 
159 162
 		if ( count( $messengers ) >= 1  && !empty( $m_values ) ) {
160 163
 			unset( $msgr_filters[0] );
@@ -191,10 +194,11 @@  discard block
 block discarded – undo
191 194
 	 * @return string
192 195
 	 */
193 196
 	public function no_items() {
194
-		if ( $this->_view !== 'trashed' )
195
-			printf( __('%sNo Custom Templates found.%s To create your first custom message template, go to the "Default Message Templates" tab and click the "Create Custom" button next to the template you want to use as a base for the new one.', 'event_espresso'), '<strong>', '</strong>' );
196
-		else
197
-			parent::no_items();
197
+		if ( $this->_view !== 'trashed' ) {
198
+					printf( __('%sNo Custom Templates found.%s To create your first custom message template, go to the "Default Message Templates" tab and click the "Create Custom" button next to the template you want to use as a base for the new one.', 'event_espresso'), '<strong>', '</strong>' );
199
+		} else {
200
+					parent::no_items();
201
+		}
198 202
 	}
199 203
 
200 204
 
Please login to merge, or discard this patch.