ntwb / wordpress

src/wp-content/themes/twentyeleven/single.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Template for displaying all single posts
- *
- * @package WordPress
- * @subpackage Twenty_Eleven
- * @since Twenty Eleven 1.0
- */
+					 * Template for displaying all single posts
+					 *
+					 * @package WordPress
+					 * @subpackage Twenty_Eleven
+					 * @since Twenty Eleven 1.0
+					 */
 
 get_header(); ?>
 

Spacing +6 added lines, -6 removed lines

@@ -12,17 +12,17 @@
 		<div id="primary">
 			<div id="content" role="main">
 
-				<?php while ( have_posts() ) : the_post(); ?>
+				<?php while (have_posts()) : the_post(); ?>
 
 					<nav id="nav-single">
-						<h3 class="assistive-text"><?php _e( 'Post navigation', 'twentyeleven' ); ?></h3>
-						<span class="nav-previous"><?php previous_post_link( '%link', __( '<span class="meta-nav">&larr;</span> Previous', 'twentyeleven' ) ); ?></span>
-						<span class="nav-next"><?php next_post_link( '%link', __( 'Next <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?></span>
+						<h3 class="assistive-text"><?php _e('Post navigation', 'twentyeleven'); ?></h3>
+						<span class="nav-previous"><?php previous_post_link('%link', __('<span class="meta-nav">&larr;</span> Previous', 'twentyeleven')); ?></span>
+						<span class="nav-next"><?php next_post_link('%link', __('Next <span class="meta-nav">&rarr;</span>', 'twentyeleven')); ?></span>
 					</nav><!-- #nav-single -->
 
-					<?php get_template_part( 'content-single', get_post_format() ); ?>
+					<?php get_template_part('content-single', get_post_format()); ?>
 
-					<?php comments_template( '', true ); ?>
+					<?php comments_template('', true); ?>
 
 				<?php endwhile; // end of the loop. ?>
 

src/wp-content/themes/twentyeleven/content-page.php

Spacing +2 added lines, -2 removed lines

@@ -15,9 +15,9 @@
 
 	<div class="entry-content">
 		<?php the_content(); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+		<?php wp_link_pages(array('before' => '<div class="page-link"><span>'.__('Pages:', 'twentyeleven').'</span>', 'after' => '</div>')); ?>
 	</div><!-- .entry-content -->
 	<footer class="entry-meta">
-		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
+		<?php edit_post_link(__('Edit', 'twentyeleven'), '<span class="edit-link">', '</span>'); ?>
 	</footer><!-- .entry-meta -->
 </article><!-- #post-<?php the_ID(); ?> -->

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Template used for displaying page content in page.php
- *
- * @package WordPress
- * @subpackage Twenty_Eleven
- * @since Twenty Eleven 1.0
- */
+				 * Template used for displaying page content in page.php
+				 *
+				 * @package WordPress
+				 * @subpackage Twenty_Eleven
+				 * @since Twenty Eleven 1.0
+				 */
 ?>
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>

src/wp-content/themes/twentyeleven/searchform.php

Spacing +4 added lines, -4 removed lines

@@ -7,8 +7,8 @@
  * @since Twenty Eleven 1.0
  */
 ?>
-	<form method="get" id="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>">
-		<label for="s" class="assistive-text"><?php _e( 'Search', 'twentyeleven' ); ?></label>
-		<input type="text" class="field" name="s" id="s" placeholder="<?php esc_attr_e( 'Search', 'twentyeleven' ); ?>" />
-		<input type="submit" class="submit" name="submit" id="searchsubmit" value="<?php esc_attr_e( 'Search', 'twentyeleven' ); ?>" />
+	<form method="get" id="searchform" action="<?php echo esc_url(home_url('/')); ?>">
+		<label for="s" class="assistive-text"><?php _e('Search', 'twentyeleven'); ?></label>
+		<input type="text" class="field" name="s" id="s" placeholder="<?php esc_attr_e('Search', 'twentyeleven'); ?>" />
+		<input type="submit" class="submit" name="submit" id="searchsubmit" value="<?php esc_attr_e('Search', 'twentyeleven'); ?>" />
 	</form>

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Template for displaying search forms in Twenty Eleven
- *
- * @package WordPress
- * @subpackage Twenty_Eleven
- * @since Twenty Eleven 1.0
- */
+				 * Template for displaying search forms in Twenty Eleven
+				 *
+				 * @package WordPress
+				 * @subpackage Twenty_Eleven
+				 * @since Twenty Eleven 1.0
+				 */
 ?>
 	<form method="get" id="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>">
 		<label for="s" class="assistive-text"><?php _e( 'Search', 'twentyeleven' ); ?></label>

src/wp-content/themes/twentyeleven/content-intro.php

Spacing +3 added lines, -3 removed lines

@@ -8,14 +8,14 @@
  */
 ?>
 
-<article id="post-<?php the_ID(); ?>" <?php post_class( 'intro' ); ?>>
+<article id="post-<?php the_ID(); ?>" <?php post_class('intro'); ?>>
 	<header class="entry-header">
 		<h2 class="entry-title"><?php the_title(); ?></h2>
 	</header><!-- .entry-header -->
 
 	<div class="entry-content">
 		<?php the_content(); ?>
-		<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
-		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
+		<?php wp_link_pages(array('before' => '<div class="page-link"><span>'.__('Pages:', 'twentyeleven').'</span>', 'after' => '</div>')); ?>
+		<?php edit_post_link(__('Edit', 'twentyeleven'), '<span class="edit-link">', '</span>'); ?>
 	</div><!-- .entry-content -->
 </article><!-- #post-<?php the_ID(); ?> -->

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Template for displaying page content in the showcase.php page template
- *
- * @package WordPress
- * @subpackage Twenty_Eleven
- * @since Twenty Eleven 1.0
- */
+					 * Template for displaying page content in the showcase.php page template
+					 *
+					 * @package WordPress
+					 * @subpackage Twenty_Eleven
+					 * @since Twenty Eleven 1.0
+					 */
 ?>
 
 <article id="post-<?php the_ID(); ?>" <?php post_class( 'intro' ); ?>>

src/wp-content/themes/twentyeleven/404.php

Spacing +8 added lines, -8 removed lines

@@ -14,30 +14,30 @@
 
 			<article id="post-0" class="post error404 not-found">
 				<header class="entry-header">
-					<h1 class="entry-title"><?php _e( 'This is somewhat embarrassing, isn&rsquo;t it?', 'twentyeleven' ); ?></h1>
+					<h1 class="entry-title"><?php _e('This is somewhat embarrassing, isn&rsquo;t it?', 'twentyeleven'); ?></h1>
 				</header>
 
 				<div class="entry-content">
-					<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching, or one of the links below, can help.', 'twentyeleven' ); ?></p>
+					<p><?php _e('It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching, or one of the links below, can help.', 'twentyeleven'); ?></p>
 
 					<?php get_search_form(); ?>
 
-					<?php the_widget( 'WP_Widget_Recent_Posts', array( 'number' => 10 ), array( 'widget_id' => '404' ) ); ?>
+					<?php the_widget('WP_Widget_Recent_Posts', array('number' => 10), array('widget_id' => '404')); ?>
 
 					<div class="widget">
-						<h2 class="widgettitle"><?php _e( 'Most Used Categories', 'twentyeleven' ); ?></h2>
+						<h2 class="widgettitle"><?php _e('Most Used Categories', 'twentyeleven'); ?></h2>
 						<ul>
-						<?php wp_list_categories( array( 'orderby' => 'count', 'order' => 'DESC', 'show_count' => 1, 'title_li' => '', 'number' => 10 ) ); ?>
+						<?php wp_list_categories(array('orderby' => 'count', 'order' => 'DESC', 'show_count' => 1, 'title_li' => '', 'number' => 10)); ?>
 						</ul>
 					</div>
 
 					<?php
 					/* translators: %1$s: smilie */
-					$archive_content = '<p>' . sprintf( __( 'Try looking in the monthly archives. %1$s', 'twentyeleven' ), convert_smilies( ':)' ) ) . '</p>';
-					the_widget( 'WP_Widget_Archives', array( 'count' => 0, 'dropdown' => 1 ), array( 'after_title' => '</h2>' . $archive_content ) );
+					$archive_content = '<p>'.sprintf(__('Try looking in the monthly archives. %1$s', 'twentyeleven'), convert_smilies(':)')).'</p>';
+					the_widget('WP_Widget_Archives', array('count' => 0, 'dropdown' => 1), array('after_title' => '</h2>'.$archive_content));
 					?>
 
-					<?php the_widget( 'WP_Widget_Tag_Cloud' ); ?>
+					<?php the_widget('WP_Widget_Tag_Cloud'); ?>
 
 				</div><!-- .entry-content -->
 			</article><!-- #post-0 -->

src/wp-content/themes/twentyeleven/content.php

Spacing +21 added lines, -21 removed lines

@@ -10,75 +10,75 @@
 
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 		<header class="entry-header">
-			<?php if ( is_sticky() ) : ?>
+			<?php if (is_sticky()) : ?>
 				<hgroup>
 					<h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
-					<h3 class="entry-format"><?php _e( 'Featured', 'twentyeleven' ); ?></h3>
+					<h3 class="entry-format"><?php _e('Featured', 'twentyeleven'); ?></h3>
 				</hgroup>
 			<?php else : ?>
 			<h1 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
 			<?php endif; ?>
 
-			<?php if ( 'post' == get_post_type() ) : ?>
+			<?php if ('post' == get_post_type()) : ?>
 			<div class="entry-meta">
 				<?php twentyeleven_posted_on(); ?>
 			</div><!-- .entry-meta -->
 			<?php endif; ?>
 
-			<?php if ( comments_open() && ! post_password_required() ) : ?>
+			<?php if (comments_open() && ! post_password_required()) : ?>
 			<div class="comments-link">
-				<?php comments_popup_link( '<span class="leave-reply">' . __( 'Reply', 'twentyeleven' ) . '</span>', _x( '1', 'comments number', 'twentyeleven' ), _x( '%', 'comments number', 'twentyeleven' ) ); ?>
+				<?php comments_popup_link('<span class="leave-reply">'.__('Reply', 'twentyeleven').'</span>', _x('1', 'comments number', 'twentyeleven'), _x('%', 'comments number', 'twentyeleven')); ?>
 			</div>
 			<?php endif; ?>
 		</header><!-- .entry-header -->
 
-		<?php if ( is_search() ) : // Only display Excerpts for Search ?>
+		<?php if (is_search()) : // Only display Excerpts for Search ?>
 		<div class="entry-summary">
 			<?php the_excerpt(); ?>
 		</div><!-- .entry-summary -->
 		<?php else : ?>
 		<div class="entry-content">
-			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
-			<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+			<?php the_content(__('Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven')); ?>
+			<?php wp_link_pages(array('before' => '<div class="page-link"><span>'.__('Pages:', 'twentyeleven').'</span>', 'after' => '</div>')); ?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>
 
 		<footer class="entry-meta">
 			<?php $show_sep = false; ?>
-			<?php if ( is_object_in_taxonomy( get_post_type(), 'category' ) ) : // Hide category text when not supported ?>
+			<?php if (is_object_in_taxonomy(get_post_type(), 'category')) : // Hide category text when not supported ?>
 			<?php
 				/* translators: used between list items, there is a space after the comma */
-				$categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
-				if ( $categories_list ):
+				$categories_list = get_the_category_list(__(', ', 'twentyeleven'));
+				if ($categories_list):
 			?>
 			<span class="cat-links">
-				<?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list );
+				<?php printf(__('<span class="%1$s">Posted in</span> %2$s', 'twentyeleven'), 'entry-utility-prep entry-utility-prep-cat-links', $categories_list);
 				$show_sep = true; ?>
 			</span>
 			<?php endif; // End if categories ?>
 			<?php endif; // End if is_object_in_taxonomy( get_post_type(), 'category' ) ?>
-			<?php if ( is_object_in_taxonomy( get_post_type(), 'post_tag' ) ) : // Hide tag text when not supported ?>
+			<?php if (is_object_in_taxonomy(get_post_type(), 'post_tag')) : // Hide tag text when not supported ?>
 			<?php
 				/* translators: used between list items, there is a space after the comma */
-				$tags_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
-				if ( $tags_list ):
-				if ( $show_sep ) : ?>
+				$tags_list = get_the_tag_list('', __(', ', 'twentyeleven'));
+				if ($tags_list):
+				if ($show_sep) : ?>
 			<span class="sep"> | </span>
 				<?php endif; // End if $show_sep ?>
 			<span class="tag-links">
-				<?php printf( __( '<span class="%1$s">Tagged</span> %2$s', 'twentyeleven' ), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list );
+				<?php printf(__('<span class="%1$s">Tagged</span> %2$s', 'twentyeleven'), 'entry-utility-prep entry-utility-prep-tag-links', $tags_list);
 				$show_sep = true; ?>
 			</span>
 			<?php endif; // End if $tags_list ?>
 			<?php endif; // End if is_object_in_taxonomy( get_post_type(), 'post_tag' ) ?>
 
-			<?php if ( comments_open() ) : ?>
-			<?php if ( $show_sep ) : ?>
+			<?php if (comments_open()) : ?>
+			<?php if ($show_sep) : ?>
 			<span class="sep"> | </span>
 			<?php endif; // End if $show_sep ?>
-			<span class="comments-link"><?php comments_popup_link( '<span class="leave-reply">' . __( 'Leave a reply', 'twentyeleven' ) . '</span>', __( '<b>1</b> Reply', 'twentyeleven' ), __( '<b>%</b> Replies', 'twentyeleven' ) ); ?></span>
+			<span class="comments-link"><?php comments_popup_link('<span class="leave-reply">'.__('Leave a reply', 'twentyeleven').'</span>', __('<b>1</b> Reply', 'twentyeleven'), __('<b>%</b> Replies', 'twentyeleven')); ?></span>
 			<?php endif; // End if comments_open() ?>
 
-			<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
+			<?php edit_post_link(__('Edit', 'twentyeleven'), '<span class="edit-link">', '</span>'); ?>
 		</footer><!-- .entry-meta -->
 	</article><!-- #post-<?php the_ID(); ?> -->

Braces +10 added lines, -4 removed lines

@@ -15,8 +15,11 @@ 
 					<h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
 					<h3 class="entry-format"><?php _e( 'Featured', 'twentyeleven' ); ?></h3>
 				</hgroup>
-			<?php else : ?>
-			<h1 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
+			<?php else {
+	: ?>
+			<h1 class="entry-title"><a href="<?php the_permalink();
+}
+?>" rel="bookmark"><?php the_title(); ?></a></h1>
 			<?php endif; ?>
 
 			<?php if ( 'post' == get_post_type() ) : ?>
@@ -36,9 +39,12 @@ 
 		<div class="entry-summary">
 			<?php the_excerpt(); ?>
 		</div><!-- .entry-summary -->
-		<?php else : ?>
+		<?php else {
+	: ?>
 		<div class="entry-content">
-			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) ); ?>
+			<?php the_content( __( 'Continue reading <span class="meta-nav">&rarr;</span>', 'twentyeleven' ) );
+}
+?>
 			<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
 		</div><!-- .entry-content -->
 		<?php endif; ?>

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Template for displaying content
- *
- * @package WordPress
- * @subpackage Twenty_Eleven
- * @since Twenty Eleven 1.0
- */
+	 * Template for displaying content
+	 *
+	 * @package WordPress
+	 * @subpackage Twenty_Eleven
+	 * @since Twenty Eleven 1.0
+	 */
 ?>
 
 	<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>

