sudar / email-log

include/install.php

Doc Comments +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
 	 *
 	 * @global object $wpdb
 	 * @param  array  $tables List of tables to be deleted
-	 * @return array  $tables Modified list of tables to be deleted
+	 * @return string[]  $tables Modified list of tables to be deleted
 	 */
 	public static function on_delete_blog( $tables ) {
 		global $wpdb;

Spacing +17 added lines, -17 removed lines

@@ -8,7 +8,7 @@ 
  * @since       1.7
  */
 
-defined( 'ABSPATH' ) || exit; // Exit if accessed directly
+defined('ABSPATH') || exit; // Exit if accessed directly
 
 /**
  * Helper class to create and maintain tables
@@ -26,17 +26,17 @@ 
 	 *
 	 * @global object $wpdb
 	 */
-	public static function on_activate( $network_wide ) {
+	public static function on_activate($network_wide) {
 		global $wpdb;
 
-		if ( is_multisite() && $network_wide ) {
+		if (is_multisite() && $network_wide) {
 			// store the current blog id
 			$current_blog = $wpdb->blogid;
 
 			// Get all blogs in the network and activate plugin on each one
-			$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
-			foreach ( $blog_ids as $blog_id ) {
-				switch_to_blog( $blog_id );
+			$blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
+			foreach ($blog_ids as $blog_id) {
+				switch_to_blog($blog_id);
 				self::create_emaillog_table();
 				restore_current_blog();
 			}
@@ -52,9 +52,9 @@ 
 	 * @static
 	 * @access public
 	 */
-	public static function on_create_blog( $blog_id, $user_id, $domain, $path, $site_id, $meta ) {
-		if ( is_plugin_active_for_network( 'email-log/email-log.php' ) ) {
-			switch_to_blog( $blog_id );
+	public static function on_create_blog($blog_id, $user_id, $domain, $path, $site_id, $meta) {
+		if (is_plugin_active_for_network('email-log/email-log.php')) {
+			switch_to_blog($blog_id);
 			self::create_emaillog_table();
 			restore_current_blog();
 		}
@@ -71,7 +71,7 @@ 
 	 * @param  array  $tables List of tables to be deleted
 	 * @return array  $tables Modified list of tables to be deleted
 	 */
-	public static function on_delete_blog( $tables ) {
+	public static function on_delete_blog($tables) {
 		global $wpdb;
 		$tables[] = $wpdb->prefix . EmailLog::TABLE_NAME;
 		return $tables;
@@ -92,7 +92,7 @@ 
 		$table_name = $wpdb->prefix . EmailLog::TABLE_NAME;
 		$charset_collate = $wpdb->get_charset_collate();
 
-		if ( $wpdb->get_var( "show tables like '{$table_name}'" ) != $table_name ) {
+		if ($wpdb->get_var("show tables like '{$table_name}'") != $table_name) {
 
 			$sql = 'CREATE TABLE ' . $table_name . ' (
 				id mediumint(9) NOT NULL AUTO_INCREMENT,
@@ -105,20 +105,20 @@ 
 				PRIMARY KEY  (id)
 			) ' . $charset_collate . ' ;';
 
-			require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
-			dbDelta( $sql );
+			require_once(ABSPATH . 'wp-admin/includes/upgrade.php');
+			dbDelta($sql);
 
-			add_option( EmailLog::DB_OPTION_NAME, EmailLog::DB_VERSION );
+			add_option(EmailLog::DB_OPTION_NAME, EmailLog::DB_VERSION);
 		}
 	}
 }
 
 // When the Plugin installed
-register_activation_hook( EMAIL_LOG_PLUGIN_FILE, array( 'Email_Log_Init', 'on_activate' ) );
+register_activation_hook(EMAIL_LOG_PLUGIN_FILE, array('Email_Log_Init', 'on_activate'));
 
 // when a new blog is created in multisite
-add_action( 'wpmu_new_blog', array( 'Email_Log_Init', 'on_create_blog' ), 10, 6 );
+add_action('wpmu_new_blog', array('Email_Log_Init', 'on_create_blog'), 10, 6);
 
 // when a blog is deleted in multisite
-add_filter( 'wpmu_drop_tables', array( 'Email_Log_Init', 'on_delete_blog' ) );
+add_filter('wpmu_drop_tables', array('Email_Log_Init', 'on_delete_blog'));
 ?>

uninstall.php

Indentation +18 added lines, -18 removed lines

@@ -8,24 +8,24 @@ 
 */
 // uninstall page for Email Log Plugin to clean up db.
 if( !defined( 'ABSPATH' ) && !defined( 'WP_UNINSTALL_PLUGIN' ) )
-    exit();
+	exit();
 
 if ( is_multisite() ) {
-    global $wpdb;
+	global $wpdb;
 
-    $original_blog_id = get_current_blog_id();
+	$original_blog_id = get_current_blog_id();
 
-    $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+	$blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
 
-    foreach ( $blog_ids as $blog_id ) {
-        switch_to_blog( $blog_id );
-        email_log_delete_table();
-    }
+	foreach ( $blog_ids as $blog_id ) {
+		switch_to_blog( $blog_id );
+		email_log_delete_table();
+	}
 
-    switch_to_blog( $original_blog_id );
+	switch_to_blog( $original_blog_id );
 
 } else {
-    email_log_delete_table();
+	email_log_delete_table();
 }
 
 /**
@@ -36,15 +36,15 @@ 
  * @global object $wpdb
  */
 function email_log_delete_table() {
-    global $wpdb;
-    $table_name = $wpdb->prefix . "email_log"; // This is hardcoded on purpose
+	global $wpdb;
+	$table_name = $wpdb->prefix . "email_log"; // This is hardcoded on purpose
 
-    if( $wpdb->get_var( "SHOW TABLES LIKE '{$table_name}'" ) == $table_name ) {
-        // If table is present, drop it
-        $wpdb->query( "DROP TABLE $table_name" );
-    }
+	if( $wpdb->get_var( "SHOW TABLES LIKE '{$table_name}'" ) == $table_name ) {
+		// If table is present, drop it
+		$wpdb->query( "DROP TABLE $table_name" );
+	}
 
-    // Delete the option
-    delete_option('email-log-db');
+	// Delete the option
+	delete_option('email-log-db');
 }
 ?>

Spacing +8 added lines, -8 removed lines

@@ -7,22 +7,22 @@ 
  * @author      Sudar
 */
 // uninstall page for Email Log Plugin to clean up db.
-if( !defined( 'ABSPATH' ) && !defined( 'WP_UNINSTALL_PLUGIN' ) )
+if ( ! defined('ABSPATH') && ! defined('WP_UNINSTALL_PLUGIN'))
     exit();
 
-if ( is_multisite() ) {
+if (is_multisite()) {
     global $wpdb;
 
     $original_blog_id = get_current_blog_id();
 
-    $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+    $blog_ids = $wpdb->get_col("SELECT blog_id FROM $wpdb->blogs");
 
-    foreach ( $blog_ids as $blog_id ) {
-        switch_to_blog( $blog_id );
+    foreach ($blog_ids as $blog_id) {
+        switch_to_blog($blog_id);
         email_log_delete_table();
     }
 
-    switch_to_blog( $original_blog_id );
+    switch_to_blog($original_blog_id);
 
 } else {
     email_log_delete_table();
@@ -39,9 +39,9 @@ 
     global $wpdb;
     $table_name = $wpdb->prefix . "email_log"; // This is hardcoded on purpose
 
-    if( $wpdb->get_var( "SHOW TABLES LIKE '{$table_name}'" ) == $table_name ) {
+    if ($wpdb->get_var("SHOW TABLES LIKE '{$table_name}'") == $table_name) {
         // If table is present, drop it
-        $wpdb->query( "DROP TABLE $table_name" );
+        $wpdb->query("DROP TABLE $table_name");
     }
 
     // Delete the option

Braces +2 added lines, -1 removed lines

@@ -7,8 +7,9 @@
  * @author      Sudar
 */
 // uninstall page for Email Log Plugin to clean up db.
-if( !defined( 'ABSPATH' ) && !defined( 'WP_UNINSTALL_PLUGIN' ) )
+if( !defined( 'ABSPATH' ) && !defined( 'WP_UNINSTALL_PLUGIN' ) ) {
     exit();
+}
 
 if ( is_multisite() ) {
     global $wpdb;

include/class-email-header-parser.php

Spacing +21 added lines, -21 removed lines

@@ -6,7 +6,7 @@ 
  * @package EmailLog
  */
 
-defined( 'ABSPATH' ) || exit; // Exit if accessed directly
+defined('ABSPATH') || exit; // Exit if accessed directly
 
 /**
  * Class Email Header Parser.
@@ -23,26 +23,26 @@ 
 	 * @param array $data Headers to be joined.
 	 * @return string Joined headers.
 	 */
-	public function join_headers( $data ) {
+	public function join_headers($data) {
 		$headers = '';
 
-		if ( ! empty( $data['from'] ) ) {
+		if ( ! empty($data['from'])) {
 			$headers .= 'From: ' . $data['from'] . "\r\n";
 		}
 
-		if ( ! empty( $data['cc'] ) ) {
+		if ( ! empty($data['cc'])) {
 			$headers .= 'CC: ' . $data['cc'] . "\r\n";
 		}
 
-		if ( ! empty( $data['bcc'] ) ) {
+		if ( ! empty($data['bcc'])) {
 			$headers .= 'BCC: ' . $data['bcc'] . "\r\n";
 		}
 
-		if ( ! empty( $data['reply_to'] ) ) {
+		if ( ! empty($data['reply_to'])) {
 			$headers .= 'Reply-to: ' . $data['reply_to'] . "\r\n";
 		}
 
-		if ( ! empty( $data['content_type'] ) ) {
+		if ( ! empty($data['content_type'])) {
 			$headers .= 'Content-type: ' . $data['content_type'] . "\r\n";
 		}
 
@@ -55,8 +55,8 @@ 
 	 * @param string $headers Headers to parse
 	 * @return array Parsed Headers.
 	 */
-	public function parse_headers( $headers ) {
-		return $this->parse( $headers );
+	public function parse_headers($headers) {
+		return $this->parse($headers);
 	}
 
 	/**
@@ -67,16 +67,16 @@ 
 	 * @param string $headers Headers to be parsed.
 	 * @return array Parsed headers
 	 */
-	private function parse( $headers ) {
+	private function parse($headers) {
 		$data = array();
-		$arr_headers = explode( "\n", $headers );
+		$arr_headers = explode("\n", $headers);
 
-		foreach ( $arr_headers as $header ) {
-			$split_header = explode( ':', $header );
-			$value = $this->parse_header_line( $split_header );
+		foreach ($arr_headers as $header) {
+			$split_header = explode(':', $header);
+			$value = $this->parse_header_line($split_header);
 
-			if ( trim( $value ) != '' ) {
-				switch ( strtolower( $split_header[0] ) ) {
+			if (trim($value) != '') {
+				switch (strtolower($split_header[0])) {
 					case 'from':
 						$data['from'] = $value;
 						break;
@@ -111,13 +111,13 @@ 
 	 * @param array   $header Header line to be parsed
 	 * @return string         Parsed value
 	 */
-	private function parse_header_line( $header ) {
+	private function parse_header_line($header) {
 		$value = '';
-		if ( count( $header ) == 2 ) {
-			if ( is_array( $header[1] ) ) {
-				$value = trim( implode( ',', array_map( 'trim', $header[1] ) ) );
+		if (count($header) == 2) {
+			if (is_array($header[1])) {
+				$value = trim(implode(',', array_map('trim', $header[1])));
 			} else {
-				$value = trim( $header[1] );
+				$value = trim($header[1]);
 			}
 		}
 

include/util/helper.php

Doc Comments -1 removed lines

@@ -30,7 +30,6 @@
  *
  * @since 1.9
  *
- * @param $string $email Email string to be sanitized.
  *
  * @return string Sanitized email.
  */

Spacing +18 added lines, -18 removed lines

@@ -14,15 +14,15 @@ 
  *
  * @return string Sanitized email.
  */
-function el_sanitize_email( $email, $multiple = true ) {
-	$emails = explode( ',', $email );
-	if ( ! $multiple ) {
-		$emails = array_slice( $emails, 0, 1 );
+function el_sanitize_email($email, $multiple = true) {
+	$emails = explode(',', $email);
+	if ( ! $multiple) {
+		$emails = array_slice($emails, 0, 1);
 	}
 
-	$cleaned_emails = array_map( 'el_sanitize_email_with_name', $emails );
+	$cleaned_emails = array_map('el_sanitize_email_with_name', $emails);
 
-	return implode( ', ', $cleaned_emails );
+	return implode(', ', $cleaned_emails);
 }
 
 /**
@@ -34,23 +34,23 @@ 
  *
  * @return string Sanitized email.
  */
-function el_sanitize_email_with_name( $string ) {
-	$string = trim( $string );
+function el_sanitize_email_with_name($string) {
+	$string = trim($string);
 
-	$bracket_pos = strpos( $string, '<' );
-	if ( $bracket_pos !== false ) {
+	$bracket_pos = strpos($string, '<');
+	if ($bracket_pos !== false) {
 		// Text before the bracketed email is the name.
-		if ( $bracket_pos > 0 ) {
-			$name = substr( $string, 0, $bracket_pos );
-			$name = str_replace( '"', '', $name );
-			$name = trim( $name );
+		if ($bracket_pos > 0) {
+			$name = substr($string, 0, $bracket_pos);
+			$name = str_replace('"', '', $name);
+			$name = trim($name);
 
-			$email = substr( $string, $bracket_pos + 1 );
-			$email = str_replace( '>', '', $email );
+			$email = substr($string, $bracket_pos + 1);
+			$email = str_replace('>', '', $email);
 
-			return sanitize_text_field( $name ) . ' <' . sanitize_email( $email ) . '>';
+			return sanitize_text_field($name) . ' <' . sanitize_email($email) . '>';
 		}
 	}
 
-	return sanitize_email( $string );
+	return sanitize_email($string);
 }
\ No newline at end of file

include/class-email-log-list-table.php

Spacing +79 added lines, -79 removed lines

@@ -15,11 +15,11 @@ 
 	 * We use the parent reference to set some default configs.
 	 */
 	public function __construct() {
-		parent::__construct( array(
-			'singular'  => 'email-log',     //singular name of the listed records
-			'plural'    => 'email-logs',    //plural name of the listed records
-			'ajax'      => false,           //does this table support ajax?
-		) );
+		parent::__construct(array(
+			'singular'  => 'email-log', //singular name of the listed records
+			'plural'    => 'email-logs', //plural name of the listed records
+			'ajax'      => false, //does this table support ajax?
+		));
 	}
 
 	/**
@@ -29,47 +29,47 @@ 
 	 *
 	 * @param string $which Add the markup after (bottom) or before (top) the list.
 	 */
-	protected function extra_tablenav( $which ) {
-		if ( 'top' == $which ) {
+	protected function extra_tablenav($which) {
+		if ('top' == $which) {
 			// The code that goes before the table is here.
 			echo '<span id = "el-pro-msg">';
-			_e( 'More fields are available in Pro addon. ', 'email-log' );
+			_e('More fields are available in Pro addon. ', 'email-log');
 			echo '<a href = "http://sudarmuthu.com/out/buy-email-log-more-fields-addon" style = "color:red">';
-			_e( 'Buy Now', 'email-log' );
+			_e('Buy Now', 'email-log');
 			echo '</a>';
 			echo '</span>';
 		}
 
-		if ( 'bottom' == $which ) {
+		if ('bottom' == $which) {
 			// The code that goes after the table is here.
 			echo '<p>&nbsp;</p>';
 			echo '<p>&nbsp;</p>';
 
 			echo '<p>';
-			_e( 'The following are the list of pro addons that are currently available for purchase.', 'email-log' );
+			_e('The following are the list of pro addons that are currently available for purchase.', 'email-log');
 			echo '</p>';
 
 			echo '<ul style="list-style:disc; padding-left:35px">';
 
 			echo '<li>';
-			echo '<strong>', __( 'Email Log - Resend Email', 'email-log' ), '</strong>', ' - ';
-			echo __( 'Adds the ability to resend email from logs.', 'email-log' );
-			echo ' <a href = "http://sudarmuthu.com/wordpress/email-log/pro-addons#resend-email-addon">', __( 'More Info', 'email-log' ), '</a>.';
-			echo ' <a href = "http://sudarmuthu.com/out/buy-email-log-resend-email-addon">', __( 'Buy now', 'email-log' ), '</a>';
+			echo '<strong>', __('Email Log - Resend Email', 'email-log'), '</strong>', ' - ';
+			echo __('Adds the ability to resend email from logs.', 'email-log');
+			echo ' <a href = "http://sudarmuthu.com/wordpress/email-log/pro-addons#resend-email-addon">', __('More Info', 'email-log'), '</a>.';
+			echo ' <a href = "http://sudarmuthu.com/out/buy-email-log-resend-email-addon">', __('Buy now', 'email-log'), '</a>';
 			echo '</li>';
 
 			echo '<li>';
-			echo '<strong>', __( 'Email Log - More fields', 'email-log' ), '</strong>', ' - ';
-			echo __( 'Adds more fields (From, CC, BCC, Reply To, Attachment) to the logs page.', 'email-log' );
-			echo ' <a href = "http://sudarmuthu.com/wordpress/email-log/pro-addons#more-fields-addon">', __( 'More Info', 'email-log' ), '</a>.';
-			echo ' <a href = "http://sudarmuthu.com/out/buy-email-log-more-fields-addon">', __( 'Buy now', 'email-log' ), '</a>';
+			echo '<strong>', __('Email Log - More fields', 'email-log'), '</strong>', ' - ';
+			echo __('Adds more fields (From, CC, BCC, Reply To, Attachment) to the logs page.', 'email-log');
+			echo ' <a href = "http://sudarmuthu.com/wordpress/email-log/pro-addons#more-fields-addon">', __('More Info', 'email-log'), '</a>.';
+			echo ' <a href = "http://sudarmuthu.com/out/buy-email-log-more-fields-addon">', __('Buy now', 'email-log'), '</a>';
 			echo '</li>';
 
 			echo '<li>';
-			echo '<strong>', __( 'Email Log - Forward Email', 'email-log' ), '</strong>', ' - ';
-			echo __( 'This addon allows you to send a copy of all emails send from WordPress to another email address', 'email-log' );
-			echo ' <a href = "http://sudarmuthu.com/wordpress/email-log/pro-addons#forward-email-addon">', __( 'More Info', 'email-log' ), '</a>.';
-			echo ' <a href = "http://sudarmuthu.com/out/buy-email-log-forward-email-addon">', __( 'Buy now', 'email-log' ), '</a>';
+			echo '<strong>', __('Email Log - Forward Email', 'email-log'), '</strong>', ' - ';
+			echo __('This addon allows you to send a copy of all emails send from WordPress to another email address', 'email-log');
+			echo ' <a href = "http://sudarmuthu.com/wordpress/email-log/pro-addons#forward-email-addon">', __('More Info', 'email-log'), '</a>.';
+			echo ' <a href = "http://sudarmuthu.com/out/buy-email-log-forward-email-addon">', __('Buy now', 'email-log'), '</a>';
 			echo '</li>';
 
 			echo '</ul>';
@@ -86,12 +86,12 @@ 
 	public function get_columns() {
 		$columns = array(
 			'cb'        => '<input type="checkbox" />', //Render a checkbox instead of text
-			'sent_date' => __( 'Sent at', 'email-log' ),
-			'to'        => __( 'To', 'email-log' ),
-			'subject'   => __( 'Subject', 'email-log' ),
+			'sent_date' => __('Sent at', 'email-log'),
+			'to'        => __('To', 'email-log'),
+			'subject'   => __('Subject', 'email-log'),
 		);
 
-		return apply_filters( EmailLog::HOOK_LOG_COLUMNS, $columns );
+		return apply_filters(EmailLog::HOOK_LOG_COLUMNS, $columns);
 	}
 
 	/**
@@ -103,9 +103,9 @@ 
 	 */
 	protected function get_sortable_columns() {
 		$sortable_columns = array(
-			'sent_date'   => array( 'sent_date', true ), //true means it's already sorted
-			'to'          => array( 'to_email', false ),
-			'subject'     => array( 'subject', false ),
+			'sent_date'   => array('sent_date', true), //true means it's already sorted
+			'to'          => array('to_email', false),
+			'subject'     => array('subject', false),
 		);
 		return $sortable_columns;
 	}
@@ -118,8 +118,8 @@ 
 	 * @param object $item
 	 * @param string $column_name
 	 */
-	protected function column_default( $item, $column_name ) {
-		do_action( EmailLog::HOOK_LOG_DISPLAY_COLUMNS, $column_name, $item );
+	protected function column_default($item, $column_name) {
+		do_action(EmailLog::HOOK_LOG_DISPLAY_COLUMNS, $column_name, $item);
 	}
 
 	/**
@@ -130,9 +130,9 @@ 
 	 * @param  object $item Current item object.
 	 * @return string       Markup to be displayed for the column.
 	 */
-	protected function column_sent_date( $item ) {
+	protected function column_sent_date($item) {
 		$email_date = mysql2date(
-			sprintf( __( '%s @ %s', 'email-log' ), get_option( 'date_format', 'F j, Y' ), get_option( 'time_format', 'g:i A' ) ),
+			sprintf(__('%s @ %s', 'email-log'), get_option('date_format', 'F j, Y'), get_option('time_format', 'g:i A')),
 			$item->sent_date
 		);
 
@@ -149,10 +149,10 @@ 
 			'admin-ajax.php'
 		);
 
-		$actions['view-content'] = sprintf( '<a href="%1$s" class="thickbox" title="%2$s">%3$s</a>',
-			esc_url( $content_ajax_url ),
-			__( 'Email Content', 'email-log' ),
-			__( 'View Content', 'email-log' )
+		$actions['view-content'] = sprintf('<a href="%1$s" class="thickbox" title="%2$s">%3$s</a>',
+			esc_url($content_ajax_url),
+			__('Email Content', 'email-log'),
+			__('View Content', 'email-log')
 		);
 
 		$delete_url = add_query_arg(
@@ -160,13 +160,13 @@ 
 				'page'                           => $_REQUEST['page'],
 				'action'                         => 'delete',
 				$this->_args['singular']         => $item->id,
-				EmailLog::DELETE_LOG_NONCE_FIELD => wp_create_nonce( EmailLog::DELETE_LOG_ACTION ),
+				EmailLog::DELETE_LOG_NONCE_FIELD => wp_create_nonce(EmailLog::DELETE_LOG_ACTION),
 			)
 		);
 
-		$actions['delete'] = sprintf( '<a href="%s">%s</a>',
-			esc_url( $delete_url ),
-			__( 'Delete', 'email-log' )
+		$actions['delete'] = sprintf('<a href="%s">%s</a>',
+			esc_url($delete_url),
+			__('Delete', 'email-log')
 		);
 
 		/**
@@ -177,12 +177,12 @@ 
 		 * @param array $actions List of actions.
 		 * @param object $item The current log item.
 		 */
-		$actions = apply_filters( 'el_row_actions', $actions, $item );
+		$actions = apply_filters('el_row_actions', $actions, $item);
 
-		return sprintf( '%1$s <span style="color:silver">(id:%2$s)</span>%3$s',
+		return sprintf('%1$s <span style="color:silver">(id:%2$s)</span>%3$s',
 			/*$1%s*/ $email_date,
 			/*$2%s*/ $item->id,
-			/*$3%s*/ $this->row_actions( $actions )
+			/*$3%s*/ $this->row_actions($actions)
 		);
 	}
 
@@ -194,8 +194,8 @@ 
 	 * @param object $item
 	 * @return string
 	 */
-	protected function column_to( $item ) {
-		return esc_html( $item->to_email );
+	protected function column_to($item) {
+		return esc_html($item->to_email);
 	}
 
 	/**
@@ -206,8 +206,8 @@ 
 	 * @param object $item
 	 * @return string
 	 */
-	protected function column_subject( $item ) {
-		return esc_html( $item->subject );
+	protected function column_subject($item) {
+		return esc_html($item->subject);
 	}
 
 	/**
@@ -218,7 +218,7 @@ 
 	 * @param object $item
 	 * @return string
 	 */
-	protected function column_cb( $item ) {
+	protected function column_cb($item) {
 		return sprintf(
 			'<input type="checkbox" name="%1$s[]" value="%2$s" />',
 			/*$1%s*/ $this->_args['singular'],
@@ -235,8 +235,8 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array(
-			'delete'     => __( 'Delete', 'email-log' ),
-			'delete-all' => __( 'Delete All Logs', 'email-log' ),
+			'delete'     => __('Delete', 'email-log'),
+			'delete-all' => __('Delete All Logs', 'email-log'),
 		);
 		return $actions;
 	}
@@ -250,16 +250,16 @@ 
 		global $wpdb;
 		global $EmailLog; //@codingStandardsIgnoreLine
 
-		if ( 'delete' === $this->current_action() ) {
+		if ('delete' === $this->current_action()) {
 			// Delete a list of logs by id.
 
-			$nonce = $_REQUEST[ EmailLog::DELETE_LOG_NONCE_FIELD ];
-			if ( wp_verify_nonce( $nonce, EmailLog::DELETE_LOG_ACTION ) ) {
+			$nonce = $_REQUEST[EmailLog::DELETE_LOG_NONCE_FIELD];
+			if (wp_verify_nonce($nonce, EmailLog::DELETE_LOG_ACTION)) {
 
-				$ids = $_GET[ $this->_args['singular'] ];
+				$ids = $_GET[$this->_args['singular']];
 
-				if ( is_array( $ids ) ) {
-					$selected_ids = implode( ',', $ids );
+				if (is_array($ids)) {
+					$selected_ids = implode(',', $ids);
 				} else {
 					$selected_ids = $ids;
 				}
@@ -267,21 +267,21 @@ 
 				// Can't use wpdb->prepare for the below query. If used it results in this bug
 				// https://github.com/sudar/email-log/issues/13
 
-				$selected_ids = esc_sql( $selected_ids );
+				$selected_ids = esc_sql($selected_ids);
 
 				$table_name = $wpdb->prefix . EmailLog::TABLE_NAME;
-				$EmailLog->logs_deleted = $wpdb->query( "DELETE FROM $table_name where id IN ( $selected_ids )" ); //@codingStandardsIgnoreLine
+				$EmailLog->logs_deleted = $wpdb->query("DELETE FROM $table_name where id IN ( $selected_ids )"); //@codingStandardsIgnoreLine
 			} else {
-				wp_die( 'Cheating, Huh? ' );
+				wp_die('Cheating, Huh? ');
 			}
-		} elseif ( 'delete-all' === $this->current_action() ) {
+		} elseif ('delete-all' === $this->current_action()) {
 			// Delete all logs.
-			$nonce = $_REQUEST[ EmailLog::DELETE_LOG_NONCE_FIELD ];
-			if ( wp_verify_nonce( $nonce, EmailLog::DELETE_LOG_ACTION ) ) {
+			$nonce = $_REQUEST[EmailLog::DELETE_LOG_NONCE_FIELD];
+			if (wp_verify_nonce($nonce, EmailLog::DELETE_LOG_ACTION)) {
 				$table_name = $wpdb->prefix . EmailLog::TABLE_NAME;
-				$EmailLog->logs_deleted = $wpdb->query( "DELETE FROM $table_name" ); //@codingStandardsIgnoreLine
+				$EmailLog->logs_deleted = $wpdb->query("DELETE FROM $table_name"); //@codingStandardsIgnoreLine
 			} else {
-				wp_die( 'Cheating, Huh? ' );
+				wp_die('Cheating, Huh? ');
 			}
 		}
 	}
@@ -305,47 +305,47 @@ 
 		$count_query = 'SELECT count(*) FROM ' . $table_name;
 		$query_cond = '';
 
-		if ( isset( $_GET['s'] ) ) {
-			$search_term = trim( esc_sql( $_GET['s'] ) );
+		if (isset($_GET['s'])) {
+			$search_term = trim(esc_sql($_GET['s']));
 			$query_cond .= " WHERE to_email LIKE '%$search_term%' OR subject LIKE '%$search_term%' ";
 		}
 
 		// Ordering parameters.
-		$orderby = ! empty( $_GET['orderby'] ) ? esc_sql( $_GET['orderby'] ) : 'sent_date';
-		$order   = ! empty( $_GET['order'] ) ? esc_sql( $_GET['order'] ) : 'DESC';
+		$orderby = ! empty($_GET['orderby']) ? esc_sql($_GET['orderby']) : 'sent_date';
+		$order   = ! empty($_GET['order']) ? esc_sql($_GET['order']) : 'DESC';
 
-		if ( ! empty( $orderby ) & ! empty( $order ) ) {
+		if ( ! empty($orderby) & ! empty($order)) {
 			$query_cond .= ' ORDER BY ' . $orderby . ' ' . $order;
 		}
 
 		// Find total number of items.
 		$count_query = $count_query . $query_cond;
-		$total_items = $wpdb->get_var( $count_query );
+		$total_items = $wpdb->get_var($count_query);
 
 		// Adjust the query to take pagination into account.
 		$per_page = EmailLog::get_per_page();
-		if ( ! empty( $current_page ) && ! empty( $per_page ) ) {
-			$offset = ( $current_page - 1 ) * $per_page;
+		if ( ! empty($current_page) && ! empty($per_page)) {
+			$offset = ($current_page - 1) * $per_page;
 			$query_cond .= ' LIMIT ' . (int) $offset . ',' . (int) $per_page;
 		}
 
 		// Fetch the items.
 		$query = $query . $query_cond;
-		$this->items = $wpdb->get_results( $query );
+		$this->items = $wpdb->get_results($query);
 
 		// Register pagination options & calculations.
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'per_page'    => $per_page,
-			'total_pages' => ceil( $total_items / $per_page ),
-		) );
+			'total_pages' => ceil($total_items / $per_page),
+		));
 	}
 
 	/**
 	 * Displays default message when no items are found.
 	 */
 	public function no_items() {
-		_e( 'Your email log is empty', 'email-log' );
+		_e('Your email log is empty', 'email-log');
 	}
 }
 ?>

email-log.php

Spacing +76 added lines, -76 removed lines

@@ -32,19 +32,19 @@ 
  *
  * @since 1.7.2
  */
-if ( ! defined( 'EMAIL_LOG_PLUGIN_FILE' ) ) {
-	define( 'EMAIL_LOG_PLUGIN_FILE', __FILE__ );
+if ( ! defined('EMAIL_LOG_PLUGIN_FILE')) {
+	define('EMAIL_LOG_PLUGIN_FILE', __FILE__);
 }
 
 /**
  * Handles installation and table creation.
  */
-require_once plugin_dir_path( __FILE__ ) . 'include/install.php';
+require_once plugin_dir_path(__FILE__) . 'include/install.php';
 
 /**
  * Helper functions.
  */
-require_once plugin_dir_path( __FILE__ ) . 'include/util/helper.php';
+require_once plugin_dir_path(__FILE__) . 'include/util/helper.php';
 
 /**
  * The main plugin class.
@@ -76,7 +76,7 @@ 
 	 * @since Genesis
 	 * @var const VERSION
 	 */
-	const VERSION                  = '1.8.2';
+	const VERSION = '1.8.2';
 
 	/**
 	 * Filter name.
@@ -84,7 +84,7 @@ 
 	 * @since Genesis
 	 * @var const FILTER_NAME
 	 */
-	const FILTER_NAME              = 'wp_mail_log';
+	const FILTER_NAME = 'wp_mail_log';
 
 	/**
 	 * Page slug to be used in admin dashboard hyperlinks.
@@ -92,7 +92,7 @@ 
 	 * @since Genesis
 	 * @var const PAGE_SLUG
 	 */
-	const PAGE_SLUG                = 'email-log';
+	const PAGE_SLUG = 'email-log';
 
 	/**
 	 * String value to generate nonce.
@@ -100,7 +100,7 @@ 
 	 * @since Genesis
 	 * @var const DELETE_LOG_NONCE_FIELD
 	 */
-	const DELETE_LOG_NONCE_FIELD   = 'sm-delete-email-log-nonce';
+	const DELETE_LOG_NONCE_FIELD = 'sm-delete-email-log-nonce';
 
 	/**
 	 * String value to generate nonce.
@@ -111,9 +111,9 @@ 
 	const DELETE_LOG_ACTION        = 'sm-delete-email-log';
 
 	// DB stuff
-	const TABLE_NAME               = 'email_log';          /* Database table name */
-	const DB_OPTION_NAME           = 'email-log-db';       /* Database option name */
-	const DB_VERSION               = '0.1';                /* Database version */
+	const TABLE_NAME               = 'email_log'; /* Database table name */
+	const DB_OPTION_NAME           = 'email-log-db'; /* Database option name */
+	const DB_VERSION               = '0.1'; /* Database version */
 
 	// JS Stuff
 	const JS_HANDLE                = 'email-log';
@@ -126,25 +126,25 @@ 
 	 * Initialize the plugin by registering the hooks.
 	 */
 	function __construct() {
-		$this->include_path = plugin_dir_path( __FILE__ );
+		$this->include_path = plugin_dir_path(__FILE__);
 
 		// Load localization domain.
-		$this->translations = dirname( plugin_basename( __FILE__ ) ) . '/languages/' ;
-		load_plugin_textdomain( 'email-log', false, $this->translations );
+		$this->translations = dirname(plugin_basename(__FILE__)) . '/languages/';
+		load_plugin_textdomain('email-log', false, $this->translations);
 
 		// Register hooks.
-		add_action( 'admin_menu', array( $this, 'register_settings_page' ) );
+		add_action('admin_menu', array($this, 'register_settings_page'));
 
 		// Register Filter.
-		add_filter( 'wp_mail', array( $this, 'log_email' ) );
-		add_filter( 'set-screen-option', array( $this, 'save_screen_options' ), 10, 3 );
-		add_filter( 'plugin_row_meta', array( $this, 'add_plugin_links' ), 10, 2 );
+		add_filter('wp_mail', array($this, 'log_email'));
+		add_filter('set-screen-option', array($this, 'save_screen_options'), 10, 3);
+		add_filter('plugin_row_meta', array($this, 'add_plugin_links'), 10, 2);
 
-		$plugin = plugin_basename( __FILE__ );
-		add_filter( "plugin_action_links_$plugin", array( $this, 'add_action_links' ) );
+		$plugin = plugin_basename(__FILE__);
+		add_filter("plugin_action_links_$plugin", array($this, 'add_action_links'));
 
 		// Add our ajax call.
-		add_action( 'wp_ajax_display_content', array( $this, 'display_content_callback' ) );
+		add_action('wp_ajax_display_content', array($this, 'display_content_callback'));
 	}
 
 	/**
@@ -159,13 +159,13 @@ 
 	 * @param string $file The name of the plugin file.
 	 * @return array Array with links to display in plugins page.
 	 */
-	public function add_plugin_links( $links, $file ) {
-		$plugin = plugin_basename( __FILE__ );
+	public function add_plugin_links($links, $file) {
+		$plugin = plugin_basename(__FILE__);
 
-		if ( $file == $plugin ) {
+		if ($file == $plugin) {
 			// only for this plugin
-			return array_merge( $links,
-				array( '<a href="http://sudarmuthu.com/wordpress/email-log/pro-addons" target="_blank">' . __( 'Buy Addons', 'email-log' ) . '</a>' )
+			return array_merge($links,
+				array('<a href="http://sudarmuthu.com/wordpress/email-log/pro-addons" target="_blank">' . __('Buy Addons', 'email-log') . '</a>')
 			);
 		}
 		return $links;
@@ -178,9 +178,9 @@ 
 	 */
 	public function register_settings_page() {
 		// Save the handle to your admin page - you'll need it to create a WP_Screen object
-		$this->admin_page = add_submenu_page( 'tools.php', __( 'Email Log', 'email-log' ), __( 'Email Log', 'email-log' ), 'manage_options', self::PAGE_SLUG , array( $this, 'display_logs' ) );
+		$this->admin_page = add_submenu_page('tools.php', __('Email Log', 'email-log'), __('Email Log', 'email-log'), 'manage_options', self::PAGE_SLUG, array($this, 'display_logs'));
 
-		add_action( "load-{$this->admin_page}", array( $this, 'create_settings_panel' ) );
+		add_action("load-{$this->admin_page}", array($this, 'create_settings_panel'));
 	}
 
 	/**
@@ -191,33 +191,33 @@ 
 	public function display_logs() {
 		add_thickbox();
 
-		$this->logs_table->prepare_items( $this->get_per_page() );
+		$this->logs_table->prepare_items($this->get_per_page());
 ?>
 	<div class="wrap">
-		<h2><?php _e( 'Email Logs', 'email-log' );?></h2>
+		<h2><?php _e('Email Logs', 'email-log'); ?></h2>
 		<?php
-		if ( isset( $this->logs_deleted ) && $this->logs_deleted != '' ) {
-			$logs_deleted = intval( $this->logs_deleted );
+		if (isset($this->logs_deleted) && $this->logs_deleted != '') {
+			$logs_deleted = intval($this->logs_deleted);
 
-			if ( $logs_deleted > 0 ) {
-				echo '<div class="updated"><p>' . sprintf( _n( '1 email log deleted.', '%s email logs deleted', $logs_deleted, 'email-log' ), $logs_deleted ) . '</p></div>';
+			if ($logs_deleted > 0) {
+				echo '<div class="updated"><p>' . sprintf(_n('1 email log deleted.', '%s email logs deleted', $logs_deleted, 'email-log'), $logs_deleted) . '</p></div>';
 			} else {
-				echo '<div class="updated"><p>' . __( 'There was some problem in deleting the email logs' , 'email-log' ) . '</p></div>';
+				echo '<div class="updated"><p>' . __('There was some problem in deleting the email logs', 'email-log') . '</p></div>';
 			}
-			unset( $this->logs_deleted );
+			unset($this->logs_deleted);
 		}
 ?>
 		<form id="email-logs-search" method="get">
 			<input type="hidden" name="page" value="<?php echo self::PAGE_SLUG; ?>" >
 <?php
-		$this->logs_table->search_box( __( 'Search Logs', 'email-log' ), 'search_id' );
+		$this->logs_table->search_box(__('Search Logs', 'email-log'), 'search_id');
 ?>
 		</form>
 
 		<form id="email-logs-filter" method="get">
 			<input type="hidden" name="page" value="<?php echo $_REQUEST['page'] ?>" />
 <?php
-		wp_nonce_field( self::DELETE_LOG_ACTION, self::DELETE_LOG_NONCE_FIELD );
+		wp_nonce_field(self::DELETE_LOG_ACTION, self::DELETE_LOG_NONCE_FIELD);
 		$this->logs_table->display();
 ?>
 		</form>
@@ -228,10 +228,10 @@ 
 		 *
 		 * @since 1.8
 		 */
-		do_action( 'el_admin_footer' );
+		do_action('el_admin_footer');
 
 		// Display credits in Footer
-		add_action( 'in_admin_footer', array( $this, 'add_footer_links' ) );
+		add_action('in_admin_footer', array($this, 'add_footer_links'));
 	}
 
 	/**
@@ -245,43 +245,43 @@ 
 		 * Create the WP_Screen object against your admin page handle
 		 * This ensures we're working with the right admin page
 		 */
-		$this->admin_screen = WP_Screen::get( $this->admin_page );
+		$this->admin_screen = WP_Screen::get($this->admin_page);
 
 		/**
 		 * Content specified inline
 		 */
 		$this->admin_screen->add_help_tab(
 			array(
-				'title'    => __( 'About Plugin', 'email-log' ),
+				'title'    => __('About Plugin', 'email-log'),
 				'id'       => 'about_tab',
-				'content'  => '<p>' . __( 'Email Log WordPress Plugin, allows you to log all emails that are sent through WordPress.', 'email-log' ) . '</p>',
+				'content'  => '<p>' . __('Email Log WordPress Plugin, allows you to log all emails that are sent through WordPress.', 'email-log') . '</p>',
 				'callback' => false,
 			)
 		);
 
 		// Add help sidebar
 		$this->admin_screen->set_help_sidebar(
-			'<p><strong>' . __( 'More information', 'email-log' ) . '</strong></p>' .
-			'<p><a href = "http://sudarmuthu.com/wordpress/email-log">' . __( 'Plugin Homepage/support', 'email-log' ) . '</a></p>' .
-			'<p><a href = "http://sudarmuthu.com/blog">' . __( "Plugin author's blog", 'email-log' ) . '</a></p>' .
-			'<p><a href = "http://sudarmuthu.com/wordpress/">' . __( "Other Plugin's by Author", 'email-log' ) . '</a></p>'
+			'<p><strong>' . __('More information', 'email-log') . '</strong></p>' .
+			'<p><a href = "http://sudarmuthu.com/wordpress/email-log">' . __('Plugin Homepage/support', 'email-log') . '</a></p>' .
+			'<p><a href = "http://sudarmuthu.com/blog">' . __("Plugin author's blog", 'email-log') . '</a></p>' .
+			'<p><a href = "http://sudarmuthu.com/wordpress/">' . __("Other Plugin's by Author", 'email-log') . '</a></p>'
 		);
 
 		// Add screen options
 		$this->admin_screen->add_option(
 			'per_page',
 			array(
-				'label' => __( 'Entries per page', 'email-log' ),
+				'label' => __('Entries per page', 'email-log'),
 				'default' => 20,
 				'option' => 'per_page',
 			)
 		);
 
-		if ( ! class_exists( 'WP_List_Table' ) ) {
+		if ( ! class_exists('WP_List_Table')) {
 			require_once ABSPATH . WPINC . '/class-wp-list-table.php';
 		}
 
-		if ( ! class_exists( 'Email_Log_List_Table' ) ) {
+		if ( ! class_exists('Email_Log_List_Table')) {
 			require_once $this->include_path . 'include/class-email-log-list-table.php';
 		}
 
@@ -298,12 +298,12 @@ 
 		global $wpdb;
 
 		$table_name = $wpdb->prefix . self::TABLE_NAME;
-		$email_id   = absint( $_GET['email_id'] );
+		$email_id   = absint($_GET['email_id']);
 
-		$query      = $wpdb->prepare( 'SELECT * FROM ' . $table_name . ' WHERE id = %d', $email_id );
-		$content    = $wpdb->get_results( $query );
+		$query      = $wpdb->prepare('SELECT * FROM ' . $table_name . ' WHERE id = %d', $email_id);
+		$content    = $wpdb->get_results($query);
 
-		echo wpautop( $content[0]->message );
+		echo wpautop($content[0]->message);
 
 		die(); // this is required to return a proper result
 	}
@@ -318,8 +318,8 @@ 
 	 * @param int      $value  The number of rows to use.
 	 * @return bool|int
 	 */
-	function save_screen_options( $status, $option, $value ) {
-		if ( 'per_page' == $option ) {
+	function save_screen_options($status, $option, $value) {
+		if ('per_page' == $option) {
 			return $value;
 		} else {
 			return $status;
@@ -335,12 +335,12 @@ 
 	 */
 	public static function get_per_page() {
 		$screen = get_current_screen();
-		$option = $screen->get_option( 'per_page', 'option' );
+		$option = $screen->get_option('per_page', 'option');
 
-		$per_page = get_user_meta( get_current_user_id(), $option, true );
+		$per_page = get_user_meta(get_current_user_id(), $option, true);
 
-		if ( empty( $per_page ) || $per_page < 1 ) {
-			$per_page = $screen->get_option( 'per_page', 'default' );
+		if (empty($per_page) || $per_page < 1) {
+			$per_page = $screen->get_option('per_page', 'default');
 		}
 
 		return $per_page;
@@ -354,10 +354,10 @@ 
 	 * @param array $links
 	 * @return array
 	 */
-	public function add_action_links( $links ) {
+	public function add_action_links($links) {
 		// Add a link to this plugin's settings page
-		$settings_link = '<a href="tools.php?page=email-log">' . __( 'Log', 'email-log' ) . '</a>';
-		array_unshift( $links, $settings_link );
+		$settings_link = '<a href="tools.php?page=email-log">' . __('Log', 'email-log') . '</a>';
+		array_unshift($links, $settings_link);
 		return $links;
 	}
 
@@ -370,8 +370,8 @@ 
 	 * @link http://striderweb.com/nerdaphernalia/2008/06/give-your-wordpress-plugin-credit/
 	 */
 	public function add_footer_links() {
-		$plugin_data = get_plugin_data( __FILE__ );
-		printf( '%1$s ' . __( 'plugin', 'email-log' ) . ' | ' . __( 'Version', 'email-log' ) . ' %2$s | ' . __( 'by', 'email-log' ) . ' %3$s<br />', $plugin_data['Title'], $plugin_data['Version'], $plugin_data['Author'] );
+		$plugin_data = get_plugin_data(__FILE__);
+		printf('%1$s ' . __('plugin', 'email-log') . ' | ' . __('Version', 'email-log') . ' %2$s | ' . __('by', 'email-log') . ' %3$s<br />', $plugin_data['Title'], $plugin_data['Version'], $plugin_data['Author']);
 	}
 
 	/**
@@ -384,21 +384,21 @@ 
 	 * @param array $mail_info Information about email.
 	 * @return array Information about email.
 	 */
-	public function log_email( $mail_info ) {
+	public function log_email($mail_info) {
 		global $wpdb;
 
-		$attachment_present = ( count( $mail_info['attachments'] ) > 0 ) ? 'true' : 'false';
+		$attachment_present = (count($mail_info['attachments']) > 0) ? 'true' : 'false';
 
 		// return filtered array
-		$mail_info  = apply_filters( self::FILTER_NAME, $mail_info );
+		$mail_info  = apply_filters(self::FILTER_NAME, $mail_info);
 		$table_name = $wpdb->prefix . self::TABLE_NAME;
 
-		if ( isset( $mail_info['message'] ) ) {
+		if (isset($mail_info['message'])) {
 			$message = $mail_info['message'];
 		} else {
 			// wpmandrill plugin is changing "message" key to "html". See https://github.com/sudar/email-log/issues/20
 			// Ideally this should be fixed in wpmandrill, but I am including this hack here till it is fixed by them.
-			if ( isset( $mail_info['html'] ) ) {
+			if (isset($mail_info['html'])) {
 				$message = $mail_info['html'];
 			} else {
 				$message = '';
@@ -406,14 +406,14 @@ 
 		}
 
 		// Log into the database
-		$wpdb->insert( $table_name, array(
-				'to_email'    => is_array( $mail_info['to'] ) ? implode( ',', $mail_info['to'] ) : $mail_info['to'],
+		$wpdb->insert($table_name, array(
+				'to_email'    => is_array($mail_info['to']) ? implode(',', $mail_info['to']) : $mail_info['to'],
 				'subject'     => $mail_info['subject'],
 				'message'     => $message,
-				'headers'     => is_array( $mail_info['headers'] ) ? implode( "\n", $mail_info['headers'] ) : $mail_info['headers'],
+				'headers'     => is_array($mail_info['headers']) ? implode("\n", $mail_info['headers']) : $mail_info['headers'],
 				'attachments' => $attachment_present,
-				'sent_date'   => current_time( 'mysql' ),
-			) );
+				'sent_date'   => current_time('mysql'),
+			));
 
 		return $mail_info;
 	}
@@ -431,5 +431,5 @@ 
 	global $EmailLog;
 	$EmailLog = new EmailLog();
 }
-add_action( 'init', 'email_log' );
+add_action('init', 'email_log');
 ?>