eventespresso / event-espresso-core

shortcodes/espresso_thank_you/templates/thank-you-page-registration-details.template.php

Spacing +18 added lines, -18 removed lines

@@ -5,61 +5,61 @@ 
 /** @type string $SPCO_attendee_information_url */
 ?>
 <h3 class="ee-registration-details-h3"><?php _e('Registration Details', 'event_espresso'); ?></h3>
-<?php  do_action( 'AHEE__thank_you_page_registration_details_template__after_heading' ); ?>
+<?php  do_action('AHEE__thank_you_page_registration_details_template__after_heading'); ?>
 
 <div class="ee-registration-details-dv">
 <?php
 $reg_cntr = 0;
 $event_name = '';
 
-foreach ( $transaction->registrations() as $registration ) {
-	if ( $registration instanceof EE_Registration ) {
+foreach ($transaction->registrations() as $registration) {
+	if ($registration instanceof EE_Registration) {
 		$reg_cntr++;
-		if ( $event_name != $registration->event_name() ) {
+		if ($event_name != $registration->event_name()) {
 			$event_name = $registration->event_name();
 	?>
 	<h5>
-		<span class="smaller-text grey-text"><?php _e('for','event_espresso');?>: </span> <?php echo htmlentities( $registration->event_name(), ENT_QUOTES, 'UTF-8' );?>
+		<span class="smaller-text grey-text"><?php _e('for', 'event_espresso'); ?>: </span> <?php echo htmlentities($registration->event_name(), ENT_QUOTES, 'UTF-8'); ?>
 	</h5>
 	<table class='ee-table ee-registrations-list'>
 		<thead>
 			<tr>
 				<th width="40%">
-					<?php _e("Registrant Name",'event_espresso')?>
+					<?php _e("Registrant Name", 'event_espresso')?>
 				</th>
 				<th width="25%" class="jst-left">
-					<?php _e("REG Code",'event_espresso');?>
+					<?php _e("REG Code", 'event_espresso'); ?>
 				</th>
 				<th width="35%" class="jst-left">
-					<?php _e("REG Status",'event_espresso');?>
+					<?php _e("REG Status", 'event_espresso'); ?>
 				</th>
 			</tr>
 		</thead>
 		<tbody>
 	<?php } ?>
-	<?php if ( $is_primary || ( ! $is_primary && $reg_url_link == $registration->reg_url_link() )) { ?>
+	<?php if ($is_primary || ( ! $is_primary && $reg_url_link == $registration->reg_url_link())) { ?>
 			<tr>
 				<td width="40%">
 				<?php
-					if ( $registration->attendee() instanceof EE_Attendee ) {
-						echo $registration->attendee()->full_name( TRUE );
+					if ($registration->attendee() instanceof EE_Attendee) {
+						echo $registration->attendee()->full_name(TRUE);
 					}
 				?>
 					<p class="tiny-text" style="margin: .75em 0 0;">
-						<a class="ee-icon-only-lnk" href="<?php echo $registration->edit_attendee_information_url();?>" title="<?php esc_attr_e('Click here to edit Attendee Information', 'event_espresso');?>"><span class="ee-icon ee-icon-user-edit"></span><?php _e('edit info', 'event_espresso');?></a>
-						<a class="ee-resend-reg-confirmation-email ee-icon-only-lnk" href="<?php echo add_query_arg( array( 'token'=>$registration->reg_url_link(), 'resend_reg_confirmation' => 'true' ), EE_Registry::instance()->CFG->core->thank_you_page_url() );?>" title="<?php esc_attr_e('Click here to resend the Registration Confirmation email', 'event_espresso');?>" rel="<?php echo $registration->reg_url_link();?>"><span class="dashicons dashicons-email-alt"></span><?php _e('resend email', 'event_espresso');?></a>
+						<a class="ee-icon-only-lnk" href="<?php echo $registration->edit_attendee_information_url(); ?>" title="<?php esc_attr_e('Click here to edit Attendee Information', 'event_espresso'); ?>"><span class="ee-icon ee-icon-user-edit"></span><?php _e('edit info', 'event_espresso'); ?></a>
+						<a class="ee-resend-reg-confirmation-email ee-icon-only-lnk" href="<?php echo add_query_arg(array('token'=>$registration->reg_url_link(), 'resend_reg_confirmation' => 'true'), EE_Registry::instance()->CFG->core->thank_you_page_url()); ?>" title="<?php esc_attr_e('Click here to resend the Registration Confirmation email', 'event_espresso'); ?>" rel="<?php echo $registration->reg_url_link(); ?>"><span class="dashicons dashicons-email-alt"></span><?php _e('resend email', 'event_espresso'); ?></a>
 					</p>
 				</td>
 				<td width="25%" class="jst-left">
 					<?php $registration->e('REG_code') ?>
 				</td>
 				<td width="35%" class="jst-left">
-					<?php $registration->e_pretty_status( TRUE )?>
+					<?php $registration->e_pretty_status(TRUE)?>
 				</td>
 			</tr>
-            <?php  do_action( 'AHEE__thank_you_page_registration_details_template__after_registration_table_row', $registration ); ?>
+            <?php  do_action('AHEE__thank_you_page_registration_details_template__after_registration_table_row', $registration); ?>
         <?php } ?>
-        <?php if (( $event_name != $registration->event_name() && $event_name != '' ) || $reg_cntr >= count( $transaction->registrations() )) {  ?>
+        <?php if (($event_name != $registration->event_name() && $event_name != '') || $reg_cntr >= count($transaction->registrations())) {  ?>
 		</tbody>
 	</table>
 	<?php
@@ -67,13 +67,13 @@ 
 	}
 }
 ?>
-<?php if ( $is_primary && $SPCO_attendee_information_url ) { ?>
+<?php if ($is_primary && $SPCO_attendee_information_url) { ?>
 	<p class="small-text jst-rght">
 		<a href='<?php echo $SPCO_attendee_information_url?>'><?php _e("Click here to edit All Attendee Information", 'event_espresso'); ?></a>
 	</p>
 <?php } ?>
 
-    <?php  do_action( 'AHEE__thank_you_page_registration_details_template__after_registration_details' ); ?>
+    <?php  do_action('AHEE__thank_you_page_registration_details_template__after_registration_details'); ?>
 
 </div>
 <!-- end of .registration-details -->

admin_pages/registrations/templates/reg_admin_details_header.template.php

Spacing +7 added lines, -7 removed lines

@@ -1,18 +1,18 @@
 	
-		<h3 id="reg-admin-reg-details-reg-nmbr-hdr"><?php echo __( 'Registration # ', 'event_espresso' ) . $reg_nmbr['value'];?></h3>
-		<h2 id="reg-admin-reg-details-reg-date-hdr"><?php echo $reg_datetime['value'];?></h2>
+		<h3 id="reg-admin-reg-details-reg-nmbr-hdr"><?php echo __('Registration # ', 'event_espresso').$reg_nmbr['value']; ?></h3>
+		<h2 id="reg-admin-reg-details-reg-date-hdr"><?php echo $reg_datetime['value']; ?></h2>
 		<h2 id="reg-admin-reg-details-reg-status-hdr">
-			<?php echo __( 'Registration Status : ', 'event_espresso' );?>
-			<span class="<?php echo $reg_status['class'];?>"><?php echo $reg_status['value'];?></span>
+			<?php echo __('Registration Status : ', 'event_espresso'); ?>
+			<span class="<?php echo $reg_status['class']; ?>"><?php echo $reg_status['value']; ?></span>
 		</h2>
 		<h3>
 			<?php _e('Change status to: ', 'event_espresso'); ?>
 			<span id="reg-admin-approve-decline-reg-status-spn">
-				<?php echo $approve_decline_reg_status_buttons;?>
+				<?php echo $approve_decline_reg_status_buttons; ?>
 			</span>
 		</h3>
-		<?php if ( $registration->group_size() > 1 ) : ?>
-			<a id="scroll-to-other-attendees" class="scroll-to" href="#other-attendees"><?php echo __( 'Scroll to Other Registrations in the Same Transaction', 'event_espresso' );?></a>
+		<?php if ($registration->group_size() > 1) : ?>
+			<a id="scroll-to-other-attendees" class="scroll-to" href="#other-attendees"><?php echo __('Scroll to Other Registrations in the Same Transaction', 'event_espresso'); ?></a>
 		<?php endif; ?>
 		
 

admin_pages/registrations/templates/reg_admin_details_main_meta_box_reg_details.template.php

Spacing +38 added lines, -38 removed lines

@@ -4,44 +4,44 @@ 
 	<?php echo $resend_registration_button; ?>
 	<br/>
 
-	<h4 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-clipboard"></span><?php _e( 'Registration Items', 'event_espresso' );?></h4>
+	<h4 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-clipboard"></span><?php _e('Registration Items', 'event_espresso'); ?></h4>
 
 	<div class="admin-primary-mbox-tbl-wrap">
 		<table class="admin-primary-mbox-tbl">
 			<thead>
 				<tr>
-					<th class="jst-left"><?php _e( 'Line Item ID', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Event Name', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Event Date', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Ticket Option', 'event_espresso' );?></th>
-					<th class="jst-cntr"><?php _e( 'Price', 'event_espresso' );?></th>
-					<th class="jst-cntr"><?php _e( 'Qty', 'event_espresso' );?></th>
-					<th class="jst-cntr"><?php _e( 'Line Total', 'event_espresso' );?></th>
+					<th class="jst-left"><?php _e('Line Item ID', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Event Name', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Event Date', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Ticket Option', 'event_espresso'); ?></th>
+					<th class="jst-cntr"><?php _e('Price', 'event_espresso'); ?></th>
+					<th class="jst-cntr"><?php _e('Qty', 'event_espresso'); ?></th>
+					<th class="jst-cntr"><?php _e('Line Total', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
-		<?php foreach ( $line_items as $item ) :
+		<?php foreach ($line_items as $item) :
 ?>
 			<tr>
-				<td class="jst-left"><?php echo $item->get('LIN_code');?></td>
-				<td class="jst-left"><?php echo $item->ticket_event_name();?></td>
-				<td class="jst-left"><?php echo $item->ticket_datetime_start('Y-m-d','h:i a'); ?></td>
-				<td class="jst-left"><?php echo $item->get('LIN_name');?></td>
-				<td class="jst-rght"><?php echo EEH_Template::format_currency( $item->get('LIN_unit_price') );?></td>
-				<td class="jst-rght"><?php echo $item->get('LIN_quantity');?></td>
-				<td class="jst-rght"><?php echo EEH_Template::format_currency($item->get('LIN_total'));?></td>
+				<td class="jst-left"><?php echo $item->get('LIN_code'); ?></td>
+				<td class="jst-left"><?php echo $item->ticket_event_name(); ?></td>
+				<td class="jst-left"><?php echo $item->ticket_datetime_start('Y-m-d', 'h:i a'); ?></td>
+				<td class="jst-left"><?php echo $item->get('LIN_name'); ?></td>
+				<td class="jst-rght"><?php echo EEH_Template::format_currency($item->get('LIN_unit_price')); ?></td>
+				<td class="jst-rght"><?php echo $item->get('LIN_quantity'); ?></td>
+				<td class="jst-rght"><?php echo EEH_Template::format_currency($item->get('LIN_total')); ?></td>
 			</tr>
 		<?php endforeach; // $items?>
-		<?php if ( $taxes ) : ?>
-			<?php foreach ( $taxes as $tax ) : ?>
+		<?php if ($taxes) : ?>
+			<?php foreach ($taxes as $tax) : ?>
 				<tr>
-					<th class=" jst-rght" colspan="6"><?php echo $tax->get('LIN_name');?> (<?php echo $tax->get_pretty('LIN_percent'); ?>%)</th>
-					<th class=" jst-rght"><?php echo EEH_Template::format_currency( $tax->get('LIN_total'));?></th>
+					<th class=" jst-rght" colspan="6"><?php echo $tax->get('LIN_name'); ?> (<?php echo $tax->get_pretty('LIN_percent'); ?>%)</th>
+					<th class=" jst-rght"><?php echo EEH_Template::format_currency($tax->get('LIN_total')); ?></th>
 				</tr>
 			<?php endforeach; // $taxes?>
 		<?php endif; // $taxes?>
 				<tr class="admin-primary-mbox-total-tr">
-					<th class=" jst-rght" colspan="6"><?php _e( 'Grand Total', 'event_espresso' );?></th>
+					<th class=" jst-rght" colspan="6"><?php _e('Grand Total', 'event_espresso'); ?></th>
 					<th class=" jst-rght"><?php echo $grand_total; ?></th>
 				</tr>
 			</tbody>
@@ -49,28 +49,28 @@ 
 	</div>
 
 	<?php
-	if ( WP_DEBUG ) {
-		$delivered_messages = get_option( 'EED_Messages__maybe_registration', array() );
-		if ( isset( $delivered_messages[ $REG_ID ] )) {
+	if (WP_DEBUG) {
+		$delivered_messages = get_option('EED_Messages__maybe_registration', array());
+		if (isset($delivered_messages[$REG_ID])) {
 	?>
-	<h4 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-email-alt"></span><?php _e( 'Messages Sent to Registrant', 'event_espresso' );?></h4>
+	<h4 class="admin-primary-mbox-h4 hdr-has-icon"><span class="dashicons dashicons-email-alt"></span><?php _e('Messages Sent to Registrant', 'event_espresso'); ?></h4>
 
 	<div class="admin-primary-mbox-tbl-wrap">
 		<table class="admin-primary-mbox-tbl">
 			<thead>
 				<tr>
-					<th class="jst-left"><?php _e( 'Date & Time', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'Message Type', 'event_espresso' );?></th>
-					<th class="jst-left"><?php _e( 'REG Status Upon Sending', 'event_espresso' );?></th>
+					<th class="jst-left"><?php _e('Date & Time', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('Message Type', 'event_espresso'); ?></th>
+					<th class="jst-left"><?php _e('REG Status Upon Sending', 'event_espresso'); ?></th>
 				</tr>
 			</thead>
 			<tbody>
-				<?php foreach ( $delivered_messages[ $REG_ID ] as $timestamp => $delivered_message ) :
+				<?php foreach ($delivered_messages[$REG_ID] as $timestamp => $delivered_message) :
 					?>
 					<tr>
-						<td class="jst-left"><?php echo gmdate( get_option('date_format') . ' ' . get_option('time_format'), ( $timestamp + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) );?></td>
-						<td class="jst-left"><?php echo isset( $delivered_message['message_type'] ) ? $delivered_message['message_type'] : '';?></td>
-						<td class="jst-left"><?php echo isset( $delivered_message['reg_status'] ) ? $delivered_message['reg_status'] : '';?></td>
+						<td class="jst-left"><?php echo gmdate(get_option('date_format').' '.get_option('time_format'), ($timestamp + (get_option('gmt_offset') * HOUR_IN_SECONDS))); ?></td>
+						<td class="jst-left"><?php echo isset($delivered_message['message_type']) ? $delivered_message['message_type'] : ''; ?></td>
+						<td class="jst-left"><?php echo isset($delivered_message['reg_status']) ? $delivered_message['reg_status'] : ''; ?></td>
 					</tr>
 				<?php endforeach; // $delivered_messages?>
 			</tbody>
@@ -82,27 +82,27 @@ 
 	?>
 
 	<a id="display-additional-registration-session-info" class="display-the-hidden smaller-text" rel="additional-registration-session-info">
-		<span class="dashicons dashicons-plus-alt"></span><?php _e( 'view additional registration session details', 'event_espresso' );?>
+		<span class="dashicons dashicons-plus-alt"></span><?php _e('view additional registration session details', 'event_espresso'); ?>
 	</a>
 
 	<div id="additional-registration-session-info-dv" class="hidden">
 
 		<a id="hide-additional-registration-session-info" class="hide-the-displayed hidden smaller-text" rel="additional-registration-session-info">
-			<span class="dashicons dashicons-dismiss"></span><?php _e( 'hide additional registration session details', 'event_espresso' );?>
+			<span class="dashicons dashicons-dismiss"></span><?php _e('hide additional registration session details', 'event_espresso'); ?>
 		</a>
 	<br class="clear"/>
 
-		<h4 class="admin-primary-mbox-h4"><?php _e( 'Registration Session Details', 'event_espresso' );?></h4>
+		<h4 class="admin-primary-mbox-h4"><?php _e('Registration Session Details', 'event_espresso'); ?></h4>
 
 		<table id="admin-primary-mbox-reg-extra-session-info-tbl" class="form-table skinny-rows">
 			<tbody>
-			<?php foreach ( $reg_details as $key => $reg_detail ) : ?>
+			<?php foreach ($reg_details as $key => $reg_detail) : ?>
 				<tr>
 					<th>
-						<label for="<?php echo $key;?>"><?php echo $reg_detail['label'];?></label>
+						<label for="<?php echo $key; ?>"><?php echo $reg_detail['label']; ?></label>
 					</th>
 					<td>
-						<?php echo $reg_detail['value'];?>
+						<?php echo $reg_detail['value']; ?>
 					</td>
 				</tr>
 			<?php endforeach; // $reg_details?>

core/libraries/messages/messenger/assets/email/CssToInlineStyles.php

Indentation +708 added lines, -708 removed lines

@@ -11,712 +11,712 @@
  */
 class CssToInlineStyles
 {
-    /**
-     * The CSS to use
-     *
-     * @var	string
-     */
-    private $css;
-
-    /**
-     * The processed CSS rules
-     *
-     * @var	array
-     */
-    private $cssRules;
-
-    /**
-     * Should the generated HTML be cleaned
-     *
-     * @var	bool
-     */
-    private $cleanup = false;
-
-    /**
-     * The encoding to use.
-     *
-     * @var	string
-     */
-    private $encoding = 'UTF-8';
-
-    /**
-     * The HTML to process
-     *
-     * @var	string
-     */
-    private $html;
-
-    /**
-     * Use inline-styles block as CSS
-     *
-     * @var	bool
-     */
-    private $useInlineStylesBlock = false;
-
-    /**
-     * Strip original style tags
-     *
-     * @var bool
-     */
-    private $stripOriginalStyleTags = false;
-
-    /**
-     * Exclude the media queries from the inlined styles
-     *
-     * @var bool
-     */
-    private $excludeMediaQueries = false;
-
-    /**
-     * Creates an instance, you could set the HTML and CSS here, or load it
-     * later.
-     *
-     * @return void
-     * @param  string[optional] $html The HTML to process.
-     * @param  string[optional] $css  The CSS to use.
-     */
-    public function __construct($html = null, $css = null)
-    {
-        if($html !== null) $this->setHTML($html);
-        if($css !== null) $this->setCSS($css);
-    }
-
-    /**
-     * Convert a CSS-selector into an xPath-query
-     *
-     * @return string
-     * @param  string $selector The CSS-selector.
-     */
-    private function buildXPathQuery($selector)
-    {
-        // redefine
-        $selector = (string) $selector;
-
-        // the CSS selector
-        $cssSelector = array(
-            // E F, Matches any F element that is a descendant of an E element
-            '/(\w)\s+([\w\*])/',
-            // E > F, Matches any F element that is a child of an element E
-            '/(\w)\s*>\s*([\w\*])/',
-            // E:first-child, Matches element E when E is the first child of its parent
-            '/(\w):first-child/',
-            // E + F, Matches any F element immediately preceded by an element
-            '/(\w)\s*\+\s*(\w)/',
-            // E[foo], Matches any E element with the "foo" attribute set (whatever the value)
-            '/(\w)\[([\w\-]+)]/',
-            // E[foo="warning"], Matches any E element whose "foo" attribute value is exactly equal to "warning"
-            '/(\w)\[([\w\-]+)\=\"(.*)\"]/',
-            // div.warning, HTML only. The same as DIV[class~="warning"]
-            '/(\w+|\*)+\.([\w\-]+)+/',
-            // .warning, HTML only. The same as *[class~="warning"]
-            '/\.([\w\-]+)/',
-            // E#myid, Matches any E element with id-attribute equal to "myid"
-            '/(\w+)+\#([\w\-]+)/',
-            // #myid, Matches any element with id-attribute equal to "myid"
-            '/\#([\w\-]+)/'
-        );
-
-        // the xPath-equivalent
-        $xPathQuery = array(
-            // E F, Matches any F element that is a descendant of an E element
-            '\1//\2',
-            // E > F, Matches any F element that is a child of an element E
-            '\1/\2',
-            // E:first-child, Matches element E when E is the first child of its parent
-            '*[1]/self::\1',
-            // E + F, Matches any F element immediately preceded by an element
-            '\1/following-sibling::*[1]/self::\2',
-            // E[foo], Matches any E element with the "foo" attribute set (whatever the value)
-            '\1 [ @\2 ]',
-            // E[foo="warning"], Matches any E element whose "foo" attribute value is exactly equal to "warning"
-            '\1[ contains( concat( " ", @\2, " " ), concat( " ", "\3", " " ) ) ]',
-            // div.warning, HTML only. The same as DIV[class~="warning"]
-            '\1[ contains( concat( " ", @class, " " ), concat( " ", "\2", " " ) ) ]',
-            // .warning, HTML only. The same as *[class~="warning"]
-            '*[ contains( concat( " ", @class, " " ), concat( " ", "\1", " " ) ) ]',
-            // E#myid, Matches any E element with id-attribute equal to "myid"
-            '\1[ @id = "\2" ]',
-            // #myid, Matches any element with id-attribute equal to "myid"
-            '*[ @id = "\1" ]'
-        );
-
-        // return
-        $xPath = (string) '//' . preg_replace($cssSelector, $xPathQuery, $selector);
-
-        return str_replace('] *', ']//*', $xPath);
-    }
-
-    /**
-     * Calculate the specifity for the CSS-selector
-     *
-     * @return int
-     * @param  string $selector The selector to calculate the specifity for.
-     */
-    private function calculateCSSSpecifity($selector)
-    {
-        // cleanup selector
-        $selector = str_replace(array('>', '+'), array(' > ', ' + '), $selector);
-
-        // init var
-        $specifity = 0;
-
-        // split the selector into chunks based on spaces
-        $chunks = explode(' ', $selector);
-
-        // loop chunks
-        foreach ($chunks as $chunk) {
-            // an ID is important, so give it a high specifity
-            if(strstr($chunk, '#') !== false) $specifity += 100;
-
-            // classes are more important than a tag, but less important then an ID
-            elseif(strstr($chunk, '.')) $specifity += 10;
-
-            // anything else isn't that important
-            else $specifity += 1;
-        }
-
-        // return
-        return $specifity;
-    }
-
-
-    /**
-     * Cleanup the generated HTML
-     *
-     * @return string
-     * @param  string $html The HTML to cleanup.
-     */
-    private function cleanupHTML($html)
-    {
-        // remove classes
-        $html = preg_replace('/(\s)+class="(.*)"(\s)+/U', ' ', $html);
-
-        // remove IDs
-        $html = preg_replace('/(\s)+id="(.*)"(\s)+/U', ' ', $html);
-
-        // return
-        return $html;
-    }
-
-
-    /**
-     * Converts the loaded HTML into an HTML-string with inline styles based on the loaded CSS
-     *
-     * @return string
-     * @param  bool[optional] $outputXHTML Should we output valid XHTML?
-     */
-    public function convert($outputXHTML = false)
-    {
-        // redefine
-        $outputXHTML = (bool) $outputXHTML;
-
-        // validate
-        if($this->html == null) throw new Exception('No HTML provided.');
-
-        // should we use inline style-block
-        if ($this->useInlineStylesBlock) {
-            // init var
-            $matches = array();
-
-            // match the style blocks
-            preg_match_all('|<style(.*)>(.*)</style>|isU', $this->html, $matches);
-
-            // any style-blocks found?
-            if (!empty($matches[2])) {
-                // add
-                foreach($matches[2] as $match) $this->css .= trim($match) ."\n";
-            }
-        }
-
-        // process css
-        $this->processCSS();
-
-        // create new DOMDocument
-        $document = new DOMDocument('1.0', $this->getEncoding());
-
-        // set error level
-        libxml_use_internal_errors(true);
-
-        // load HTML
-        $document->loadHTML($this->html);
-
-        // create new XPath
-        $xPath = new DOMXPath($document);
-
-        // any rules?
-        if (!empty($this->cssRules)) {
-            // loop rules
-            foreach ($this->cssRules as $rule) {
-                // init var
-                $query = $this->buildXPathQuery($rule['selector']);
-
-                // validate query
-                if($query === false) continue;
-
-                // search elements
-                $elements = $xPath->query($query);
-
-                // validate elements
-                if($elements === false) continue;
-
-                // loop found elements
-                foreach ($elements as $element) {
-                    // no styles stored?
-                    if ($element->attributes->getNamedItem(
-                        'data-css-to-inline-styles-original-styles'
-                    ) == null) {
-                        // init var
-                        $originalStyle = '';
-                        if ($element->attributes->getNamedItem('style') !== null) {
-                            $originalStyle = $element->attributes->getNamedItem('style')->value;
-                        }
-
-                        // store original styles
-                        $element->setAttribute(
-                            'data-css-to-inline-styles-original-styles',
-                            $originalStyle
-                        );
-
-                        // clear the styles
-                        $element->setAttribute('style', '');
-                    }
-
-                    // init var
-                    $properties = array();
-
-                    // get current styles
-                    $stylesAttribute = $element->attributes->getNamedItem('style');
-
-                    // any styles defined before?
-                    if ($stylesAttribute !== null) {
-                        // get value for the styles attribute
-                        $definedStyles = (string) $stylesAttribute->value;
-
-                        // split into properties
-                        $definedProperties = (array) explode(';', $definedStyles);
-
-                        // loop properties
-                        foreach ($definedProperties as $property) {
-                            // validate property
-                            if($property == '') continue;
-
-                            // split into chunks
-                            $chunks = (array) explode(':', trim($property), 2);
-
-                            // validate
-                            if(!isset($chunks[1])) continue;
-
-                            // loop chunks
-                            $properties[$chunks[0]] = trim($chunks[1]);
-                        }
-                    }
-
-                    // add new properties into the list
-                    foreach ($rule['properties'] as $key => $value) {
-                        $properties[$key] = $value;
-                    }
-
-                    // build string
-                    $propertyChunks = array();
-
-                    // build chunks
-                    foreach ($properties as $key => $values) {
-                        foreach ((array) $values as $value) {
-                            $propertyChunks[] = $key . ': ' . $value . ';';
-                        }
-                    }
-
-                    // build properties string
-                    $propertiesString = implode(' ', $propertyChunks);
-
-                    // set attribute
-                    if ($propertiesString != '') {
-                        $element->setAttribute('style', $propertiesString);
-                    }
-                }
-            }
-
-            // reapply original styles
-            $query = $this->buildXPathQuery(
-                '*[@data-css-to-inline-styles-original-styles]'
-            );
-
-            // validate query
-            if($query === false) return;
-
-            // search elements
-            $elements = $xPath->query($query);
-
-            // loop found elements
-            foreach ($elements as $element) {
-                // get the original styles
-                $originalStyle = $element->attributes->getNamedItem(
-                    'data-css-to-inline-styles-original-styles'
-                )->value;
-
-                if ($originalStyle != '') {
-                    $originalProperties = array();
-                    $originalStyles = (array) explode(';', $originalStyle);
-
-                    foreach ($originalStyles as $property) {
-                        // validate property
-                        if($property == '') continue;
-
-                        // split into chunks
-                        $chunks = (array) explode(':', trim($property), 2);
-
-                        // validate
-                        if(!isset($chunks[1])) continue;
-
-                        // loop chunks
-                        $originalProperties[$chunks[0]] = trim($chunks[1]);
-                    }
-
-                    // get current styles
-                    $stylesAttribute = $element->attributes->getNamedItem('style');
-                    $properties = array();
-
-                    // any styles defined before?
-                    if ($stylesAttribute !== null) {
-                        // get value for the styles attribute
-                        $definedStyles = (string) $stylesAttribute->value;
-
-                        // split into properties
-                        $definedProperties = (array) explode(';', $definedStyles);
-
-                        // loop properties
-                        foreach ($definedProperties as $property) {
-                            // validate property
-                            if($property == '') continue;
-
-                            // split into chunks
-                            $chunks = (array) explode(':', trim($property), 2);
-
-                            // validate
-                            if(!isset($chunks[1])) continue;
-
-                            // loop chunks
-                            $properties[$chunks[0]] = trim($chunks[1]);
-                        }
-                    }
-
-                    // add new properties into the list
-                    foreach ($originalProperties as $key => $value) {
-                        $properties[$key] = $value;
-                    }
-
-                    // build string
-                    $propertyChunks = array();
-
-                    // build chunks
-                    foreach ($properties as $key => $values) {
-                        foreach ((array) $values as $value) {
-                            $propertyChunks[] = $key . ': ' . $value . ';';
-                        }
-                    }
-
-                    // build properties string
-                    $propertiesString = implode(' ', $propertyChunks);
-
-                    // set attribute
-                    if($propertiesString != '') $element->setAttribute(
-                        'style', $propertiesString
-                    );
-                }
-
-                // remove placeholder
-                $element->removeAttribute(
-                    'data-css-to-inline-styles-original-styles'
-                );
-            }
-        }
-
-        // should we output XHTML?
-        if ($outputXHTML) {
-            // set formating
-            $document->formatOutput = true;
-
-            // get the HTML as XML
-            $html = $document->saveXML(null, LIBXML_NOEMPTYTAG);
-
-            // get start of the XML-declaration
-            $startPosition = strpos($html, '<?xml');
-
-            // valid start position?
-            if ($startPosition !== false) {
-                // get end of the xml-declaration
-                $endPosition = strpos($html, '?>', $startPosition);
-
-                // remove the XML-header
-                $html = ltrim(substr($html, $endPosition + 1));
-            }
-        }
-
-        // just regular HTML 4.01 as it should be used in newsletters
-        else {
-            // get the HTML
-            $html = $document->saveHTML();
-        }
-
-        // cleanup the HTML if we need to
-        if($this->cleanup) $html = $this->cleanupHTML($html);
-
-        // strip original style tags if we need to
-        if ($this->stripOriginalStyleTags) {
-            $html = $this->stripOriginalStyleTags($html);
-        }
-
-        // return
-        return $html;
-    }
-
-
-    /**
-     * Get the encoding to use
-     *
-     * @return string
-     */
-    private function getEncoding()
-    {
-        return $this->encoding;
-    }
-
-
-    /**
-     * Process the loaded CSS
-     *
-     * @return void
-     */
-    private function processCSS()
-    {
-        // init vars
-        $css = (string) $this->css;
-
-        // remove newlines
-        $css = str_replace(array("\r", "\n"), '', $css);
-
-        // replace double quotes by single quotes
-        $css = str_replace('"', '\'', $css);
-
-        // remove comments
-        $css = preg_replace('|/\*.*?\*/|', '', $css);
-
-        // remove spaces
-        $css = preg_replace('/\s\s+/', ' ', $css);
-
-        if ($this->excludeMediaQueries) {
-            $css = preg_replace('/@media [^{]*{([^{}]|{[^{}]*})*}/', '', $css);
-        }
-
-        // rules are splitted by }
-        $rules = (array) explode('}', $css);
-
-        // init var
-        $i = 1;
-
-        // loop rules
-        foreach ($rules as $rule) {
-            // split into chunks
-            $chunks = explode('{', $rule);
-
-            // invalid rule?
-            if(!isset($chunks[1])) continue;
-
-            // set the selectors
-            $selectors = trim($chunks[0]);
-
-            // get cssProperties
-            $cssProperties = trim($chunks[1]);
-
-            // split multiple selectors
-            $selectors = (array) explode(',', $selectors);
-
-            // loop selectors
-            foreach ($selectors as $selector) {
-                // cleanup
-                $selector = trim($selector);
-
-                // build an array for each selector
-                $ruleSet = array();
-
-                // store selector
-                $ruleSet['selector'] = $selector;
-
-                // process the properties
-                $ruleSet['properties'] = $this->processCSSProperties(
-                    $cssProperties
-                );
-
-                // calculate specifity
-                $ruleSet['specifity'] = $this->calculateCSSSpecifity(
-                    $selector
-                ) + $i;
-
-                // add into global rules
-                $this->cssRules[] = $ruleSet;
-            }
-
-            // increment
-            $i++;
-        }
-
-        // sort based on specifity
-        if (!empty($this->cssRules)) {
-            usort($this->cssRules, array(__CLASS__, 'sortOnSpecifity'));
-        }
-    }
-
-    /**
-     * Process the CSS-properties
-     *
-     * @return array
-     * @param  string $propertyString The CSS-properties.
-     */
-    private function processCSSProperties($propertyString)
-    {
-        // split into chunks
-        $properties = (array) explode(';', $propertyString);
-
-        // init var
-        $pairs = array();
-
-        // loop properties
-        foreach ($properties as $property) {
-            // split into chunks
-            $chunks = (array) explode(':', $property, 2);
-
-            // validate
-            if(!isset($chunks[1])) continue;
-
-            // cleanup
-            $chunks[0] = trim($chunks[0]);
-            $chunks[1] = trim($chunks[1]);
-
-            // add to pairs array
-            if(!isset($pairs[$chunks[0]]) ||
-               !in_array($chunks[1], $pairs[$chunks[0]])) {
-                $pairs[$chunks[0]][] = $chunks[1];
-            }
-        }
-
-        // sort the pairs
-        ksort($pairs);
-
-        // return
-        return $pairs;
-    }
-
-    /**
-     * Should the IDs and classes be removed?
-     *
-     * @return void
-     * @param  bool[optional] $on Should we enable cleanup?
-     */
-    public function setCleanup($on = true)
-    {
-        $this->cleanup = (bool) $on;
-    }
-
-    /**
-     * Set CSS to use
-     *
-     * @return void
-     * @param  string $css The CSS to use.
-     */
-    public function setCSS($css)
-    {
-        $this->css = (string) $css;
-    }
-
-    /**
-     * Set the encoding to use with the DOMDocument
-     *
-     * @return void
-     * @param  string $encoding The encoding to use.
-     */
-    public function setEncoding($encoding)
-    {
-        $this->encoding = (string) $encoding;
-    }
-
-    /**
-     * Set HTML to process
-     *
-     * @return void
-     * @param  string $html The HTML to process.
-     */
-    public function setHTML($html)
-    {
-        $this->html = (string) $html;
-    }
-
-    /**
-     * Set use of inline styles block
-     * If this is enabled the class will use the style-block in the HTML.
-     *
-     * @return void
-     * @param  bool[optional] $on Should we process inline styles?
-     */
-    public function setUseInlineStylesBlock($on = true)
-    {
-        $this->useInlineStylesBlock = (bool) $on;
-    }
-
-    /**
-     * Set strip original style tags
-     * If this is enabled the class will remove all style tags in the HTML.
-     *
-     * @return void
-     * @param  bool[optional] $on Should we process inline styles?
-     */
-    public function setStripOriginalStyleTags($on = true)
-    {
-        $this->stripOriginalStyleTags = (bool) $on;
-    }
-
-    /**
-     * Set exclude media queries
-     *
-     * If this is enabled the media queries will be removed before inlining the rules
-     *
-     * @return void
-     * @param bool[optional] $on
-     */
-    public function setExcludeMediaQueries($on = true)
-    {
-        $this->excludeMediaQueries = (bool) $on;
-    }
-
-    /**
-     * Strip style tags into the generated HTML
-     *
-     * @return string
-     * @param  string $html The HTML to strip style tags.
-     */
-    private function stripOriginalStyleTags($html)
-    {
-        return preg_replace('|<style(.*)>(.*)</style>|isU', '', $html);
-    }
-
-    /**
-     * Sort an array on the specifity element
-     *
-     * @return int
-     * @param  array $e1 The first element.
-     * @param  array $e2 The second element.
-     */
-    private static function sortOnSpecifity($e1, $e2)
-    {
-        // validate
-        if(!isset($e1['specifity']) || !isset($e2['specifity'])) return 0;
-
-        // lower
-        if($e1['specifity'] < $e2['specifity']) return -1;
-
-        // higher
-        if($e1['specifity'] > $e2['specifity']) return 1;
-
-        // fallback
-        return 0;
-    }
+	/**
+	 * The CSS to use
+	 *
+	 * @var	string
+	 */
+	private $css;
+
+	/**
+	 * The processed CSS rules
+	 *
+	 * @var	array
+	 */
+	private $cssRules;
+
+	/**
+	 * Should the generated HTML be cleaned
+	 *
+	 * @var	bool
+	 */
+	private $cleanup = false;
+
+	/**
+	 * The encoding to use.
+	 *
+	 * @var	string
+	 */
+	private $encoding = 'UTF-8';
+
+	/**
+	 * The HTML to process
+	 *
+	 * @var	string
+	 */
+	private $html;
+
+	/**
+	 * Use inline-styles block as CSS
+	 *
+	 * @var	bool
+	 */
+	private $useInlineStylesBlock = false;
+
+	/**
+	 * Strip original style tags
+	 *
+	 * @var bool
+	 */
+	private $stripOriginalStyleTags = false;
+
+	/**
+	 * Exclude the media queries from the inlined styles
+	 *
+	 * @var bool
+	 */
+	private $excludeMediaQueries = false;
+
+	/**
+	 * Creates an instance, you could set the HTML and CSS here, or load it
+	 * later.
+	 *
+	 * @return void
+	 * @param  string[optional] $html The HTML to process.
+	 * @param  string[optional] $css  The CSS to use.
+	 */
+	public function __construct($html = null, $css = null)
+	{
+		if($html !== null) $this->setHTML($html);
+		if($css !== null) $this->setCSS($css);
+	}
+
+	/**
+	 * Convert a CSS-selector into an xPath-query
+	 *
+	 * @return string
+	 * @param  string $selector The CSS-selector.
+	 */
+	private function buildXPathQuery($selector)
+	{
+		// redefine
+		$selector = (string) $selector;
+
+		// the CSS selector
+		$cssSelector = array(
+			// E F, Matches any F element that is a descendant of an E element
+			'/(\w)\s+([\w\*])/',
+			// E > F, Matches any F element that is a child of an element E
+			'/(\w)\s*>\s*([\w\*])/',
+			// E:first-child, Matches element E when E is the first child of its parent
+			'/(\w):first-child/',
+			// E + F, Matches any F element immediately preceded by an element
+			'/(\w)\s*\+\s*(\w)/',
+			// E[foo], Matches any E element with the "foo" attribute set (whatever the value)
+			'/(\w)\[([\w\-]+)]/',
+			// E[foo="warning"], Matches any E element whose "foo" attribute value is exactly equal to "warning"
+			'/(\w)\[([\w\-]+)\=\"(.*)\"]/',
+			// div.warning, HTML only. The same as DIV[class~="warning"]
+			'/(\w+|\*)+\.([\w\-]+)+/',
+			// .warning, HTML only. The same as *[class~="warning"]
+			'/\.([\w\-]+)/',
+			// E#myid, Matches any E element with id-attribute equal to "myid"
+			'/(\w+)+\#([\w\-]+)/',
+			// #myid, Matches any element with id-attribute equal to "myid"
+			'/\#([\w\-]+)/'
+		);
+
+		// the xPath-equivalent
+		$xPathQuery = array(
+			// E F, Matches any F element that is a descendant of an E element
+			'\1//\2',
+			// E > F, Matches any F element that is a child of an element E
+			'\1/\2',
+			// E:first-child, Matches element E when E is the first child of its parent
+			'*[1]/self::\1',
+			// E + F, Matches any F element immediately preceded by an element
+			'\1/following-sibling::*[1]/self::\2',
+			// E[foo], Matches any E element with the "foo" attribute set (whatever the value)
+			'\1 [ @\2 ]',
+			// E[foo="warning"], Matches any E element whose "foo" attribute value is exactly equal to "warning"
+			'\1[ contains( concat( " ", @\2, " " ), concat( " ", "\3", " " ) ) ]',
+			// div.warning, HTML only. The same as DIV[class~="warning"]
+			'\1[ contains( concat( " ", @class, " " ), concat( " ", "\2", " " ) ) ]',
+			// .warning, HTML only. The same as *[class~="warning"]
+			'*[ contains( concat( " ", @class, " " ), concat( " ", "\1", " " ) ) ]',
+			// E#myid, Matches any E element with id-attribute equal to "myid"
+			'\1[ @id = "\2" ]',
+			// #myid, Matches any element with id-attribute equal to "myid"
+			'*[ @id = "\1" ]'
+		);
+
+		// return
+		$xPath = (string) '//' . preg_replace($cssSelector, $xPathQuery, $selector);
+
+		return str_replace('] *', ']//*', $xPath);
+	}
+
+	/**
+	 * Calculate the specifity for the CSS-selector
+	 *
+	 * @return int
+	 * @param  string $selector The selector to calculate the specifity for.
+	 */
+	private function calculateCSSSpecifity($selector)
+	{
+		// cleanup selector
+		$selector = str_replace(array('>', '+'), array(' > ', ' + '), $selector);
+
+		// init var
+		$specifity = 0;
+
+		// split the selector into chunks based on spaces
+		$chunks = explode(' ', $selector);
+
+		// loop chunks
+		foreach ($chunks as $chunk) {
+			// an ID is important, so give it a high specifity
+			if(strstr($chunk, '#') !== false) $specifity += 100;
+
+			// classes are more important than a tag, but less important then an ID
+			elseif(strstr($chunk, '.')) $specifity += 10;
+
+			// anything else isn't that important
+			else $specifity += 1;
+		}
+
+		// return
+		return $specifity;
+	}
+
+
+	/**
+	 * Cleanup the generated HTML
+	 *
+	 * @return string
+	 * @param  string $html The HTML to cleanup.
+	 */
+	private function cleanupHTML($html)
+	{
+		// remove classes
+		$html = preg_replace('/(\s)+class="(.*)"(\s)+/U', ' ', $html);
+
+		// remove IDs
+		$html = preg_replace('/(\s)+id="(.*)"(\s)+/U', ' ', $html);
+
+		// return
+		return $html;
+	}
+
+
+	/**
+	 * Converts the loaded HTML into an HTML-string with inline styles based on the loaded CSS
+	 *
+	 * @return string
+	 * @param  bool[optional] $outputXHTML Should we output valid XHTML?
+	 */
+	public function convert($outputXHTML = false)
+	{
+		// redefine
+		$outputXHTML = (bool) $outputXHTML;
+
+		// validate
+		if($this->html == null) throw new Exception('No HTML provided.');
+
+		// should we use inline style-block
+		if ($this->useInlineStylesBlock) {
+			// init var
+			$matches = array();
+
+			// match the style blocks
+			preg_match_all('|<style(.*)>(.*)</style>|isU', $this->html, $matches);
+
+			// any style-blocks found?
+			if (!empty($matches[2])) {
+				// add
+				foreach($matches[2] as $match) $this->css .= trim($match) ."\n";
+			}
+		}
+
+		// process css
+		$this->processCSS();
+
+		// create new DOMDocument
+		$document = new DOMDocument('1.0', $this->getEncoding());
+
+		// set error level
+		libxml_use_internal_errors(true);
+
+		// load HTML
+		$document->loadHTML($this->html);
+
+		// create new XPath
+		$xPath = new DOMXPath($document);
+
+		// any rules?
+		if (!empty($this->cssRules)) {
+			// loop rules
+			foreach ($this->cssRules as $rule) {
+				// init var
+				$query = $this->buildXPathQuery($rule['selector']);
+
+				// validate query
+				if($query === false) continue;
+
+				// search elements
+				$elements = $xPath->query($query);
+
+				// validate elements
+				if($elements === false) continue;
+
+				// loop found elements
+				foreach ($elements as $element) {
+					// no styles stored?
+					if ($element->attributes->getNamedItem(
+						'data-css-to-inline-styles-original-styles'
+					) == null) {
+						// init var
+						$originalStyle = '';
+						if ($element->attributes->getNamedItem('style') !== null) {
+							$originalStyle = $element->attributes->getNamedItem('style')->value;
+						}
+
+						// store original styles
+						$element->setAttribute(
+							'data-css-to-inline-styles-original-styles',
+							$originalStyle
+						);
+
+						// clear the styles
+						$element->setAttribute('style', '');
+					}
+
+					// init var
+					$properties = array();
+
+					// get current styles
+					$stylesAttribute = $element->attributes->getNamedItem('style');
+
+					// any styles defined before?
+					if ($stylesAttribute !== null) {
+						// get value for the styles attribute
+						$definedStyles = (string) $stylesAttribute->value;
+
+						// split into properties
+						$definedProperties = (array) explode(';', $definedStyles);
+
+						// loop properties
+						foreach ($definedProperties as $property) {
+							// validate property
+							if($property == '') continue;
+
+							// split into chunks
+							$chunks = (array) explode(':', trim($property), 2);
+
+							// validate
+							if(!isset($chunks[1])) continue;
+
+							// loop chunks
+							$properties[$chunks[0]] = trim($chunks[1]);
+						}
+					}
+
+					// add new properties into the list
+					foreach ($rule['properties'] as $key => $value) {
+						$properties[$key] = $value;
+					}
+
+					// build string
+					$propertyChunks = array();
+
+					// build chunks
+					foreach ($properties as $key => $values) {
+						foreach ((array) $values as $value) {
+							$propertyChunks[] = $key . ': ' . $value . ';';
+						}
+					}
+
+					// build properties string
+					$propertiesString = implode(' ', $propertyChunks);
+
+					// set attribute
+					if ($propertiesString != '') {
+						$element->setAttribute('style', $propertiesString);
+					}
+				}
+			}
+
+			// reapply original styles
+			$query = $this->buildXPathQuery(
+				'*[@data-css-to-inline-styles-original-styles]'
+			);
+
+			// validate query
+			if($query === false) return;
+
+			// search elements
+			$elements = $xPath->query($query);
+
+			// loop found elements
+			foreach ($elements as $element) {
+				// get the original styles
+				$originalStyle = $element->attributes->getNamedItem(
+					'data-css-to-inline-styles-original-styles'
+				)->value;
+
+				if ($originalStyle != '') {
+					$originalProperties = array();
+					$originalStyles = (array) explode(';', $originalStyle);
+
+					foreach ($originalStyles as $property) {
+						// validate property
+						if($property == '') continue;
+
+						// split into chunks
+						$chunks = (array) explode(':', trim($property), 2);
+
+						// validate
+						if(!isset($chunks[1])) continue;
+
+						// loop chunks
+						$originalProperties[$chunks[0]] = trim($chunks[1]);
+					}
+
+					// get current styles
+					$stylesAttribute = $element->attributes->getNamedItem('style');
+					$properties = array();
+
+					// any styles defined before?
+					if ($stylesAttribute !== null) {
+						// get value for the styles attribute
+						$definedStyles = (string) $stylesAttribute->value;
+
+						// split into properties
+						$definedProperties = (array) explode(';', $definedStyles);
+
+						// loop properties
+						foreach ($definedProperties as $property) {
+							// validate property
+							if($property == '') continue;
+
+							// split into chunks
+							$chunks = (array) explode(':', trim($property), 2);
+
+							// validate
+							if(!isset($chunks[1])) continue;
+
+							// loop chunks
+							$properties[$chunks[0]] = trim($chunks[1]);
+						}
+					}
+
+					// add new properties into the list
+					foreach ($originalProperties as $key => $value) {
+						$properties[$key] = $value;
+					}
+
+					// build string
+					$propertyChunks = array();
+
+					// build chunks
+					foreach ($properties as $key => $values) {
+						foreach ((array) $values as $value) {
+							$propertyChunks[] = $key . ': ' . $value . ';';
+						}
+					}
+
+					// build properties string
+					$propertiesString = implode(' ', $propertyChunks);
+
+					// set attribute
+					if($propertiesString != '') $element->setAttribute(
+						'style', $propertiesString
+					);
+				}
+
+				// remove placeholder
+				$element->removeAttribute(
+					'data-css-to-inline-styles-original-styles'
+				);
+			}
+		}
+
+		// should we output XHTML?
+		if ($outputXHTML) {
+			// set formating
+			$document->formatOutput = true;
+
+			// get the HTML as XML
+			$html = $document->saveXML(null, LIBXML_NOEMPTYTAG);
+
+			// get start of the XML-declaration
+			$startPosition = strpos($html, '<?xml');
+
+			// valid start position?
+			if ($startPosition !== false) {
+				// get end of the xml-declaration
+				$endPosition = strpos($html, '?>', $startPosition);
+
+				// remove the XML-header
+				$html = ltrim(substr($html, $endPosition + 1));
+			}
+		}
+
+		// just regular HTML 4.01 as it should be used in newsletters
+		else {
+			// get the HTML
+			$html = $document->saveHTML();
+		}
+
+		// cleanup the HTML if we need to
+		if($this->cleanup) $html = $this->cleanupHTML($html);
+
+		// strip original style tags if we need to
+		if ($this->stripOriginalStyleTags) {
+			$html = $this->stripOriginalStyleTags($html);
+		}
+
+		// return
+		return $html;
+	}
+
+
+	/**
+	 * Get the encoding to use
+	 *
+	 * @return string
+	 */
+	private function getEncoding()
+	{
+		return $this->encoding;
+	}
+
+
+	/**
+	 * Process the loaded CSS
+	 *
+	 * @return void
+	 */
+	private function processCSS()
+	{
+		// init vars
+		$css = (string) $this->css;
+
+		// remove newlines
+		$css = str_replace(array("\r", "\n"), '', $css);
+
+		// replace double quotes by single quotes
+		$css = str_replace('"', '\'', $css);
+
+		// remove comments
+		$css = preg_replace('|/\*.*?\*/|', '', $css);
+
+		// remove spaces
+		$css = preg_replace('/\s\s+/', ' ', $css);
+
+		if ($this->excludeMediaQueries) {
+			$css = preg_replace('/@media [^{]*{([^{}]|{[^{}]*})*}/', '', $css);
+		}
+
+		// rules are splitted by }
+		$rules = (array) explode('}', $css);
+
+		// init var
+		$i = 1;
+
+		// loop rules
+		foreach ($rules as $rule) {
+			// split into chunks
+			$chunks = explode('{', $rule);
+
+			// invalid rule?
+			if(!isset($chunks[1])) continue;
+
+			// set the selectors
+			$selectors = trim($chunks[0]);
+
+			// get cssProperties
+			$cssProperties = trim($chunks[1]);
+
+			// split multiple selectors
+			$selectors = (array) explode(',', $selectors);
+
+			// loop selectors
+			foreach ($selectors as $selector) {
+				// cleanup
+				$selector = trim($selector);
+
+				// build an array for each selector
+				$ruleSet = array();
+
+				// store selector
+				$ruleSet['selector'] = $selector;
+
+				// process the properties
+				$ruleSet['properties'] = $this->processCSSProperties(
+					$cssProperties
+				);
+
+				// calculate specifity
+				$ruleSet['specifity'] = $this->calculateCSSSpecifity(
+					$selector
+				) + $i;
+
+				// add into global rules
+				$this->cssRules[] = $ruleSet;
+			}
+
+			// increment
+			$i++;
+		}
+
+		// sort based on specifity
+		if (!empty($this->cssRules)) {
+			usort($this->cssRules, array(__CLASS__, 'sortOnSpecifity'));
+		}
+	}
+
+	/**
+	 * Process the CSS-properties
+	 *
+	 * @return array
+	 * @param  string $propertyString The CSS-properties.
+	 */
+	private function processCSSProperties($propertyString)
+	{
+		// split into chunks
+		$properties = (array) explode(';', $propertyString);
+
+		// init var
+		$pairs = array();
+
+		// loop properties
+		foreach ($properties as $property) {
+			// split into chunks
+			$chunks = (array) explode(':', $property, 2);
+
+			// validate
+			if(!isset($chunks[1])) continue;
+
+			// cleanup
+			$chunks[0] = trim($chunks[0]);
+			$chunks[1] = trim($chunks[1]);
+
+			// add to pairs array
+			if(!isset($pairs[$chunks[0]]) ||
+			   !in_array($chunks[1], $pairs[$chunks[0]])) {
+				$pairs[$chunks[0]][] = $chunks[1];
+			}
+		}
+
+		// sort the pairs
+		ksort($pairs);
+
+		// return
+		return $pairs;
+	}
+
+	/**
+	 * Should the IDs and classes be removed?
+	 *
+	 * @return void
+	 * @param  bool[optional] $on Should we enable cleanup?
+	 */
+	public function setCleanup($on = true)
+	{
+		$this->cleanup = (bool) $on;
+	}
+
+	/**
+	 * Set CSS to use
+	 *
+	 * @return void
+	 * @param  string $css The CSS to use.
+	 */
+	public function setCSS($css)
+	{
+		$this->css = (string) $css;
+	}
+
+	/**
+	 * Set the encoding to use with the DOMDocument
+	 *
+	 * @return void
+	 * @param  string $encoding The encoding to use.
+	 */
+	public function setEncoding($encoding)
+	{
+		$this->encoding = (string) $encoding;
+	}
+
+	/**
+	 * Set HTML to process
+	 *
+	 * @return void
+	 * @param  string $html The HTML to process.
+	 */
+	public function setHTML($html)
+	{
+		$this->html = (string) $html;
+	}
+
+	/**
+	 * Set use of inline styles block
+	 * If this is enabled the class will use the style-block in the HTML.
+	 *
+	 * @return void
+	 * @param  bool[optional] $on Should we process inline styles?
+	 */
+	public function setUseInlineStylesBlock($on = true)
+	{
+		$this->useInlineStylesBlock = (bool) $on;
+	}
+
+	/**
+	 * Set strip original style tags
+	 * If this is enabled the class will remove all style tags in the HTML.
+	 *
+	 * @return void
+	 * @param  bool[optional] $on Should we process inline styles?
+	 */
+	public function setStripOriginalStyleTags($on = true)
+	{
+		$this->stripOriginalStyleTags = (bool) $on;
+	}
+
+	/**
+	 * Set exclude media queries
+	 *
+	 * If this is enabled the media queries will be removed before inlining the rules
+	 *
+	 * @return void
+	 * @param bool[optional] $on
+	 */
+	public function setExcludeMediaQueries($on = true)
+	{
+		$this->excludeMediaQueries = (bool) $on;
+	}
+
+	/**
+	 * Strip style tags into the generated HTML
+	 *
+	 * @return string
+	 * @param  string $html The HTML to strip style tags.
+	 */
+	private function stripOriginalStyleTags($html)
+	{
+		return preg_replace('|<style(.*)>(.*)</style>|isU', '', $html);
+	}
+
+	/**
+	 * Sort an array on the specifity element
+	 *
+	 * @return int
+	 * @param  array $e1 The first element.
+	 * @param  array $e2 The second element.
+	 */
+	private static function sortOnSpecifity($e1, $e2)
+	{
+		// validate
+		if(!isset($e1['specifity']) || !isset($e2['specifity'])) return 0;
+
+		// lower
+		if($e1['specifity'] < $e2['specifity']) return -1;
+
+		// higher
+		if($e1['specifity'] > $e2['specifity']) return 1;
+
+		// fallback
+		return 0;
+	}
 }

Spacing +30 added lines, -30 removed lines

@@ -77,8 +77,8 @@ 
      */
     public function __construct($html = null, $css = null)
     {
-        if($html !== null) $this->setHTML($html);
-        if($css !== null) $this->setCSS($css);
+        if ($html !== null) $this->setHTML($html);
+        if ($css !== null) $this->setCSS($css);
     }
 
     /**
@@ -141,7 +141,7 @@ 
         );
 
         // return
-        $xPath = (string) '//' . preg_replace($cssSelector, $xPathQuery, $selector);
+        $xPath = (string) '//'.preg_replace($cssSelector, $xPathQuery, $selector);
 
         return str_replace('] *', ']//*', $xPath);
     }
@@ -166,10 +166,10 @@ 
         // loop chunks
         foreach ($chunks as $chunk) {
             // an ID is important, so give it a high specifity
-            if(strstr($chunk, '#') !== false) $specifity += 100;
+            if (strstr($chunk, '#') !== false) $specifity += 100;
 
             // classes are more important than a tag, but less important then an ID
-            elseif(strstr($chunk, '.')) $specifity += 10;
+            elseif (strstr($chunk, '.')) $specifity += 10;
 
             // anything else isn't that important
             else $specifity += 1;
@@ -211,7 +211,7 @@ 
         $outputXHTML = (bool) $outputXHTML;
 
         // validate
-        if($this->html == null) throw new Exception('No HTML provided.');
+        if ($this->html == null) throw new Exception('No HTML provided.');
 
         // should we use inline style-block
         if ($this->useInlineStylesBlock) {
@@ -222,9 +222,9 @@ 
             preg_match_all('|<style(.*)>(.*)</style>|isU', $this->html, $matches);
 
             // any style-blocks found?
-            if (!empty($matches[2])) {
+            if ( ! empty($matches[2])) {
                 // add
-                foreach($matches[2] as $match) $this->css .= trim($match) ."\n";
+                foreach ($matches[2] as $match) $this->css .= trim($match)."\n";
             }
         }
 
@@ -244,20 +244,20 @@ 
         $xPath = new DOMXPath($document);
 
         // any rules?
-        if (!empty($this->cssRules)) {
+        if ( ! empty($this->cssRules)) {
             // loop rules
             foreach ($this->cssRules as $rule) {
                 // init var
                 $query = $this->buildXPathQuery($rule['selector']);
 
                 // validate query
-                if($query === false) continue;
+                if ($query === false) continue;
 
                 // search elements
                 $elements = $xPath->query($query);
 
                 // validate elements
-                if($elements === false) continue;
+                if ($elements === false) continue;
 
                 // loop found elements
                 foreach ($elements as $element) {
@@ -298,13 +298,13 @@ 
                         // loop properties
                         foreach ($definedProperties as $property) {
                             // validate property
-                            if($property == '') continue;
+                            if ($property == '') continue;
 
                             // split into chunks
                             $chunks = (array) explode(':', trim($property), 2);
 
                             // validate
-                            if(!isset($chunks[1])) continue;
+                            if ( ! isset($chunks[1])) continue;
 
                             // loop chunks
                             $properties[$chunks[0]] = trim($chunks[1]);
@@ -322,7 +322,7 @@ 
                     // build chunks
                     foreach ($properties as $key => $values) {
                         foreach ((array) $values as $value) {
-                            $propertyChunks[] = $key . ': ' . $value . ';';
+                            $propertyChunks[] = $key.': '.$value.';';
                         }
                     }
 
@@ -342,7 +342,7 @@ 
             );
 
             // validate query
-            if($query === false) return;
+            if ($query === false) return;
 
             // search elements
             $elements = $xPath->query($query);
@@ -360,13 +360,13 @@ 
 
                     foreach ($originalStyles as $property) {
                         // validate property
-                        if($property == '') continue;
+                        if ($property == '') continue;
 
                         // split into chunks
                         $chunks = (array) explode(':', trim($property), 2);
 
                         // validate
-                        if(!isset($chunks[1])) continue;
+                        if ( ! isset($chunks[1])) continue;
 
                         // loop chunks
                         $originalProperties[$chunks[0]] = trim($chunks[1]);
@@ -387,13 +387,13 @@ 
                         // loop properties
                         foreach ($definedProperties as $property) {
                             // validate property
-                            if($property == '') continue;
+                            if ($property == '') continue;
 
                             // split into chunks
                             $chunks = (array) explode(':', trim($property), 2);
 
                             // validate
-                            if(!isset($chunks[1])) continue;
+                            if ( ! isset($chunks[1])) continue;
 
                             // loop chunks
                             $properties[$chunks[0]] = trim($chunks[1]);
@@ -411,7 +411,7 @@ 
                     // build chunks
                     foreach ($properties as $key => $values) {
                         foreach ((array) $values as $value) {
-                            $propertyChunks[] = $key . ': ' . $value . ';';
+                            $propertyChunks[] = $key.': '.$value.';';
                         }
                     }
 
@@ -419,7 +419,7 @@ 
                     $propertiesString = implode(' ', $propertyChunks);
 
                     // set attribute
-                    if($propertiesString != '') $element->setAttribute(
+                    if ($propertiesString != '') $element->setAttribute(
                         'style', $propertiesString
                     );
                 }
@@ -459,7 +459,7 @@ 
         }
 
         // cleanup the HTML if we need to
-        if($this->cleanup) $html = $this->cleanupHTML($html);
+        if ($this->cleanup) $html = $this->cleanupHTML($html);
 
         // strip original style tags if we need to
         if ($this->stripOriginalStyleTags) {
@@ -520,7 +520,7 @@ 
             $chunks = explode('{', $rule);
 
             // invalid rule?
-            if(!isset($chunks[1])) continue;
+            if ( ! isset($chunks[1])) continue;
 
             // set the selectors
             $selectors = trim($chunks[0]);
@@ -561,7 +561,7 @@ 
         }
 
         // sort based on specifity
-        if (!empty($this->cssRules)) {
+        if ( ! empty($this->cssRules)) {
             usort($this->cssRules, array(__CLASS__, 'sortOnSpecifity'));
         }
     }
@@ -586,15 +586,15 @@ 
             $chunks = (array) explode(':', $property, 2);
 
             // validate
-            if(!isset($chunks[1])) continue;
+            if ( ! isset($chunks[1])) continue;
 
             // cleanup
             $chunks[0] = trim($chunks[0]);
             $chunks[1] = trim($chunks[1]);
 
             // add to pairs array
-            if(!isset($pairs[$chunks[0]]) ||
-               !in_array($chunks[1], $pairs[$chunks[0]])) {
+            if ( ! isset($pairs[$chunks[0]]) ||
+               ! in_array($chunks[1], $pairs[$chunks[0]])) {
                 $pairs[$chunks[0]][] = $chunks[1];
             }
         }
@@ -708,13 +708,13 @@ 
     private static function sortOnSpecifity($e1, $e2)
     {
         // validate
-        if(!isset($e1['specifity']) || !isset($e2['specifity'])) return 0;
+        if ( ! isset($e1['specifity']) || ! isset($e2['specifity'])) return 0;
 
         // lower
-        if($e1['specifity'] < $e2['specifity']) return -1;
+        if ($e1['specifity'] < $e2['specifity']) return -1;
 
         // higher
-        if($e1['specifity'] > $e2['specifity']) return 1;
+        if ($e1['specifity'] > $e2['specifity']) return 1;
 
         // fallback
         return 0;

Braces +69 added lines, -23 removed lines

@@ -77,8 +77,12 @@ 
      */
     public function __construct($html = null, $css = null)
     {
-        if($html !== null) $this->setHTML($html);
-        if($css !== null) $this->setCSS($css);
+        if($html !== null) {
+        	$this->setHTML($html);
+        }
+        if($css !== null) {
+        	$this->setCSS($css);
+        }
     }
 
     /**
@@ -166,13 +170,19 @@ 
         // loop chunks
         foreach ($chunks as $chunk) {
             // an ID is important, so give it a high specifity
-            if(strstr($chunk, '#') !== false) $specifity += 100;
+            if(strstr($chunk, '#') !== false) {
+            	$specifity += 100;
+            }
 
             // classes are more important than a tag, but less important then an ID
-            elseif(strstr($chunk, '.')) $specifity += 10;
+            elseif(strstr($chunk, '.')) {
+            	$specifity += 10;
+            }
 
             // anything else isn't that important
-            else $specifity += 1;
+            else {
+            	$specifity += 1;
+            }
         }
 
         // return
@@ -211,7 +221,9 @@ 
         $outputXHTML = (bool) $outputXHTML;
 
         // validate
-        if($this->html == null) throw new Exception('No HTML provided.');
+        if($this->html == null) {
+        	throw new Exception('No HTML provided.');
+        }
 
         // should we use inline style-block
         if ($this->useInlineStylesBlock) {
@@ -224,7 +236,9 @@ 
             // any style-blocks found?
             if (!empty($matches[2])) {
                 // add
-                foreach($matches[2] as $match) $this->css .= trim($match) ."\n";
+                foreach($matches[2] as $match) {
+                	$this->css .= trim($match) ."\n";
+                }
             }
         }
 
@@ -251,13 +265,17 @@ 
                 $query = $this->buildXPathQuery($rule['selector']);
 
                 // validate query
-                if($query === false) continue;
+                if($query === false) {
+                	continue;
+                }
 
                 // search elements
                 $elements = $xPath->query($query);
 
                 // validate elements
-                if($elements === false) continue;
+                if($elements === false) {
+                	continue;
+                }
 
                 // loop found elements
                 foreach ($elements as $element) {
@@ -298,13 +316,17 @@ 
                         // loop properties
                         foreach ($definedProperties as $property) {
                             // validate property
-                            if($property == '') continue;
+                            if($property == '') {
+                            	continue;
+                            }
 
                             // split into chunks
                             $chunks = (array) explode(':', trim($property), 2);
 
                             // validate
-                            if(!isset($chunks[1])) continue;
+                            if(!isset($chunks[1])) {
+                            	continue;
+                            }
 
                             // loop chunks
                             $properties[$chunks[0]] = trim($chunks[1]);
@@ -342,7 +364,9 @@ 
             );
 
             // validate query
-            if($query === false) return;
+            if($query === false) {
+            	return;
+            }
 
             // search elements
             $elements = $xPath->query($query);
@@ -360,13 +384,17 @@ 
 
                     foreach ($originalStyles as $property) {
                         // validate property
-                        if($property == '') continue;
+                        if($property == '') {
+                        	continue;
+                        }
 
                         // split into chunks
                         $chunks = (array) explode(':', trim($property), 2);
 
                         // validate
-                        if(!isset($chunks[1])) continue;
+                        if(!isset($chunks[1])) {
+                        	continue;
+                        }
 
                         // loop chunks
                         $originalProperties[$chunks[0]] = trim($chunks[1]);
@@ -387,13 +415,17 @@ 
                         // loop properties
                         foreach ($definedProperties as $property) {
                             // validate property
-                            if($property == '') continue;
+                            if($property == '') {
+                            	continue;
+                            }
 
                             // split into chunks
                             $chunks = (array) explode(':', trim($property), 2);
 
                             // validate
-                            if(!isset($chunks[1])) continue;
+                            if(!isset($chunks[1])) {
+                            	continue;
+                            }
 
                             // loop chunks
                             $properties[$chunks[0]] = trim($chunks[1]);
@@ -419,9 +451,11 @@ 
                     $propertiesString = implode(' ', $propertyChunks);
 
                     // set attribute
-                    if($propertiesString != '') $element->setAttribute(
+                    if($propertiesString != '') {
+                    	$element->setAttribute(
                         'style', $propertiesString
                     );
+                    }
                 }
 
                 // remove placeholder
@@ -459,7 +493,9 @@ 
         }
 
         // cleanup the HTML if we need to
-        if($this->cleanup) $html = $this->cleanupHTML($html);
+        if($this->cleanup) {
+        	$html = $this->cleanupHTML($html);
+        }
 
         // strip original style tags if we need to
         if ($this->stripOriginalStyleTags) {
@@ -520,7 +556,9 @@ 
             $chunks = explode('{', $rule);
 
             // invalid rule?
-            if(!isset($chunks[1])) continue;
+            if(!isset($chunks[1])) {
+            	continue;
+            }
 
             // set the selectors
             $selectors = trim($chunks[0]);
@@ -586,7 +624,9 @@ 
             $chunks = (array) explode(':', $property, 2);
 
             // validate
-            if(!isset($chunks[1])) continue;
+            if(!isset($chunks[1])) {
+            	continue;
+            }
 
             // cleanup
             $chunks[0] = trim($chunks[0]);
@@ -708,13 +748,19 @@ 
     private static function sortOnSpecifity($e1, $e2)
     {
         // validate
-        if(!isset($e1['specifity']) || !isset($e2['specifity'])) return 0;
+        if(!isset($e1['specifity']) || !isset($e2['specifity'])) {
+        	return 0;
+        }
 
         // lower
-        if($e1['specifity'] < $e2['specifity']) return -1;
+        if($e1['specifity'] < $e2['specifity']) {
+        	return -1;
+        }
 
         // higher
-        if($e1['specifity'] > $e2['specifity']) return 1;
+        if($e1['specifity'] > $e2['specifity']) {
+        	return 1;
+        }
 
         // fallback
         return 0;

core/libraries/shortcodes/EE_Primary_Registration_Details_Shortcodes.lib.php

Spacing +12 added lines, -12 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
 	exit('NO direct script access allowed');
 
 /**
@@ -45,7 +45,7 @@ 
 			'[PRIMARY_REGISTRANT_ADDRESS2]' => __('Whatever was in the address 2 field for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_CITY]' => __('The city for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_ZIP_PC]' => __('The ZIP (or Postal) Code for the primary registrant for the transaction.', 'event_espresso'),
-			'[PRIMARY_REGISTRANT_ADDRESS_STATE]' => __('The state/province for the primary registrant for the transaction.', 'event_espresso' ),
+			'[PRIMARY_REGISTRANT_ADDRESS_STATE]' => __('The state/province for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_COUNTRY]' => __('The country for the primary registrant for the transaction.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_REGISTRATION_DATE]' => __('The date the registration occured for the primary registration.', 'event_espresso'),
 			'[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]' => __('Generates a link for the given registration to edit this registration details on the frontend.', 'event_espresso')
@@ -54,21 +54,21 @@ 
 
 
 
-	protected function _parser( $shortcode ) {
+	protected function _parser($shortcode) {
 		//make sure we end up with a copy of the EE_Messages_Addressee object
 		$primary_registration = $this->_data instanceof EE_Messages_Addressee ? $this->_data : NULL;
-		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $primary_registration;
-		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $primary_registration;
+		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array($this->_data) && isset($this->_data['data']) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $primary_registration;
+		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && ! empty($this->_extra_data['data']) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $primary_registration;
 
-		if ( ! $primary_registration instanceof EE_Messages_Addressee )
+		if ( ! $primary_registration instanceof EE_Messages_Addressee)
 			return '';
 
 		$attendee = $primary_registration->primary_att_obj;
 
-		if ( ! $attendee instanceof EE_Attendee )
+		if ( ! $attendee instanceof EE_Attendee)
 			return '';
 
-		switch ( $shortcode ) {
+		switch ($shortcode) {
 			case '[PRIMARY_REGISTRANT_FNAME]' :
 				return $attendee->fname();
 				break;
@@ -82,7 +82,7 @@ 
 				break;
 
 			case '[PRIMARY_REGISTRANT_REGISTRATION_CODE]' :
-				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration )
+				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration)
 					return '';
 				return $primary_registration->primary_reg_obj->reg_code();
 				break;
@@ -118,13 +118,13 @@ 
 				break;
 
 			case '[PRIMARY_REGISTRANT_REGISTRATION_DATE]' :
-				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration )
+				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration)
 					return '';
-				return date_i18n( get_option( 'date_format'), strtotime( $primary_registration->primary_reg_obj->date() ) );
+				return date_i18n(get_option('date_format'), strtotime($primary_registration->primary_reg_obj->date()));
 				break;
 
 			case '[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]' :
-				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration )
+				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration)
 					return '';
 				return $primary_registration->primary_reg_obj->edit_attendee_information_url();
 				break;

Braces +17 added lines, -11 removed lines

@@ -1,7 +1,8 @@ 
 <?php
 
-if (!defined('EVENT_ESPRESSO_VERSION') )
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
 	exit('NO direct script access allowed');
+}
 
 /**
  * Event Espresso
@@ -60,13 +61,15 @@ 
 		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && is_array($this->_data) && isset( $this->_data['data'] ) && $this->_data['data'] instanceof EE_Messages_Addressee ? $this->_data['data'] : $primary_registration;
 		$primary_registration = ! $primary_registration instanceof EE_Messages_Addressee && !empty( $this->_extra_data['data'] ) && $this->_extra_data['data'] instanceof EE_Messages_Addressee ? $this->_extra_data['data'] : $primary_registration;
 
-		if ( ! $primary_registration instanceof EE_Messages_Addressee )
-			return '';
+		if ( ! $primary_registration instanceof EE_Messages_Addressee ) {
+					return '';
+		}
 
 		$attendee = $primary_registration->primary_att_obj;
 
-		if ( ! $attendee instanceof EE_Attendee )
-			return '';
+		if ( ! $attendee instanceof EE_Attendee ) {
+					return '';
+		}
 
 		switch ( $shortcode ) {
 			case '[PRIMARY_REGISTRANT_FNAME]' :
@@ -82,8 +85,9 @@ 
 				break;
 
 			case '[PRIMARY_REGISTRANT_REGISTRATION_CODE]' :
-				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration )
-					return '';
+				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration ) {
+									return '';
+				}
 				return $primary_registration->primary_reg_obj->reg_code();
 				break;
 
@@ -118,14 +122,16 @@ 
 				break;
 
 			case '[PRIMARY_REGISTRANT_REGISTRATION_DATE]' :
-				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration )
-					return '';
+				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration ) {
+									return '';
+				}
 				return date_i18n( get_option( 'date_format'), strtotime( $primary_registration->primary_reg_obj->date() ) );
 				break;
 
 			case '[PRIMARY_REGISTRANT_FRONTEND_EDIT_REG_LINK]' :
-				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration )
-					return '';
+				if ( ! $primary_registration->primary_reg_obj instanceof EE_Registration ) {
+									return '';
+				}
 				return $primary_registration->primary_reg_obj->edit_attendee_information_url();
 				break;
 

caffeinated/admin/extend/events/templates/event_type_metabox_contents.template.php

Indentation +3 added lines, -3 removed lines

@@ -4,9 +4,9 @@
 	</ul>
 	<div id="espresso_event_type-all" class="tabs-panel">
 		<?php
-        $name = 'tax_input[espresso_event_type]';
-        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.
-        ?>
+		$name = 'tax_input[espresso_event_type]';
+		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.
+		?>
 		<ul id="espresso_event_typechecklist" data-wp-lists="list:espresso_event_type" class="categorychecklist form-no-clear">
 			<?php echo $radio_list; ?>
 		</ul>