src/wp-content/themes/twentyeleven/comments.php

Spacing +16 added lines, -16 removed lines

@@ -13,8 +13,8 @@ 
  */
 ?>
 	<div id="comments">
-	<?php if ( post_password_required() ) : ?>
-		<p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyeleven' ); ?></p>
+	<?php if (post_password_required()) : ?>
+		<p class="nopassword"><?php _e('This post is password protected. Enter the password to view any comments.', 'twentyeleven'); ?></p>
 	</div><!-- #comments -->
 	<?php
 			/*
@@ -28,19 +28,19 @@ 
 
 	<?php // You can start editing here -- including this comment! ?>
 
-	<?php if ( have_comments() ) : ?>
+	<?php if (have_comments()) : ?>
 		<h2 id="comments-title">
 			<?php
-				printf( _n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentyeleven' ),
-					number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
+				printf(_n('One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'twentyeleven'),
+					number_format_i18n(get_comments_number()), '<span>'.get_the_title().'</span>');
 			?>
 		</h2>
 
-		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
+		<?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : // are there comments to navigate through ?>
 		<nav id="comment-nav-above">
-			<h1 class="assistive-text"><?php _e( 'Comment navigation', 'twentyeleven' ); ?></h1>
-			<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyeleven' ) ); ?></div>
-			<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentyeleven' ) ); ?></div>
+			<h1 class="assistive-text"><?php _e('Comment navigation', 'twentyeleven'); ?></h1>
+			<div class="nav-previous"><?php previous_comments_link(__('&larr; Older Comments', 'twentyeleven')); ?></div>
+			<div class="nav-next"><?php next_comments_link(__('Newer Comments &rarr;', 'twentyeleven')); ?></div>
 		</nav>
 		<?php endif; // check for comment navigation ?>
 
@@ -53,15 +53,15 @@ 
 				 * define twentyeleven_comment() and that will be used instead.
 				 * See twentyeleven_comment() in twentyeleven/functions.php for more.
 				 */
-				wp_list_comments( array( 'callback' => 'twentyeleven_comment' ) );
+				wp_list_comments(array('callback' => 'twentyeleven_comment'));
 			?>
 		</ol>
 
-		<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
+		<?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : // are there comments to navigate through ?>
 		<nav id="comment-nav-below">
-			<h1 class="assistive-text"><?php _e( 'Comment navigation', 'twentyeleven' ); ?></h1>
-			<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'twentyeleven' ) ); ?></div>
-			<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'twentyeleven' ) ); ?></div>
+			<h1 class="assistive-text"><?php _e('Comment navigation', 'twentyeleven'); ?></h1>
+			<div class="nav-previous"><?php previous_comments_link(__('&larr; Older Comments', 'twentyeleven')); ?></div>
+			<div class="nav-next"><?php next_comments_link(__('Newer Comments &rarr;', 'twentyeleven')); ?></div>
 		</nav>
 		<?php endif; // check for comment navigation ?>
 
@@ -70,8 +70,8 @@ 
 		 * If there are no comments and comments are closed, let's leave a little note, shall we?
 		 * But we only want the note on posts and pages that had comments in the first place.
 		 */
-		if ( ! comments_open() && get_comments_number() ) : ?>
-		<p class="nocomments"><?php _e( 'Comments are closed.' , 'twentyeleven' ); ?></p>
+		if ( ! comments_open() && get_comments_number()) : ?>
+		<p class="nocomments"><?php _e('Comments are closed.', 'twentyeleven'); ?></p>
 		<?php endif; ?>
 
 	<?php endif; // have_comments() ?>

src/wp-content/plugins/hello.php

Spacing +4 added lines, -4 removed lines

@@ -44,10 +44,10 @@ 
 Dolly'll never go away again";
 
 	// Here we split it into lines
-	$lyrics = explode( "\n", $lyrics );
+	$lyrics = explode("\n", $lyrics);
 
 	// And then randomly choose a line
-	return wptexturize( $lyrics[ mt_rand( 0, count( $lyrics ) - 1 ) ] );
+	return wptexturize($lyrics[mt_rand(0, count($lyrics) - 1)]);
 }
 
 // This just echoes the chosen line, we'll position it later
@@ -57,7 +57,7 @@ 
 }
 
 // Now we set that function up to execute when the admin_notices action is called
-add_action( 'admin_notices', 'hello_dolly' );
+add_action('admin_notices', 'hello_dolly');
 
 // We need some CSS to position the paragraph
 function dolly_css() {
@@ -77,6 +77,6 @@ 
 	";
 }
 
-add_action( 'admin_head', 'dolly_css' );
+add_action('admin_head', 'dolly_css');
 
 ?>

Indentation +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 /**
- * @package Hello_Dolly
- * @version 1.6
- */
+			 * @package Hello_Dolly
+			 * @version 1.6
+			 */
 /*
 Plugin Name: Hello Dolly
 Plugin URI: http://wordpress.org/plugins/hello-dolly/

src/wp-mail.php

Braces +29 added lines, -17 removed lines

@@ -11,8 +11,9 @@ 
 require(dirname(__FILE__) . '/wp-load.php');
 
 /** This filter is documented in wp-admin/options.php */
-if ( ! apply_filters( 'enable_post_by_email_configuration', true ) )
+if ( ! apply_filters( 'enable_post_by_email_configuration', true ) ) {
 	wp_die( __( 'This action has been disabled by the administrator.' ) );
+}
 
 /**
  * Fires to allow a plugin to do a complete takeover of Post by Email.
@@ -25,13 +26,16 @@ 
 require_once( ABSPATH . WPINC . '/class-pop3.php' );
 
 /** Only check at this interval for new messages. */
-if ( !defined('WP_MAIL_INTERVAL') )
-	define('WP_MAIL_INTERVAL', 300); // 5 minutes
+if ( !defined('WP_MAIL_INTERVAL') ) {
+	define('WP_MAIL_INTERVAL', 300);
+}
+// 5 minutes
 
 $last_checked = get_transient('mailserver_last_checked');
 
-if ( $last_checked )
+if ( $last_checked ) {
 	wp_die(__('Slow down cowboy, no need to check for new mails so often!'));
+}
 
 set_transient('mailserver_last_checked', true, WP_MAIL_INTERVAL);
 
@@ -41,13 +45,15 @@ 
 
 $pop3 = new POP3();
 
-if ( !$pop3->connect( get_option('mailserver_url'), get_option('mailserver_port') ) || !$pop3->user( get_option('mailserver_login') ) )
+if ( !$pop3->connect( get_option('mailserver_url'), get_option('mailserver_port') ) || !$pop3->user( get_option('mailserver_login') ) ) {
 	wp_die( esc_html( $pop3->ERROR ) );
+}
 
 $count = $pop3->pass( get_option('mailserver_pass') );
 
-if( false === $count )
+if( false === $count ) {
 	wp_die( esc_html( $pop3->ERROR ) );
+}
 
 if( 0 === $count ) {
 	$pop3->quit();
@@ -69,8 +75,9 @@ 
 	$dmonths = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
 	foreach ($message as $line) {
 		// Body signal.
-		if ( strlen($line) < 3 )
-			$bodysignal = true;
+		if ( strlen($line) < 3 ) {
+					$bodysignal = true;
+		}
 		if ( $bodysignal ) {
 			$content .= $line;
 		} else {
@@ -113,10 +120,11 @@ 
 			 * otherwise use the site admin.
 			 */
 			if ( ! $author_found && preg_match( '/^(From|Reply-To): /', $line ) ) {
-				if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) )
-					$author = $matches[0];
-				else
-					$author = trim($line);
+				if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) ) {
+									$author = $matches[0];
+				} else {
+									$author = trim($line);
+				}
 				$author = sanitize_email($author);
 				if ( is_email($author) ) {
 					echo '<p>' . sprintf(__('Author is %s'), $author) . '</p>';
@@ -220,7 +228,9 @@ 
 
 	$post_title = xmlrpc_getposttitle($content);
 
-	if ($post_title == '') $post_title = $subject;
+	if ($post_title == '') {
+		$post_title = $subject;
+	}
 
 	$post_category = array(get_option('default_email_category'));
 
@@ -228,12 +238,14 @@ 
 	$post_data = wp_slash($post_data);
 
 	$post_ID = wp_insert_post($post_data);
-	if ( is_wp_error( $post_ID ) )
-		echo "\n" . $post_ID->get_error_message();
+	if ( is_wp_error( $post_ID ) ) {
+			echo "\n" . $post_ID->get_error_message();
+	}
 
 	// We couldn't post, for whatever reason. Better move forward to the next email.
-	if ( empty( $post_ID ) )
-		continue;
+	if ( empty( $post_ID ) ) {
+			continue;
+	}
 
 	/**
 	 * Fires after a post submitted by email is published.

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Gets the email message from the user's mailbox to add as
- * a WordPress post. Mailbox connection information must be
- * configured under Settings > Writing
- *
- * @package WordPress
- */
+	 * Gets the email message from the user's mailbox to add as
+	 * a WordPress post. Mailbox connection information must be
+	 * configured under Settings > Writing
+	 *
+	 * @package WordPress
+	 */
 
 /** Make sure that the WordPress bootstrap has run before continuing. */
 require(dirname(__FILE__) . '/wp-load.php');

Spacing +59 added lines, -59 removed lines

@@ -8,29 +8,29 @@ 
  */
 
 /** Make sure that the WordPress bootstrap has run before continuing. */
-require(dirname(__FILE__) . '/wp-load.php');
+require(dirname(__FILE__).'/wp-load.php');
 
 /** This filter is documented in wp-admin/options.php */
-if ( ! apply_filters( 'enable_post_by_email_configuration', true ) )
-	wp_die( __( 'This action has been disabled by the administrator.' ) );
+if ( ! apply_filters('enable_post_by_email_configuration', true))
+	wp_die(__('This action has been disabled by the administrator.'));
 
 /**
  * Fires to allow a plugin to do a complete takeover of Post by Email.
  *
  * @since 2.9.0
  */
-do_action( 'wp-mail.php' );
+do_action('wp-mail.php');
 
 /** Get the POP3 class with which to access the mailbox. */
-require_once( ABSPATH . WPINC . '/class-pop3.php' );
+require_once(ABSPATH.WPINC.'/class-pop3.php');
 
 /** Only check at this interval for new messages. */
-if ( !defined('WP_MAIL_INTERVAL') )
+if ( ! defined('WP_MAIL_INTERVAL'))
 	define('WP_MAIL_INTERVAL', 300); // 5 minutes
 
 $last_checked = get_transient('mailserver_last_checked');
 
-if ( $last_checked )
+if ($last_checked)
 	wp_die(__('Slow down cowboy, no need to check for new mails so often!'));
 
 set_transient('mailserver_last_checked', true, WP_MAIL_INTERVAL);
@@ -41,20 +41,20 @@ 
 
 $pop3 = new POP3();
 
-if ( !$pop3->connect( get_option('mailserver_url'), get_option('mailserver_port') ) || !$pop3->user( get_option('mailserver_login') ) )
-	wp_die( esc_html( $pop3->ERROR ) );
+if ( ! $pop3->connect(get_option('mailserver_url'), get_option('mailserver_port')) || ! $pop3->user(get_option('mailserver_login')))
+	wp_die(esc_html($pop3->ERROR));
 
-$count = $pop3->pass( get_option('mailserver_pass') );
+$count = $pop3->pass(get_option('mailserver_pass'));
 
-if( false === $count )
-	wp_die( esc_html( $pop3->ERROR ) );
+if (false === $count)
+	wp_die(esc_html($pop3->ERROR));
 
-if( 0 === $count ) {
+if (0 === $count) {
 	$pop3->quit();
-	wp_die( __('There doesn’t seem to be any new mail.') );
+	wp_die(__('There doesn’t seem to be any new mail.'));
 }
 
-for ( $i = 1; $i <= $count; $i++ ) {
+for ($i = 1; $i <= $count; $i++) {
 
 	$message = $pop3->get($i);
 
@@ -69,28 +69,28 @@ 
 	$dmonths = array('Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec');
 	foreach ($message as $line) {
 		// Body signal.
-		if ( strlen($line) < 3 )
+		if (strlen($line) < 3)
 			$bodysignal = true;
-		if ( $bodysignal ) {
+		if ($bodysignal) {
 			$content .= $line;
 		} else {
-			if ( preg_match('/Content-Type: /i', $line) ) {
+			if (preg_match('/Content-Type: /i', $line)) {
 				$content_type = trim($line);
 				$content_type = substr($content_type, 14, strlen($content_type) - 14);
 				$content_type = explode(';', $content_type);
-				if ( ! empty( $content_type[1] ) ) {
+				if ( ! empty($content_type[1])) {
 					$charset = explode('=', $content_type[1]);
-					$charset = ( ! empty( $charset[1] ) ) ? trim($charset[1]) : '';
+					$charset = ( ! empty($charset[1])) ? trim($charset[1]) : '';
 				}
 				$content_type = $content_type[0];
 			}
-			if ( preg_match('/Content-Transfer-Encoding: /i', $line) ) {
+			if (preg_match('/Content-Transfer-Encoding: /i', $line)) {
 				$content_transfer_encoding = trim($line);
 				$content_transfer_encoding = substr($content_transfer_encoding, 27, strlen($content_transfer_encoding) - 27);
 				$content_transfer_encoding = explode(';', $content_transfer_encoding);
 				$content_transfer_encoding = $content_transfer_encoding[0];
 			}
-			if ( ( $content_type == 'multipart/alternative' ) && ( false !== strpos($line, 'boundary="') ) && ( '' == $boundary ) ) {
+			if (($content_type == 'multipart/alternative') && (false !== strpos($line, 'boundary="')) && ('' == $boundary)) {
 				$boundary = trim($line);
 				$boundary = explode('"', $boundary);
 				$boundary = $boundary[1];
@@ -99,7 +99,7 @@ 
 				$subject = trim($line);
 				$subject = substr($subject, 9, strlen($subject) - 9);
 				// Captures any text in the subject before $phone_delim as the subject
-				if ( function_exists('iconv_mime_decode') ) {
+				if (function_exists('iconv_mime_decode')) {
 					$subject = iconv_mime_decode($subject, 2, get_option('blog_charset'));
 				} else {
 					$subject = wp_iso_descrambler($subject);
@@ -112,36 +112,36 @@ 
 			 * Set the author using the email address (From or Reply-To, the last used)
 			 * otherwise use the site admin.
 			 */
-			if ( ! $author_found && preg_match( '/^(From|Reply-To): /', $line ) ) {
-				if ( preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches) )
+			if ( ! $author_found && preg_match('/^(From|Reply-To): /', $line)) {
+				if (preg_match('|[a-z0-9_.-]+@[a-z0-9_.-]+(?!.*<)|i', $line, $matches))
 					$author = $matches[0];
 				else
 					$author = trim($line);
 				$author = sanitize_email($author);
-				if ( is_email($author) ) {
-					echo '<p>' . sprintf(__('Author is %s'), $author) . '</p>';
+				if (is_email($author)) {
+					echo '<p>'.sprintf(__('Author is %s'), $author).'</p>';
 					$userdata = get_user_by('email', $author);
-					if ( ! empty( $userdata ) ) {
+					if ( ! empty($userdata)) {
 						$post_author = $userdata->ID;
 						$author_found = true;
 					}
 				}
 			}
 
-			if ( preg_match( '/Date: /i', $line ) ) { // of the form '20 Mar 2002 20:32:37 +0100'
-				$ddate = str_replace( 'Date: ', '', trim( $line ) );
-				$ddate = preg_replace( '!\s*\(.+\)\s*$!', '', $ddate );	// remove parenthesised timezone string if it exists, as this confuses strtotime
-				$ddate_U = strtotime( $ddate );
-				$post_date = gmdate( 'Y-m-d H:i:s', $ddate_U + $time_difference );
-				$post_date_gmt = gmdate( 'Y-m-d H:i:s', $ddate_U );
+			if (preg_match('/Date: /i', $line)) { // of the form '20 Mar 2002 20:32:37 +0100'
+				$ddate = str_replace('Date: ', '', trim($line));
+				$ddate = preg_replace('!\s*\(.+\)\s*$!', '', $ddate); // remove parenthesised timezone string if it exists, as this confuses strtotime
+				$ddate_U = strtotime($ddate);
+				$post_date = gmdate('Y-m-d H:i:s', $ddate_U + $time_difference);
+				$post_date_gmt = gmdate('Y-m-d H:i:s', $ddate_U);
 			}
 		}
 	}
 
 	// Set $post_status based on $author_found and on author's publish_posts capability
-	if ( $author_found ) {
+	if ($author_found) {
 		$user = new WP_User($post_author);
-		$post_status = ( $user->has_cap('publish_posts') ) ? 'publish' : 'pending';
+		$post_status = ($user->has_cap('publish_posts')) ? 'publish' : 'pending';
 	} else {
 		// Author not found in DB, set status to pending. Author already set to admin.
 		$post_status = 'pending';
@@ -149,12 +149,12 @@ 
 
 	$subject = trim($subject);
 
-	if ( $content_type == 'multipart/alternative' ) {
+	if ($content_type == 'multipart/alternative') {
 		$content = explode('--'.$boundary, $content);
 		$content = $content[2];
 
 		// Match case-insensitive content-transfer-encoding.
-		if ( preg_match( '/Content-Transfer-Encoding: quoted-printable/i', $content, $delim) ) {
+		if (preg_match('/Content-Transfer-Encoding: quoted-printable/i', $content, $delim)) {
 			$content = explode($delim[0], $content);
 			$content = $content[1];
 		}
@@ -172,19 +172,19 @@ 
 	 *
 	 * @param string $content The original email content.
 	 */
-	$content = apply_filters( 'wp_mail_original_content', $content );
+	$content = apply_filters('wp_mail_original_content', $content);
 
-	if ( false !== stripos($content_transfer_encoding, "quoted-printable") ) {
+	if (false !== stripos($content_transfer_encoding, "quoted-printable")) {
 		$content = quoted_printable_decode($content);
 	}
 
-	if ( function_exists('iconv') && ! empty( $charset ) ) {
+	if (function_exists('iconv') && ! empty($charset)) {
 		$content = iconv($charset, get_option('blog_charset'), $content);
 	}
 
 	// Captures any text in the body after $phone_delim as the body
 	$content = explode($phone_delim, $content);
-	$content = empty( $content[1] ) ? $content[0] : $content[1];
+	$content = empty($content[1]) ? $content[0] : $content[1];
 
 	$content = trim($content);
 
@@ -195,7 +195,7 @@ 
 	 *
 	 * @param string $content The email content.
 	 */
-	$post_content = apply_filters( 'phone_content', $content );
+	$post_content = apply_filters('phone_content', $content);
 
 	$post_title = xmlrpc_getposttitle($content);
 
@@ -203,15 +203,15 @@ 
 
 	$post_category = array(get_option('default_email_category'));
 
-	$post_data = compact('post_content','post_title','post_date','post_date_gmt','post_author','post_category', 'post_status');
+	$post_data = compact('post_content', 'post_title', 'post_date', 'post_date_gmt', 'post_author', 'post_category', 'post_status');
 	$post_data = wp_slash($post_data);
 
 	$post_ID = wp_insert_post($post_data);
-	if ( is_wp_error( $post_ID ) )
-		echo "\n" . $post_ID->get_error_message();
+	if (is_wp_error($post_ID))
+		echo "\n".$post_ID->get_error_message();
 
 	// We couldn't post, for whatever reason. Better move forward to the next email.
-	if ( empty( $post_ID ) )
+	if (empty($post_ID))
 		continue;
 
 	/**
@@ -221,25 +221,25 @@ 
 	 *
 	 * @param int $post_ID The post ID.
 	 */
-	do_action( 'publish_phone', $post_ID );
+	do_action('publish_phone', $post_ID);
 
-	echo "\n<p><strong>" . __( 'Author:' ) . '</strong> ' . esc_html( $post_author ) . '</p>';
-	echo "\n<p><strong>" . __( 'Posted title:' ) . '</strong> ' . esc_html( $post_title ) . '</p>';
+	echo "\n<p><strong>".__('Author:').'</strong> '.esc_html($post_author).'</p>';
+	echo "\n<p><strong>".__('Posted title:').'</strong> '.esc_html($post_title).'</p>';
 
-	if(!$pop3->delete($i)) {
-		echo '<p>' . sprintf(
+	if ( ! $pop3->delete($i)) {
+		echo '<p>'.sprintf(
 			/* translators: %s: POP3 error */
-			__( 'Oops: %s' ),
-			esc_html( $pop3->ERROR )
-		) . '</p>';
+			__('Oops: %s'),
+			esc_html($pop3->ERROR)
+		).'</p>';
 		$pop3->reset();
 		exit;
 	} else {
-		echo '<p>' . sprintf(
+		echo '<p>'.sprintf(
 			/* translators: %s: the message ID */
-			__( 'Mission complete. Message %s deleted.' ),
-			'<strong>' . $i . '</strong>'
-		) . '</p>';
+			__('Mission complete. Message %s deleted.'),
+			'<strong>'.$i.'</strong>'
+		).'</p>';
 	}
 
 }