From 35a59101baac7e12e018973acc41981110ca2e10 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <danielbachhuber@gmail.com>
Date: Sat, 3 Nov 2012 16:39:33 -0500
Subject: [PATCH 001/485] i18n fix

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index b1baa66..8540eb3 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -409,7 +409,7 @@ public function meta_box_comments() {
 
 		echo '<div id="message-tools">';
 		echo '<div id="comment-attachments-wrap">';
-		echo '<div id="upload-messages">' . __( 'Drop a file in the message to attach it' ) . '</div>';
+		echo '<div id="upload-messages">' . __( 'Drop a file in the message to attach it', 'supportflow' ) . '</div>';
 		echo '<ul id="comment-attachments-list">';
 		echo '</ul>';
 		echo '<input type="hidden" id="comment-attachments" name="comment-attachments" />';

From d2691bf88e0dc8b673a8f99ec4a8939177cd7d0e Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <danielbachhuber@gmail.com>
Date: Sat, 3 Nov 2012 17:14:01 -0500
Subject: [PATCH 002/485] Moar i18n fixes

---
 supportflow.php | 52 ++++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index acd7486..2143484 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -8,7 +8,7 @@
  * Author URI:  
  * Version:     0.1
  *
- * Text Domain: support-flow
+ * Text Domain: supportflow
  * Domain Path: /languages/
  */
 
@@ -169,20 +169,20 @@ private function setup_globals() {
 
 		$this->post_statuses  = apply_filters( 'supportflow_thread_post_statuses', array(
 			'sf_new'     => array(
-				'label'       => __( 'New', 'support-flow' ),
-				'label_count' => _n_noop( 'New <span class="count">(%s)</span>', 'New <span class="count">(%s)</span>', 'support-flow' ),
+				'label'       => __( 'New', 'supportflow' ),
+				'label_count' => _n_noop( 'New <span class="count">(%s)</span>', 'New <span class="count">(%s)</span>', 'supportflow' ),
 			),
 			'sf_open'    => array(
-				'label'       => __( 'Open', 'support-flow' ),
-				'label_count' => _n_noop( 'Open <span class="count">(%s)</span>', 'Open <span class="count">(%s)</span>', 'support-flow' ),
+				'label'       => __( 'Open', 'supportflow' ),
+				'label_count' => _n_noop( 'Open <span class="count">(%s)</span>', 'Open <span class="count">(%s)</span>', 'supportflow' ),
 			),
 			'sf_pending' => array(
-				'label'       => __( 'Pending', 'support-flow' ),
-				'label_count' => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>', 'support-flow' ),
+				'label'       => __( 'Pending', 'supportflow' ),
+				'label_count' => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>', 'supportflow' ),
 			),
 			'sf_closed'  => array(
-				'label'       => __( 'Closed', 'support-flow' ),
-				'label_count' => _n_noop( 'Closed <span class="count">(%s)</span>', 'Closed <span class="count">(%s)</span>', 'support-flow' ),
+				'label'       => __( 'Closed', 'supportflow' ),
+				'label_count' => _n_noop( 'Closed <span class="count">(%s)</span>', 'Closed <span class="count">(%s)</span>', 'supportflow' ),
 			),
 		) );
 
@@ -254,18 +254,18 @@ private function setup_actions() {
 	public function action_init_register_post_type() {
 		register_post_type( $this->post_type, array(
 			'labels' => array(
-				'menu_name'          => __( 'SupportFlow',               'support-flow' ),
-				'name'               => __( 'Threads',                   'support-flow' ),
-				'singular_name'      => __( 'Thread',                    'support-flow' ),
-				'all_items'          => __( 'All Threads',               'support-flow' ),
-				'add_new'            => __( 'New Thread',                'support-flow' ),
-				'add_new_item'       => __( 'Start New Thread',          'support-flow' ),
-				'edit_item'          => __( 'Discussion',                'support-flow' ),
-				'new_item'           => __( 'New Thread',                'support-flow' ),
-				'view_item'          => __( 'View Thread',               'support-flow' ),
-				'search_items'       => __( 'Search Threads',            'support-flow' ),
-				'not_found'          => __( 'No threads found',          'support-flow' ),
-				'not_found_in_trash' => __( 'No threads found in trash', 'support-flow' ),
+				'menu_name'          => __( 'SupportFlow',               'supportflow' ),
+				'name'               => __( 'Threads',                   'supportflow' ),
+				'singular_name'      => __( 'Thread',                    'supportflow' ),
+				'all_items'          => __( 'All Threads',               'supportflow' ),
+				'add_new'            => __( 'New Thread',                'supportflow' ),
+				'add_new_item'       => __( 'Start New Thread',          'supportflow' ),
+				'edit_item'          => __( 'Discussion',                'supportflow' ),
+				'new_item'           => __( 'New Thread',                'supportflow' ),
+				'view_item'          => __( 'View Thread',               'supportflow' ),
+				'search_items'       => __( 'Search Threads',            'supportflow' ),
+				'not_found'          => __( 'No threads found',          'supportflow' ),
+				'not_found_in_trash' => __( 'No threads found in trash', 'supportflow' ),
 				),
 			'public'        => true,
 			'menu_position' => 3,
@@ -281,12 +281,12 @@ public function action_init_register_post_type() {
 	public function action_init_register_taxonomies() {
 
 		$args = array(
-			'label'                  => __( 'Respondents',                'support-flow' ),
+			'label'                  => __( 'Respondents',                'supportflow' ),
 			'labels' => array(
-				'search_items'       => __( 'Search Respondents',         'support-flow' ),
-				'edit_item'          => __( 'Edit Respondent',            'support-flow' ),
-				'update_item'        => __( 'Update Respondent',          'support-flow' ),
-				'add_new_item'       => __( 'Add New Respondent',         'support-flow' ),
+				'search_items'       => __( 'Search Respondents',         'supportflow' ),
+				'edit_item'          => __( 'Edit Respondent',            'supportflow' ),
+				'update_item'        => __( 'Update Respondent',          'supportflow' ),
+				'add_new_item'       => __( 'Add New Respondent',         'supportflow' ),
 				),
 			'public'                 => true,
 			'show_in_nav_menus'      => true,

From 2b737846ef6c3b7268abe8ccf62ada28e49a2185 Mon Sep 17 00:00:00 2001
From: Greg Johnson <greg@uponaweb.com>
Date: Sat, 3 Nov 2012 17:05:59 -0500
Subject: [PATCH 003/485] Added Date Opened, and Last Activity details to the
 Details sidebar widget on view Discussion page. Added styling to reveal the
 widget handle as well

---
 classes/class-supportflow-admin.php | 20 +++++++++++++++++++-
 css/admin.css                       | 13 +++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index b1baa66..9256cb1 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -323,7 +323,22 @@ public function action_add_meta_boxes() {
 	public function meta_box_details() {
 		global $pagenow;
 
+		// Display Meta Data for Post
 		echo '<div id="misc-publishing-actions">';
+
+		// Date Created and Last Activity for Existing Posts
+		if( 'post.php' == $pagenow ) {
+
+			$modified_gmt = get_post_modified_time( 'U', true, $thread_id );
+			$last_activity = sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
+
+			echo '<div class="misc-pub-section created-on">';
+			echo '<label for="created_on">' . __( 'Opened', 'supportflow' ) . ':</label>';
+			echo '<span class="the-date">' . get_the_date() . ' ' .get_the_time() . '</span>'; 
+			echo '<div clas="last-activity" title="' . get_the_modified_date('l, M j, Y ') . get_the_modified_time() . '">' . __( 'Last Activity', 'SupportFlow' ) . ': <strong>' . $last_activity . '</strong></div>';
+			echo '</div>';
+		}
+
 		// Post status dropdown
 		$current_status = get_post_status( get_the_ID() );
 		echo '<div class="misc-pub-section">';
@@ -334,6 +349,7 @@ public function meta_box_details() {
 		}
 		echo '</select>';
 		echo '</div>';
+
 		// Agent assignment dropdown
 		$post_author = get_post( get_the_ID() )->post_author;
 		echo '<div class="misc-pub-section">';
@@ -348,8 +364,10 @@ public function meta_box_details() {
 		wp_dropdown_users( $args );
 		echo '</div>';
 
-		echo '</div>';
+		echo '</div>'; // end div#misc-publishing-actions
+
 
+		// Start/Update Thread (submit)
 		if ( 'post-new.php' == $pagenow )
 			$submit_text = __( 'Start Thread', 'supportflow' );
 		else
diff --git a/css/admin.css b/css/admin.css
index 88327b2..8d308fc 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -42,6 +42,11 @@
 	display:none;
 }
 
+#supportflow-details .handlediv,
+#supportflow-details h3.hndle {
+	display: block;
+}
+
 #supportflow-details #misc-publishing-actions label {
 	width: 50px;
 	display: inline-block;
@@ -51,6 +56,14 @@
 	width: 100px;
 }
 
+#supportflow-details #misc-publishing-actions span.the-date {
+	font-weight: bold;
+}
+
+#supportflow-details #misc-publishing-actions div.last-activity {
+	font-size: 11px;
+}
+
 #supportflow-subject h4,
 #supportflow-respondents h4,
 #supportflow-comments h4 {

From bf8479e9880b8c70abe70de88f8d718bedbf1acf Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <danielbachhuber@gmail.com>
Date: Sat, 3 Nov 2012 17:20:33 -0500
Subject: [PATCH 004/485] Create Thread: New threads must have subjects

See #52
---
 supportflow.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/supportflow.php b/supportflow.php
index 2143484..b06d8cf 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -242,6 +242,8 @@ private function setup_actions() {
 		add_action( 'init', array( $this, 'action_init_register_taxonomies' ) );
 		add_action( 'init', array( $this, 'action_init_register_post_statuses' ) );
 
+		add_filter( 'wp_insert_post_empty_content', array( $this, 'filter_wp_insert_post_empty_content' ), 10, 2 );
+
 		do_action_ref_array( 'supportflow_after_setup_actions', array( &$this ) );
 	}
 
@@ -412,6 +414,20 @@ public function create_thread( $args ) {
 		return $thread_id;
 	}
 
+	/**
+	 * Threads must have subjects
+	 */
+	public function filter_wp_insert_post_empty_content( $maybe_empty, $postarr ) {
+
+		if ( $this->post_type != $postarr['post_type'] )
+			return $maybe_empty;
+
+		if ( empty( $postarr['post_title'] ) )
+			return true;
+
+		return $maybe_empty;
+	}
+
 	/**
 	 * @todo This should produce an object with thread details, respondents, and comments
 	 */

From 8429bd1471c41fb433a2d8716501d4b7305e2991 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <danielbachhuber@gmail.com>
Date: Sat, 3 Nov 2012 17:26:09 -0500
Subject: [PATCH 005/485] Fix error "Undefined variable"

See #79
---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index d834461..990eecd 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -329,7 +329,7 @@ public function meta_box_details() {
 		// Date Created and Last Activity for Existing Posts
 		if( 'post.php' == $pagenow ) {
 
-			$modified_gmt = get_post_modified_time( 'U', true, $thread_id );
+			$modified_gmt = get_post_modified_time( 'U', true, get_the_ID() );
 			$last_activity = sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
 
 			echo '<div class="misc-pub-section created-on">';

From a7fda3d841e5da8762236a3b7b3a3074431f1351 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <danielbachhuber@gmail.com>
Date: Sat, 3 Nov 2012 17:26:58 -0500
Subject: [PATCH 006/485] Spacing fix

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 990eecd..cf81a17 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -334,7 +334,7 @@ public function meta_box_details() {
 
 			echo '<div class="misc-pub-section created-on">';
 			echo '<label for="created_on">' . __( 'Opened', 'supportflow' ) . ':</label>';
-			echo '<span class="the-date">' . get_the_date() . ' ' .get_the_time() . '</span>'; 
+			echo '<span class="the-date">' . get_the_date() . ' ' . get_the_time() . '</span>'; 
 			echo '<div clas="last-activity" title="' . get_the_modified_date('l, M j, Y ') . get_the_modified_time() . '">' . __( 'Last Activity', 'SupportFlow' ) . ': <strong>' . $last_activity . '</strong></div>';
 			echo '</div>';
 		}

From 7b85d3ca90aa1c5b38fecccf1ccf50e5dbe924ac Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <danielbachhuber@gmail.com>
Date: Sat, 3 Nov 2012 18:23:41 -0500
Subject: [PATCH 007/485] Manage Threads: Apply the most recent public comment
 as the excerpt for mode=excerpt

Closes #26
---
 classes/class-supportflow-admin.php | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index cf81a17..a190a59 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -39,11 +39,14 @@ public function setup_actions() {
 	 * Re-sort the custom statuses so trash appears last
 	 */
 	function action_admin_init() {
-		global $wp_post_statuses;
+		global $wp_post_statuses, $pagenow;
 
 		$trash_status = $wp_post_statuses['trash'];
 		unset( $wp_post_statuses['trash'] );
 		$wp_post_statuses['trash'] = $trash_status;
+
+		if ( 'edit.php' == $pagenow )
+			add_filter( 'get_the_excerpt', array( $this, 'filter_get_the_excerpt' ) );
 	}
 
 	/**
@@ -536,6 +539,17 @@ public function manage_sortable_columns( $columns ) {
 		return $columns;
 	}
 
+	/**
+	 * Use the most recent public comment as the post excerpt
+	 * on the Manage Threads view so mode=excerpt works well
+	 */
+	public function filter_get_the_excerpt( $orig ) {
+		if ( $comment = array_pop( SupportFlow()->get_thread_comments( get_the_ID() ) ) )
+			return $comment->comment_author .': "' . wp_trim_excerpt( $comment->comment_content ) . '"';
+		else
+			return $orig;
+	}
+
 	/**
 	 * Produce the column values for the custom columns we created
 	 */

From af2d51ffa0d5574c16c06258a4edbca9a4ba0a54 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <danielbachhuber@gmail.com>
Date: Sat, 3 Nov 2012 18:42:02 -0500
Subject: [PATCH 008/485] Manage Threads: The count for 'All' shouldn't include
 the closed status

See #61
---
 classes/class-supportflow-admin.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index a190a59..9ec6242 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -27,6 +27,7 @@ public function setup_actions() {
 		add_filter( 'manage_' . SupportFlow()->post_type . '_posts_columns', array( $this, 'filter_manage_post_columns' ) );
 		add_filter( 'manage_edit-' . SupportFlow()->post_type . '_sortable_columns', array( $this, 'manage_sortable_columns' ) );
 		add_action( 'manage_posts_custom_column', array( $this, 'action_manage_posts_custom_column' ), 10, 2 );
+		add_filter( 'views_edit-' . SupportFlow()->post_type, array( $this, 'filter_views' ) );
 		add_filter( 'post_row_actions', array( $this, 'filter_post_row_actions' ), 10, 2 );
 		add_filter( 'bulk_actions-edit-' . SupportFlow()->post_type, array( $this, 'filter_bulk_actions' ) );
 		add_action( 'pre_get_posts', array( $this, 'action_pre_get_posts' ) );
@@ -124,6 +125,24 @@ public function filter_post_updated_messages( $messages ) {
 		return $messages;
 	}
 
+	/**
+	 *
+	 */
+	public function filter_views( $views ) {
+
+		// The 'all' count shouldn't include closed posts
+		$post_type = SupportFlow()->post_type;
+		$num_posts = wp_count_posts( $post_type, 'readable' );
+		$total_posts = array_sum( (array)$num_posts );
+		foreach ( get_post_stati( array('show_in_admin_all_list' => false) ) as $state )
+			$total_posts -= $num_posts->$state;
+		$total_posts -= $num_posts->sf_closed;
+		$class = empty( $class ) && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['show_sticky'] ) ? ' class="current"' : '';
+		$views['all'] = "<a href='edit.php?post_type=$post_type'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts, 'posts' ), number_format_i18n( $total_posts ) ) . '</a>';
+
+		return $views;
+	}
+
 	/**
 	 * Add custom filters for the Manage Threads view
 	 */

From a92bff3e9bf534cb49e952cde910732c64e07c24 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <danielbachhuber@gmail.com>
Date: Sat, 3 Nov 2012 18:48:18 -0500
Subject: [PATCH 009/485] Permissions: We don't need this named function for
 now

See #78
---
 classes/class-supportflow-permissions.php | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 1503f88..91bd3a7 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -161,17 +161,4 @@ public function get_cap( $cap ) {
 	}
 }
 
-SupportFlow()->extend->permissions = new SupportFlow_Permissions();
-
-/**
- * Get the name of an individual capability.
- *
- * @since	0.1
- * @uses	SupportFlow, SupportFlow_Permissions::get_cap
- *
- * @param 	string			$cap		Capability to get.
- * @return	bool|string					Internal name of the capability on success; false on failure;
- */
-function sf_get_cap( $cap ) {
-	return SupportFlow()->extend->permissions->get_cap( $cap );
-}
\ No newline at end of file
+SupportFlow()->extend->permissions = new SupportFlow_Permissions();
\ No newline at end of file

From ba18861f4355fad69e78b547177509270157cf8d Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <danielbachhuber@gmail.com>
Date: Sat, 3 Nov 2012 18:48:59 -0500
Subject: [PATCH 010/485] Permissions: Filters should just be named explicitly

---
 classes/class-supportflow-permissions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 91bd3a7..4a52a14 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -60,7 +60,7 @@ public function setup_actions() {
 	 */
 	private function _setup_caps() {
 		// Setup the default caps for SupportFlow
-		$this->_caps = apply_filters( 'sf_caps', array(
+		$this->_caps = apply_filters( 'supportflow_caps', array(
 			'close_others_threads' 		=> 'sf_close_others_threads',
 			'open_others_threads' 		=> 'sf_open_others_threads',
 			'reopen_others_threads' 	=> 'sf_reopen_others_threads',
@@ -72,7 +72,7 @@ private function _setup_caps() {
 		) );
 
 		// Map the default caps onto WordPress roles
-		$this->_role_cap_map = apply_filters( 'sf_role_cap_map', array(
+		$this->_role_cap_map = apply_filters( 'supportflow_role_cap_map', array(
 			'administrator' => $this->get_caps(), // Apply all caps
 			'editor' 		=> $this->get_caps(), // Apply all caps
 			'author' 		=> array(

From 8a522347afb9616a0669234e4e00be8f6920864e Mon Sep 17 00:00:00 2001
From: jeremyfelt <jeremy.felt@gmail.com>
Date: Sat, 3 Nov 2012 17:34:32 -0700
Subject: [PATCH 011/485] Initial handling of attachments

First draft at the handling of attachments. Grabs the message structure, processes the part containing the attachment data, creates a new temporary file, then sideloads it into WordPress.

The next step will be to dynamically handle the structure of incoming attachments properly as it won't always be one jpeg.
---
 classes/class-supportflow-email-replies.php | 31 ++++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 3d7c227..c493ff1 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -50,10 +50,11 @@ public function download_and_process_email_replies( $connection_details ) {
 		for( $i = 1; $i <= $email_count; $i++ ) {
 			$email = new stdClass;
 			$email->headers = imap_headerinfo( $this->imap_connection, $i );
+			$email->structure = imap_fetchstructure( $this->imap_connection, $i );
 			$email->body = $this->get_body_from_connection( $this->imap_connection, $i );
 
 			// @todo Confirm this a message we want to process
-			$ret = $this->process_email( $email );
+			$ret = $this->process_email( $email, $i );
 			// If it was successful, move the email to the archive
 			if ( $ret ) {
 				imap_mail_move( $this->imap_connection, $i, $archive );
@@ -65,10 +66,28 @@ public function download_and_process_email_replies( $connection_details ) {
 
 	/**
 	 * Given an email object, maybe create a new ticket
-	 *
-	 * @todo upload the attachment if there is one
 	 */
-	public function process_email( $email ) {
+	public function process_email( $email, $i ) {
+
+		// Initial handling of one jpg attachment via hard coded part 2
+		$raw_attachment_data = imap_fetchbody( $this->imap_connection, $i, '2' );
+
+		// The raw data from imap is base64 encoded, but php-imap has us covered!
+		$attachment_data = imap_base64( $raw_attachment_data );
+
+
+		$temp_file = get_temp_dir() . time() . '_supportflow_temp.tmp';
+		touch( $temp_file );
+		$temp_handle = fopen( $temp_file, 'w+' );
+		fwrite( $temp_handle, $attachment_data );
+		fclose( $temp_handle );
+
+		$file_array = array(
+			'tmp_name' => $temp_file,
+			'name' => 'attached-email.jpg', // @todo this should be the real attachment name
+		);
+
+		$new_attachment_id = media_handle_sideload( $file_array, NULL );
 
 		if ( ! empty( $email->headers->subject ) )
 			$subject = $email->headers->subject;
@@ -118,6 +137,10 @@ public function process_email( $email ) {
 				);
 			$thread_id = SupportFlow()->create_thread( $new_thread_args );
 		}
+
+		// Associate the thread ID as the parent to our new attachment
+		wp_update_post( array( 'ID' => $new_attachment_id, 'post_parent' => $thread_id, 'post_status' => 'inherit' ) );
+
 		$new_comment = array_pop( SupportFlow()->get_thread_comments( $thread_id ) );
 
 		// Add anyone else that was in the 'to' or 'cc' fields as respondents

From 529784f2ff47b1ad9f2164b0d7d376840eab1ff7 Mon Sep 17 00:00:00 2001
From: jeremyfelt <jeremy.felt@gmail.com>
Date: Sat, 3 Nov 2012 18:25:01 -0700
Subject: [PATCH 012/485] Improved handling of incoming attachments

Attachment data is now processed dynamically. This allows for multiple file types, proper file names, and multiple attachments in one email.

There is no strict checking, so the code will need to be tightened up a bit before we can trust it. Also need to associate the new attachment IDs with comments in addition to the threads for better interface display.
---
 classes/class-supportflow-email-replies.php | 50 +++++++++++++--------
 1 file changed, 32 insertions(+), 18 deletions(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index c493ff1..0f31b07 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -69,25 +69,37 @@ public function download_and_process_email_replies( $connection_details ) {
 	 */
 	public function process_email( $email, $i ) {
 
-		// Initial handling of one jpg attachment via hard coded part 2
-		$raw_attachment_data = imap_fetchbody( $this->imap_connection, $i, '2' );
-
-		// The raw data from imap is base64 encoded, but php-imap has us covered!
-		$attachment_data = imap_base64( $raw_attachment_data );
-
+		$accepted_attachments = array( 'PDF', 'JPEG', 'PNG', 'GIF' );
+		$new_attachment_ids = array();
+
+		$k = 0;
+		foreach( $email->structure->parts as $email_part ) {
+			if ( 'ATTACHMENT' == $email_part->disposition && in_array( $email_part->subtype, $accepted_attachments ) ) {
+				// We need to add 1 to our array key each time to get the correct email part
+				$raw_attachment_data = imap_fetchbody( $this->imap_connection, $i, $k+1 );
+
+				// The raw data from imap is base64 encoded, but php-imap has us covered!
+				$attachment_data = imap_base64( $raw_attachment_data );
+
+				$temp_file = get_temp_dir() . time() . '_supportflow_temp.tmp';
+				touch( $temp_file );
+				$temp_handle = fopen( $temp_file, 'w+' );
+				fwrite( $temp_handle, $attachment_data );
+				fclose( $temp_handle );
+
+				$file_array = array(
+					'tmp_name' => $temp_file,
+					'name' => $email_part->dparameters[0]->value,
+				);
 
-		$temp_file = get_temp_dir() . time() . '_supportflow_temp.tmp';
-		touch( $temp_file );
-		$temp_handle = fopen( $temp_file, 'w+' );
-		fwrite( $temp_handle, $attachment_data );
-		fclose( $temp_handle );
+				$upload_result = media_handle_sideload( $file_array, NULL );
 
-		$file_array = array(
-			'tmp_name' => $temp_file,
-			'name' => 'attached-email.jpg', // @todo this should be the real attachment name
-		);
+				if ( ! is_wp_error( $upload_result ) )
+					$new_attachment_ids[] = $upload_result;
 
-		$new_attachment_id = media_handle_sideload( $file_array, NULL );
+			}
+			$k++;
+		}
 
 		if ( ! empty( $email->headers->subject ) )
 			$subject = $email->headers->subject;
@@ -138,8 +150,10 @@ public function process_email( $email, $i ) {
 			$thread_id = SupportFlow()->create_thread( $new_thread_args );
 		}
 
-		// Associate the thread ID as the parent to our new attachment
-		wp_update_post( array( 'ID' => $new_attachment_id, 'post_parent' => $thread_id, 'post_status' => 'inherit' ) );
+		foreach ( $new_attachment_ids as $new_attachment_id ) {
+			// Associate the thread ID as the parent to our new attachment
+			wp_update_post( array( 'ID' => $new_attachment_id, 'post_parent' => $thread_id, 'post_status' => 'inherit' ) );
+		}
 
 		$new_comment = array_pop( SupportFlow()->get_thread_comments( $thread_id ) );
 

From 512e4b5f56dc46205e2e55deb4ef1900c58f5ac6 Mon Sep 17 00:00:00 2001
From: jeremyfelt <jeremy.felt@gmail.com>
Date: Sat, 3 Nov 2012 18:32:00 -0700
Subject: [PATCH 013/485] Do some checking to make sure the object we're
 working with is valid enough

---
 classes/class-supportflow-email-replies.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 0f31b07..893abe0 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -69,11 +69,17 @@ public function download_and_process_email_replies( $connection_details ) {
 	 */
 	public function process_email( $email, $i ) {
 
+		// @todo can probably make this the same as accepted MIME types in WordPress
 		$accepted_attachments = array( 'PDF', 'JPEG', 'PNG', 'GIF' );
 		$new_attachment_ids = array();
 
 		$k = 0;
 		foreach( $email->structure->parts as $email_part ) {
+
+			// We should at least be dealing with something that resembles an email object at this point
+			if ( ! isset( $email_part->disposition ) || ! isset( $email_part->subtype ) || ! isset( $email_part->dparameters[0]->value ) )
+				continue;
+
 			if ( 'ATTACHMENT' == $email_part->disposition && in_array( $email_part->subtype, $accepted_attachments ) ) {
 				// We need to add 1 to our array key each time to get the correct email part
 				$raw_attachment_data = imap_fetchbody( $this->imap_connection, $i, $k+1 );

From f39fdfcd0659ecc6c7a6fd63540c7d280ef337f6 Mon Sep 17 00:00:00 2001
From: jeremyfelt <jeremy.felt@gmail.com>
Date: Sat, 3 Nov 2012 18:39:44 -0700
Subject: [PATCH 014/485] Add new attachment IDs as meta data to the newly
 created comment on this thread

---
 classes/class-supportflow-email-replies.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 893abe0..171d5d3 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -179,9 +179,10 @@ public function process_email( $email, $i ) {
 
 		// Store the original email ID so we don't accidentally dupe it
 		$email_id = trim( $email->headers->message_id, '<>' );
-		if ( is_object( $new_comment ) )
+		if ( is_object( $new_comment ) ) {
 			update_comment_meta( $new_comment->comment_ID, self::email_id_key, $email_id );
-
+			update_comment_meta( $new_comment->comment_ID, '_sf_attachment_ids', $new_attachment_ids );
+		}
 		return true;
 	}
 

From 120fd49e3248659c24409bb877e269ecfdd13f8a Mon Sep 17 00:00:00 2001
From: jeremyfelt <jeremy.felt@gmail.com>
Date: Sat, 3 Nov 2012 18:41:53 -0700
Subject: [PATCH 015/485] comment meta key s/_sf_attachment_ids/attachment_ids

---
 classes/class-supportflow-email-replies.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 171d5d3..5a173b7 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -181,7 +181,7 @@ public function process_email( $email, $i ) {
 		$email_id = trim( $email->headers->message_id, '<>' );
 		if ( is_object( $new_comment ) ) {
 			update_comment_meta( $new_comment->comment_ID, self::email_id_key, $email_id );
-			update_comment_meta( $new_comment->comment_ID, '_sf_attachment_ids', $new_attachment_ids );
+			update_comment_meta( $new_comment->comment_ID, 'attachment_ids', $new_attachment_ids );
 		}
 		return true;
 	}

From 4339bdaa80b5413949c1b478da672969bf903266 Mon Sep 17 00:00:00 2001
From: root <root@FOGHLAIMLinode.(none)>
Date: Sun, 4 Nov 2012 17:55:36 +0000
Subject: [PATCH 016/485] Move the part number up a notch to account for email
 structure. 0 is headers, 1 is message, 2 and up are attachments. This needs
 to be tested more.

---
 classes/class-supportflow-email-replies.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 5a173b7..3662e05 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -81,8 +81,9 @@ public function process_email( $email, $i ) {
 				continue;
 
 			if ( 'ATTACHMENT' == $email_part->disposition && in_array( $email_part->subtype, $accepted_attachments ) ) {
-				// We need to add 1 to our array key each time to get the correct email part
-				$raw_attachment_data = imap_fetchbody( $this->imap_connection, $i, $k+1 );
+				// We need to add 2 to our array key each time to get the correct email part
+				//@todo this needs more testing with different emails, should be smarter about which parts
+				$raw_attachment_data = imap_fetchbody( $this->imap_connection, $i, $k+2 );
 
 				// The raw data from imap is base64 encoded, but php-imap has us covered!
 				$attachment_data = imap_base64( $raw_attachment_data );
@@ -199,4 +200,4 @@ public function get_body_from_connection( $connection, $num, $type = 'text/plain
 
 }
 
-SupportFlow()->extend->email_replies = new SupportFlow_Email_Replies();
\ No newline at end of file
+SupportFlow()->extend->email_replies = new SupportFlow_Email_Replies();

From d1f254080e0efa2fdebc26be914f2100387bf1a5 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <danielbachhuber@gmail.com>
Date: Sun, 4 Nov 2012 20:03:39 -0600
Subject: [PATCH 017/485] get_thread_from_secret() should always return an
 integer

---
 classes/class-supportflow-email-replies.php | 2 +-
 supportflow.php                             | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 3662e05..c97da8e 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -138,7 +138,7 @@ public function process_email( $email, $i ) {
 		// Check to see if this message was in response to an existing thread
 		$thread_id = false;
 		if ( preg_match( '#\[([a-zA-Z0-9]{8})\]$#', $subject, $matches ) )
-			$thread_id = (int)SupportFlow()->get_thread_from_secret( $matches[1] );
+			$thread_id = SupportFlow()->get_thread_from_secret( $matches[1] );
 
 		if ( $thread_id ) {
 			$message_args = array(
diff --git a/supportflow.php b/supportflow.php
index b06d8cf..0d2f912 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -667,7 +667,14 @@ public function get_secret_for_thread( $thread_id ) {
 	public function get_thread_from_secret( $secret ) {
 		global $wpdb;
 		$thread_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key=%s AND meta_value=%s", $this->thread_secret_key, $secret ) );
-		return ( $thread_id ) ? $thread_id : false;
+		return ( $thread_id ) ? (int)$thread_id : 0;
+	}
+
+	/**
+	 * Get the special capability given a string
+	 */
+	public function get_cap( $cap ) {
+		return SupportFlow()->extend->permissions->get_cap( $cap );
 	}
 
 }

From 04cf686e978790bb7a7a2cfa33466efcf002b93a Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <danielbachhuber@gmail.com>
Date: Sun, 4 Nov 2012 20:21:22 -0600
Subject: [PATCH 018/485] Reply by Email: Don't check the filetype on importing
 because it's properly checked by media_handle_sideload(), and
 wp_handle_sideload()

Closes #71
---
 classes/class-supportflow-email-replies.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index c97da8e..523c6c3 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -69,8 +69,6 @@ public function download_and_process_email_replies( $connection_details ) {
 	 */
 	public function process_email( $email, $i ) {
 
-		// @todo can probably make this the same as accepted MIME types in WordPress
-		$accepted_attachments = array( 'PDF', 'JPEG', 'PNG', 'GIF' );
 		$new_attachment_ids = array();
 
 		$k = 0;
@@ -80,7 +78,7 @@ public function process_email( $email, $i ) {
 			if ( ! isset( $email_part->disposition ) || ! isset( $email_part->subtype ) || ! isset( $email_part->dparameters[0]->value ) )
 				continue;
 
-			if ( 'ATTACHMENT' == $email_part->disposition && in_array( $email_part->subtype, $accepted_attachments ) ) {
+			if ( 'ATTACHMENT' == $email_part->disposition ) {
 				// We need to add 2 to our array key each time to get the correct email part
 				//@todo this needs more testing with different emails, should be smarter about which parts
 				$raw_attachment_data = imap_fetchbody( $this->imap_connection, $i, $k+2 );
@@ -101,7 +99,9 @@ public function process_email( $email, $i ) {
 
 				$upload_result = media_handle_sideload( $file_array, NULL );
 
-				if ( ! is_wp_error( $upload_result ) )
+				if ( is_wp_error( $upload_result ) )
+					WP_CLI::warning( $upload_result->get_error_message() );
+				else
 					$new_attachment_ids[] = $upload_result;
 
 			}

From 24431b41fdb521f0b1c0b22325c52fa20c108724 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <danielbachhuber@gmail.com>
Date: Sun, 4 Nov 2012 20:25:51 -0600
Subject: [PATCH 019/485] User Widget: Hide from activation by removing the
 plugin headers. It's not ready for activation yet

Closes #77
---
 supportflow-user-widget.php | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/supportflow-user-widget.php b/supportflow-user-widget.php
index ec19e95..3b7bc66 100644
--- a/supportflow-user-widget.php
+++ b/supportflow-user-widget.php
@@ -1,17 +1,5 @@
 <?php
 
-/**
- * Plugin Name: SupportFlow: User Widget
- * Plugin URI:  
- * Description: Displays a widget on the front end of any blog allowing interaction with a local or remote SupportFlow install.
- * Author:      Daniel Bachhuber, Alex Mills, Andrew Spittle
- * Author URI:  
- * Version:     0.1
- *
- * Text Domain: support-flow
- * Domain Path: /languages/
- */
-
 add_action( 'wp_enqueue_scripts',      'sf_user_widget_enqueue_scripts' );
 add_action( 'admin_enqueue_scripts',   'sf_user_widget_enqueue_scripts' );
 function sf_user_widget_enqueue_scripts() {

From 55ba2ce5c13b207c1b5c9196f1b541425011ed3e Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <danielbachhuber@gmail.com>
Date: Sun, 4 Nov 2012 20:56:49 -0600
Subject: [PATCH 020/485] Manage Theads: Add a "Mine" link to the top set of
 quick links which allows you to quickly filter to your tickets

This should only appear for users who have 'manage_other_sf_threads', but that's dependent on #55

Closes #61
---
 classes/class-supportflow-admin.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 9ec6242..eeb0318 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -129,6 +129,7 @@ public function filter_post_updated_messages( $messages ) {
 	 *
 	 */
 	public function filter_views( $views ) {
+		global $wpdb;
 
 		// The 'all' count shouldn't include closed posts
 		$post_type = SupportFlow()->post_type;
@@ -138,7 +139,25 @@ public function filter_views( $views ) {
 			$total_posts -= $num_posts->$state;
 		$total_posts -= $num_posts->sf_closed;
 		$class = empty( $class ) && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['show_sticky'] ) ? ' class="current"' : '';
-		$views['all'] = "<a href='edit.php?post_type=$post_type'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts, 'posts' ), number_format_i18n( $total_posts ) ) . '</a>';
+		$view_all = "<a href='edit.php?post_type=$post_type'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts, 'posts' ), number_format_i18n( $total_posts ) ) . '</a>';
+
+		// @todo Only show "Mine" if the user is an agent
+		$mine_args = array(
+				'post_type'        => SupportFlow()->post_type,
+				'author'           => get_current_user_id(),
+			);
+		$post_statuses = SupportFlow()->post_statuses;
+		array_pop( $post_statuses );
+		$post_statuses = "'" . implode( "','", array_map( 'sanitize_key', array_keys( $post_statuses ) ) ) . "'";
+		$my_posts = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_type=%s AND post_author=%d AND post_status IN ({$post_statuses})", SupportFlow()->post_type, get_current_user_id() ) );
+		$view_mine = '<a href="' . add_query_arg( $mine_args, admin_url( 'edit.php' ) ) . '">' . sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $my_posts, 'posts' ), number_format_i18n( $my_posts ) ) . '</a>';
+
+		// Put 'All' and 'Mine' at the beginning of the array
+		array_shift( $views );
+		$views = array_reverse( $views );
+		$views['mine'] = $view_mine;
+		$views['all'] = $view_all;
+		$views = array_reverse( $views );
 
 		return $views;
 	}

From 18301c3d4352dfdfe10993fd440a90dd63d8f9bc Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <danielbachhuber@gmail.com>
Date: Sun, 4 Nov 2012 21:42:56 -0600
Subject: [PATCH 021/485] Email notifications: Include the notification context
 in the subject filter in the situation where something different should be
 added for agents vs. respondents

See #3
---
 classes/class-supportflow-emails.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 654db04..258173e 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -59,7 +59,7 @@ public function notify_agents_thread_comment( $comment_id ) {
 		}
 
 		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $thread->ID );
-		$subject = apply_filters( 'supportflow_emails_comment_notify_subject', $subject, $comment_id, $thread->ID );
+		$subject = apply_filters( 'supportflow_emails_comment_notify_subject', $subject, $comment_id, $thread->ID, 'agent' );
 
 		$message = stripslashes( $comment->comment_content );
 		if ( $attachment_ids = get_comment_meta( $comment->comment_ID, 'attachment_ids', true ) ) {
@@ -94,7 +94,7 @@ public function notify_respondents_thread_comment( $comment_id ) {
 		}
 
 		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $thread->ID );
-		$subject = apply_filters( 'supportflow_emails_comment_notify_subject', $subject, $comment_id, $thread->ID );
+		$subject = apply_filters( 'supportflow_emails_comment_notify_subject', $subject, $comment_id, $thread->ID, 'respondent' );
 
 		$message = stripslashes( $comment->comment_content );
 		if ( $attachment_ids = get_comment_meta( $comment->comment_ID, 'attachment_ids', true ) ) {

From bcd4da4ef72004f75ed7c0720cfe79b18702a8db Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <danielbachhuber@gmail.com>
Date: Sun, 4 Nov 2012 21:45:35 -0600
Subject: [PATCH 022/485] Email Notifications: In the emails to agents, append
 the ticket status and assigned agent to the end of the message

See #3
---
 classes/class-supportflow-emails.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 258173e..db833db 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -68,6 +68,15 @@ public function notify_agents_thread_comment( $comment_id ) {
 				$message .= "\n" . wp_get_attachment_url( $attachment_id );
 			}
 		}
+		// Ticket details that are relevant to the agent
+		$message .= "\n\n-------";
+		// Thread status
+		$post_status = SupportFlow()->post_statuses[$thread->post_status]['label'];
+		$message .= "\n" . sprintf( __( "Status: %s", 'supportflow' ), $post_status );
+		// Assigned agent
+		$assigned_agent = ( $thread->post_author ) ? get_user_by( 'id', $thread->post_author )->display_name : __( 'None assigned', 'supportflow' );
+		$message .= "\n" . sprintf( __( "Agent: %s", 'supportflow' ), $assigned_agent );
+
 		foreach( $agent_emails as $agent_email ) {
 			wp_mail( $agent_email, $subject, $message );
 		}

From b3dc58600bc4dcdad111fbdc7b545088d6df07b0 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <danielbachhuber@gmail.com>
Date: Sun, 4 Nov 2012 21:50:10 -0600
Subject: [PATCH 023/485] Email Notifications: Allow the messages to be
 filtered as well

See #3
---
 classes/class-supportflow-emails.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index db833db..6d89064 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -77,6 +77,8 @@ public function notify_agents_thread_comment( $comment_id ) {
 		$assigned_agent = ( $thread->post_author ) ? get_user_by( 'id', $thread->post_author )->display_name : __( 'None assigned', 'supportflow' );
 		$message .= "\n" . sprintf( __( "Agent: %s", 'supportflow' ), $assigned_agent );
 
+		$message = apply_filters( 'supportflow_emails_comment_notify_message', $message, $comment_id, $thread->ID, 'agent' );
+
 		foreach( $agent_emails as $agent_email ) {
 			wp_mail( $agent_email, $subject, $message );
 		}
@@ -112,6 +114,9 @@ public function notify_respondents_thread_comment( $comment_id ) {
 				$message .= "\n" . wp_get_attachment_url( $attachment_id );
 			}
 		}
+
+		$message = apply_filters( 'supportflow_emails_comment_notify_message', $message, $comment_id, $thread->ID, 'respondent' );
+
 		foreach( $respondents as $respondent_email ) {
 			self::mail( $respondent_email, $subject, $message );
 		}

From 4fe96991ecf64f446b09bd7f6533e47c6bc8687d Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <danielbachhuber@gmail.com>
Date: Sun, 4 Nov 2012 22:02:56 -0600
Subject: [PATCH 024/485] Email Notifications: A more core-friendly way of
 filtering the "From" values used by wp_mail(). Allows the filters to only be
 applied when SupportFlow is sending an email.

See #3
---
 classes/class-supportflow-emails.php | 38 ++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 6d89064..630b322 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -5,8 +5,8 @@
 
 class SupportFlow_Emails extends SupportFlow {
 
-	var $from_name;
-	var $from_address;
+	private $from_name = false;
+	private $from_email = false;
 
 	function __construct() {
 		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
@@ -18,7 +18,7 @@ function __construct() {
 	public function setup_actions() {
 
 		$this->from_name = apply_filters( 'supportflow_emails_from_name', $this->from_name );
-		$this->from_address = apply_filters( 'supportflow_emails_from_address', $this->from_address );
+		$this->from_email = apply_filters( 'supportflow_emails_from_address', $this->from_email );
 
 		// Don't send out any notifications when importing or using WP-CLI
 		if ( ( defined('WP_IMPORTING') && WP_IMPORTING ) || ( defined('WP_CLI') && WP_CLI ) )
@@ -80,7 +80,7 @@ public function notify_agents_thread_comment( $comment_id ) {
 		$message = apply_filters( 'supportflow_emails_comment_notify_message', $message, $comment_id, $thread->ID, 'agent' );
 
 		foreach( $agent_emails as $agent_email ) {
-			wp_mail( $agent_email, $subject, $message );
+			self::mail( $agent_email, $subject, $message );
 		}
 	}
 
@@ -126,10 +126,32 @@ public function notify_respondents_thread_comment( $comment_id ) {
 	 * Send an email from SupportFlow
 	 */
 	public function mail( $respondent_email, $subject, $message ) {
-		$headers = array();
-		if ( ! empty( $this->from_name ) && is_email( $this->from_address ) )
-			$headers[] = 'From: ' . $this->from_name  . ' <' . $this->from_address . '>';
-		wp_mail( $respondent_email, $subject, $message, $headers );
+		
+		add_filter( 'wp_mail_from', array( $this, 'filter_wp_mail_from' ) );
+		add_filter( 'wp_mail_from_name', array( $this, 'filter_wp_mail_from_name' ) );
+		wp_mail( $respondent_email, $subject, $message );
+		remove_filter( 'wp_mail_from', array( $this, 'filter_wp_mail_from' ) );
+		remove_filter( 'wp_mail_from_name', array( $this, 'filter_wp_mail_from_name' ) );
+	}
+
+	/**
+	 * Filter the 'from address' value used by wp_mail
+	 */
+	public function filter_wp_mail_from( $from_email ) {
+		if ( $this->from_email )
+			return $this->from_email;
+		else
+			$from_email;
+	}
+
+	/**
+	 * Filter the 'from name' value used by wp_mail
+	 */
+	public function filter_wp_mail_from_name( $from_name ) {
+		if ( $this->from_name )
+			return $this->from_name;
+		else
+			$from_name;
 	}
 }
 

From 7b5e9e95aeec993241d593719a2b91f81184ec54 Mon Sep 17 00:00:00 2001
From: Greg Johnson <greg@uponaweb.com>
Date: Sun, 4 Nov 2012 15:30:20 -0600
Subject: [PATCH 025/485] Added autocomplete stub for respondents and
 registered in SupportFlow_Admin::action_admin_enqueue_scripts

---
 classes/class-supportflow-admin.php | 1 +
 js/respondents-autocomplete.js      | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 js/respondents-autocomplete.js

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index eeb0318..5507006 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -60,6 +60,7 @@ public function action_admin_enqueue_scripts() {
 		if ( 'post.php' == $pagenow || 'post-new.php' == $pagenow ) {
 			wp_enqueue_script( 'supportflow-plupload', SupportFlow()->plugin_url . 'js/plupload.js' , array( 'wp-plupload', 'jquery' ) );
 			self::add_default_plupload_settings();
+			wp_enqueue_script( 'supportflow-respondents-autocomplete', SupportFlow()->plugin_url . 'js/respondents-autocomplete', array('jquery', 'jquery-ui-autocomplete' ) );
 		}
 	}
 
diff --git a/js/respondents-autocomplete.js b/js/respondents-autocomplete.js
new file mode 100644
index 0000000..ff6b04b
--- /dev/null
+++ b/js/respondents-autocomplete.js
@@ -0,0 +1,5 @@
+jQuery(document).ready(function($) {
+
+	
+
+});
\ No newline at end of file

From a38bbd56cd1787b9a93aa08117cb41a33a2ffbc9 Mon Sep 17 00:00:00 2001
From: Greg Johnson <greg@uponaweb.com>
Date: Sun, 4 Nov 2012 18:24:21 -0600
Subject: [PATCH 026/485] Added SupportFlow::get_respondents() to search for
 respondents by email address

---
 supportflow.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/supportflow.php b/supportflow.php
index 0d2f912..475b05a 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -471,6 +471,29 @@ public function get_threads( $args = array() ) {
 		return $threads->posts;
 	}
 
+	/**
+	 * Get respondents matching $query
+	 * 
+	 * @param string $query partial email address to search for
+	 */
+	public function get_respondents( $query ) {
+
+		$args = array(
+				'orderby' => 'name',
+				'hide_empty' => 0,
+				'fields' => 'all',
+				'name__like' => $query,
+				'number' => 10
+			);
+
+		$matches = get_terms( $this->respondents_tax, $args );
+
+		if( !$matches ) 
+			return array();
+
+		return $matches;
+	}
+
 	/**
 	 * Get a thread's respondents
 	 *

From d94c987843b988e2fcd0a08665e53f2c7a2df352 Mon Sep 17 00:00:00 2001
From: Greg Johnson <greg@uponaweb.com>
Date: Sun, 4 Nov 2012 18:25:13 -0600
Subject: [PATCH 027/485] Added SupportFlow::get_respondents() wrapper to JSON
 api using action 'get-respondents'

---
 classes/class-supportflow-json-api.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/classes/class-supportflow-json-api.php b/classes/class-supportflow-json-api.php
index 863bb52..27670c3 100644
--- a/classes/class-supportflow-json-api.php
+++ b/classes/class-supportflow-json-api.php
@@ -53,6 +53,19 @@ public function action_wp_ajax_supportflow_json() {
 
 				break;
 
+			case 'get-respondents':
+				$search_for = sanitize_text_field( $_REQUEST['respondents'] );
+				$respondent_matches = SupportFlow()->get_respondents( $search_for );
+				if( is_wp_error($respondent_matches) ) {
+					$response['message'] = $respondent_matches->get_error_message();
+				} else {
+					$response['query'] = $search_for;
+					$response['status'] = "ok";
+					$response['respondents'] = $respondent_matches;
+				}
+
+				break;
+
 			case 'get-thread':
 				$thread_id = (int)$_REQUEST['thread_id'];
 				$response['status'] = 'ok';

From 5e739674ada4bfbe88b57aff971c5bf1c2f2b307 Mon Sep 17 00:00:00 2001
From: Greg Johnson <greg@uponaweb.com>
Date: Sun, 4 Nov 2012 18:26:56 -0600
Subject: [PATCH 028/485] enqueued js/respondents-autocomplete javascript

---
 classes/class-supportflow-admin.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 5507006..fcbd661 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -60,7 +60,10 @@ public function action_admin_enqueue_scripts() {
 		if ( 'post.php' == $pagenow || 'post-new.php' == $pagenow ) {
 			wp_enqueue_script( 'supportflow-plupload', SupportFlow()->plugin_url . 'js/plupload.js' , array( 'wp-plupload', 'jquery' ) );
 			self::add_default_plupload_settings();
-			wp_enqueue_script( 'supportflow-respondents-autocomplete', SupportFlow()->plugin_url . 'js/respondents-autocomplete', array('jquery', 'jquery-ui-autocomplete' ) );
+			wp_enqueue_script( 'supportflow-respondents-autocomplete', SupportFlow()->plugin_url . 'js/respondents-autocomplete.js', array('jquery', 'jquery-ui-autocomplete' ) );
+
+			$ajaxurl = add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) );
+			wp_localize_script('supportflow-respondents-autocomplete', 'SFRespondentsAc', array('ajax_url' => $ajaxurl ) );
 		}
 	}
 

From 80b54cad2eca9b79cf4cbd8a4ece5fa4d9cf2b5e Mon Sep 17 00:00:00 2001
From: Greg Johnson <greg@uponaweb.com>
Date: Sun, 4 Nov 2012 18:29:10 -0600
Subject: [PATCH 029/485] adding comments

---
 js/respondents-autocomplete.js | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/js/respondents-autocomplete.js b/js/respondents-autocomplete.js
index ff6b04b..dbf3117 100644
--- a/js/respondents-autocomplete.js
+++ b/js/respondents-autocomplete.js
@@ -1,5 +1,34 @@
 jQuery(document).ready(function($) {
-
 	
+	var getSearchTerm = function() {
+
+		// Input of the Respondents field can contain multiple addresses,
+		// we only want to search on the last address
+		var resps = $('#respondents').val().replace(" ", '').split(",");
+		var search_for = resps.pop();
+
+		return { "respondents":search_for, "api-action":'get-respondents' };
+		
+	}	
+
+	$('#respondents').autocomplete({
+
+		source: function( req, response ) {
+			
+			$.ajax({
+				url: SFRespondentsAc.ajax_url,
+				dataType: 'json',
+				data: getSearchTerm(),
+				success: function(data) {
+					console.log(data);
+				}
+			});
+
+		},
+		select: function( event, ui ) {
+			console.log(ui);
+		},
+		minLength: 2,
+	});
 
 });
\ No newline at end of file

From f8d7fec9f315de5657ff6ee08ff4de055f898bb3 Mon Sep 17 00:00:00 2001
From: Greg Johnson <greg@innerbot.com>
Date: Sun, 4 Nov 2012 22:48:03 -0600
Subject: [PATCH 030/485] implemented respondents input auto-completion

---
 js/respondents-autocomplete.js | 38 ++++++++++++++++++++++++++++------
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/js/respondents-autocomplete.js b/js/respondents-autocomplete.js
index dbf3117..55f015d 100644
--- a/js/respondents-autocomplete.js
+++ b/js/respondents-autocomplete.js
@@ -5,7 +5,13 @@ jQuery(document).ready(function($) {
 		// Input of the Respondents field can contain multiple addresses,
 		// we only want to search on the last address
 		var resps = $('#respondents').val().replace(" ", '').split(",");
-		var search_for = resps.pop();
+
+		if( $.isArray(resps) && resps.length > 1 ) {
+			var search_for = resps.pop();
+		}
+		else {
+			search_for = resps[0];
+		}
 
 		return { "respondents":search_for, "api-action":'get-respondents' };
 		
@@ -20,15 +26,35 @@ jQuery(document).ready(function($) {
 				dataType: 'json',
 				data: getSearchTerm(),
 				success: function(data) {
-					console.log(data);
+					if(data.query == "") {
+						response(false);
+						return false;
+					}
+					response( $.map( data.respondents, function (item) {
+
+						// normaliz input
+						var resps = $('#respondents').val().replace(" ", '').split(",");
+
+						// remove partial respondent
+						resps.pop();
+
+						// replace with full email
+						resps.push(item.name);
+
+						// make it a string
+						var retval = resps.join(", ");
+
+						// return those respondents!
+						return {
+							label: item.name,
+							value: retval
+						}
+					}));
 				}
 			});
 
 		},
-		select: function( event, ui ) {
-			console.log(ui);
-		},
-		minLength: 2,
+		minLength: 2
 	});
 
 });
\ No newline at end of file

From a5f6abb17d55198a051184cc05de4323fd093411 Mon Sep 17 00:00:00 2001
From: Daniel Bachhuber <danielbachhuber@gmail.com>
Date: Mon, 5 Nov 2012 23:23:23 -0600
Subject: [PATCH 031/485] Open the door for potentially other arguments later
 by passing an array to get_respondents method

See #85
---
 classes/class-supportflow-json-api.php |  2 +-
 supportflow.php                        | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/classes/class-supportflow-json-api.php b/classes/class-supportflow-json-api.php
index 27670c3..c9e68a7 100644
--- a/classes/class-supportflow-json-api.php
+++ b/classes/class-supportflow-json-api.php
@@ -55,7 +55,7 @@ public function action_wp_ajax_supportflow_json() {
 
 			case 'get-respondents':
 				$search_for = sanitize_text_field( $_REQUEST['respondents'] );
-				$respondent_matches = SupportFlow()->get_respondents( $search_for );
+				$respondent_matches = SupportFlow()->get_respondents( array( 'search' => $search_for ) );
 				if( is_wp_error($respondent_matches) ) {
 					$response['message'] = $respondent_matches->get_error_message();
 				} else {
diff --git a/supportflow.php b/supportflow.php
index 475b05a..9131043 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -476,17 +476,22 @@ public function get_threads( $args = array() ) {
 	 * 
 	 * @param string $query partial email address to search for
 	 */
-	public function get_respondents( $query ) {
+	public function get_respondents( $args = array() ) {
 
-		$args = array(
+		$defaults = array(
+				'search' => '',
+				'number' => 10
+			);
+		$args = array_merge( $defaults, $args );
+
+		$term_args = array(
 				'orderby' => 'name',
 				'hide_empty' => 0,
 				'fields' => 'all',
-				'name__like' => $query,
-				'number' => 10
+				'name__like' => $args['search'],
+				'number' => $args['number'],
 			);
-
-		$matches = get_terms( $this->respondents_tax, $args );
+		$matches = get_terms( $this->respondents_tax, $term_args );
 
 		if( !$matches ) 
 			return array();

From 23dc83f54384715e489dffa6e9df08726dae111c Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 16 May 2014 23:56:18 +0530
Subject: [PATCH 032/485] Edited code to match with WordPress coding standards

---
 classes/class-supportflow-admin.php           | 328 +++++++-------
 classes/class-supportflow-attachments.php     |  72 ++--
 classes/class-supportflow-email-replies.php   | 101 +++--
 classes/class-supportflow-emails.php          |  51 ++-
 classes/class-supportflow-json-api.php        |  58 +--
 classes/class-supportflow-permissions.php     | 121 +++---
 .../class-supportflow-ui-submissionform.php   |  67 +--
 classes/class-supportflow-ui-widget.php       |  56 +--
 classes/class-supportflow-wp-cli.php          | 102 ++---
 css/admin.css                                 |  23 +-
 css/widget.css                                |  26 +-
 js/plupload.js                                |  30 +-
 js/respondents-autocomplete.js                |  28 +-
 js/supportflow-user-widget.js                 |  96 ++---
 supportflow-user-widget.php                   |  23 +-
 supportflow.php                               | 400 ++++++++++--------
 16 files changed, 861 insertions(+), 721 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index fcbd661..5537656 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -15,8 +15,9 @@ public function setup_actions() {
 		add_action( 'add_meta_boxes', array( $this, 'action_add_meta_boxes' ) );
 		add_action( 'save_post', array( $this, 'action_save_post' ) );
 
-		if ( !$this->is_edit_screen() )
+		if ( ! $this->is_edit_screen() ) {
 			return;
+		}
 
 		// Everything
 		add_action( 'admin_enqueue_scripts', array( $this, 'action_admin_enqueue_scripts' ) );
@@ -46,8 +47,9 @@ function action_admin_init() {
 		unset( $wp_post_statuses['trash'] );
 		$wp_post_statuses['trash'] = $trash_status;
 
-		if ( 'edit.php' == $pagenow )
+		if ( 'edit.php' == $pagenow ) {
 			add_filter( 'get_the_excerpt', array( $this, 'filter_get_the_excerpt' ) );
+		}
 	}
 
 	/**
@@ -58,12 +60,12 @@ public function action_admin_enqueue_scripts() {
 
 		wp_enqueue_style( 'supportflow-admin', SupportFlow()->plugin_url . 'css/admin.css', array(), SupportFlow()->version );
 		if ( 'post.php' == $pagenow || 'post-new.php' == $pagenow ) {
-			wp_enqueue_script( 'supportflow-plupload', SupportFlow()->plugin_url . 'js/plupload.js' , array( 'wp-plupload', 'jquery' ) );
+			wp_enqueue_script( 'supportflow-plupload', SupportFlow()->plugin_url . 'js/plupload.js', array( 'wp-plupload', 'jquery' ) );
 			self::add_default_plupload_settings();
-			wp_enqueue_script( 'supportflow-respondents-autocomplete', SupportFlow()->plugin_url . 'js/respondents-autocomplete.js', array('jquery', 'jquery-ui-autocomplete' ) );
+			wp_enqueue_script( 'supportflow-respondents-autocomplete', SupportFlow()->plugin_url . 'js/respondents-autocomplete.js', array( 'jquery', 'jquery-ui-autocomplete' ) );
 
 			$ajaxurl = add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) );
-			wp_localize_script('supportflow-respondents-autocomplete', 'SFRespondentsAc', array('ajax_url' => $ajaxurl ) );
+			wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
 		}
 	}
 
@@ -80,12 +82,12 @@ private static function add_default_plupload_settings() {
 			'url'                 => add_query_arg( 'post_id', get_the_id(), admin_url( 'admin-ajax.php', 'relative' ) ),
 			'flash_swf_url'       => includes_url( 'js/plupload/plupload.flash.swf' ),
 			'silverlight_xap_url' => includes_url( 'js/plupload/plupload.silverlight.xap' ),
-			'filters'             => array( array( 'title' => __( 'Allowed Files' ), 'extensions' => '*') ),
+			'filters'             => array( array( 'title' => __( 'Allowed Files' ), 'extensions' => '*' ) ),
 			'multipart'           => true,
 			'urlstream_upload'    => true,
 			'multipart_params'    => array(
-				'action'          => 'upload-attachment',
-				'_wpnonce'        => wp_create_nonce( 'media-form' )
+				'action'   => 'upload-attachment',
+				'_wpnonce' => wp_create_nonce( 'media-form' )
 			)
 		);
 
@@ -100,8 +102,9 @@ private static function add_default_plupload_settings() {
 		$script = 'var _wpPluploadSettings = ' . json_encode( $settings ) . ';';
 		$data   = $wp_scripts->get_data( 'wp-plupload', 'data' );
 
-		if ( ! empty( $data ) )
+		if ( ! empty( $data ) ) {
 			$script = "$data\n$script";
+		}
 
 		$wp_scripts->add_data( 'wp-plupload', 'data', $script );
 	}
@@ -113,19 +116,20 @@ public function filter_post_updated_messages( $messages ) {
 		global $post;
 
 		$messages[SupportFlow()->post_type] = array(
-			0 => '', // Unused. Messages start at index 1.
-			1 => __( 'Thread updated.', 'supportflow' ),
-			2 => __( 'Custom field updated.', 'supportflow' ),
-			3 => __( 'Custom field deleted.', 'supportflow' ),
-			4 => __( 'Thread updated.', 'supportflow' ),
+			0  => '', // Unused. Messages start at index 1.
+			1  => __( 'Thread updated.', 'supportflow' ),
+			2  => __( 'Custom field updated.', 'supportflow' ),
+			3  => __( 'Custom field deleted.', 'supportflow' ),
+			4  => __( 'Thread updated.', 'supportflow' ),
 			/* translators: %s: date and time of the revision */
-			5 => isset($_GET['revision']) ? sprintf( __( 'Thread restored to revision from %s', 'supportflow' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6 => __( 'Thread updated.', 'supportflow' ),
-			7 => __( 'Thread updated.', 'supportflow' ),
-			8 => __( 'Thread updated.', 'supportflow' ),
-			9 => __( 'Thread updated.', 'supportflow' ),
+			5  => isset( $_GET['revision'] ) ? sprintf( __( 'Thread restored to revision from %s', 'supportflow' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+			6  => __( 'Thread updated.', 'supportflow' ),
+			7  => __( 'Thread updated.', 'supportflow' ),
+			8  => __( 'Thread updated.', 'supportflow' ),
+			9  => __( 'Thread updated.', 'supportflow' ),
 			10 => __( 'Thread updated.', 'supportflow' ),
 		);
+
 		return $messages;
 	}
 
@@ -136,32 +140,33 @@ public function filter_views( $views ) {
 		global $wpdb;
 
 		// The 'all' count shouldn't include closed posts
-		$post_type = SupportFlow()->post_type;
-		$num_posts = wp_count_posts( $post_type, 'readable' );
-		$total_posts = array_sum( (array)$num_posts );
-		foreach ( get_post_stati( array('show_in_admin_all_list' => false) ) as $state )
+		$post_type   = SupportFlow()->post_type;
+		$num_posts   = wp_count_posts( $post_type, 'readable' );
+		$total_posts = array_sum( (array) $num_posts );
+		foreach ( get_post_stati( array( 'show_in_admin_all_list' => false ) ) as $state ) {
 			$total_posts -= $num_posts->$state;
+		}
 		$total_posts -= $num_posts->sf_closed;
-		$class = empty( $class ) && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['show_sticky'] ) ? ' class="current"' : '';
+		$class    = empty( $class ) && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['show_sticky'] ) ? ' class="current"' : '';
 		$view_all = "<a href='edit.php?post_type=$post_type'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts, 'posts' ), number_format_i18n( $total_posts ) ) . '</a>';
 
 		// @todo Only show "Mine" if the user is an agent
-		$mine_args = array(
-				'post_type'        => SupportFlow()->post_type,
-				'author'           => get_current_user_id(),
-			);
+		$mine_args     = array(
+			'post_type' => SupportFlow()->post_type,
+			'author'    => get_current_user_id(),
+		);
 		$post_statuses = SupportFlow()->post_statuses;
 		array_pop( $post_statuses );
 		$post_statuses = "'" . implode( "','", array_map( 'sanitize_key', array_keys( $post_statuses ) ) ) . "'";
-		$my_posts = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_type=%s AND post_author=%d AND post_status IN ({$post_statuses})", SupportFlow()->post_type, get_current_user_id() ) );
-		$view_mine = '<a href="' . add_query_arg( $mine_args, admin_url( 'edit.php' ) ) . '">' . sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $my_posts, 'posts' ), number_format_i18n( $my_posts ) ) . '</a>';
+		$my_posts      = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_type=%s AND post_author=%d AND post_status IN ({$post_statuses})", SupportFlow()->post_type, get_current_user_id() ) );
+		$view_mine     = '<a href="' . add_query_arg( $mine_args, admin_url( 'edit.php' ) ) . '">' . sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $my_posts, 'posts' ), number_format_i18n( $my_posts ) ) . '</a>';
 
 		// Put 'All' and 'Mine' at the beginning of the array
 		array_shift( $views );
-		$views = array_reverse( $views );
+		$views         = array_reverse( $views );
 		$views['mine'] = $view_mine;
-		$views['all'] = $view_all;
-		$views = array_reverse( $views );
+		$views['all']  = $view_all;
+		$views         = array_reverse( $views );
 
 		return $views;
 	}
@@ -173,11 +178,11 @@ public function action_restrict_manage_posts() {
 
 		// Filter to specific agents
 		$agent_dropdown_args = array(
-						'show_option_all'   => __( 'Show all agents', 'supportflow' ),
-						'name'              => 'author',
-						'selected'          => ( ! empty( $_REQUEST['author'] ) ) ? (int)$_REQUEST['author'] : false,
-						'who'               => 'authors',
-						);
+			'show_option_all' => __( 'Show all agents', 'supportflow' ),
+			'name'            => 'author',
+			'selected'        => ( ! empty( $_REQUEST['author'] ) ) ? (int) $_REQUEST['author'] : false,
+			'who'             => 'authors',
+		);
 		$agent_dropdown_args = apply_filters( 'supportflow_admin_agent_dropdown_args', $agent_dropdown_args );
 		wp_dropdown_users( $agent_dropdown_args );
 	}
@@ -188,8 +193,9 @@ public function action_restrict_manage_posts() {
 	function filter_post_row_actions( $row_actions, $post ) {
 
 		// Rename these actions
-		if ( isset( $row_actions['edit'] ) )
+		if ( isset( $row_actions['edit'] ) ) {
 			$row_actions['edit'] = str_replace( __( 'Edit' ), __( 'View', 'supportflow' ), str_replace( __( 'Edit this item' ), __( 'View Thread', 'supportflow' ), $row_actions['edit'] ) );
+		}
 
 		// Save the trash action for the end
 		if ( isset( $row_actions['trash'] ) ) {
@@ -200,29 +206,30 @@ function filter_post_row_actions( $row_actions, $post ) {
 		}
 
 		// Allow an agent to easily close a ticket
-		$statuses = SupportFlow()->post_statuses;
+		$statuses     = SupportFlow()->post_statuses;
 		$status_slugs = array_keys( $statuses );
-		$last_status = array_pop( $status_slugs );
-		if ( !in_array( get_query_var( 'post_status' ), array( 'trash' ) ) ) {
+		$last_status  = array_pop( $status_slugs );
+		if ( ! in_array( get_query_var( 'post_status' ), array( 'trash' ) ) ) {
 
-			if ( $last_status == get_post_status( $post->ID ) )
+			if ( $last_status == get_post_status( $post->ID ) ) {
 				$change_to = $status_slugs[2];
-			else
+			} else {
 				$change_to = $last_status;
+			}
 
-			$args = array(
-					'action'          => 'change_status',
-					'sf_nonce'        => wp_create_nonce( 'sf-change-status' ),
-					'post_status'     => $change_to,
-					'thread_id'       => $post->ID,
-					'post_type'       => SupportFlow()->post_type,
-				);
+			$args        = array(
+				'action'      => 'change_status',
+				'sf_nonce'    => wp_create_nonce( 'sf-change-status' ),
+				'post_status' => $change_to,
+				'thread_id'   => $post->ID,
+				'post_type'   => SupportFlow()->post_type,
+			);
 			$action_link = add_query_arg( $args, admin_url( 'edit.php' ) );
 			if ( $last_status == $change_to ) {
-				$title_attr = esc_attr__( 'Close Thread', 'supportflow' );
+				$title_attr  = esc_attr__( 'Close Thread', 'supportflow' );
 				$action_text = esc_html__( 'Close', 'supportflow' );
 			} else {
-				$title_attr = esc_attr__( 'Reopen Thread', 'supportflow' );
+				$title_attr  = esc_attr__( 'Reopen Thread', 'supportflow' );
 				$action_text = esc_html__( 'Reopen', 'supportflow' );
 			}
 			$row_actions['change_status'] = '<a href="' . esc_url( $action_link ) . '" title="' . $title_attr . '">' . $action_text . '</a>';
@@ -232,8 +239,9 @@ function filter_post_row_actions( $row_actions, $post ) {
 		unset( $row_actions['inline hide-if-no-js'] );
 		unset( $row_actions['view'] );
 
-		if ( $trash_action )
+		if ( $trash_action ) {
 			$row_actions['trash'] = $trash_action;
+		}
 
 		return $row_actions;
 	}
@@ -243,6 +251,7 @@ function filter_post_row_actions( $row_actions, $post ) {
 	 */
 	public function filter_bulk_actions( $actions ) {
 		unset( $actions['edit'] );
+
 		return $actions;
 	}
 
@@ -252,20 +261,21 @@ public function filter_bulk_actions( $actions ) {
 	function action_pre_get_posts( $query ) {
 		global $pagenow;
 
-		if ( 'edit.php' != $pagenow || !$query->is_main_query() )
+		if ( 'edit.php' != $pagenow || ! $query->is_main_query() ) {
 			return;
+		}
 
-		$statuses = SupportFlow()->post_statuses;
+		$statuses     = SupportFlow()->post_statuses;
 		$status_slugs = array_keys( $statuses );
-		$last_status = array_pop( $status_slugs );
+		$last_status  = array_pop( $status_slugs );
 
 		// Order posts by post_modified if there's no orderby set
-		if ( !$query->get( 'orderby' ) ) {
-			$sort_order = array(
-					'orderby'       => 'modified',
-				);
+		if ( ! $query->get( 'orderby' ) ) {
+			$sort_order          = array(
+				'orderby' => 'modified',
+			);
 			$sort_order['order'] = ( in_array( $query->get( 'post_status' ), array( 'trash', $last_status ) ) ) ? 'desc' : 'asc';
-			foreach( $sort_order as $key => $value ) {
+			foreach ( $sort_order as $key => $value ) {
 				$query->set( $key, $value );
 				$_GET[$key] = $value;
 			}
@@ -274,24 +284,25 @@ function action_pre_get_posts( $query ) {
 		// Do our own custom search handling so we can search against comment text
 		if ( $search = $query->get( 's' ) ) {
 			// Get any comments that match our results
-			$args = array(
-					'search'                   => $search,
-					'status'                   => 'any',
-				);
+			$args              = array(
+				'search' => $search,
+				'status' => 'any',
+			);
 			$matching_comments = SupportFlow()->get_comments( $args );
-			$post_ids = wp_list_pluck( $matching_comments, 'comment_post_ID' );
-
-			$args = array(
-					's'                        => $search,
-					'post_type'                => SupportFlow()->post_type,
-					'no_found_rows'            => true,
-					'update_post_meta_cache'   => false,
-					'update_post_term_cache'   => false,
-					'fields'                   => 'ids',
-				);
+			$post_ids          = wp_list_pluck( $matching_comments, 'comment_post_ID' );
+
+			$args       = array(
+				's'                      => $search,
+				'post_type'              => SupportFlow()->post_type,
+				'no_found_rows'          => true,
+				'update_post_meta_cache' => false,
+				'update_post_term_cache' => false,
+				'fields'                 => 'ids',
+			);
 			$post_query = new WP_Query( $args );
-			if ( !is_wp_error( $post_query ) )
+			if ( ! is_wp_error( $post_query ) ) {
 				$post_ids = array_merge( $post_ids, $post_query->posts );
+			}
 
 			$query->set( 'post__in', $post_ids );
 			// Ignore the original search query
@@ -300,8 +311,9 @@ function action_pre_get_posts( $query ) {
 
 		// Only show threads with the last status if the last status is set
 		$post_status = $query->get( 'post_status' );
-		if ( !$query->get( 's' ) && empty( $post_status ) )
+		if ( ! $query->get( 's' ) && empty( $post_status ) ) {
 			$query->set( 'post_status', $status_slugs );
+		}
 
 	}
 
@@ -319,19 +331,21 @@ public function filter_posts_search( $posts_search ) {
 	 */
 	function handle_action_change_status() {
 
-		if ( ! isset( $_GET['action'], $_GET['sf_nonce'], $_GET['post_status'], $_GET['thread_id'] ) )
+		if ( ! isset( $_GET['action'], $_GET['sf_nonce'], $_GET['post_status'], $_GET['thread_id'] ) ) {
 			return;
+		}
 
-		if ( ! wp_verify_nonce( $_GET['sf_nonce'], 'sf-change-status' ) )
+		if ( ! wp_verify_nonce( $_GET['sf_nonce'], 'sf-change-status' ) ) {
 			wp_die( __( "Doin' something phishy, huh?", 'supportflow' ) );
+		}
 
 		$post_status = sanitize_key( $_GET['post_status'] );
-		$thread_id = (int)$_GET['thread_id'];
+		$thread_id   = (int) $_GET['thread_id'];
 
 		$new_thread = array(
-				'ID'               => $thread_id,
-				'post_status'      => $post_status,
-			);
+			'ID'          => $thread_id,
+			'post_status' => $post_status,
+		);
 		wp_update_post( $new_thread );
 		wp_safe_redirect( wp_get_referer() );
 		exit;
@@ -346,15 +360,16 @@ function handle_action_change_status() {
 	 *
 	 */
 	public function action_add_meta_boxes() {
-		if ( ! $this->is_edit_screen() )
+		if ( ! $this->is_edit_screen() ) {
 			return;
+		}
 
 		$respondents_box = 'tagsdiv-' . SupportFlow()->respondents_tax;
-		remove_meta_box( 'submitdiv',               SupportFlow()->post_type, 'side' );
-		remove_meta_box( $respondents_box,          SupportFlow()->post_type, 'side' );
-		remove_meta_box( 'commentstatusdiv',        SupportFlow()->post_type, 'normal' );
-		remove_meta_box( 'slugdiv',                 SupportFlow()->post_type, 'normal' );
-		remove_meta_box( 'commentsdiv',             SupportFlow()->post_type, 'normal' );
+		remove_meta_box( 'submitdiv', SupportFlow()->post_type, 'side' );
+		remove_meta_box( $respondents_box, SupportFlow()->post_type, 'side' );
+		remove_meta_box( 'commentstatusdiv', SupportFlow()->post_type, 'normal' );
+		remove_meta_box( 'slugdiv', SupportFlow()->post_type, 'normal' );
+		remove_meta_box( 'commentsdiv', SupportFlow()->post_type, 'normal' );
 
 		add_meta_box( 'supportflow-details', __( 'Details', 'supportflow' ), array( $this, 'meta_box_details' ), SupportFlow()->post_type, 'side' );
 		add_meta_box( 'supportflow-subject', __( 'Subject', 'supportflow' ), array( $this, 'meta_box_subject' ), SupportFlow()->post_type, 'normal' );
@@ -372,15 +387,15 @@ public function meta_box_details() {
 		echo '<div id="misc-publishing-actions">';
 
 		// Date Created and Last Activity for Existing Posts
-		if( 'post.php' == $pagenow ) {
+		if ( 'post.php' == $pagenow ) {
 
-			$modified_gmt = get_post_modified_time( 'U', true, get_the_ID() );
+			$modified_gmt  = get_post_modified_time( 'U', true, get_the_ID() );
 			$last_activity = sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
 
 			echo '<div class="misc-pub-section created-on">';
 			echo '<label for="created_on">' . __( 'Opened', 'supportflow' ) . ':</label>';
-			echo '<span class="the-date">' . get_the_date() . ' ' . get_the_time() . '</span>'; 
-			echo '<div clas="last-activity" title="' . get_the_modified_date('l, M j, Y ') . get_the_modified_time() . '">' . __( 'Last Activity', 'SupportFlow' ) . ': <strong>' . $last_activity . '</strong></div>';
+			echo '<span class="the-date">' . get_the_date() . ' ' . get_the_time() . '</span>';
+			echo '<div clas="last-activity" title="' . get_the_modified_date( 'l, M j, Y ' ) . get_the_modified_time() . '">' . __( 'Last Activity', 'SupportFlow' ) . ': <strong>' . $last_activity . '</strong></div>';
 			echo '</div>';
 		}
 
@@ -389,7 +404,7 @@ public function meta_box_details() {
 		echo '<div class="misc-pub-section">';
 		echo '<label for="post_status">' . __( 'Status', 'supportflow' ) . ':</label>';
 		echo '<select id="post_status" name="post_status">';
-		foreach( SupportFlow()->post_statuses as $slug => $post_status ) {
+		foreach ( SupportFlow()->post_statuses as $slug => $post_status ) {
 			echo '<option value="' . esc_attr( $slug ) . '" ' . selected( $current_status, $slug ) . '>' . esc_html( $post_status['label'] ) . '</option>';
 		}
 		echo '</select>';
@@ -400,12 +415,12 @@ public function meta_box_details() {
 		echo '<div class="misc-pub-section">';
 		echo '<label for="post_author">' . __( 'Owner', 'supportflow' ) . ':</label>';
 		$args = array(
-				'show_option_none'    => __( '-- Unassigned --', 'supportflow' ),
-				'selected'            => $post_author,
-				'id'                  => 'post_author',
-				'name'                => 'post_author',
-				'who'                 => 'author',
-			);
+			'show_option_none' => __( '-- Unassigned --', 'supportflow' ),
+			'selected'         => $post_author,
+			'id'               => 'post_author',
+			'name'             => 'post_author',
+			'who'              => 'author',
+		);
 		wp_dropdown_users( $args );
 		echo '</div>';
 
@@ -413,10 +428,11 @@ public function meta_box_details() {
 
 
 		// Start/Update Thread (submit)
-		if ( 'post-new.php' == $pagenow )
+		if ( 'post-new.php' == $pagenow ) {
 			$submit_text = __( 'Start Thread', 'supportflow' );
-		else
+		} else {
 			$submit_text = __( 'Update Thread', 'supportflow' );
+		}
 		echo '<div id="major-publishing-actions">';
 		echo '<div id="publishing-action">';
 		submit_button( $submit_text, 'primary', 'save', false );
@@ -443,9 +459,9 @@ public function meta_box_subject() {
 	 */
 	public function meta_box_respondents() {
 
-		$respondents = SupportFlow()->get_thread_respondents( get_the_ID(), array( 'fields' => 'emails' ) );
+		$respondents        = SupportFlow()->get_thread_respondents( get_the_ID(), array( 'fields' => 'emails' ) );
 		$respondents_string = implode( ', ', $respondents );
-		$placeholder = __( 'Who are you starting a conversation with?', 'supportflow' );
+		$placeholder        = __( 'Who are you starting a conversation with?', 'supportflow' );
 		echo '<h4>' . __( 'Respondent(s)', 'supportflow' ) . '</h4>';
 		echo '<input type="text" id="respondents" name="respondents" placeholder="' . $placeholder . '" value="' . esc_attr( $respondents_string ) . '" autocomplete="off" />';
 		echo '<p class="description">' . __( 'Enter each respondent email address, separated with a comma', 'supportflow' ) . '</p>';
@@ -459,9 +475,9 @@ public function meta_box_comments() {
 		global $pagenow;
 
 		$placeholders = array(
-				__( "What's burning?",                              'supportflow' ),
-				__( 'What do you need to get off your chest?',      'supportflow' ),
-			);
+			__( "What's burning?", 'supportflow' ),
+			__( 'What do you need to get off your chest?', 'supportflow' ),
+		);
 
 		$rand = array_rand( $placeholders );
 		echo '<h4>' . __( 'Conversation', 'supportflow' ) . '</h4>';
@@ -480,10 +496,11 @@ public function meta_box_comments() {
 		echo '<div id="submit-action">';
 		echo '<input type="checkbox" id="mark-private" name="mark-private" />';
 		echo '<label for="mark-private">' . __( 'Mark private', 'supportflow' ) . '</label>';
-		if ( 'post-new.php' == $pagenow )
+		if ( 'post-new.php' == $pagenow ) {
 			$submit_text = __( 'Start Thread', 'supportflow' );
-		else
+		} else {
 			$submit_text = __( 'Send Message', 'supportflow' );
+		}
 		submit_button( $submit_text, 'primary', 'save', false );
 		echo '</div>';
 		echo '</div>';
@@ -498,23 +515,23 @@ public function meta_box_comments() {
 	public function display_thread_comments() {
 
 		$private_comments = SupportFlow()->get_thread_comments( get_the_ID(), array( 'status' => 'private' ) );
-		if ( !empty( $private_comments ) ) {
+		if ( ! empty( $private_comments ) ) {
 			echo '<ul class="private-comments">';
-			foreach( $private_comments as $comment ) {
+			foreach ( $private_comments as $comment ) {
 				echo '<li>';
 				echo '<div class="thread-comment">';
 				echo wpautop( stripslashes( $comment->comment_content ) );
 				if ( $attachment_ids = get_comment_meta( $comment->comment_ID, 'attachment_ids', true ) ) {
 					echo '<ul class="thread-comment-attachments">';
-					foreach( $attachment_ids as $attachment_id ) {
+					foreach ( $attachment_ids as $attachment_id ) {
 						$attachment_link = wp_get_attachment_url( $attachment_id );
 						echo '<li><a target="_blank" href="' . esc_url( $attachment_link ) . '">' . esc_html( get_the_title( $attachment_id ) ) . '</a></li>';
 					}
 					echo '</ul>';
 				}
 				echo '</div>';
-				$comment_date = get_comment_date( get_option( 'date_format' ), $comment->comment_ID );
-				$comment_time = get_comment_date( get_option( 'time_format' ), $comment->comment_ID );
+				$comment_date      = get_comment_date( get_option( 'date_format' ), $comment->comment_ID );
+				$comment_time      = get_comment_date( get_option( 'time_format' ), $comment->comment_ID );
 				$comment_timestamp = sprintf( __( 'Noted by %1$s on %2$s at %3$s', 'supportflow' ), $comment->comment_author, $comment_date, $comment_time );
 				echo '<div class="thread-meta"><span class="comment-timestamp">' . esc_html( $comment_timestamp ) . '</span></div>';
 				echo '</li>';
@@ -523,18 +540,18 @@ public function display_thread_comments() {
 		}
 
 		$comments = SupportFlow()->get_thread_comments( get_the_ID(), array( 'status' => 'public' ) );
-		if ( !empty( $comments ) ) {
+		if ( ! empty( $comments ) ) {
 			echo '<ul class="thread-comments">';
-			foreach( $comments as $comment ) {
+			foreach ( $comments as $comment ) {
 				echo '<li>';
 				echo '<div class="comment-avatar">' . get_avatar( $comment->comment_author_email, 72 );
-				echo '<p class="comment-author">' . esc_html( $comment->comment_author ) .'</p>';
+				echo '<p class="comment-author">' . esc_html( $comment->comment_author ) . '</p>';
 				echo '</div>';
 				echo '<div class="thread-comment">';
 				echo wpautop( stripslashes( $comment->comment_content ) );
 				if ( $attachment_ids = get_comment_meta( $comment->comment_ID, 'attachment_ids', true ) ) {
 					echo '<ul class="thread-comment-attachments">';
-					foreach( $attachment_ids as $attachment_id ) {
+					foreach ( $attachment_ids as $attachment_id ) {
 						$attachment_link = wp_get_attachment_url( $attachment_id );
 						echo '<li><a target="_blank" href="' . esc_url( $attachment_link ) . '">' . esc_html( get_the_title( $attachment_id ) ) . '</a></li>';
 					}
@@ -560,15 +577,16 @@ public function display_thread_comments() {
 	public function filter_manage_post_columns( $columns ) {
 
 		$new_columns = array(
-				'cb'                  => $columns['cb'],
-				'updated'             => __( 'Updated', 'supportflow' ),
-				'title'               => __( 'Subject', 'supportflow' ),
-				'respondents'         => __( 'Respondents', 'supportflow' ),
-				'status'              => __( 'Status', 'supportflow' ),
-				'author'              => __( 'Agent', 'supportflow' ),
-				'sf_comments'         => '<span class="vers"><img alt="' . esc_attr__( 'Comments', 'supportflow' ) . '" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></span>',
-				'created'             => __( 'Created', 'support' ),
-			);
+			'cb'          => $columns['cb'],
+			'updated'     => __( 'Updated', 'supportflow' ),
+			'title'       => __( 'Subject', 'supportflow' ),
+			'respondents' => __( 'Respondents', 'supportflow' ),
+			'status'      => __( 'Status', 'supportflow' ),
+			'author'      => __( 'Agent', 'supportflow' ),
+			'sf_comments' => '<span class="vers"><img alt="' . esc_attr__( 'Comments', 'supportflow' ) . '" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></span>',
+			'created'     => __( 'Created', 'support' ),
+		);
+
 		return $new_columns;
 	}
 
@@ -578,6 +596,7 @@ public function filter_manage_post_columns( $columns ) {
 	public function manage_sortable_columns( $columns ) {
 		$columns['updated'] = 'modified';
 		$columns['created'] = 'date';
+
 		return $columns;
 	}
 
@@ -586,10 +605,11 @@ public function manage_sortable_columns( $columns ) {
 	 * on the Manage Threads view so mode=excerpt works well
 	 */
 	public function filter_get_the_excerpt( $orig ) {
-		if ( $comment = array_pop( SupportFlow()->get_thread_comments( get_the_ID() ) ) )
-			return $comment->comment_author .': "' . wp_trim_excerpt( $comment->comment_content ) . '"';
-		else
+		if ( $comment = array_pop( SupportFlow()->get_thread_comments( get_the_ID() ) ) ) {
+			return $comment->comment_author . ': "' . wp_trim_excerpt( $comment->comment_content ) . '"';
+		} else {
 			return $orig;
+		}
 	}
 
 	/**
@@ -597,31 +617,32 @@ public function filter_get_the_excerpt( $orig ) {
 	 */
 	function action_manage_posts_custom_column( $column_name, $thread_id ) {
 
-		switch( $column_name ) {
+		switch ( $column_name ) {
 			case 'updated':
 				$modified_gmt = get_post_modified_time( 'U', true, $thread_id );
 				echo sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
 				break;
 			case 'respondents':
 				$respondents = SupportFlow()->get_thread_respondents( $thread_id, array( 'fields' => 'emails' ) );
-				if ( empty( $respondents ) )
+				if ( empty( $respondents ) ) {
 					break;
-				foreach( $respondents as $key => $respondent_email ) {
-					$args = array(
-							SupportFlow()->respondents_tax     => SupportFlow()->get_email_hash( $respondent_email ),
-							'post_type'                         => SupportFlow()->post_type,
-						);
-					$respondent_link = '<a href="' . esc_url( add_query_arg( $args, admin_url( 'edit.php' ) ) ) . '">' . $respondent_email . '</a>';
+				}
+				foreach ( $respondents as $key => $respondent_email ) {
+					$args              = array(
+						SupportFlow()->respondents_tax => SupportFlow()->get_email_hash( $respondent_email ),
+						'post_type'                    => SupportFlow()->post_type,
+					);
+					$respondent_link   = '<a href="' . esc_url( add_query_arg( $args, admin_url( 'edit.php' ) ) ) . '">' . $respondent_email . '</a>';
 					$respondents[$key] = get_avatar( $respondent_email, 16 ) . '&nbsp;&nbsp;' . $respondent_link;
 				}
 				echo implode( '<br />', $respondents );
 				break;
 			case 'status':
 				$post_status = get_post_status( $thread_id );
-				$args = array(
-						'post_type'       => SupportFlow()->post_type,
-						'post_status'     => $post_status,
-					);
+				$args        = array(
+					'post_type'   => SupportFlow()->post_type,
+					'post_status' => $post_status,
+				);
 				$status_name = get_post_status_object( $post_status )->label;
 				$filter_link = add_query_arg( $args, admin_url( 'edit.php' ) );
 				echo '<a href="' . esc_url( $filter_link ) . '">' . esc_html( $status_name ) . '</a>';
@@ -652,6 +673,7 @@ public function is_edit_screen() {
 			return $pagenow;
 		} elseif ( 'post.php' == $pagenow && ! empty( $_GET['action'] ) && 'edit' == $_GET['action'] && ! empty( $_GET['post'] ) ) {
 			$the_post = get_post( $_GET['post'] );
+
 			return ( $the_post->post_type == SupportFlow()->post_type ) ? $pagenow : false;
 		} else {
 			return false;
@@ -667,25 +689,27 @@ public function is_edit_screen() {
 	 */
 	public function action_save_post( $thread_id ) {
 
-		if( SupportFlow()->post_type != get_post_type( $thread_id ) )
+		if ( SupportFlow()->post_type != get_post_type( $thread_id ) ) {
 			return;
+		}
 
 		if ( isset( $_POST['respondents'] ) ) {
 			$respondents = array_map( 'sanitize_email', explode( ',', $_POST['respondents'] ) );
 			SupportFlow()->update_thread_respondents( $thread_id, $respondents );
 		}
 
-		if ( isset( $_POST['comment'] ) && !empty( $_POST['comment' ] ) ) {
-			$comment = wp_filter_nohtml_kses( $_POST['comment'] );
-			$visibility = ( !empty( $_POST['mark-private'] ) ) ? 'private' : 'public';
-			if ( !empty( $_POST['comment-attachments'] ) )
+		if ( isset( $_POST['comment'] ) && ! empty( $_POST['comment'] ) ) {
+			$comment    = wp_filter_nohtml_kses( $_POST['comment'] );
+			$visibility = ( ! empty( $_POST['mark-private'] ) ) ? 'private' : 'public';
+			if ( ! empty( $_POST['comment-attachments'] ) ) {
 				$attachment_ids = array_map( 'intval', explode( ',', trim( $_POST['comment-attachments'], ',' ) ) );
-			else
+			} else {
 				$attachment_ids = '';
+			}
 			$comment_args = array(
-					'comment_approved'        => $visibility,
-					'attachment_ids'          => $attachment_ids,
-				);
+				'comment_approved' => $visibility,
+				'attachment_ids'   => $attachment_ids,
+			);
 			SupportFlow()->add_thread_comment( $thread_id, $comment, $comment_args );
 		}
 
diff --git a/classes/class-supportflow-attachments.php b/classes/class-supportflow-attachments.php
index 5719eb4..4c25848 100644
--- a/classes/class-supportflow-attachments.php
+++ b/classes/class-supportflow-attachments.php
@@ -24,13 +24,13 @@ public function setup_actions() {
 
 		// Generate a secret key for our hashes the first time this is loaded in the admin
 		$this->secret_key = get_option( self::secret_key_option );
-		if ( is_admin() && !$this->secret_key ) {
+		if ( is_admin() && ! $this->secret_key ) {
 			$this->secret_key = wp_generate_password();
 			update_option( self::secret_key_option, $this->secret_key );
 		}
 
 		// Only apply to files that are uploaded to a thread
-		if ( isset( $_REQUEST['post_id'] ) && SupportFlow()->is_thread( (int)$_REQUEST['post_id'] ) ) {
+		if ( isset( $_REQUEST['post_id'] ) && SupportFlow()->is_thread( (int) $_REQUEST['post_id'] ) ) {
 			add_filter( 'wp_handle_upload_prefilter', array( $this, 'wp_handle_upload_prefilter' ) );
 			add_filter( 'wp_handle_upload', array( $this, 'wp_handle_upload' ) );
 		}
@@ -42,63 +42,72 @@ public function setup_actions() {
 	public function filter_wp_get_attachment_url( $url, $attachment_id ) {
 
 		if ( $attachment = get_post( $attachment_id ) ) {
-			if ( SupportFlow()->is_thread( $attachment->post_parent ) )
+			if ( SupportFlow()->is_thread( $attachment->post_parent ) ) {
 				return $attachment->guid;
+			}
 
 		}
+
 		return $url;
 	}
 
 	public function handle_file_delivery( $template ) {
 
 		// First check to see
-		if ( false === stripos( $_SERVER['REQUEST_URI' ], "secure-files/" ) )
+		if ( false === stripos( $_SERVER['REQUEST_URI'], "secure-files/" ) ) {
 			return;
+		}
 
 		// Get the file
 		preg_match( '#\/secure\-files\/(.+)$#', $_SERVER['REQUEST_URI'], $matches );
-		if ( empty( $matches ) )
+		if ( empty( $matches ) ) {
 			return;
+		}
 
 		// User must be logged in to see attachments that require permission
 		if ( ! is_user_logged_in() && $this->attachments_require_permission ) {
 			$args = array(
-					'redirect_to'       => urlencode( esc_url( home_url( $_SERVER['REQUEST_URI'] ) ) ),
-				);
+				'redirect_to' => urlencode( esc_url( home_url( $_SERVER['REQUEST_URI'] ) ) ),
+			);
 			wp_safe_redirect( add_query_arg( $args, site_url( '/wp-login.php' ) ) );
 			exit;
 		}
 
 		global $wpdb;
-		$file = $matches[1];
+		$file  = $matches[1];
 		$query = $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE guid LIKE %s", '%' . $file );
-		$post = $wpdb->get_row( $query );
-		if ( empty( $post ) )
+		$post  = $wpdb->get_row( $query );
+		if ( empty( $post ) ) {
 			return get_404_template();
+		}
 
 		// Check to see whether the user has permission to view the thread
-		if ( $this->attachments_require_permission && ! $this->can_view_attachment( $post->ID ) )
+		if ( $this->attachments_require_permission && ! $this->can_view_attachment( $post->ID ) ) {
 			wp_die( __( 'Sorry, you do not have permission to view this attachment.', 'supportflow' ) );
+		}
 
 		$post_id = $post->ID;
 
 		$file = get_attached_file( $post_id );
 
-		if ( !is_file( $file ) )
+		if ( ! is_file( $file ) ) {
 			return get_404_template();
+		}
 
 		// We may override this later.
 		status_header( 200 );
 
 		//rest inspired by wp-includes/ms-files.php.
 		$mime = wp_check_filetype( $file );
-		if ( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) )
-			$mime[ 'type' ] = mime_content_type( $file );
+		if ( false === $mime['type'] && function_exists( 'mime_content_type' ) ) {
+			$mime['type'] = mime_content_type( $file );
+		}
 
-		if ( $mime[ 'type' ] )
-			$mimetype = $mime[ 'type' ];
-		else
+		if ( $mime['type'] ) {
+			$mimetype = $mime['type'];
+		} else {
 			$mimetype = 'image/' . substr( $file, strrpos( $file, '.' ) + 1 );
+		}
 
 		//fake the filename
 		$filename = $post->post_name;
@@ -110,7 +119,7 @@ public function handle_file_delivery( $template ) {
 		header( 'Content-Type: ' . $mimetype ); // always send this
 		header( 'Content-Length: ' . filesize( $file ) );
 		$last_modified = gmdate( 'D, d M Y H:i:s', filemtime( $file ) );
-		$etag = '"' . md5( $last_modified ) . '"';
+		$etag          = '"' . md5( $last_modified ) . '"';
 		header( "Last-Modified: $last_modified GMT" );
 		header( 'ETag: ' . $etag );
 		header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + 100000000 ) . ' GMT' );
@@ -118,8 +127,9 @@ public function handle_file_delivery( $template ) {
 		// Support for Conditional GET
 		$client_etag = isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ? stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) : false;
 
-		if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )
+		if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
 			$_SERVER['HTTP_IF_MODIFIED_SINCE'] = false;
+		}
 
 		$client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
 
@@ -127,13 +137,14 @@ public function handle_file_delivery( $template ) {
 		$client_modified_timestamp = $client_last_modified ? strtotime( $client_last_modified ) : 0;
 
 		// Make a timestamp for our most recent modification...
-		$modified_timestamp = strtotime($last_modified);
+		$modified_timestamp = strtotime( $last_modified );
 
 		if ( ( $client_last_modified && $client_etag )
-			? ( ( $client_modified_timestamp >= $modified_timestamp) && ( $client_etag == $etag ) )
-			: ( ( $client_modified_timestamp >= $modified_timestamp) || ( $client_etag == $etag ) )
+			? ( ( $client_modified_timestamp >= $modified_timestamp ) && ( $client_etag == $etag ) )
+			: ( ( $client_modified_timestamp >= $modified_timestamp ) || ( $client_etag == $etag ) )
 		) {
 			status_header( 304 );
+
 			return;
 		}
 
@@ -151,21 +162,24 @@ public function handle_file_delivery( $template ) {
 	 */
 	public function can_view_attachment( $attachment_id, $email_or_login = false ) {
 
-		if ( ! $email_or_login && is_user_logged_in() )
+		if ( ! $email_or_login && is_user_logged_in() ) {
 			$email_or_login = wp_get_current_user()->user_email;
+		}
 
 		if ( ! is_email( $email_or_login ) ) {
 			$user = get_user_by( 'login' );
-			if ( $user )
+			if ( $user ) {
 				$email_or_login = $user->user_email;
+			}
 		}
 
-		$thread_id = get_post( $attachment_id )->post_parent;
+		$thread_id   = get_post( $attachment_id )->post_parent;
 		$respondents = SupportFlow()->get_thread_respondents( $thread_id, array( 'fields' => 'emails' ) );
 
 		// If the email address is a respondent, they can view
-		if ( in_array( $email_or_login, $respondents ) )
+		if ( in_array( $email_or_login, $respondents ) ) {
 			return true;
+		}
 
 		// @todo permissions check on whether the user is logged in as some who can view threads
 
@@ -175,14 +189,16 @@ public function can_view_attachment( $attachment_id, $email_or_login = false ) {
 	public function wp_handle_upload_prefilter( $file ) {
 
 		$this->private_hash = md5( $this->secret_key . date( 'Y-m-d' ) . $file['name'] );
-		$file['name'] = $this->private_hash . '.' . basename( $file['name'] );
+		$file['name']       = $this->private_hash . '.' . basename( $file['name'] );
+
 		return $file;
 	}
 
 	public function wp_handle_upload( $file ) {
 
 		$secondary_hash = md5( $this->secret_key . date( 'Y-m-d' ) );
-		$file['url'] = site_url( '/secure-files/' ) . str_replace( $this->private_hash . '.', $secondary_hash . '/', basename( $file['file'] ) );
+		$file['url']    = site_url( '/secure-files/' ) . str_replace( $this->private_hash . '.', $secondary_hash . '/', basename( $file['file'] ) );
+
 		return $file;
 	}
 
diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 523c6c3..3bb8670 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -20,6 +20,7 @@ public function setup_actions() {
 	public function filter_comment_notify_subject( $subject, $comment_id, $thread_id ) {
 
 		$subject = rtrim( $subject ) . ' [' . SupportFlow()->get_secret_for_thread( $thread_id ) . ']';
+
 		return $subject;
 	}
 
@@ -28,39 +29,43 @@ public function filter_comment_notify_subject( $subject, $comment_id, $thread_id
 	 */
 	public function download_and_process_email_replies( $connection_details ) {
 
-		$inbox = $connection_details['inbox'];
+		$inbox   = $connection_details['inbox'];
 		$archive = $connection_details['archive'];
 
 		$this->imap_connection = imap_open( $connection_details['host'], $connection_details['username'], $connection_details['password'] );
-		if ( ! $this->imap_connection )
+		if ( ! $this->imap_connection ) {
 			return new WP_Error( 'connection-error', __( 'Error connecting to mailbox', 'supportflow' ) );
+		}
 
 		// Check to see if the archive mailbox exists, and create it if it doesn't
 		$mailboxes = imap_getmailboxes( $this->imap_connection, $connection_details['host'], '*' );
-		if ( ! wp_filter_object_list( $mailboxes, array( 'name' => $connection_details['host'] . $archive ) ) )
+		if ( ! wp_filter_object_list( $mailboxes, array( 'name' => $connection_details['host'] . $archive ) ) ) {
 			imap_createmailbox( $this->imap_connection, $connection_details['host'] . $archive );
+		}
 
 		// Make sure here are new emails to process
 		$email_count = imap_num_msg( $this->imap_connection );
-		if ( $email_count < 1 )
+		if ( $email_count < 1 ) {
 			return false;
+		}
 
 		// Process each new email and put it in the archive mailbox when done
 		$success = 0;
-		for( $i = 1; $i <= $email_count; $i++ ) {
-			$email = new stdClass;
-			$email->headers = imap_headerinfo( $this->imap_connection, $i );
+		for ( $i = 1; $i <= $email_count; $i ++ ) {
+			$email            = new stdClass;
+			$email->headers   = imap_headerinfo( $this->imap_connection, $i );
 			$email->structure = imap_fetchstructure( $this->imap_connection, $i );
-			$email->body = $this->get_body_from_connection( $this->imap_connection, $i );
+			$email->body      = $this->get_body_from_connection( $this->imap_connection, $i );
 
 			// @todo Confirm this a message we want to process
 			$ret = $this->process_email( $email, $i );
 			// If it was successful, move the email to the archive
 			if ( $ret ) {
 				imap_mail_move( $this->imap_connection, $i, $archive );
-				$success++;
+				$success ++;
 			}
 		}
+
 		return sprintf( __( 'Processed %d emails', 'supportflow' ), $success );
 	}
 
@@ -72,16 +77,17 @@ public function process_email( $email, $i ) {
 		$new_attachment_ids = array();
 
 		$k = 0;
-		foreach( $email->structure->parts as $email_part ) {
+		foreach ( $email->structure->parts as $email_part ) {
 
 			// We should at least be dealing with something that resembles an email object at this point
-			if ( ! isset( $email_part->disposition ) || ! isset( $email_part->subtype ) || ! isset( $email_part->dparameters[0]->value ) )
+			if ( ! isset( $email_part->disposition ) || ! isset( $email_part->subtype ) || ! isset( $email_part->dparameters[0]->value ) ) {
 				continue;
+			}
 
 			if ( 'ATTACHMENT' == $email_part->disposition ) {
 				// We need to add 2 to our array key each time to get the correct email part
 				//@todo this needs more testing with different emails, should be smarter about which parts
-				$raw_attachment_data = imap_fetchbody( $this->imap_connection, $i, $k+2 );
+				$raw_attachment_data = imap_fetchbody( $this->imap_connection, $i, $k + 2 );
 
 				// The raw data from imap is base64 encoded, but php-imap has us covered!
 				$attachment_data = imap_base64( $raw_attachment_data );
@@ -94,67 +100,72 @@ public function process_email( $email, $i ) {
 
 				$file_array = array(
 					'tmp_name' => $temp_file,
-					'name' => $email_part->dparameters[0]->value,
+					'name'     => $email_part->dparameters[0]->value,
 				);
 
-				$upload_result = media_handle_sideload( $file_array, NULL );
+				$upload_result = media_handle_sideload( $file_array, null );
 
-				if ( is_wp_error( $upload_result ) )
+				if ( is_wp_error( $upload_result ) ) {
 					WP_CLI::warning( $upload_result->get_error_message() );
-				else
+				} else {
 					$new_attachment_ids[] = $upload_result;
+				}
 
 			}
-			$k++;
+			$k ++;
 		}
 
-		if ( ! empty( $email->headers->subject ) )
+		if ( ! empty( $email->headers->subject ) ) {
 			$subject = $email->headers->subject;
-		else
+		} else {
 			$subject = sprintf( __( 'New thread from %s', 'supportflow' ), $email->headers->fromaddress );
+		}
 
-		$respondent_name = $email->headers->from[0]->personal;
+		$respondent_name  = $email->headers->from[0]->personal;
 		$respondent_email = $email->headers->from[0]->mailbox . '@' . $email->headers->from[0]->host;
 
 		// Parse out the reply body
-		if ( function_exists( 'What_The_Email' ) )
+		if ( function_exists( 'What_The_Email' ) ) {
 			$message = What_The_Email()->get_message( $email->body );
-		else
+		} else {
 			$message = $email->body;
+		}
 
 		// Check if this email should be blocked
 		if ( function_exists( 'What_The_Email' ) ) {
 			$check_strings = array(
-					'subject'       => $subject,
-					'sender'        => $respondent_email,
-					'message'       => $message,
-				);
-			foreach( $check_strings as $key => $value ) {
-				if ( What_The_Email()->is_robot( $key, $value ) )
+				'subject' => $subject,
+				'sender'  => $respondent_email,
+				'message' => $message,
+			);
+			foreach ( $check_strings as $key => $value ) {
+				if ( What_The_Email()->is_robot( $key, $value ) ) {
 					return true;
+				}
 			}
 		}
 
 		// Check to see if this message was in response to an existing thread
 		$thread_id = false;
-		if ( preg_match( '#\[([a-zA-Z0-9]{8})\]$#', $subject, $matches ) )
+		if ( preg_match( '#\[([a-zA-Z0-9]{8})\]$#', $subject, $matches ) ) {
 			$thread_id = SupportFlow()->get_thread_from_secret( $matches[1] );
+		}
 
 		if ( $thread_id ) {
 			$message_args = array(
-					'comment_author'        => $respondent_name,
-					'comment_author_email'  => $respondent_email,
-				);
+				'comment_author'       => $respondent_name,
+				'comment_author_email' => $respondent_email,
+			);
 			SupportFlow()->add_thread_comment( $thread_id, $message, $message_args );
 		} else {
 			// If this wasn't in reply to an existing message, create a new thread
 			$new_thread_args = array(
-					'subject'               => $subject,
-					'respondent_name'       => $respondent_name,
-					'respondent_email'      => $respondent_email,
-					'message'               => $message,
-				);
-			$thread_id = SupportFlow()->create_thread( $new_thread_args );
+				'subject'          => $subject,
+				'respondent_name'  => $respondent_name,
+				'respondent_email' => $respondent_email,
+				'message'          => $message,
+			);
+			$thread_id       = SupportFlow()->create_thread( $new_thread_args );
 		}
 
 		foreach ( $new_attachment_ids as $new_attachment_id ) {
@@ -166,13 +177,14 @@ public function process_email( $email, $i ) {
 
 		// Add anyone else that was in the 'to' or 'cc' fields as respondents
 		$respondents = array();
-		$fields = array( 'to', 'cc' );
-		foreach( $fields as $field ) {
+		$fields      = array( 'to', 'cc' );
+		foreach ( $fields as $field ) {
 			if ( ! empty( $email->headers->$field ) ) {
-				foreach( $email->headers->$field as $recipient ) {
+				foreach ( $email->headers->$field as $recipient ) {
 					$email_address = $recipient->mailbox . '@' . $recipient->host;
-					if ( is_email( $email_address ) && $email_address != SupportFlow()->extend->emails->from_address )
+					if ( is_email( $email_address ) && $email_address != SupportFlow()->extend->emails->from_address ) {
 						$respondents[] = $email_address;
+					}
 				}
 			}
 		}
@@ -184,6 +196,7 @@ public function process_email( $email, $i ) {
 			update_comment_meta( $new_comment->comment_ID, self::email_id_key, $email_id );
 			update_comment_meta( $new_comment->comment_ID, 'attachment_ids', $new_attachment_ids );
 		}
+
 		return true;
 	}
 
@@ -193,8 +206,10 @@ public function process_email( $email, $i ) {
 	public function get_body_from_connection( $connection, $num, $type = 'text/plain' ) {
 		// Hacky way to get the email body. We should support more MIME types in the future
 		$body = imap_fetchbody( $connection, $num, 1.1 );
-		if ( empty( $body ) )
+		if ( empty( $body ) ) {
 			$body = imap_fetchbody( $connection, $num, 1 );
+		}
+
 		return $body;
 	}
 
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 630b322..2e8f6e4 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -17,12 +17,13 @@ function __construct() {
 	 */
 	public function setup_actions() {
 
-		$this->from_name = apply_filters( 'supportflow_emails_from_name', $this->from_name );
+		$this->from_name  = apply_filters( 'supportflow_emails_from_name', $this->from_name );
 		$this->from_email = apply_filters( 'supportflow_emails_from_address', $this->from_email );
 
 		// Don't send out any notifications when importing or using WP-CLI
-		if ( ( defined('WP_IMPORTING') && WP_IMPORTING ) || ( defined('WP_CLI') && WP_CLI ) )
+		if ( ( defined( 'WP_IMPORTING' ) && WP_IMPORTING ) || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
 			return;
+		}
 
 		// When a new comment is added to a thread, notify the respondents and the agents
 		add_action( 'supportflow_thread_comment_added', array( $this, 'notify_agents_thread_comment' ) );
@@ -35,27 +36,31 @@ public function setup_actions() {
 	public function notify_agents_thread_comment( $comment_id ) {
 
 		$comment = get_comment( $comment_id );
-		if ( ! $comment )
+		if ( ! $comment ) {
 			return;
+		}
 
 		$thread = SupportFlow()->get_thread( $comment->comment_post_ID );
 		// One agent by default, but easily allow notifications to a triage team
 		$agent_ids = apply_filters( 'supportflow_emails_notify_agent_ids', array( $thread->post_author ), $thread, 'comment' );
 
-		if ( empty( $agent_ids ) )
+		if ( empty( $agent_ids ) ) {
 			return;
+		}
 
 		$agent_emails = array();
-		foreach( $agent_ids as $user_id ) {
-			if ( $user = get_user_by( 'id', $user_id ) )
+		foreach ( $agent_ids as $user_id ) {
+			if ( $user = get_user_by( 'id', $user_id ) ) {
 				$agent_emails[] = $user->user_email;
+			}
 		}
 
 		// Don't email the person creating the comment, unless that's desired behavior
-		if ( !apply_filters( 'supportflow_emails_notify_creator', false, 'comment' ) ) {
+		if ( ! apply_filters( 'supportflow_emails_notify_creator', false, 'comment' ) ) {
 			$key = array_search( $comment->comment_author_email, $agent_emails );
-			if ( false !== $key )
+			if ( false !== $key ) {
 				unset( $agent_emails[$key] );
+			}
 		}
 
 		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $thread->ID );
@@ -64,7 +69,7 @@ public function notify_agents_thread_comment( $comment_id ) {
 		$message = stripslashes( $comment->comment_content );
 		if ( $attachment_ids = get_comment_meta( $comment->comment_ID, 'attachment_ids', true ) ) {
 			$message .= "\n";
-			foreach( $attachment_ids as $attachment_id ) {
+			foreach ( $attachment_ids as $attachment_id ) {
 				$message .= "\n" . wp_get_attachment_url( $attachment_id );
 			}
 		}
@@ -79,7 +84,7 @@ public function notify_agents_thread_comment( $comment_id ) {
 
 		$message = apply_filters( 'supportflow_emails_comment_notify_message', $message, $comment_id, $thread->ID, 'agent' );
 
-		foreach( $agent_emails as $agent_email ) {
+		foreach ( $agent_emails as $agent_email ) {
 			self::mail( $agent_email, $subject, $message );
 		}
 	}
@@ -91,17 +96,19 @@ public function notify_respondents_thread_comment( $comment_id ) {
 
 		// Respondents shouldn't receive private comments
 		$comment = get_comment( $comment_id );
-		if ( ! $comment || 'private' == $comment->comment_approved )
+		if ( ! $comment || 'private' == $comment->comment_approved ) {
 			return;
+		}
 
-		$thread = SupportFlow()->get_thread( $comment->comment_post_ID );
+		$thread      = SupportFlow()->get_thread( $comment->comment_post_ID );
 		$respondents = SupportFlow()->get_thread_respondents( $thread->ID, array( 'fields' => 'emails' ) );
 
 		// Don't email the person creating the comment, unless that's desired behavior
-		if ( !apply_filters( 'supportflow_emails_notify_creator', false, 'comment' ) ) {
+		if ( ! apply_filters( 'supportflow_emails_notify_creator', false, 'comment' ) ) {
 			$key = array_search( $comment->comment_author_email, $respondents );
-			if ( false !== $key )
+			if ( false !== $key ) {
 				unset( $respondents[$key] );
+			}
 		}
 
 		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $thread->ID );
@@ -110,14 +117,14 @@ public function notify_respondents_thread_comment( $comment_id ) {
 		$message = stripslashes( $comment->comment_content );
 		if ( $attachment_ids = get_comment_meta( $comment->comment_ID, 'attachment_ids', true ) ) {
 			$message .= "\n";
-			foreach( $attachment_ids as $attachment_id ) {
+			foreach ( $attachment_ids as $attachment_id ) {
 				$message .= "\n" . wp_get_attachment_url( $attachment_id );
 			}
 		}
 
 		$message = apply_filters( 'supportflow_emails_comment_notify_message', $message, $comment_id, $thread->ID, 'respondent' );
 
-		foreach( $respondents as $respondent_email ) {
+		foreach ( $respondents as $respondent_email ) {
 			self::mail( $respondent_email, $subject, $message );
 		}
 	}
@@ -126,7 +133,7 @@ public function notify_respondents_thread_comment( $comment_id ) {
 	 * Send an email from SupportFlow
 	 */
 	public function mail( $respondent_email, $subject, $message ) {
-		
+
 		add_filter( 'wp_mail_from', array( $this, 'filter_wp_mail_from' ) );
 		add_filter( 'wp_mail_from_name', array( $this, 'filter_wp_mail_from_name' ) );
 		wp_mail( $respondent_email, $subject, $message );
@@ -138,20 +145,22 @@ public function mail( $respondent_email, $subject, $message ) {
 	 * Filter the 'from address' value used by wp_mail
 	 */
 	public function filter_wp_mail_from( $from_email ) {
-		if ( $this->from_email )
+		if ( $this->from_email ) {
 			return $this->from_email;
-		else
+		} else {
 			$from_email;
+		}
 	}
 
 	/**
 	 * Filter the 'from name' value used by wp_mail
 	 */
 	public function filter_wp_mail_from_name( $from_name ) {
-		if ( $this->from_name )
+		if ( $this->from_name ) {
 			return $this->from_name;
-		else
+		} else {
 			$from_name;
+		}
 	}
 }
 
diff --git a/classes/class-supportflow-json-api.php b/classes/class-supportflow-json-api.php
index c9e68a7..aaa47a9 100644
--- a/classes/class-supportflow-json-api.php
+++ b/classes/class-supportflow-json-api.php
@@ -17,34 +17,35 @@ public function action_wp_ajax_supportflow_json() {
 		$current_user = wp_get_current_user();
 
 		$response = array(
-				'api-action'           => ( ! empty( $_REQUEST['api-action'] ) ) ? sanitize_key( $_REQUEST['api-action'] ) : '',
-				'status'              => 'error',
-				'message'             => '',
-				'html'                => '',
-			);
+			'api-action' => ( ! empty( $_REQUEST['api-action'] ) ) ? sanitize_key( $_REQUEST['api-action'] ) : '',
+			'status'     => 'error',
+			'message'    => '',
+			'html'       => '',
+		);
 		switch ( $response['api-action'] ) {
 
 			case 'create-thread':
 
 				$thread_args = array(
-						'subject'                    => sanitize_text_field( $_REQUEST['subject'] ),
-						'message'                    => wp_filter_nohtml_kses( $_REQUEST['message'] ),
-					);
-				if ( !empty( $_REQUEST['respondent_email'] ) && is_email( $_REQUEST['respondent_email'] ) ) {
+					'subject' => sanitize_text_field( $_REQUEST['subject'] ),
+					'message' => wp_filter_nohtml_kses( $_REQUEST['message'] ),
+				);
+				if ( ! empty( $_REQUEST['respondent_email'] ) && is_email( $_REQUEST['respondent_email'] ) ) {
 					$thread_args['respondent_email'] = sanitize_email( $_REQUEST['respondent_email'] );
-					if ( !empty( $_REQUEST['respondent_name'] ) )
+					if ( ! empty( $_REQUEST['respondent_name'] ) ) {
 						$thread_args['respondent_name'] = sanitize_text_field( $_REQUEST['respondent_name'] );
+					}
 				} else {
 					$thread_args['respondent_email'] = $current_user->user_email;
-					$thread_args['respondent_name'] = $current_user->display_name;
-					$thread_args['respondent_id'] = $current_user->ID;
+					$thread_args['respondent_name']  = $current_user->display_name;
+					$thread_args['respondent_id']    = $current_user->ID;
 				}
 
 				$thread_id = SupportFlow()->create_thread( $thread_args );
 				if ( is_wp_error( $thread_id ) ) {
 					$response['message'] = $thread_id->get_error_message();
 				} else {
-					$response['status'] = 'ok';
+					$response['status']    = 'ok';
 					$response['thread_id'] = $thread_id;
 				}
 				break;
@@ -54,42 +55,43 @@ public function action_wp_ajax_supportflow_json() {
 				break;
 
 			case 'get-respondents':
-				$search_for = sanitize_text_field( $_REQUEST['respondents'] );
+				$search_for         = sanitize_text_field( $_REQUEST['respondents'] );
 				$respondent_matches = SupportFlow()->get_respondents( array( 'search' => $search_for ) );
-				if( is_wp_error($respondent_matches) ) {
+				if ( is_wp_error( $respondent_matches ) ) {
 					$response['message'] = $respondent_matches->get_error_message();
 				} else {
-					$response['query'] = $search_for;
-					$response['status'] = "ok";
+					$response['query']       = $search_for;
+					$response['status']      = "ok";
 					$response['respondents'] = $respondent_matches;
 				}
 
 				break;
 
 			case 'get-thread':
-				$thread_id = (int)$_REQUEST['thread_id'];
-				$response['status'] = 'ok';
+				$thread_id             = (int) $_REQUEST['thread_id'];
+				$response['status']    = 'ok';
 				$response['thread_id'] = $thread_id;
 				break;
 			case 'add-thread-comment':
-				$thread_id = (int)$_REQUEST['thread_id'];
-				$message = wp_filter_nohtml_kses( $_REQUEST['message'] );
+				$thread_id    = (int) $_REQUEST['thread_id'];
+				$message      = wp_filter_nohtml_kses( $_REQUEST['message'] );
 				$comment_args = array();
-				if ( !empty( $_REQUEST['comment_author_email'] ) && is_email( $_REQUEST['comment_author_email'] ) ) {
+				if ( ! empty( $_REQUEST['comment_author_email'] ) && is_email( $_REQUEST['comment_author_email'] ) ) {
 					$comment_args['comment_author_email'] = sanitize_email( $_REQUEST['comment_author_email'] );
-					if ( !empty( $_REQUEST['comment_author'] ) )
+					if ( ! empty( $_REQUEST['comment_author'] ) ) {
 						$comment_args['comment_author'] = sanitize_text_field( $_REQUEST['comment_author'] );
+					}
 				} else {
 					$comment_args['comment_author_email'] = $current_user->user_email;
-					$comment_args['comment_author'] = $current_user->display_name;
-					$comment_args['user_id'] = $current_user->ID;
+					$comment_args['comment_author']       = $current_user->display_name;
+					$comment_args['user_id']              = $current_user->ID;
 				}
-				$comment_id = SupportFlow()->add_thread_comment( $thread_id, $message);
+				$comment_id = SupportFlow()->add_thread_comment( $thread_id, $message );
 				if ( is_wp_error( $comment_id ) ) {
 					$response['message'] = $comment_id->get_error_message();
 				} else {
-					$response['status'] = 'ok';
-					$response['thread_id'] = $thread_id;
+					$response['status']     = 'ok';
+					$response['thread_id']  = $thread_id;
 					$response['comment_id'] = $comment_id;
 				}
 				break;
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 4a52a14..ed22b25 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -2,34 +2,34 @@
 /**
  * Sets up the permissions for SupportFlow
  *
- * @since	0.1
+ * @since    0.1
  */
 class SupportFlow_Permissions extends SupportFlow {
 
 	/**
 	 * Holds all of the capabilities managed by SupportFlow.
 	 *
-	 * @access	private
-	 * @var		array
+	 * @access    private
+	 * @var        array
 	 */
 	private $_caps = array();
 
 	/**
 	 * Array of user roles and associated capabilities.
 	 *
-	 * @access	private
-	 * @var 	array
+	 * @access    private
+	 * @var    array
 	 */
 	private $_role_cap_map = array();
 
 	/**
 	 * Construct the object and initiate actions to setup permissions.
 	 *
-	 * @access	public
-	 * @since	0.1
-	 * @uses	add_action
+	 * @access    public
+	 * @since     0.1
+	 * @uses      add_action
 	 *
-	 * @return	SupportFlow_Permissions
+	 * @return    SupportFlow_Permissions
 	 */
 	public function __construct() {
 		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
@@ -38,11 +38,11 @@ public function __construct() {
 	/**
 	 * Initiates the actions for the permissions class.
 	 *
-	 * @access	public
-	 * @since 	0.1
-	 * @uses	add_action
+	 * @access    public
+	 * @since     0.1
+	 * @uses      add_action
 	 *
-	 * @return	void
+	 * @return    void
 	 */
 	public function setup_actions() {
 		$this->_setup_caps();
@@ -52,54 +52,59 @@ public function setup_actions() {
 	/**
 	 * Setup the mapping of roles to capabilities.
 	 *
-	 * @access	public
-	 * @since	0.1
-	 * @uses	apply_filters
+	 * @access    public
+	 * @since     0.1
+	 * @uses      apply_filters
 	 *
-	 * @return	void
+	 * @return    void
 	 */
 	private function _setup_caps() {
 		// Setup the default caps for SupportFlow
-		$this->_caps = apply_filters( 'supportflow_caps', array(
-			'close_others_threads' 		=> 'sf_close_others_threads',
-			'open_others_threads' 		=> 'sf_open_others_threads',
-			'reopen_others_threads' 	=> 'sf_reopen_others_threads',
-			'comment_on_others_threads' => 'sf_comment_on_others_threads',
-			'close_threads' 			=> 'sf_close_threads',
-			'open_threads'			 	=> 'sf_open_threads',
-			'reopen_threads' 			=> 'sf_reopen_threads',
-			'comment_on_threads' 		=> 'sf_comment_on_threads',
-		) );
+		$this->_caps = apply_filters(
+			'supportflow_caps', array(
+				'close_others_threads'      => 'sf_close_others_threads',
+				'open_others_threads'       => 'sf_open_others_threads',
+				'reopen_others_threads'     => 'sf_reopen_others_threads',
+				'comment_on_others_threads' => 'sf_comment_on_others_threads',
+				'close_threads'             => 'sf_close_threads',
+				'open_threads'              => 'sf_open_threads',
+				'reopen_threads'            => 'sf_reopen_threads',
+				'comment_on_threads'        => 'sf_comment_on_threads',
+			)
+		);
 
 		// Map the default caps onto WordPress roles
-		$this->_role_cap_map = apply_filters( 'supportflow_role_cap_map', array(
-			'administrator' => $this->get_caps(), // Apply all caps
-			'editor' 		=> $this->get_caps(), // Apply all caps
-			'author' 		=> array(
-				'close_threads' 	 => $this->get_cap( 'close_threads' ),
-				'open_threads' 		 => $this->get_cap( 'open_threads' ),
-				'comment_on_threads' => $this->get_cap( 'comment_on_threads' ),
-			),
-			'contributor' 	=> array(
-				'comment_on_threads' => $this->get_cap( 'comment_on_threads' ),
-			),
-		) );
+		$this->_role_cap_map = apply_filters(
+			'supportflow_role_cap_map', array(
+				'administrator' => $this->get_caps(), // Apply all caps
+				'editor'        => $this->get_caps(), // Apply all caps
+				'author'        => array(
+					'close_threads'      => $this->get_cap( 'close_threads' ),
+					'open_threads'       => $this->get_cap( 'open_threads' ),
+					'comment_on_threads' => $this->get_cap( 'comment_on_threads' ),
+				),
+				'contributor'   => array(
+					'comment_on_threads' => $this->get_cap( 'comment_on_threads' ),
+				),
+			)
+		);
 	}
 
 	/**
 	 * Adds the standard SupportFlow capabilities to built-in WordPress roles.
 	 *
-	 * @access	public
-	 * @since	0.1
-	 * @uses	get_role, WP_Roles::add_cap
+	 * @access    public
+	 * @since     0.1
+	 * @uses      get_role, WP_Roles::add_cap
 	 *
-	 * @return	void
+	 * @return    void
 	 */
 	public function add_capabilities() {
 		$role_cap_map = $this->get_role_cap_map();
 
-		if ( empty( $role_cap_map ) )
+		if ( empty( $role_cap_map ) ) {
 			return;
+		}
 
 		// Loop through roles, adding the associated caps to each role
 		foreach ( $role_cap_map as $role => $caps ) {
@@ -121,10 +126,10 @@ public function add_capabilities() {
 	/**
 	 * Get all SF capabilities.
 	 *
-	 * @access	public
-	 * @since	0.1
+	 * @access    public
+	 * @since     0.1
 	 *
-	 * @return	array	Array of SF capabilities.
+	 * @return    array    Array of SF capabilities.
 	 */
 	public function get_caps() {
 		return $this->_caps;
@@ -133,10 +138,10 @@ public function get_caps() {
 	/**
 	 * Get the mapping of roles to capabilities.
 	 *
-	 * @access	public
-	 * @since	0.1
+	 * @access    public
+	 * @since     0.1
 	 *
-	 * @return	array	Array roles and caps.
+	 * @return    array    Array roles and caps.
 	 */
 	public function get_role_cap_map() {
 		return $this->_role_cap_map;
@@ -145,19 +150,21 @@ public function get_role_cap_map() {
 	/**
 	 * Get the name of an individual capability.
 	 *
-	 * @access	public
-	 * @since	0.1
+	 * @access    public
+	 * @since     0.1
+	 *
+	 * @param    string $cap Capability to get.
 	 *
-	 * @param 	string			$cap		Capability to get.
-	 * @return 	string|bool					Capability name on success; False on failure.
+	 * @return    string|bool                    Capability name on success; False on failure.
 	 */
 	public function get_cap( $cap ) {
 		$all_caps = $this->get_caps();
 
-		if ( array_key_exists( $cap, $all_caps ) )
-			return $all_caps[ $cap ];
-		else
+		if ( array_key_exists( $cap, $all_caps ) ) {
+			return $all_caps[$cap];
+		} else {
 			return false;
+		}
 	}
 }
 
diff --git a/classes/class-supportflow-ui-submissionform.php b/classes/class-supportflow-ui-submissionform.php
index bca448b..8b53e16 100644
--- a/classes/class-supportflow-ui-submissionform.php
+++ b/classes/class-supportflow-ui-submissionform.php
@@ -19,59 +19,68 @@ public function shortcode_submissionform() {
 		$html = '';
 
 		$html .= '<div class="supportflow-submissionform">';
-			$html .= '<form action="" method="POST">';
-
-				if ( ! empty( $this->messages ) ) {
-					foreach ( $this->messages as $message ) {
-						$html .= '<p class="supportflow-message" style="font-weight:bold;color:red;">' . $message . '</p>';
-					}
-				}
-
-				$html .= "<p>This is just an ugly form that's meant for testing. We'll probably want something like this in the final version but we can worry about that later.</p>";
-				$html .= '<p>Your Name: <input type="text" name="supportflow[name]" size="30" /></p>';
-				$html .= '<p>Your Email: <input type="text" name="supportflow[email]" size="30" /></p>';
-				$html .= '<p>Subject: <input type="text" name="supportflow[subject]" size="60" /></p>';
-				$html .= '<p>Message:</p>';
-				$html .= '<p><textarea name="supportflow[message]" cols="50" rows="10"></textarea></p>';
-				$html .= '<p><input type="submit" value="Submit" /></p>';
-			$html .= '</form>';
+		$html .= '<form action="" method="POST">';
+
+		if ( ! empty( $this->messages ) ) {
+			foreach ( $this->messages as $message ) {
+				$html .= '<p class="supportflow-message" style="font-weight:bold;color:red;">' . $message . '</p>';
+			}
+		}
+
+		$html .= "<p>This is just an ugly form that's meant for testing. We'll probably want something like this in the final version but we can worry about that later.</p>";
+		$html .= '<p>Your Name: <input type="text" name="supportflow[name]" size="30" /></p>';
+		$html .= '<p>Your Email: <input type="text" name="supportflow[email]" size="30" /></p>';
+		$html .= '<p>Subject: <input type="text" name="supportflow[subject]" size="60" /></p>';
+		$html .= '<p>Message:</p>';
+		$html .= '<p><textarea name="supportflow[message]" cols="50" rows="10"></textarea></p>';
+		$html .= '<p><input type="submit" value="Submit" /></p>';
+		$html .= '</form>';
 		$html .= '</div>';
 
 		return $html;
 	}
 
 	public function action_init_handle_form_submission() {
-		if ( empty( $_POST['supportflow'] ) || ! is_array( $_POST['supportflow'] ) )
+		if ( empty( $_POST['supportflow'] ) || ! is_array( $_POST['supportflow'] ) ) {
 			return;
+		}
 
 		$_POST['supportflow'] = array_map( 'stripslashes', $_POST['supportflow'] );
 
-		if ( empty( $_POST['supportflow']['name'] ) )
+		if ( empty( $_POST['supportflow']['name'] ) ) {
 			$this->messages[] = 'The name field is required.';
+		}
 
-		if ( empty( $_POST['supportflow']['email'] ) )
+		if ( empty( $_POST['supportflow']['email'] ) ) {
 			$this->messages[] = 'The email field is required.';
-		elseif ( ! is_email( $_POST['supportflow']['email'] ) )
+		} elseif ( ! is_email( $_POST['supportflow']['email'] ) ) {
 			$this->messages[] = 'Please enter a valid e-mail address.';
+		}
 
-		if ( empty( $_POST['supportflow']['subject'] ) )
+		if ( empty( $_POST['supportflow']['subject'] ) ) {
 			$this->messages[] = 'The subject field is required.';
+		}
 
-		if ( empty( $_POST['supportflow']['message'] ) )
+		if ( empty( $_POST['supportflow']['message'] ) ) {
 			$this->messages[] = 'You must enter a message.';
+		}
 
-		if ( ! empty( $this->messages ) )
+		if ( ! empty( $this->messages ) ) {
 			return;
+		}
 
-		$thread_id = SupportFlow()->create_thread( array(
-			'subject'         => $_POST['supportflow']['subject'],
-			'message'         => $_POST['supportflow']['message'],
-			'requester_name'  => $_POST['supportflow']['name'],
-			'requester_email' => $_POST['supportflow']['email'],
-		) );
+		$thread_id = SupportFlow()->create_thread(
+			array(
+				'subject'         => $_POST['supportflow']['subject'],
+				'message'         => $_POST['supportflow']['message'],
+				'requester_name'  => $_POST['supportflow']['name'],
+				'requester_email' => $_POST['supportflow']['email'],
+			)
+		);
 
 		if ( is_wp_error( $thread_id ) ) {
 			$this->messages[] = 'There was an error creating the thread: ' . $thread_id->get_error_message();
+
 			return;
 		}
 
diff --git a/classes/class-supportflow-ui-widget.php b/classes/class-supportflow-ui-widget.php
index 6e8b156..01e640f 100644
--- a/classes/class-supportflow-ui-widget.php
+++ b/classes/class-supportflow-ui-widget.php
@@ -5,8 +5,9 @@ class SupportFlow_UI_Widget extends SupportFlow {
 	public $script_slug = 'supportflow-user-widget';
 
 	function __construct() {
-		if ( ! empty( $_REQUEST['supportflow_widget'] ) )
+		if ( ! empty( $_REQUEST['supportflow_widget'] ) ) {
 			add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
+		}
 	}
 
 	public function setup_actions() {
@@ -20,20 +21,22 @@ public function setup_actions() {
 	 */
 	public function filter_json_api_response( $response ) {
 
-		if ( 'error' == $response['status'] )
+		if ( 'error' == $response['status'] ) {
 			return $response;
+		}
 
-		switch( $response['api-action'] ) {
+		switch ( $response['api-action'] ) {
 			case 'create-thread':
 			case 'get-thread':
-				$response['widget_title'] = get_the_title( (int)$response['thread_id'] );
-				$response['html'] = $this->render_single_thread_comments_html( (int)$response['thread_id'] );
+				$response['widget_title'] = get_the_title( (int) $response['thread_id'] );
+				$response['html']         = $this->render_single_thread_comments_html( (int) $response['thread_id'] );
 				break;
 			case 'add-thread-comment':
-				$comment = get_comment( $response['comment_id'] );
+				$comment          = get_comment( $response['comment_id'] );
 				$response['html'] = '<li>' . $this->render_single_comment_html( $comment ) . '</li>';
 				break;
 		}
+
 		return $response;
 	}
 
@@ -42,10 +45,11 @@ public function render_single_thread_comments_html( $thread_id ) {
 		$comments = SupportFlow()->get_thread_comments( $thread_id, array( 'status' => 'public', 'order' => 'ASC' ) );
 
 		$output = '<ul class="thread-comments">';
-		foreach( $comments as $comment ) {
+		foreach ( $comments as $comment ) {
 			$output .= '<li>' . $this->render_single_comment_html( $comment ) . '</li>';
 		}
 		$output .= '</ul>';
+
 		return $output;
 	}
 
@@ -53,12 +57,13 @@ public function render_single_comment_html( $comment ) {
 		$comment_timestamp = get_comment_date( 'M. n', $comment->comment_ID );
 
 		$output = '<div class="thread-comment-body">'
-				. wpautop( stripslashes( $comment->comment_content ) )
-				. '</div>'
-				. '<div class="thread-comment-meta">'
-				. '<span class="thread-comment-author">' . esc_html( $comment->comment_author ) . '</span>'
-				. '<span class="thread-comment-timestamp">' . esc_html( $comment_timestamp ) . '</span>'
-				. '</div>';
+			. wpautop( stripslashes( $comment->comment_content ) )
+			. '</div>'
+			. '<div class="thread-comment-meta">'
+			. '<span class="thread-comment-author">' . esc_html( $comment->comment_author ) . '</span>'
+			. '<span class="thread-comment-timestamp">' . esc_html( $comment_timestamp ) . '</span>'
+			. '</div>';
+
 		return $output;
 	}
 
@@ -71,11 +76,11 @@ public function render_all_threads_html() {
 			$output = '<div class="thread nothreads">' . __( 'No open threads.', 'supportflow' ) . '</div>';
 		} else {
 			$output = '<ul id="respondent-threads">';
-			foreach( $threads as $thread ) {
+			foreach ( $threads as $thread ) {
 				$output .= '<li id="thread-' . $thread->ID . '">';
 				$output .= '<h4 class="thread-title">' . get_the_title( $thread->ID ) . '</h4>';
 				$output .= '<div class="thread-comments">';
-				$comments = SupportFlow()->get_thread_comments( $thread->ID, array( 'status' => 'public' ) );
+				$comments     = SupportFlow()->get_thread_comments( $thread->ID, array( 'status' => 'public' ) );
 				$last_comment = array_shift( $comments );
 				$output .= $this->render_single_comment_html( $last_comment );
 				$output .= '</div>';
@@ -83,6 +88,7 @@ public function render_all_threads_html() {
 			}
 			$output .= '</ul>';
 		}
+
 		return $output;
 
 	}
@@ -102,20 +108,20 @@ public function action_template_redirect() {
 
 		$widget_title = __( 'Support', 'supportflow' );
 
-		$start_thread_text = __( 'Start thread', 'supportflow' );
+		$start_thread_text    = __( 'Start thread', 'supportflow' );
 		$starting_thread_text = __( 'Starting thread...', 'supportflow' );
-		$send_reply_text = __( 'Send reply', 'supportflow' );
-		$sending_reply_text = __( 'Sending reply...', 'supportflow' );
+		$send_reply_text      = __( 'Send reply', 'supportflow' );
+		$sending_reply_text   = __( 'Sending reply...', 'supportflow' );
 		wp_localize_script(
 			$this->script_slug,
 			'SupportFlowUserWidgetVars',
 			array(
-				'ajaxurl'                       => $ajaxurl,
-				'widget_title'                  => $widget_title,
-				'start_thread_text'             => $start_thread_text,
-				'starting_thread_text'          => $starting_thread_text,
-				'send_reply_text'               => $send_reply_text,
-				'sending_reply_text'            => $sending_reply_text,
+				'ajaxurl'              => $ajaxurl,
+				'widget_title'         => $widget_title,
+				'start_thread_text'    => $start_thread_text,
+				'starting_thread_text' => $starting_thread_text,
+				'send_reply_text'      => $send_reply_text,
+				'sending_reply_text'   => $sending_reply_text,
 			)
 		);
 
@@ -147,7 +153,7 @@ public function action_template_redirect() {
 	</div>
 
 	<div id="supportflow-all-threads">
-<?php echo $this->render_all_threads_html(); ?>
+		<?php echo $this->render_all_threads_html(); ?>
 	</div>
 
 	<div id="supportflow-single-thread">
diff --git a/classes/class-supportflow-wp-cli.php b/classes/class-supportflow-wp-cli.php
index 68a617e..a551788 100644
--- a/classes/class-supportflow-wp-cli.php
+++ b/classes/class-supportflow-wp-cli.php
@@ -12,8 +12,9 @@ class SupportFlow_WPCLI extends WP_CLI_Command {
 	 */
 	public static function help() {
 
-		WP_CLI::line( <<<EOB
-usage: wp supportflow <parameters>
+		WP_CLI::line(
+			<<<EOB
+			usage: wp supportflow <parameters>
 Possible subcommands:
 					download_and_process_email_replies
 					import_remote               Import from a remote SupportFlow
@@ -31,22 +32,23 @@ public static function help() {
 	 */
 	public function download_and_process_email_replies( $args, $assoc_args ) {
 
-		$defaults = array(
-				'host'           => '', // '{imap.gmail.com:993/imap/ssl/novalidate-cert}' for Gmail
-				'username'       => '', // Full email address for Gmail
-				'password'       => '', // Whatever the password is
-				'inbox'          => 'INBOX', // Where the new emails will go
-				'archive'        => 'SF_ARCHIVE', // Where you'd like emails put after they've been processed
-			);
+		$defaults           = array(
+			'host'     => '', // '{imap.gmail.com:993/imap/ssl/novalidate-cert}' for Gmail
+			'username' => '', // Full email address for Gmail
+			'password' => '', // Whatever the password is
+			'inbox'    => 'INBOX', // Where the new emails will go
+			'archive'  => 'SF_ARCHIVE', // Where you'd like emails put after they've been processed
+		);
 		$connection_details = wp_parse_args( $assoc_args, $defaults );
 
 		// Allow the connection details to be stored in a secret config file or similar
 		$connection_details = apply_filters( 'supportflow_imap_connection_details', $connection_details );
-		$retval = SupportFlow()->extend->email_replies->download_and_process_email_replies( $connection_details );
-		if ( is_wp_error( $retval ) )
+		$retval             = SupportFlow()->extend->email_replies->download_and_process_email_replies( $connection_details );
+		if ( is_wp_error( $retval ) ) {
 			WP_CLI::error( $retval->get_error_message() );
-		else
+		} else {
 			WP_CLI::success( $retval );
+		}
 	}
 
 	/**
@@ -57,12 +59,12 @@ public function download_and_process_email_replies( $args, $assoc_args ) {
 	public function import_remote( $args, $assoc_args ) {
 
 		$defaults = array(
-				'db_host'                   => '',
-				'db_name'                   => '',
-				'db_user'                   => '',
-				'db_pass'                   => '',
-				'table_prefix'              => 'support_',
-			);
+			'db_host'      => '',
+			'db_name'      => '',
+			'db_user'      => '',
+			'db_pass'      => '',
+			'table_prefix' => 'support_',
+		);
 
 		$this->args = wp_parse_args( $assoc_args, $defaults );
 
@@ -77,31 +79,31 @@ public function import_remote( $args, $assoc_args ) {
 
 		// Register our tables
 		$sp_tables = array(
-				'messagemeta',
-				'messages',
-				'predefined_messages',
-				'tags',
-				'threadmeta',
-				'threads',
-				'usermeta',
-				'users',
-			);
-		foreach( $sp_tables as $sp_table ) {
+			'messagemeta',
+			'messages',
+			'predefined_messages',
+			'tags',
+			'threadmeta',
+			'threads',
+			'usermeta',
+			'users',
+		);
+		foreach ( $sp_tables as $sp_table ) {
 			$table_name = $this->args['table_prefix'] . $sp_table;
-			if ( !in_array( $table_name, $spdb->tables ) ) {
+			if ( ! in_array( $table_name, $spdb->tables ) ) {
 				$spdb->tables[$sp_table] = $table_name;
-				$spdb->$sp_table = $table_name;
+				$spdb->$sp_table         = $table_name;
 			}
 		}
-		
+
 		/**
 		 * Import threads and their messages
 		 *
 		 * @todo Support for importing priorities. This seems to exist in the schema for old SP, but not in the interface
 		 */
-		$old_threads = $spdb->get_results( "SELECT * FROM $spdb->threads" );
+		$old_threads           = $spdb->get_results( "SELECT * FROM $spdb->threads" );
 		$count_threads_created = 0;
-		foreach( $old_threads as $old_thread ) {
+		foreach ( $old_threads as $old_thread ) {
 
 			// Don't import a thread that's already been imported
 			if ( $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE '_imported_id'=%d", $old_thread->thread_id ) ) ) {
@@ -111,39 +113,41 @@ public function import_remote( $args, $assoc_args ) {
 
 			// Create the new thread
 			$thread_args = array(
-					'subject'                => $old_thread->subject,
-					'date'                   => $old_thread->dt,
-					'status'            => 'sf_' . $old_thread->state,
-				);
-			$thread_id = SupportFlow()->create_thread( $thread_args );
-			if ( is_wp_error( $thread_id ) )
+				'subject' => $old_thread->subject,
+				'date'    => $old_thread->dt,
+				'status'  => 'sf_' . $old_thread->state,
+			);
+			$thread_id   = SupportFlow()->create_thread( $thread_args );
+			if ( is_wp_error( $thread_id ) ) {
 				continue;
+			}
 
 			// Add the respondent to the thread
 			SupportFlow()->update_thread_respondents( $thread_id, $old_thread->email );
 
 			// Get the thread's messages and import those too
-			$old_messages = (array)$spdb->get_results( $spdb->prepare( "SELECT * FROM $spdb->messages WHERE thread_id=%d", $old_thread->thread_id ) );
+			$old_messages   = (array) $spdb->get_results( $spdb->prepare( "SELECT * FROM $spdb->messages WHERE thread_id=%d", $old_thread->thread_id ) );
 			$count_comments = 0;
-			foreach( $old_messages as $old_message ) {
+			foreach ( $old_messages as $old_message ) {
 				$message_args = array(
-						'comment_author'              => $old_message->email,
-						'comment_author_email'        => $old_message->email,
-						'time'                        => $old_message->dt,
-						'comment_approved'            => ( 'note' == $old_message->message_type ) ? 'private' : 'public',
-					);
-				if ( function_exists( 'What_The_Email' ) )
+					'comment_author'       => $old_message->email,
+					'comment_author_email' => $old_message->email,
+					'time'                 => $old_message->dt,
+					'comment_approved'     => ( 'note' == $old_message->message_type ) ? 'private' : 'public',
+				);
+				if ( function_exists( 'What_The_Email' ) ) {
 					$old_message->content = What_The_Email()->get_message( $old_message->content );
+				}
 				$comment_id = SupportFlow()->add_thread_comment( $thread_id, $old_message->content, $message_args );
 				add_comment_meta( $comment_id, '_imported_id', $old_message->message_id );
-				$count_comments++;
+				$count_comments ++;
 			}
 
 			// One the thread is created, log the old thread ID
 			update_post_meta( $thread_id, '_imported_id', $old_thread->thread_id );
 
 			WP_CLI::line( "Created: #{$old_thread->thread_id} '{$old_thread->subject}' with {$count_comments} comments" );
-			$count_threads_created++;
+			$count_threads_created ++;
 		}
 
 		/**
diff --git a/css/admin.css b/css/admin.css
index 8d308fc..c37d50b 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -22,8 +22,8 @@
 
 #supportflow-subject.postbox,
 #supportflow-respondents.postbox {
-	border:none;
-	background:none;
+	border: none;
+	background: none;
 }
 
 #supportflow-subject.postbox .inside,
@@ -39,7 +39,7 @@
 #supportflow-respondents h3.hndle,
 #supportflow-comments .handlediv,
 #supportflow-comments h3.hndle {
-	display:none;
+	display: none;
 }
 
 #supportflow-details .handlediv,
@@ -67,7 +67,7 @@
 #supportflow-subject h4,
 #supportflow-respondents h4,
 #supportflow-comments h4 {
-	font-family: Georgia,"Times New Roman","Bitstream Charter",Times,serif;
+	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
 	font-size: 13px;
 	font-weight: normal;
 	margin-left: 0;
@@ -90,6 +90,7 @@
 	padding: 8px;
 	font-size: 1.2em;
 }
+
 #supportflow-comments.postbox #comment-reply {
 	width: 100%;
 }
@@ -102,7 +103,7 @@
 }
 
 #supportflow-comments.postbox .inside #message-tools #submit-action {
-	padding:0;
+	padding: 0;
 	margin-top: 5px;
 	float: right;
 }
@@ -151,7 +152,7 @@
 }
 
 #supportflow-comments.postbox ul.thread-comments li {
-	clear:left;
+	clear: left;
 	margin-top: 20px;
 	margin-bottom: 20px;
 }
@@ -197,15 +198,17 @@
 }
 
 input::-webkit-input-placeholder {
-	color:#BBB;
+	color: #BBB;
 }
+
 input:-moz-placeholder {
-	color:#BBB;
+	color: #BBB;
 }
 
 textarea::-webkit-input-placeholder {
-	color:#BBB;
+	color: #BBB;
 }
+
 textarea:-moz-placeholder {
-	color:#BBB;
+	color: #BBB;
 }
\ No newline at end of file
diff --git a/css/widget.css b/css/widget.css
index e90c0fe..29dc45a 100644
--- a/css/widget.css
+++ b/css/widget.css
@@ -14,7 +14,7 @@ body {
 }
 
 #supportflow-back {
-	display:none;
+	display: none;
 	position: relative;
 	background-color: #fff;
 	border: 1px solid #bbb;
@@ -37,6 +37,7 @@ body {
 #supportflow-newthread-box {
 	padding: 10px 0;
 }
+
 #supportflow-newthread,
 #new-thread-submit {
 	background-color: #fff;
@@ -49,6 +50,7 @@ body {
 	white-space: nowrap;
 	-webkit-border-radius: 15px;
 }
+
 #new-thread-submit {
 	margin-top: 10px;
 }
@@ -61,7 +63,7 @@ body {
 #supportflow-existing-thread-form textarea {
 	width: 100%;
 	font-size: 16px;
-	font-weight:200;
+	font-weight: 200;
 	border: 1px solid #BBB;
 	-webkit-border-radius: 3px;
 	-moz-border-radius: 3px;
@@ -89,7 +91,7 @@ body {
 
 #supportflow-newthread-form input[type='submit']:hover,
 #supportflow-existing-thread-form input[type='submit']:hover {
-	cursor:pointer;
+	cursor: pointer;
 	border-color: #888;
 	color: #111;
 }
@@ -102,9 +104,11 @@ body {
 #supportflow-back:active {
 	border-color: #666;
 }
+
 #supportflow-all-threads .thread .time {
 	color: gray;
 }
+
 #supportflow-all-threads .nothreads {
 	border-bottom: 1px solid #989898;
 	border-top: 1px solid #989898;
@@ -113,17 +117,21 @@ body {
 	padding: 20px 0;
 	text-align: center;
 }
+
 #supportflow-newthread-form {
 	display: none;
 	margin: 0;
 }
+
 #supportflow-newthread-form input[name="subject"] {
 	margin-bottom: 6px;
 }
+
 #supportflow-newthread-form input[type="text"] {
 	font-size: 14px;
 	line-height: 150%;
 }
+
 #supportflow-newthread-form input[type="text"] {
 	border: 1px solid #ccc;
 	-webkit-border-radius: 3px;
@@ -132,48 +140,58 @@ body {
 	padding: 3px 8px;
 	width: 100%;
 }
+
 #supportflow-help:hover,
 #supportflow-help:active {
 	background-color: #13455b;
 }
 
 #supportflow-single-thread {
-	display:none;
+	display: none;
 }
+
 #supportflow-single-thread ul,
 #supportflow-all-threads ul {
 	list-style-type: none;
 	margin: 0;
 	padding: 0;
 }
+
 #supportflow-single-thread ul li,
 #supportflow-all-threads ul li {
 	border-bottom: 1px solid #ECECEC;
 	padding: 5px 5px 10px 5px;
 }
+
 #supportflow-all-threads ul li:first-child {
 	border-top: 1px solid #ECECEC;
 	padding-top: 0;
 }
+
 #supportflow-all-threads ul li:hover {
 	background-color: #fff;
 	cursor: pointer;
 }
+
 #supportflow-all-threads ul li h4 {
 	font: bold 14px/18px "Helvetica Neue", sans-serif;
 	margin: 10px 0 0 0;
 }
+
 .thread-comments .thread-comment-body p {
 	font: 13px/18px "Helvetica Neue", sans-serif;
 	margin: 5px 0;
 }
+
 .thread-comments .thread-comment-meta {
 	font-size: 12px;
 	color: #888;
 }
+
 .thread-comments .thread-comment-meta .thread-comment-author {
 	font-weight: bold;
 }
+
 .thread-comments .thread-comment-meta .thread-comment-timestamp {
 	float: right;
 }
\ No newline at end of file
diff --git a/js/plupload.js b/js/plupload.js
index 1590a80..81a7f5b 100644
--- a/js/plupload.js
+++ b/js/plupload.js
@@ -1,26 +1,26 @@
-jQuery(document).ready(function($) {
+jQuery(document).ready(function ($) {
 	new wp.Uploader({
 
 		/* Selectors */
-		browser:   '#upload-indicator',
-		dropzone:  '#comment-reply',
+		browser : '#upload-indicator',
+		dropzone: '#comment-reply',
 
 		/* Callbacks */
-		success  : function( attachment ) {
-			$( '#comment-attachments' ).val( $( '#comment-attachments' ).val() + ',' + attachment.id );
-			$( '#upload-messages' ).hide();
-			$( '<li>', {
+		success : function (attachment) {
+			$('#comment-attachments').val($('#comment-attachments').val() + ',' + attachment.id);
+			$('#upload-messages').hide();
+			$('<li>', {
 				html: '<a target="_blank" href="' + attachment.url + '">' + attachment.title + '</a>',
-			 } ).appendTo( $( 'ul#comment-attachments-list' ) );
-			$( '#upload-messages' ).removeClass( 'uploading' );
+			}).appendTo($('ul#comment-attachments-list'));
+			$('#upload-messages').removeClass('uploading');
 		},
 
-		error    : function ( reason ) {
-			$( '#upload-indicator' ).html( reason ).addClass('error');
+		error: function (reason) {
+			$('#upload-indicator').html(reason).addClass('error');
 		},
 
-		added    : function() {
-			$( '#upload-indicator' ).addClass( 'uploading' );
+		added: function () {
+			$('#upload-indicator').addClass('uploading');
 		},
 
 		// TypeError: file is undefined
@@ -28,8 +28,8 @@ jQuery(document).ready(function($) {
 		// 	$( '#upload-indicator' ).html( "Uploading: " + file.name + ' ' + file.percent + '%' );
 		// },
 
-		complete : function() {
-			$( '#upload-indicator' ).html( 'All done!' );
+		complete: function () {
+			$('#upload-indicator').html('All done!');
 		}
 	});
 });
diff --git a/js/respondents-autocomplete.js b/js/respondents-autocomplete.js
index 55f015d..514e9b0 100644
--- a/js/respondents-autocomplete.js
+++ b/js/respondents-autocomplete.js
@@ -1,36 +1,36 @@
-jQuery(document).ready(function($) {
-	
-	var getSearchTerm = function() {
+jQuery(document).ready(function ($) {
+
+	var getSearchTerm = function () {
 
 		// Input of the Respondents field can contain multiple addresses,
 		// we only want to search on the last address
 		var resps = $('#respondents').val().replace(" ", '').split(",");
 
-		if( $.isArray(resps) && resps.length > 1 ) {
+		if ($.isArray(resps) && resps.length > 1) {
 			var search_for = resps.pop();
 		}
 		else {
 			search_for = resps[0];
 		}
 
-		return { "respondents":search_for, "api-action":'get-respondents' };
-		
-	}	
+		return { "respondents": search_for, "api-action": 'get-respondents' };
+
+	}
 
 	$('#respondents').autocomplete({
 
-		source: function( req, response ) {
-			
+		source   : function (req, response) {
+
 			$.ajax({
-				url: SFRespondentsAc.ajax_url,
+				url     : SFRespondentsAc.ajax_url,
 				dataType: 'json',
-				data: getSearchTerm(),
-				success: function(data) {
-					if(data.query == "") {
+				data    : getSearchTerm(),
+				success : function (data) {
+					if (data.query == "") {
 						response(false);
 						return false;
 					}
-					response( $.map( data.respondents, function (item) {
+					response($.map(data.respondents, function (item) {
 
 						// normaliz input
 						var resps = $('#respondents').val().replace(" ", '').split(",");
diff --git a/js/supportflow-user-widget.js b/js/supportflow-user-widget.js
index 695d4be..2c2395f 100644
--- a/js/supportflow-user-widget.js
+++ b/js/supportflow-user-widget.js
@@ -4,54 +4,54 @@
 
 var supportflow = {};
 
-( function( $ ) {
+(function ($) {
 
-	supportflow.init = function() {
+	supportflow.init = function () {
 		supportflow.widget_title = $('h1#widget-title');
 		supportflow.original_widget_title = supportflow.widget_title.html();
 		supportflow.back_button = $('#supportflow-back');
-		supportflow.back_button.click( supportflow.hide_single_thread_view );
+		supportflow.back_button.click(supportflow.hide_single_thread_view);
 
 		// Creating a new thread
 		supportflow.new_thread_button = $('#supportflow-newthread');
 		supportflow.new_thread_form = $('#supportflow-newthread-form');
-		supportflow.new_thread_subject = supportflow.new_thread_form.find('#new-thread-subject' );
-		supportflow.new_thread_message = supportflow.new_thread_form.find('#new-thread-message' );
-		supportflow.new_thread_submit = supportflow.new_thread_form.find('#new-thread-submit' );
+		supportflow.new_thread_subject = supportflow.new_thread_form.find('#new-thread-subject');
+		supportflow.new_thread_message = supportflow.new_thread_form.find('#new-thread-message');
+		supportflow.new_thread_submit = supportflow.new_thread_form.find('#new-thread-submit');
 
-		supportflow.new_thread_button.click( supportflow.show_new_thread_form );
-		supportflow.new_thread_form.submit( supportflow.submit_new_thread_form );
+		supportflow.new_thread_button.click(supportflow.show_new_thread_form);
+		supportflow.new_thread_form.submit(supportflow.submit_new_thread_form);
 
 		// Viewing all threads
 		supportflow.all_threads_view = $('#supportflow-all-threads');
-		supportflow.all_threads_view.find('li').click( supportflow.show_single_thread_view );
+		supportflow.all_threads_view.find('li').click(supportflow.show_single_thread_view);
 
 		// Viewing an existing thread
 		supportflow.single_thread_view = $('#supportflow-single-thread');
 		supportflow.single_thread_body = supportflow.single_thread_view.find('#supportflow-thread-body');
 		supportflow.single_thread_form = supportflow.single_thread_view.find('#supportflow-existing-thread-form');
-		supportflow.single_thread_id = supportflow.single_thread_form.find('#existing-thread-id' );
+		supportflow.single_thread_id = supportflow.single_thread_form.find('#existing-thread-id');
 		supportflow.single_thread_message = supportflow.single_thread_view.find('#existing-thread-message');
-		supportflow.single_thread_submit = supportflow.single_thread_form.find('#existing-thread-submit' );
+		supportflow.single_thread_submit = supportflow.single_thread_form.find('#existing-thread-submit');
 
-		supportflow.single_thread_form.submit( supportflow.submit_new_message_form );
+		supportflow.single_thread_form.submit(supportflow.submit_new_message_form);
 
 	};
 
-	supportflow.get_ajax_url = function( action ) {
+	supportflow.get_ajax_url = function (action) {
 		return SupportFlowUserWidgetVars.ajaxurl + '&api-action=' + action;
 	};
 
-	supportflow.show_new_thread_form = function() {
+	supportflow.show_new_thread_form = function () {
 		$(this).hide();
 		$('#supportflow-newthread-form').slideDown();
 	};
 
-	supportflow.hide_new_thread_form = function() {
+	supportflow.hide_new_thread_form = function () {
 
 	}
 
-	supportflow.hide_single_thread_view = function() {
+	supportflow.hide_single_thread_view = function () {
 		supportflow.single_thread_view.hide();
 		supportflow.widget_title.html(supportflow.original_widget_title);
 		supportflow.all_threads_view.attr('opacity', '1').show();
@@ -59,7 +59,7 @@ var supportflow = {};
 		supportflow.back_button.hide();
 	}
 
-	supportflow.show_single_thread_view = function( e ) {
+	supportflow.show_single_thread_view = function (e) {
 		e.preventDefault();
 
 		supportflow.back_button.show();
@@ -67,94 +67,94 @@ var supportflow = {};
 		supportflow.new_thread_button.hide();
 		supportflow.all_threads_view.attr('opacity', '0.5');
 		supportflow.widget_title.html($(this).find('.thread-title').html());
-		var thread_id = $(this).attr('id').replace('thread-','');
+		var thread_id = $(this).attr('id').replace('thread-', '');
 		var data = {
-			thread_id:               thread_id,
-			supportflow_widget:     true,
+			thread_id         : thread_id,
+			supportflow_widget: true,
 		}
-		$.get( supportflow.get_ajax_url( 'get-thread' ), data, supportflow.handle_new_thread_response );
+		$.get(supportflow.get_ajax_url('get-thread'), data, supportflow.handle_new_thread_response);
 
 	}
 
-	supportflow.submit_new_thread_form = function( e ) {
+	supportflow.submit_new_thread_form = function (e) {
 		e.preventDefault();
 
-		supportflow.disable_thread_form( supportflow.new_thread_form, SupportFlowUserWidgetVars.starting_thread_text );
+		supportflow.disable_thread_form(supportflow.new_thread_form, SupportFlowUserWidgetVars.starting_thread_text);
 
 		var data = {
-			subject:                 supportflow.new_thread_subject.val(),
-			message:                 supportflow.new_thread_message.val(),
-			supportflow_widget:     true,
+			subject           : supportflow.new_thread_subject.val(),
+			message           : supportflow.new_thread_message.val(),
+			supportflow_widget: true,
 		}
-		$.post( supportflow.get_ajax_url( 'create-thread' ), data, supportflow.handle_new_thread_response );
+		$.post(supportflow.get_ajax_url('create-thread'), data, supportflow.handle_new_thread_response);
 	}
 
-	supportflow.submit_new_message_form = function( e ) {
+	supportflow.submit_new_message_form = function (e) {
 		e.preventDefault();
 
-		supportflow.disable_thread_form( supportflow.single_thread_form, SupportFlowUserWidgetVars.sending_reply_text );
+		supportflow.disable_thread_form(supportflow.single_thread_form, SupportFlowUserWidgetVars.sending_reply_text);
 
 		var data = {
-			thread_id:               supportflow.single_thread_id.val(),
-			message:                 supportflow.single_thread_message.val(),
-			supportflow_widget:     true,
+			thread_id         : supportflow.single_thread_id.val(),
+			message           : supportflow.single_thread_message.val(),
+			supportflow_widget: true,
 		}
-		$.post( supportflow.get_ajax_url( 'add-thread-comment' ), data, supportflow.handle_new_message_response );
+		$.post(supportflow.get_ajax_url('add-thread-comment'), data, supportflow.handle_new_message_response);
 	}
 
-	supportflow.enable_thread_form = function( form, clear_form, submit_text ) {
+	supportflow.enable_thread_form = function (form, clear_form, submit_text) {
 		form.find('input.thread-subject').removeAttr('disabled');
 		form.find('textarea.thread-message').removeAttr('disabled');
 		form.find('input.submit-button').removeAttr('disabled').val(submit_text).removeClass('disabled');
-		if ( clear_form ) {
+		if (clear_form) {
 			form.find('input.thread-subject').val('');
 			form.find('textarea.thread-message').val('');
 		}
 	}
 
-	supportflow.disable_thread_form = function( form, submit_text ) {
+	supportflow.disable_thread_form = function (form, submit_text) {
 		form.find('input.thread-subject').attr('disabled', 'disabled');
 		form.find('textarea.thread-message').attr('disabled', 'disabled');
 		form.find('input.submit-form').attr('disabled', 'disabled').val(submit_text).addClass('disabled');
 	}
 
-	supportflow.handle_new_thread_response = function( response ) {
+	supportflow.handle_new_thread_response = function (response) {
 
 		// If there was an error in the process, re-enable the form and show the error message
-		if ( 'error' == response.status ) {
-			supportflow.enable_thread_form( supportflow.new_thread_form, false, SupportFlowUserWidgetVars.start_thread_text );
+		if ('error' == response.status) {
+			supportflow.enable_thread_form(supportflow.new_thread_form, false, SupportFlowUserWidgetVars.start_thread_text);
 			return;
 		}
 
 		// Restore and hide the form
-		supportflow.enable_thread_form( supportflow.new_thread_form, true, SupportFlowUserWidgetVars.start_thread_text );
+		supportflow.enable_thread_form(supportflow.new_thread_form, true, SupportFlowUserWidgetVars.start_thread_text);
 		supportflow.new_thread_form.hide();
 		supportflow.all_threads_view.hide();
 
 		// We're good to render the single thread
 		supportflow.widget_title.html(response.title);
-		supportflow.single_thread_body.html( response.html );
+		supportflow.single_thread_body.html(response.html);
 		supportflow.single_thread_view.show();
 		supportflow.single_thread_id.val(response.thread_id);
 
 	}
 
-	supportflow.handle_new_message_response = function( response ) {
+	supportflow.handle_new_message_response = function (response) {
 
 		// If there was an error in the process, re-enable the form and show the error message
-		if ( 'error' == response.status ) {
+		if ('error' == response.status) {
 			// @todo display the error message
-			supportflow.enable_thread_form( supportflow.single_thread_form, false, SupportFlowUserWidgetVars.send_reply_text );
+			supportflow.enable_thread_form(supportflow.single_thread_form, false, SupportFlowUserWidgetVars.send_reply_text);
 			return;
 		}
 
 		// Renable the form and append the response
-		supportflow.enable_thread_form( supportflow.single_thread_form, true, SupportFlowUserWidgetVars.send_reply_text );
-		supportflow.single_thread_body.find( 'ul' ).append( response.html );
+		supportflow.enable_thread_form(supportflow.single_thread_form, true, SupportFlowUserWidgetVars.send_reply_text);
+		supportflow.single_thread_body.find('ul').append(response.html);
 
 	}
 
 	// Initialize everything!
-	$( document ).ready( supportflow.init );
+	$(document).ready(supportflow.init);
 
-} )( jQuery );
\ No newline at end of file
+})(jQuery);
\ No newline at end of file
diff --git a/supportflow-user-widget.php b/supportflow-user-widget.php
index 3b7bc66..96ae3c5 100644
--- a/supportflow-user-widget.php
+++ b/supportflow-user-widget.php
@@ -1,19 +1,20 @@
 <?php
 
-add_action( 'wp_enqueue_scripts',      'sf_user_widget_enqueue_scripts' );
-add_action( 'admin_enqueue_scripts',   'sf_user_widget_enqueue_scripts' );
+add_action( 'wp_enqueue_scripts', 'sf_user_widget_enqueue_scripts' );
+add_action( 'admin_enqueue_scripts', 'sf_user_widget_enqueue_scripts' );
 function sf_user_widget_enqueue_scripts() {
 	wp_enqueue_script( 'jquery' );
 }
 
-add_action( 'wp_footer',        'sf_user_widget_load_footer' );
-add_action( 'admin_footer',     'sf_user_widget_load_footer' );
+add_action( 'wp_footer', 'sf_user_widget_load_footer' );
+add_action( 'admin_footer', 'sf_user_widget_load_footer' );
 function sf_user_widget_load_footer() {
 	$query_arg = 'supportflow_widget';
 
 	// If being run on the same site as SupportFlow, prevent infinite widgets
-	if ( ! empty( $_GET[$query_arg] ) )
+	if ( ! empty( $_GET[$query_arg] ) ) {
 		return;
+	}
 
 	/**
 	 * This variable will need to be replaced with a UI or whatnot
@@ -22,14 +23,14 @@ function sf_user_widget_load_footer() {
 	 */
 	$supportflow_install_url = home_url();
 
-?>
+	?>
 
-<div id="supportflow-widget" style="display:none;  position:fixed;bottom:0px;right:0px;z-index:10000; width:350px;height:85%;background-color:#f9f9f9;box-shadow: -2px 0px 6px rgba(102, 102, 102, .6);-webkit-box-shadow: -2px 0px 6px rgba(102, 102, 102, .6);-moz-box-shadow: -2px 0px 6px rgba(102, 102, 102, .6);border:1px solid #989898; border-right:none;border-bottom:none;">
-	<button id="supportflow-widget-close" style="position:absolute;top:0;right:10px;cursor:pointer;color: #666;margin: -37px 25px -1px 0;z-index: 10000;font: bold 14px Helvetica, Arial, sans-serif;padding: 10px;background-color: #f9f9f9;border: 1px solid #989898;border-bottom: none;-webkit-border-top-left-radius: 10px;-webkit-border-top-right-radius: 10px;-moz-border-radius-topleft: 10px;-moz-border-radius-topright: 10px;border-top-left-radius: 10px;border-top-right-radius: 10px;" onclick="jQuery('#supportflow-widget').slideUp(function(){jQuery('#supportflow-help').fadeIn();});"><?php _e( 'Close', 'supportflow-user-widget' ); ?></button>
-	<iframe width="100%" height="100%" src="<?php echo esc_url( add_query_arg( $query_arg, 1, $supportflow_install_url ) ); ?>"></iframe>
-</div>
+	<div id="supportflow-widget" style="display:none;  position:fixed;bottom:0px;right:0px;z-index:10000; width:350px;height:85%;background-color:#f9f9f9;box-shadow: -2px 0px 6px rgba(102, 102, 102, .6);-webkit-box-shadow: -2px 0px 6px rgba(102, 102, 102, .6);-moz-box-shadow: -2px 0px 6px rgba(102, 102, 102, .6);border:1px solid #989898; border-right:none;border-bottom:none;">
+		<button id="supportflow-widget-close" style="position:absolute;top:0;right:10px;cursor:pointer;color: #666;margin: -37px 25px -1px 0;z-index: 10000;font: bold 14px Helvetica, Arial, sans-serif;padding: 10px;background-color: #f9f9f9;border: 1px solid #989898;border-bottom: none;-webkit-border-top-left-radius: 10px;-webkit-border-top-right-radius: 10px;-moz-border-radius-topleft: 10px;-moz-border-radius-topright: 10px;border-top-left-radius: 10px;border-top-right-radius: 10px;" onclick="jQuery('#supportflow-widget').slideUp(function(){jQuery('#supportflow-help').fadeIn();});"><?php _e( 'Close', 'supportflow-user-widget' ); ?></button>
+		<iframe width="100%" height="100%" src="<?php echo esc_url( add_query_arg( $query_arg, 1, $supportflow_install_url ) ); ?>"></iframe>
+	</div>
 
-<button id="supportflow-help" style="cursor:pointer;color: #fff;position: fixed;bottom: 0;right: 0;margin: 0 25px -1px 0;z-index: 10000;font: bold 14px Helvetica, Arial, sans-serif;padding: 10px;background-color: #21759b;border: 1px solid #fff;border-bottom: none;-moz-box-shadow: 0px 0px 6px rgba(102, 102, 102, .6);-webkit-box-shadow: 0px 0px 6px rgba(102, 102, 102, .6);box-shadow: 0px 0px 2px rgba(102, 102, 102, .6);-webkit-border-top-left-radius: 10px;-webkit-border-top-right-radius: 10px;-moz-border-radius-topleft: 10px;-moz-border-radius-topright: 10px;border-top-left-radius: 10px;border-top-right-radius: 10px;" onclick="jQuery(this).hide();jQuery('#supportflow-widget').slideDown();">Need help?</button>
+	<button id="supportflow-help" style="cursor:pointer;color: #fff;position: fixed;bottom: 0;right: 0;margin: 0 25px -1px 0;z-index: 10000;font: bold 14px Helvetica, Arial, sans-serif;padding: 10px;background-color: #21759b;border: 1px solid #fff;border-bottom: none;-moz-box-shadow: 0px 0px 6px rgba(102, 102, 102, .6);-webkit-box-shadow: 0px 0px 6px rgba(102, 102, 102, .6);box-shadow: 0px 0px 2px rgba(102, 102, 102, .6);-webkit-border-top-left-radius: 10px;-webkit-border-top-right-radius: 10px;-moz-border-radius-topleft: 10px;-moz-border-radius-topright: 10px;border-top-left-radius: 10px;border-top-right-radius: 10px;" onclick="jQuery(this).hide();jQuery('#supportflow-widget').slideDown();">Need help?</button>
 
 <?php
 }
\ No newline at end of file
diff --git a/supportflow.php b/supportflow.php
index 9131043..774ac8c 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -2,10 +2,10 @@
 
 /**
  * Plugin Name: SupportFlow
- * Plugin URI:  
+ * Plugin URI:
  * Description: Reinventing how you support your customers.
  * Author:      Daniel Bachhuber, Alex Mills, Andrew Spittle
- * Author URI:  
+ * Author URI:
  * Version:     0.1
  *
  * Text Domain: supportflow
@@ -52,12 +52,12 @@ class SupportFlow {
 	 * Ensures that only one instance of SupportFlow exists in memory at any one
 	 * time. Also prevents needing to define globals all over the place.
 	 *
-	 * @since SupportFlow 0.1
+	 * @since     SupportFlow 0.1
 	 * @staticvar array $instance
-	 * @uses SupportFlow::setup_globals() Setup the globals needed
-	 * @uses SupportFlow::includes() Include the required files
-	 * @uses SupportFlow::setup_actions() Setup the hooks and actions
-	 * @see SupportFlow()
+	 * @uses      SupportFlow::setup_globals() Setup the globals needed
+	 * @uses      SupportFlow::includes() Include the required files
+	 * @uses      SupportFlow::setup_actions() Setup the hooks and actions
+	 * @see       SupportFlow()
 	 * @return The one true SupportFlow
 	 */
 	public static function instance() {
@@ -67,6 +67,7 @@ public static function instance() {
 			self::$instance->includes();
 			self::$instance->setup_actions();
 		}
+
 		return self::$instance;
 	}
 
@@ -76,8 +77,8 @@ public static function instance() {
 	 * A dummy constructor to prevent SupportFlow from being loaded more than once.
 	 *
 	 * @since SupportFlow 0.1
-	 * @see SupportFlow::instance()
-	 * @see SupportFlow();
+	 * @see   SupportFlow::instance()
+	 * @see   SupportFlow();
 	 */
 	private function __construct() {
 		/* Do nothing here */
@@ -134,72 +135,74 @@ public function __set( $key, $value ) {
 	 * Set some smart defaults to class variables. Allow some of them to be
 	 * filtered to allow for early overriding.
 	 *
-	 * @since SupportFlow 0.1
+	 * @since  SupportFlow 0.1
 	 * @access private
-	 * @uses plugin_dir_path() To generate SupportFlow plugin path
-	 * @uses plugin_dir_url() To generate SupportFlow plugin url
-	 * @uses apply_filters() Calls various filters
+	 * @uses   plugin_dir_path() To generate SupportFlow plugin path
+	 * @uses   plugin_dir_url() To generate SupportFlow plugin url
+	 * @uses   apply_filters() Calls various filters
 	 */
 	private function setup_globals() {
 
 		/** Version ***********************************************************/
 
-		$this->version        = '0.1-alpha'; // SupportFlow version
+		$this->version = '0.1-alpha'; // SupportFlow version
 
 		/** Paths *************************************************************/
 
 		// Setup some base path and URL information
-		$this->file           = __FILE__;
-		$this->basename       = apply_filters( 'supportflow_plugin_basenname', plugin_basename( $this->file ) );
-		$this->plugin_dir     = apply_filters( 'supportflow_plugin_dir_path',  plugin_dir_path( $this->file ) );
-		$this->plugin_url     = apply_filters( 'supportflow_plugin_dir_url',   plugin_dir_url ( $this->file ) );
+		$this->file       = __FILE__;
+		$this->basename   = apply_filters( 'supportflow_plugin_basenname', plugin_basename( $this->file ) );
+		$this->plugin_dir = apply_filters( 'supportflow_plugin_dir_path', plugin_dir_path( $this->file ) );
+		$this->plugin_url = apply_filters( 'supportflow_plugin_dir_url', plugin_dir_url( $this->file ) );
 
 		// Languages
-		$this->lang_dir       = apply_filters( 'supportflow_lang_dir',         trailingslashit( $this->plugin_dir . 'languages' ) );
+		$this->lang_dir = apply_filters( 'supportflow_lang_dir', trailingslashit( $this->plugin_dir . 'languages' ) );
 
 		/** Identifiers *******************************************************/
 
-		$this->post_type        = apply_filters( 'supportflow_thread_post_type',      'sf_thread' );
-		$this->respondents_tax  = apply_filters( 'supportflow_respondents_taxonomy',  'sf_respondent' );
-		$this->comment_type     = apply_filters( 'supportflow_thread_comment_type',   'sf_comment' );
+		$this->post_type       = apply_filters( 'supportflow_thread_post_type', 'sf_thread' );
+		$this->respondents_tax = apply_filters( 'supportflow_respondents_taxonomy', 'sf_respondent' );
+		$this->comment_type    = apply_filters( 'supportflow_thread_comment_type', 'sf_comment' );
 
 		$this->email_term_prefix = 'sf-';
 
 		$this->thread_secret_key = 'thread_secret';
 
-		$this->post_statuses  = apply_filters( 'supportflow_thread_post_statuses', array(
-			'sf_new'     => array(
-				'label'       => __( 'New', 'supportflow' ),
-				'label_count' => _n_noop( 'New <span class="count">(%s)</span>', 'New <span class="count">(%s)</span>', 'supportflow' ),
-			),
-			'sf_open'    => array(
-				'label'       => __( 'Open', 'supportflow' ),
-				'label_count' => _n_noop( 'Open <span class="count">(%s)</span>', 'Open <span class="count">(%s)</span>', 'supportflow' ),
-			),
-			'sf_pending' => array(
-				'label'       => __( 'Pending', 'supportflow' ),
-				'label_count' => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>', 'supportflow' ),
-			),
-			'sf_closed'  => array(
-				'label'       => __( 'Closed', 'supportflow' ),
-				'label_count' => _n_noop( 'Closed <span class="count">(%s)</span>', 'Closed <span class="count">(%s)</span>', 'supportflow' ),
-			),
-		) );
+		$this->post_statuses = apply_filters(
+			'supportflow_thread_post_statuses', array(
+				'sf_new'     => array(
+					'label'       => __( 'New', 'supportflow' ),
+					'label_count' => _n_noop( 'New <span class="count">(%s)</span>', 'New <span class="count">(%s)</span>', 'supportflow' ),
+				),
+				'sf_open'    => array(
+					'label'       => __( 'Open', 'supportflow' ),
+					'label_count' => _n_noop( 'Open <span class="count">(%s)</span>', 'Open <span class="count">(%s)</span>', 'supportflow' ),
+				),
+				'sf_pending' => array(
+					'label'       => __( 'Pending', 'supportflow' ),
+					'label_count' => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>', 'supportflow' ),
+				),
+				'sf_closed'  => array(
+					'label'       => __( 'Closed', 'supportflow' ),
+					'label_count' => _n_noop( 'Closed <span class="count">(%s)</span>', 'Closed <span class="count">(%s)</span>', 'supportflow' ),
+				),
+			)
+		);
 
 		/** Misc **************************************************************/
 
-		$this->extend         = new stdClass(); // Plugins add data here
-		$this->extend->ui     = new stdClass(); // For UI-related plugins
-		$this->errors         = new WP_Error(); // Feedback
+		$this->extend     = new stdClass(); // Plugins add data here
+		$this->extend->ui = new stdClass(); // For UI-related plugins
+		$this->errors     = new WP_Error(); // Feedback
 	}
 
 	/**
 	 * Include required files
 	 *
-	 * @since SupportFlow 0.1
+	 * @since  SupportFlow 0.1
 	 * @access private
-	 * @todo Be smarter about conditionally loading code
-	 * @uses is_admin() If in WordPress admin, load additional file
+	 * @todo   Be smarter about conditionally loading code
+	 * @uses   is_admin() If in WordPress admin, load additional file
 	 */
 	private function includes() {
 
@@ -217,8 +220,9 @@ private function includes() {
 		require_once( $this->plugin_dir . 'classes/class-supportflow-ui-widget.php' );
 
 		/** Tools *************************************************************/
-		if ( defined('WP_CLI') && WP_CLI )
+		if ( defined( 'WP_CLI' ) && WP_CLI ) {
 			require_once( $this->plugin_dir . '/classes/class-supportflow-wp-cli.php' );
+		}
 
 		# TODO: Akismet plugin?
 
@@ -233,9 +237,9 @@ private function includes() {
 	/**
 	 * Setup the default hooks and actions
 	 *
-	 * @since SupportFlow 0.1
+	 * @since  SupportFlow 0.1
 	 * @access private
-	 * @uses add_action() To add various actions
+	 * @uses   add_action() To add various actions
 	 */
 	private function setup_actions() {
 		add_action( 'init', array( $this, 'action_init_register_post_type' ) );
@@ -251,30 +255,32 @@ private function setup_actions() {
 	 * Register the custom post type
 	 *
 	 * @since SupportFlow 0.1
-	 * @uses register_post_type() To register the post type
+	 * @uses  register_post_type() To register the post type
 	 */
 	public function action_init_register_post_type() {
-		register_post_type( $this->post_type, array(
-			'labels' => array(
-				'menu_name'          => __( 'SupportFlow',               'supportflow' ),
-				'name'               => __( 'Threads',                   'supportflow' ),
-				'singular_name'      => __( 'Thread',                    'supportflow' ),
-				'all_items'          => __( 'All Threads',               'supportflow' ),
-				'add_new'            => __( 'New Thread',                'supportflow' ),
-				'add_new_item'       => __( 'Start New Thread',          'supportflow' ),
-				'edit_item'          => __( 'Discussion',                'supportflow' ),
-				'new_item'           => __( 'New Thread',                'supportflow' ),
-				'view_item'          => __( 'View Thread',               'supportflow' ),
-				'search_items'       => __( 'Search Threads',            'supportflow' ),
-				'not_found'          => __( 'No threads found',          'supportflow' ),
-				'not_found_in_trash' => __( 'No threads found in trash', 'supportflow' ),
+		register_post_type(
+			$this->post_type, array(
+				'labels'        => array(
+					'menu_name'          => __( 'SupportFlow', 'supportflow' ),
+					'name'               => __( 'Threads', 'supportflow' ),
+					'singular_name'      => __( 'Thread', 'supportflow' ),
+					'all_items'          => __( 'All Threads', 'supportflow' ),
+					'add_new'            => __( 'New Thread', 'supportflow' ),
+					'add_new_item'       => __( 'Start New Thread', 'supportflow' ),
+					'edit_item'          => __( 'Discussion', 'supportflow' ),
+					'new_item'           => __( 'New Thread', 'supportflow' ),
+					'view_item'          => __( 'View Thread', 'supportflow' ),
+					'search_items'       => __( 'Search Threads', 'supportflow' ),
+					'not_found'          => __( 'No threads found', 'supportflow' ),
+					'not_found_in_trash' => __( 'No threads found in trash', 'supportflow' ),
 				),
-			'public'        => true,
-			'menu_position' => 3,
-			'supports'      => array(
-				'comments',
-			),
-		) );
+				'public'        => true,
+				'menu_position' => 3,
+				'supports'      => array(
+					'comments',
+				),
+			)
+		);
 	}
 
 	/**
@@ -283,17 +289,17 @@ public function action_init_register_post_type() {
 	public function action_init_register_taxonomies() {
 
 		$args = array(
-			'label'                  => __( 'Respondents',                'supportflow' ),
-			'labels' => array(
-				'search_items'       => __( 'Search Respondents',         'supportflow' ),
-				'edit_item'          => __( 'Edit Respondent',            'supportflow' ),
-				'update_item'        => __( 'Update Respondent',          'supportflow' ),
-				'add_new_item'       => __( 'Add New Respondent',         'supportflow' ),
-				),
-			'public'                 => true,
-			'show_in_nav_menus'      => true,
-			'rewrite'                => false,
-			);
+			'label'             => __( 'Respondents', 'supportflow' ),
+			'labels'            => array(
+				'search_items' => __( 'Search Respondents', 'supportflow' ),
+				'edit_item'    => __( 'Edit Respondent', 'supportflow' ),
+				'update_item'  => __( 'Update Respondent', 'supportflow' ),
+				'add_new_item' => __( 'Add New Respondent', 'supportflow' ),
+			),
+			'public'            => true,
+			'show_in_nav_menus' => true,
+			'rewrite'           => false,
+		);
 		register_taxonomy( $this->respondents_tax, $this->post_type, $args );
 	}
 
@@ -301,8 +307,8 @@ public function action_init_register_taxonomies() {
 	 * Register the custom post (thread) statuses
 	 *
 	 * @since SupportFlow 0.1
-	 * @uses register_post_status() To register the post statuses
-	 * @uses apply_filters() To control what statuses are registered
+	 * @uses  register_post_status() To register the post statuses
+	 * @uses  apply_filters() To control what statuses are registered
 	 */
 	public function action_init_register_post_statuses() {
 		foreach ( $this->post_statuses as $post_status => $args ) {
@@ -320,18 +326,17 @@ public function validate_user( $user ) {
 		// User ID
 		if ( is_numeric( $user ) ) {
 			$user_object = get_user_by( 'ID', $user );
-		}
-		// User e-mail address
+		} // User e-mail address
 		elseif ( is_email( $user ) ) {
 			$user_object = get_user_by( 'email', $user );
-		}
-		// User login
+		} // User login
 		else {
 			$user_object = get_user_by( 'login', $user );
 		}
 
-		if ( ! $user_object )
+		if ( ! $user_object ) {
 			return false;
+		}
 
 		return $user_object->data->ID;
 	}
@@ -342,8 +347,9 @@ public function validate_user( $user ) {
 	public function get_email_hash( $email ) {
 		$email = strtolower( trim( $email ) );
 
-		if ( ! is_email( $email ) )
+		if ( ! is_email( $email ) ) {
 			return false;
+		}
 
 		$email = $this->email_term_prefix . md5( $email );
 
@@ -367,47 +373,49 @@ public function create_thread( $args ) {
 		$post_statuses = $this->post_statuses;
 
 		$defaults = array(
-			'subject'                  => '',
-			'message'                  => '',
-			'date'                     => '',
-			'respondent_id'            => 0,  // If the requester has a WordPress account (ID or username)
-			'respondent_name'          => '', // Otherwise supply a name
-			'respondent_email'         => '', // And an e-mail address
-			'status'                   => key( $post_statuses ),
-			'assignee'                 => -1,  // WordPress user ID or username of ticket assignee/owner
+			'subject'          => '',
+			'message'          => '',
+			'date'             => '',
+			'respondent_id'    => 0, // If the requester has a WordPress account (ID or username)
+			'respondent_name'  => '', // Otherwise supply a name
+			'respondent_email' => '', // And an e-mail address
+			'status'           => key( $post_statuses ),
+			'assignee'         => - 1, // WordPress user ID or username of ticket assignee/owner
 		);
 
 		$args = wp_parse_args( $args, $defaults );
 
 		$thread = array(
-			'post_type'                => $this->post_type,
-			'post_title'               => $args['subject'],
-			'post_author'              => $args['assignee'],
-			'post_date'                => $args['date'],
+			'post_type'   => $this->post_type,
+			'post_title'  => $args['subject'],
+			'post_author' => $args['assignee'],
+			'post_date'   => $args['date'],
 		);
 
 		// Validate the thread status
-		if ( ! get_post_status_object( $args['status'] ) )
+		if ( ! get_post_status_object( $args['status'] ) ) {
 			$args['status'] = $defaults['status'];
+		}
 		$thread['post_status'] = $args['status'];
 
 		$thread_id = wp_insert_post( $thread, true );
 
-		if ( is_wp_error( $thread_id ) )
+		if ( is_wp_error( $thread_id ) ) {
 			return $thread_id;
+		}
 
 		// Assign the respondent(s)
-		if ( !empty( $args['respondent_email'] ) ) {
+		if ( ! empty( $args['respondent_email'] ) ) {
 			$this->update_thread_respondents( $thread_id, $args['respondent_email'] );
 		}
 
 		// If there was a message, add it to the thread
-		if ( !empty( $args['message'] ) && !empty( $args['respondent_email'] ) ) {
+		if ( ! empty( $args['message'] ) && ! empty( $args['respondent_email'] ) ) {
 			$comment_details = array(
-					'comment_author'             => $args['respondent_name'],
-					'comment_author_email'       => $args['respondent_email'],
-					'user_id'                    => $args['respondent_id'],
-				);
+				'comment_author'       => $args['respondent_name'],
+				'comment_author_email' => $args['respondent_email'],
+				'user_id'              => $args['respondent_id'],
+			);
 			$this->add_thread_comment( $thread_id, $args['message'], $comment_details );
 		}
 
@@ -419,11 +427,13 @@ public function create_thread( $args ) {
 	 */
 	public function filter_wp_insert_post_empty_content( $maybe_empty, $postarr ) {
 
-		if ( $this->post_type != $postarr['post_type'] )
+		if ( $this->post_type != $postarr['post_type'] ) {
 			return $maybe_empty;
+		}
 
-		if ( empty( $postarr['post_title'] ) )
+		if ( empty( $postarr['post_title'] ) ) {
 			return true;
+		}
 
 		return $maybe_empty;
 	}
@@ -442,59 +452,63 @@ public function get_thread( $thread_id ) {
 	public function get_threads( $args = array() ) {
 
 		$defaults = array(
-				'respondent_email'         => '',
-				'post_status'              => '',
-				'orderby'                  => 'modified',
-			);
-		$args = array_merge( $defaults, $args );
+			'respondent_email' => '',
+			'post_status'      => '',
+			'orderby'          => 'modified',
+		);
+		$args     = array_merge( $defaults, $args );
 
 		$thread_args = array();
-		if ( empty( $args['post_status'] ) )
+		if ( empty( $args['post_status'] ) ) {
 			$thread_args['post_status'] = array_keys( $this->post_statuses );
+		}
 
-		if ( !empty( $args['respondent_email'] ) )
+		if ( ! empty( $args['respondent_email'] ) ) {
 			$thread_args['tax_query'] = array(
-					array(
-						'taxonomy' => $this->respondents_tax,
-						'field'    => 'slug',
-						'terms'    => $this->get_email_hash( $args['respondent_email'] ),
-					),
+				array(
+					'taxonomy' => $this->respondents_tax,
+					'field'    => 'slug',
+					'terms'    => $this->get_email_hash( $args['respondent_email'] ),
+				),
 			);
+		}
 
 		$thread_args['post_type'] = $this->post_type;
-		$thread_args['orderby'] = $args['orderby'];
+		$thread_args['orderby']   = $args['orderby'];
 
 		$threads = new WP_Query( $thread_args );
-		if ( is_wp_error( $threads ) )
+		if ( is_wp_error( $threads ) ) {
 			return $threads;
+		}
 
 		return $threads->posts;
 	}
 
 	/**
 	 * Get respondents matching $query
-	 * 
+	 *
 	 * @param string $query partial email address to search for
 	 */
 	public function get_respondents( $args = array() ) {
 
 		$defaults = array(
-				'search' => '',
-				'number' => 10
-			);
-		$args = array_merge( $defaults, $args );
+			'search' => '',
+			'number' => 10
+		);
+		$args     = array_merge( $defaults, $args );
 
 		$term_args = array(
-				'orderby' => 'name',
-				'hide_empty' => 0,
-				'fields' => 'all',
-				'name__like' => $args['search'],
-				'number' => $args['number'],
-			);
-		$matches = get_terms( $this->respondents_tax, $term_args );
+			'orderby'    => 'name',
+			'hide_empty' => 0,
+			'fields'     => 'all',
+			'name__like' => $args['search'],
+			'number'     => $args['number'],
+		);
+		$matches   = get_terms( $this->respondents_tax, $term_args );
 
-		if( !$matches ) 
+		if ( ! $matches ) {
 			return array();
+		}
 
 		return $matches;
 	}
@@ -507,29 +521,31 @@ public function get_respondents( $args = array() ) {
 	public function get_thread_respondents( $thread_id, $args = array() ) {
 
 		$default_args = array(
-				'fields' => 'all',          // 'all', 'emails'
-			);
-		$args = array_merge( $default_args, $args );
+			'fields' => 'all', // 'all', 'emails'
+		);
+		$args         = array_merge( $default_args, $args );
 
 		$raw_respondents = wp_get_object_terms( $thread_id, $this->respondents_tax );
-		if ( is_wp_error( $raw_respondents ) )
+		if ( is_wp_error( $raw_respondents ) ) {
 			return array();
+		}
 
 		$respondents = array();
 		if ( 'emails' == $args['fields'] ) {
-			foreach( $raw_respondents as $raw_respondent ) {
+			foreach ( $raw_respondents as $raw_respondent ) {
 				$respondents[] = $raw_respondent->name;
 			}
 		}
+
 		return $respondents;
 	}
 
 	/**
 	 * Update a thread's respondents
 	 *
-	 * @param int $thread_id
+	 * @param int   $thread_id
 	 * @param array $respondents An array of email addresses
-	 * @param bool $append Whether or not to append these email addresses to any existing addresses
+	 * @param bool  $append      Whether or not to append these email addresses to any existing addresses
 	 */
 	public function update_thread_respondents( $thread_id, $respondents, $append = false ) {
 
@@ -538,15 +554,16 @@ public function update_thread_respondents( $thread_id, $respondents, $append = f
 		}
 
 		$term_ids = array();
-		foreach( $respondents as $dirty_respondent ) {
-			if ( empty( $dirty_respondent ) )
+		foreach ( $respondents as $dirty_respondent ) {
+			if ( empty( $dirty_respondent ) ) {
 				continue;
+			}
 			// Create a term if it doesn't yet exist
 			$email = ( is_array( $dirty_respondent ) ) ? $dirty_respondent['user_email'] : $dirty_respondent;
 			if ( $term = get_term_by( 'name', $email, $this->respondents_tax ) ) {
-				$term_ids[] = (int)$term->term_id;
+				$term_ids[] = (int) $term->term_id;
 			} else {
-				$term = wp_insert_term( $email, $this->respondents_tax, array( 'slug' => $this->get_email_hash( $email ) ) );
+				$term       = wp_insert_term( $email, $this->respondents_tax, array( 'slug' => $this->get_email_hash( $email ) ) );
 				$term_ids[] = $term['term_id'];
 			}
 		}
@@ -560,6 +577,7 @@ public function get_thread_comments( $thread_id, $args = array() ) {
 
 		$args['post_id'] = $thread_id;
 		$thread_comments = SupportFlow()->get_comments( $args );
+
 		return $thread_comments;
 	}
 
@@ -569,24 +587,25 @@ public function get_thread_comments( $thread_id, $args = array() ) {
 	public function get_comments( $args ) {
 
 		$default_args = array(
-				'status'                 => 'public', // 'public', 'private', 'all'
-				'post_id'                => '',
-				'search'                 => '',
-				'order'                  => 'DESC',   // 'DESC', 'ASC',
-			);
+			'status'  => 'public', // 'public', 'private', 'all'
+			'post_id' => '',
+			'search'  => '',
+			'order'   => 'DESC', // 'DESC', 'ASC',
+		);
 
-		$args = array_merge( $default_args, $args );
+		$args         = array_merge( $default_args, $args );
 		$comment_args = array(
-				'search'                 => $args['search'],
-				'post_id'                => $args['post_id'],
-				'status'                 => $args['status'],
-				'comment_type'           => $this->comment_type,
-				'order'                  => $args['order'],
-			);
+			'search'       => $args['search'],
+			'post_id'      => $args['post_id'],
+			'status'       => $args['status'],
+			'comment_type' => $this->comment_type,
+			'order'        => $args['order'],
+		);
 
 		add_filter( 'comments_clauses', array( $this, 'filter_comment_clauses' ), 10, 2 );
 		$thread_comments = get_comments( $comment_args );
 		remove_filter( 'comments_clauses', array( $this, 'filter_comment_clauses' ) );
+
 		return $thread_comments;
 	}
 
@@ -595,11 +614,13 @@ public function get_comments( $args ) {
 	 */
 	public function filter_comment_clauses( $clauses, $query ) {
 		$old_comment_approved = "( comment_approved = '0' OR comment_approved = '1' )";
-		if ( in_array( $query->query_vars['status'], array( 'public', 'private' ) ) )
+		if ( in_array( $query->query_vars['status'], array( 'public', 'private' ) ) ) {
 			$new_comment_approved = "comment_approved = '{$query->query_vars['status']}' ";
-		else
+		} else {
 			$new_comment_approved = "comment_approved IN ( 'private', 'public' )";
+		}
 		$clauses['where'] = str_replace( $old_comment_approved, $new_comment_approved, $clauses['where'] );
+
 		return $clauses;
 	}
 
@@ -612,7 +633,8 @@ public function get_thread_comment_count( $thread_id, $args = array() ) {
 		global $wpdb;
 
 		$count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_post_ID =%s AND comment_type = %s", $thread_id, $this->comment_type ) );
-		return (int)$count;
+
+		return (int) $count;
 	}
 
 	/**
@@ -622,19 +644,19 @@ public function add_thread_comment( $thread_id, $comment_text, $details = array(
 		global $wpdb;
 
 		$default_details = array(
-				'time'                   => current_time( 'mysql' ),
-				'comment_author'         => '',
-				'comment_author_email'   => '',
-				'user_id'                => '',
-				'comment_approved'       => 'public',
-			);
+			'time'                 => current_time( 'mysql' ),
+			'comment_author'       => '',
+			'comment_author_email' => '',
+			'user_id'              => '',
+			'comment_approved'     => 'public',
+		);
 
 		// @todo This actually probably shouldn't default to current user, so
 		// we don't have to mandate the arguments be assigned each time
 		if ( $user = wp_get_current_user() ) {
-			$default_details['comment_author'] = $user->display_name;
+			$default_details['comment_author']       = $user->display_name;
 			$default_details['comment_author_email'] = $user->user_email;
-			$default_details['user_id'] = $user->ID;
+			$default_details['user_id']              = $user->ID;
 		}
 
 		$details = array_merge( $default_details, $details );
@@ -647,25 +669,26 @@ public function add_thread_comment( $thread_id, $comment_text, $details = array(
 			$attachment_ids = false;
 		}
 
-		$comment = array(
-				'comment_content'        => esc_sql( $comment_text ),
-				'comment_post_ID'        => (int)$thread_id,
-				'comment_date'           => esc_sql( $details['time'] ),
-				'comment_approved'       => esc_sql( $details['comment_approved'] ),
-				'comment_type'           => esc_sql( $this->comment_type ),
-				'comment_author'         => esc_sql( $details['comment_author'] ),
-				'comment_author_email'   => esc_sql( $details['comment_author_email'] ),
-				'user_id'                => (int)$details['user_id'],
-			);
-		$comment = apply_filters( 'supportflow_pre_insert_thread_comment', $comment );
+		$comment    = array(
+			'comment_content'      => esc_sql( $comment_text ),
+			'comment_post_ID'      => (int) $thread_id,
+			'comment_date'         => esc_sql( $details['time'] ),
+			'comment_approved'     => esc_sql( $details['comment_approved'] ),
+			'comment_type'         => esc_sql( $this->comment_type ),
+			'comment_author'       => esc_sql( $details['comment_author'] ),
+			'comment_author_email' => esc_sql( $details['comment_author_email'] ),
+			'user_id'              => (int) $details['user_id'],
+		);
+		$comment    = apply_filters( 'supportflow_pre_insert_thread_comment', $comment );
 		$comment_id = wp_insert_comment( $comment );
 
 		// If there are attachment IDs store them as meta
-		if ( !empty( $attachment_ids ) )
+		if ( ! empty( $attachment_ids ) ) {
 			add_comment_meta( $comment_id, 'attachment_ids', $attachment_ids, true );
+		}
 
 		// Adding a thread comment updates the post modified time for the thread
-		$query = $wpdb->update( $wpdb->posts, array( 'post_modified' => current_time( 'mysql') ), array( 'ID' => $thread_id ) );
+		$query = $wpdb->update( $wpdb->posts, array( 'post_modified' => current_time( 'mysql' ) ), array( 'ID' => $thread_id ) );
 		clean_post_cache( $thread_id );
 
 		do_action( 'supportflow_thread_comment_added', $comment_id );
@@ -681,11 +704,13 @@ public function add_thread_comment( $thread_id, $comment_text, $details = array(
 	 */
 	public function get_secret_for_thread( $thread_id ) {
 
-		if ( $secret = get_post_meta( $thread_id, $this->thread_secret_key, true ) )
+		if ( $secret = get_post_meta( $thread_id, $this->thread_secret_key, true ) ) {
 			return $secret;
+		}
 
 		$secret = wp_generate_password( 8, false );
 		update_post_meta( $thread_id, $this->thread_secret_key, $secret );
+
 		return $secret;
 	}
 
@@ -695,7 +720,8 @@ public function get_secret_for_thread( $thread_id ) {
 	public function get_thread_from_secret( $secret ) {
 		global $wpdb;
 		$thread_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key=%s AND meta_value=%s", $this->thread_secret_key, $secret ) );
-		return ( $thread_id ) ? (int)$thread_id : 0;
+
+		return ( $thread_id ) ? (int) $thread_id : 0;
 	}
 
 	/**

From 264571be40a8abc4854320f2fab0b015e59ca7e5 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 20 May 2014 19:10:01 +0530
Subject: [PATCH 033/485] Created a page to add/remove IMAP E-Mail accounts

---
 classes/class-supportflow-email-accounts.php | 175 +++++++++++++++++++
 supportflow.php                              |   1 +
 2 files changed, 176 insertions(+)
 create mode 100644 classes/class-supportflow-email-accounts.php

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
new file mode 100644
index 0000000..3da20ef
--- /dev/null
+++ b/classes/class-supportflow-email-accounts.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ *
+ */
+
+if( ! class_exists( 'WP_List_Table' ) ) {
+    require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+}
+
+class SupportFlow_Email_Accounts_Table extends WP_List_Table {
+	protected $_data;
+
+	function __construct( $accounts ){
+		parent::__construct();
+		$data = array();
+
+		foreach( $accounts as $k=>$y) {
+			$email_account = unserialize( $k );
+			$imap_host     = $email_account['host'];
+			$imap_port     = $email_account['port'];
+			$imap_user     = $email_account['user'];
+			$data[]  = array(
+				'imap_host'   => $imap_host,
+				'imap_port'   => $imap_port,
+				'imap_user'   => $imap_user,
+				'imap_action' => "<a href='#' data-key='$k' id='delete_email_account'>Delete</a>",
+			);
+		}
+		$this->_data = $data;
+	}
+
+	function column_default( $item, $column_name ) {
+		return $item[ $column_name ];
+	}
+
+	function get_columns(){
+		return array(
+		    'imap_host'   => __( 'Host Name' , 'supportflow' ),
+		    'imap_port'   => __( 'Port No'   , 'supportflow' ),
+		    'imap_user'   => __( 'User Name' , 'supportflow' ),
+		    'imap_action' => __( 'Action'    , 'supportflow' )
+		);
+	}
+
+	function prepare_items() {
+		$columns  = $this->get_columns();
+		$data     = $this->_data;
+		$hidden   = array();
+		$sortable = array();
+		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->items           = $data;;
+	}
+}
+
+class SupportFlow_Email_Accounts extends SupportFlow {
+
+	function __construct() {
+		add_action( 'admin_menu', array( $this, 'action_admin_menu' ) );
+	}
+
+	function action_admin_menu() {
+		$post_type = SupportFlow()->post_type;
+
+		// Create a menu (SupportFlow->E-Mail Accounts)
+		add_submenu_page(
+			"edit.php?post_type=$post_type",
+			__( 'SupportFlow E-Mail Accounts', 'supportflow' ),
+			__( 'E-Mail Accounts', 'supportflow' ),
+			'manage_options',
+			'sf_accounts',
+			array( $this, 'settings_page' )
+		);
+
+	}
+
+	function settings_page() {
+
+		$email_accounts = get_option( 'sf_email_accounts' );
+		if ( ! is_array( $email_accounts ) ) {
+			$email_accounts = array();
+		}
+
+		echo '<div class="wrap">
+			<h2>' . __( 'E-Mail Accounts', 'supportflow' ) . '</h2>';
+
+		if ( isset( $_POST['action'] ) ) {
+			$action = $_POST['action'];
+		}
+
+		// Create new account
+		if ( 'add' == $action && isset( $_POST['imap_host'], $_POST['imap_user'], $_POST['imap_pass'], $_POST['imap_port'] ) ) {
+			$_POST['imap_port'] = is_numeric( $_POST['imap_port'] ) ? (int) $_POST['imap_port'] : 993;
+			$account_key = serialize( array( 'host' => $_POST['imap_host'], 'user' => $_POST['imap_user'], 'port' => $_POST['imap_port'] ) );
+
+			if ( isset( $email_accounts[$account_key] ) ) {
+				echo '<h3>' . __( 'There is an account already exists with same host name and user name. Please create a new account with different settings.', 'supportflow' ) . '</h3>';
+			} elseif  ( ! @imap_open( "{{$_POST['imap_host']}:{$_POST['imap_port']}/ssl}", $_POST['imap_user'], $_POST['imap_pass'] ) ) {
+				echo '<h3>' . __( 'Unable to login to the IMAP server. Please check your IMAP details.', 'supportflow' ) . '</h3>';
+			} else {
+				$email_accounts[$account_key] = $_POST['imap_pass'];
+				update_option( 'sf_email_accounts', $email_accounts );
+				echo '<h3>' . __( 'Account added successfully', 'supportflow' ) . '</h3>';
+			}
+		}
+
+		// Delete existing account
+		if ( 'delete' == $action && isset( $_POST['key'] ) ) {
+			$account_key = stripcslashes( $_POST['key'] );
+
+			if ( ! isset( $email_accounts[$account_key] ) ) {
+				echo '<h3>' . __( 'Failed deleting account. There is no such account exists. Please try again.', 'supportflow' ) . '</h3>';
+			} else {
+				unset( $email_accounts[$account_key] );
+				update_option( 'sf_email_accounts', $email_accounts) ;
+				echo '<h3>' . __( 'Account Deleted successfully', 'supportflow' ) . '</h3>';
+			}
+		}
+
+
+		$email_accounts_table = new SupportFlow_Email_Accounts_Table($email_accounts);
+		$email_accounts_table->prepare_items();
+		$email_accounts_table->display();
+
+		?>
+		<h3><?= __( 'Add New Account', 'supportflow' ) ?></h3>
+		<?= __( 'Please enter IMAP Server Settings', 'supportflow' ) ?><br />
+		<form method="POST" action="edit.php?post_type=sf_thread&page=sf_accounts">
+			<input type="hidden" name="action" value="add" />
+			<table class="form-table">
+				<tr valign="top">
+					<th scope="row"><?= __( 'Host Name:', 'supportflow' ) ?></th>
+					<td><input type="text" name="imap_host" /></td>
+				</tr>
+
+				<tr valign="top">
+					<th scope="row"><?= __( 'Port No: (default 993)', 'supportflow' ) ?></th>
+					<td><input type="text" name="imap_port" /></td>
+				</tr>
+
+				<tr valign="top">
+					<th scope="row"><?= __( 'Username:', 'supportflow' ) ?></th>
+					<td><input type="text" name="imap_user"/></td>
+				</tr>
+
+				<tr valign="top">
+					<th scope="row"><?= __( 'Password:', 'supportflow' ) ?></th>
+					<td><input type="text" name="imap_pass" /></td>
+				</tr>
+			</table>
+		<?php submit_button( __( 'Add New Server', 'supportflow' ) ); ?>
+		</form>
+
+		<script>
+			jQuery('#delete_email_account' ).click(function(e) {
+				e.preventDefault();
+				if ( ! confirm('<?= __( 'Are you sure want to delete this account.', 'supportflow' ) ?>' ) ) {
+					return;
+				}
+
+				var account_key  = jQuery(this).data('key' );
+				var form = "<form method='POST' action='edit.php?post_type=sf_thread&page=sf_accounts'>" +
+					"<input type='hidden' name='action' value='delete' />" +
+					"<input type='hidden' name='key' value=" + account_key + " />" +
+				"</form>";
+
+				jQuery(form).submit();
+			});
+		</script>
+		<?php
+	}
+
+
+}
+
+SupportFlow()->extend->settings = new SupportFlow_Email_Accounts();
\ No newline at end of file
diff --git a/supportflow.php b/supportflow.php
index 774ac8c..fc6a075 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -213,6 +213,7 @@ private function includes() {
 		require_once( $this->plugin_dir . 'classes/class-supportflow-emails.php' );
 		require_once( $this->plugin_dir . 'classes/class-supportflow-email-replies.php' );
 		require_once( $this->plugin_dir . 'classes/class-supportflow-permissions.php' );
+		require_once( $this->plugin_dir . 'classes/class-supportflow-email-accounts.php' );
 
 		/** Extensions ********************************************************/
 

From 7dc3976c7567b44e351a49fd652cbcb358047cf3 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 22 May 2014 02:10:30 +0530
Subject: [PATCH 034/485] Updated E-Mail account setting page

---
 classes/class-supportflow-email-accounts.php | 279 ++++++++++++++-----
 1 file changed, 204 insertions(+), 75 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 3da20ef..d077d0c 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -3,59 +3,77 @@
  *
  */
 
-if( ! class_exists( 'WP_List_Table' ) ) {
-    require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+if ( ! class_exists( 'WP_List_Table' ) ) {
+	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
 }
 
 class SupportFlow_Email_Accounts_Table extends WP_List_Table {
 	protected $_data;
 
-	function __construct( $accounts ){
+	function __construct( $accounts ) {
 		parent::__construct();
+
+		$data = & $this->_data;
 		$data = array();
 
-		foreach( $accounts as $k=>$y) {
-			$email_account = unserialize( $k );
-			$imap_host     = $email_account['host'];
-			$imap_port     = $email_account['port'];
-			$imap_user     = $email_account['user'];
-			$data[]  = array(
-				'imap_host'   => $imap_host,
-				'imap_port'   => $imap_port,
-				'imap_user'   => $imap_user,
-				'imap_action' => "<a href='#' data-key='$k' id='delete_email_account'>Delete</a>",
+		foreach ( $accounts as $account_id => $account ) {
+			$data[] = array(
+				'username'  => $account['username'],
+				'imap_host' => $account['imap_host'],
+				'imap_port' => $account['imap_port'],
+				'smtp_host' => $account['smtp_host'],
+				'smtp_port' => $account['smtp_port'],
+				'action'    => "<a href='#' data-account-id='$account_id' id='delete_email_account'>Delete</a>",
 			);
 		}
-		$this->_data = $data;
 	}
 
 	function column_default( $item, $column_name ) {
-		return $item[ $column_name ];
+		return $item[$column_name];
 	}
 
-	function get_columns(){
+	function get_columns() {
 		return array(
-		    'imap_host'   => __( 'Host Name' , 'supportflow' ),
-		    'imap_port'   => __( 'Port No'   , 'supportflow' ),
-		    'imap_user'   => __( 'User Name' , 'supportflow' ),
-		    'imap_action' => __( 'Action'    , 'supportflow' )
+			'username'  => __( 'Username', 'supportflow' ),
+			'imap_host' => __( 'IMAP Host', 'supportflow' ),
+			'imap_port' => __( 'IMAP Port', 'supportflow' ),
+			'smtp_host' => __( 'SMTP Host', 'supportflow' ),
+			'smtp_port' => __( 'SMTP Port', 'supportflow' ),
+			'action'    => __( 'Action', 'supportflow' ),
 		);
 	}
 
 	function prepare_items() {
-		$columns  = $this->get_columns();
-		$data     = $this->_data;
-		$hidden   = array();
-		$sortable = array();
+		$columns               = $this->get_columns();
+		$data                  = $this->_data;
+		$hidden                = array();
+		$sortable              = array();
 		$this->_column_headers = array( $columns, $hidden, $sortable );
-		$this->items           = $data;;
+		$this->items           = $data;
 	}
 }
 
 class SupportFlow_Email_Accounts extends SupportFlow {
+	protected $_email_accounts;
+
+	const SUCCESS                  = 0;
+	const ACCOUNT_EXISTS           = 1;
+	const NO_ACCOUNT_EXISTS        = 2;
+	const IMAP_HOST_NOT_FOUND      = 3;
+	const IMAP_INVALID_CRIDENTIALS = 4;
+	const IMAP_TIME_OUT            = 5;
+	const IMAP_CONNECTION_FAILED   = 6;
+
 
 	function __construct() {
 		add_action( 'admin_menu', array( $this, 'action_admin_menu' ) );
+
+		// Get existing E-Mail accounts from database
+		$email_accounts = & $this->_email_accounts;
+		$email_accounts = get_option( 'sf_email_accounts' );
+		if ( ! is_array( $email_accounts ) ) {
+			$email_accounts = array();
+		}
 	}
 
 	function action_admin_menu() {
@@ -73,103 +91,214 @@ function action_admin_menu() {
 
 	}
 
+	/*
+	 * Loads the setting page to add/remove E-Mail accounts
+	 */
 	function settings_page() {
-
-		$email_accounts = get_option( 'sf_email_accounts' );
-		if ( ! is_array( $email_accounts ) ) {
-			$email_accounts = array();
-		}
+		$action = isset( $_POST['action'] ) ? $_POST['action'] : '';
 
 		echo '<div class="wrap">
 			<h2>' . __( 'E-Mail Accounts', 'supportflow' ) . '</h2>';
 
-		if ( isset( $_POST['action'] ) ) {
-			$action = $_POST['action'];
-		}
-
 		// Create new account
-		if ( 'add' == $action && isset( $_POST['imap_host'], $_POST['imap_user'], $_POST['imap_pass'], $_POST['imap_port'] ) ) {
-			$_POST['imap_port'] = is_numeric( $_POST['imap_port'] ) ? (int) $_POST['imap_port'] : 993;
-			$account_key = serialize( array( 'host' => $_POST['imap_host'], 'user' => $_POST['imap_user'], 'port' => $_POST['imap_port'] ) );
-
-			if ( isset( $email_accounts[$account_key] ) ) {
-				echo '<h3>' . __( 'There is an account already exists with same host name and user name. Please create a new account with different settings.', 'supportflow' ) . '</h3>';
-			} elseif  ( ! @imap_open( "{{$_POST['imap_host']}:{$_POST['imap_port']}/ssl}", $_POST['imap_user'], $_POST['imap_pass'] ) ) {
-				echo '<h3>' . __( 'Unable to login to the IMAP server. Please check your IMAP details.', 'supportflow' ) . '</h3>';
-			} else {
-				$email_accounts[$account_key] = $_POST['imap_pass'];
-				update_option( 'sf_email_accounts', $email_accounts );
-				echo '<h3>' . __( 'Account added successfully', 'supportflow' ) . '</h3>';
+		if ( 'add' == $action && isset( $_POST['imap_host'], $_POST['imap_port'], $_POST['smtp_host'], $_POST['smtp_port'], $_POST['username'], $_POST['password'] ) ) {
+			$res = $this->add_email_account( $_POST['imap_host'], $_POST['imap_port'], $_POST['smtp_host'], $_POST['smtp_port'], $_POST['username'], $_POST['password'] );
+			switch ( $res ) {
+
+				case self::SUCCESS:
+					echo '<h3>' . __( 'Account added successfully', 'supportflow' ) . '</h3>';
+					unset( $_POST['imap_host'], $_POST['imap_port'], $_POST['smtp_host'], $_POST['smtp_port'], $_POST['username'], $_POST['password'] );
+					break;
+				case self::ACCOUNT_EXISTS:
+					echo '<h3>' . __( 'There is an account already exists with same host name and user name. Please create a new account with different settings.', 'supportflow' ) . '</h3>';
+					break;
+				case self::IMAP_HOST_NOT_FOUND:
+					echo '<h3>' . __( 'Unable to connect to ' . esc_html( $_POST['imap_host'] ) . '. Please check your IMAP host name.', 'supportflow' ) . '</h3>';
+					break;
+				case self::IMAP_TIME_OUT:
+					echo '<h3>' . __( 'Time out while connecting to ' . esc_html( $_POST['imap_host'] ) . '. Please check your IMAP port number and host name.', 'supportflow' ) . '</h3>';
+					break;
+				case self::IMAP_INVALID_CRIDENTIALS:
+					echo '<h3>' . __( 'Unable to connect with given username/password combination. Please re-check your username and password', 'supportflow' ) . '</h3>';
+					break;
+				case self::IMAP_CONNECTION_FAILED:
+					echo '<h3>' . __( 'Unknown error while connecting to the IMAP server. Please check your IMAP settings and try again.', 'supportflow' ) . '</h3>';
+					break;
 			}
 		}
 
 		// Delete existing account
-		if ( 'delete' == $action && isset( $_POST['key'] ) ) {
-			$account_key = stripcslashes( $_POST['key'] );
-
-			if ( ! isset( $email_accounts[$account_key] ) ) {
-				echo '<h3>' . __( 'Failed deleting account. There is no such account exists. Please try again.', 'supportflow' ) . '</h3>';
-			} else {
-				unset( $email_accounts[$account_key] );
-				update_option( 'sf_email_accounts', $email_accounts) ;
-				echo '<h3>' . __( 'Account Deleted successfully', 'supportflow' ) . '</h3>';
+		if ( 'delete' == $action && isset( $_POST['account_id'] ) ) {
+			$res = $this->remove_email_account( $_POST['account_id'] );
+			switch ( $res ) {
+
+				case self::SUCCESS:
+					echo '<h3>' . __( 'Account Deleted successfully', 'supportflow' ) . '</h3>';
+					break;
+				case self::NO_ACCOUNT_EXISTS:
+					echo '<h3>' . __( 'Failed deleting account. There is no such account exists. Please try again.', 'supportflow' ) . '</h3>';
+					break;
 			}
 		}
 
-
-		$email_accounts_table = new SupportFlow_Email_Accounts_Table($email_accounts);
+		$email_accounts_table = new SupportFlow_Email_Accounts_Table( $this->get_email_accounts() );
 		$email_accounts_table->prepare_items();
 		$email_accounts_table->display();
 
 		?>
-		<h3><?= __( 'Add New Account', 'supportflow' ) ?></h3>
-		<?= __( 'Please enter IMAP Server Settings', 'supportflow' ) ?><br />
+		<h3><?php _e( 'Add New Account', 'supportflow' ) ?></h3>
+		<?php _e( 'Please enter IMAP Server Settings', 'supportflow' ) ?><br />
 		<form method="POST" action="edit.php?post_type=sf_thread&page=sf_accounts">
 			<input type="hidden" name="action" value="add" />
 			<table class="form-table">
 				<tr valign="top">
-					<th scope="row"><?= __( 'Host Name:', 'supportflow' ) ?></th>
-					<td><input type="text" name="imap_host" /></td>
+					<th scope="row"><?php _e( 'IMAP Host:', 'supportflow' ) ?></th>
+					<td>
+						<input type="text" required name="imap_host" value="<?php echo esc_html( isset( $_POST['imap_host'] ) ? $_POST['imap_host'] : '' ) ?>" />
+					</td>
+				</tr>
+
+				<tr valign="top">
+					<th scope="row"><?php _e( 'IMAP Port Number: ', 'supportflow' ) ?></th>
+					<td>
+						<input type="number" required name="imap_port" value="<?php echo esc_html( isset( $_POST['imap_port'] ) ? $_POST['imap_port'] : '993' ) ?>" />
+					</td>
+				</tr>
+
+				<tr valign="top">
+					<th scope="row"><?php _e( 'SMTP Host:', 'supportflow' ) ?></th>
+					<td>
+						<input type="text" required name="smtp_host" value="<?php echo esc_html( isset( $_POST['smtp_host'] ) ? $_POST['smtp_host'] : '' ) ?>" />
+					</td>
 				</tr>
 
 				<tr valign="top">
-					<th scope="row"><?= __( 'Port No: (default 993)', 'supportflow' ) ?></th>
-					<td><input type="text" name="imap_port" /></td>
+					<th scope="row"><?php _e( 'SMTP Port Number: ', 'supportflow' ) ?></th>
+					<td>
+						<input type="number" required name="smtp_port" value="<?php echo esc_html( isset( $_POST['smtp_port'] ) ? $_POST['smtp_port'] : '465' ) ?>" />
+					</td>
 				</tr>
 
 				<tr valign="top">
-					<th scope="row"><?= __( 'Username:', 'supportflow' ) ?></th>
-					<td><input type="text" name="imap_user"/></td>
+					<th scope="row"><?php _e( 'Username:', 'supportflow' ) ?></th>
+					<td>
+						<input type="text" required name="username" value="<?php echo esc_html( isset( $_POST['username'] ) ? $_POST['username'] : '' ) ?>" />
+					</td>
 				</tr>
 
 				<tr valign="top">
-					<th scope="row"><?= __( 'Password:', 'supportflow' ) ?></th>
-					<td><input type="text" name="imap_pass" /></td>
+					<th scope="row"><?php _e( 'Password:', 'supportflow' ) ?></th>
+					<td><input type="password" required name="password" /></td>
 				</tr>
 			</table>
-		<?php submit_button( __( 'Add New Server', 'supportflow' ) ); ?>
+			<?php submit_button( __( 'Add New Server', 'supportflow' ) ); ?>
 		</form>
 
-		<script>
-			jQuery('#delete_email_account' ).click(function(e) {
+		<script type="text/javascript">
+			jQuery('#delete_email_account').click(function (e) {
 				e.preventDefault();
-				if ( ! confirm('<?= __( 'Are you sure want to delete this account.', 'supportflow' ) ?>' ) ) {
+				if (!confirm('<?php _e( 'Are you sure want to delete this account.', 'supportflow' ) ?>')) {
 					return;
 				}
 
-				var account_key  = jQuery(this).data('key' );
+				var account_key = jQuery(this).data('account-id');
 				var form = "<form method='POST' action='edit.php?post_type=sf_thread&page=sf_accounts'>" +
 					"<input type='hidden' name='action' value='delete' />" +
-					"<input type='hidden' name='key' value=" + account_key + " />" +
-				"</form>";
+					"<input type='hidden' name='account_id' value=" + account_key + " />" +
+					"</form>";
 
 				jQuery(form).submit();
 			});
 		</script>
-		<?php
+	<?php
+	}
+
+	/**
+	 * Add a new E-Mail account to database
+	 */
+	function add_email_account( $imap_host, $imap_port, $smtp_host, $smtp_port, $username, $password, $test_login = true ) {
+		$email_accounts = & $this->_email_accounts;
+		sanitize_text_field( $imap_host, $imap_port, $smtp_port, $username, $password );
+
+		if ( $this->is_exist_email_account( $imap_host, $smtp_host, $username ) ) {
+			return self::ACCOUNT_EXISTS;
+		}
+
+		if ( true == $test_login ) {
+			imap_timeout( IMAP_OPENTIMEOUT, apply_filters( 'supportflow_imap_open_timeout', 5 ) );
+			if ( $imap_stream = imap_open( "{{$imap_host}:{$imap_port}/ssl}", $username, $password, 0, 0 ) ) {
+				imap_close( $imap_stream );
+			} else {
+				$error = imap_errors()[0];
+				if ( (string) strpos( $error, 'Host not found' ) != '' ) {
+					return self::IMAP_HOST_NOT_FOUND;
+				} elseif ( (string) strpos( $error, 'Timed out' ) != '' ) {
+					return self::IMAP_TIME_OUT;
+				} elseif ( (string) strpos( $error, 'Invalid credentials' ) != '' ) {
+					return self::IMAP_INVALID_CRIDENTIALS;
+				} else {
+					return self::IMAP_CONNECTION_FAILED;
+				}
+			}
+		}
+
+		$email_accounts[] = array(
+			'imap_host' => $imap_host,
+			'imap_port' => $imap_port,
+			'smtp_host' => $smtp_host,
+			'smtp_port' => $smtp_port,
+			'username'  => $username,
+			'password'  => $password,
+		);
+		update_option( 'sf_email_accounts', $email_accounts );
+
+		return self::SUCCESS;
+
+	}
+
+	/**
+	 * Remove an E-Mail account from database
+	 */
+	function remove_email_account( $account_id ) {
+		$email_accounts = & $this->_email_accounts;
+
+		if ( ! isset( $email_accounts[$account_id] ) ) {
+			return self::NO_ACCOUNT_EXISTS;
+		} else {
+			unset( $email_accounts[$account_id] );
+			update_option( 'sf_email_accounts', $email_accounts );
+
+			return self::SUCCESS;
+		}
+	}
+
+	/**
+	 * Return the list of all existing E-Mail accounts
+	 * @return array
+	 */
+	function get_email_accounts() {
+		return $this->_email_accounts;
 	}
 
+	/**
+	 * Check if E-Mail account exists in database
+	 * @return boolean
+	 */
+	function is_exist_email_account( $imap_host, $smtp_host, $username ) {
+		$email_accounts = & $this->_email_accounts;
+
+		foreach ( $email_accounts as $email_account ) {
+			if (
+				$email_account['imap_host'] == $imap_host &&
+				$email_account['smtp_host'] == $smtp_host &&
+				$email_account['username'] == $username
+			) {
+				return true;
+			}
+		}
 
+		return false;
+	}
 }
 
 SupportFlow()->extend->settings = new SupportFlow_Email_Accounts();
\ No newline at end of file

From b668968b316a0e753be0408cc7678f91a8ec3640 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 20 May 2014 19:33:53 +0530
Subject: [PATCH 035/485] Registered tags taxonomy

---
 supportflow.php | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index 774ac8c..60c5ae7 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -162,6 +162,7 @@ private function setup_globals() {
 
 		$this->post_type       = apply_filters( 'supportflow_thread_post_type', 'sf_thread' );
 		$this->respondents_tax = apply_filters( 'supportflow_respondents_taxonomy', 'sf_respondent' );
+		$this->tags_tax        = apply_filters( 'supportflow_tags_taxonomy', 'sf_tags' );
 		$this->comment_type    = apply_filters( 'supportflow_thread_comment_type', 'sf_comment' );
 
 		$this->email_term_prefix = 'sf-';
@@ -288,7 +289,7 @@ public function action_init_register_post_type() {
 	 */
 	public function action_init_register_taxonomies() {
 
-		$args = array(
+		$args_respondents_tax = array(
 			'label'             => __( 'Respondents', 'supportflow' ),
 			'labels'            => array(
 				'search_items' => __( 'Search Respondents', 'supportflow' ),
@@ -300,7 +301,22 @@ public function action_init_register_taxonomies() {
 			'show_in_nav_menus' => true,
 			'rewrite'           => false,
 		);
-		register_taxonomy( $this->respondents_tax, $this->post_type, $args );
+
+		$args_tags_tax = array(
+			'label'             => __( 'Tags', 'supportflow' ),
+			'labels'            => array(
+				'search_items' => __( 'Search Tags', 'supportflow' ),
+				'edit_item'    => __( 'Edit Tag', 'supportflow' ),
+				'update_item'  => __( 'Update Tag', 'supportflow' ),
+				'add_new_item' => __( 'Add New Tag', 'supportflow' ),
+			),
+			'public'            => true,
+			'show_in_nav_menus' => true,
+			'rewrite'           => false,
+		);
+
+		register_taxonomy( $this->respondents_tax, $this->post_type, $args_respondents_tax );
+		register_taxonomy( $this->tags_tax, $this->post_type, $args_tags_tax );
 	}
 
 	/**

From 2666e6922c3aae3511681fd8369d8554f375e876 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 25 May 2014 04:08:54 +0530
Subject: [PATCH 036/485] Converted replies from custom comments to custom
 posts

Also changed the usage of word comment/comments with reply/replies
---
 classes/class-supportflow-admin.php         | 123 +++++++++--------
 classes/class-supportflow-email-replies.php |  20 +--
 classes/class-supportflow-emails.php        |  58 ++++----
 classes/class-supportflow-json-api.php      |  34 ++---
 classes/class-supportflow-permissions.php   |  24 ++--
 classes/class-supportflow-ui-widget.php     | 118 ++++++++--------
 classes/class-supportflow-wp-cli.php        |  20 +--
 css/admin.css                               | 136 +++++++++---------
 css/widget.css                              | 146 ++++++++++----------
 js/plupload.js                              |   6 +-
 js/supportflow-user-widget.js               |   2 +-
 supportflow.php                             | 131 +++++++++---------
 12 files changed, 416 insertions(+), 402 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 5537656..d23a5f0 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -281,15 +281,16 @@ function action_pre_get_posts( $query ) {
 			}
 		}
 
-		// Do our own custom search handling so we can search against comment text
+		// Do our own custom search handling so we can search against reply text
 		if ( $search = $query->get( 's' ) ) {
-			// Get any comments that match our results
-			$args              = array(
+
+			// Get all replies that match our results
+			$args             = array(
 				'search' => $search,
 				'status' => 'any',
 			);
-			$matching_comments = SupportFlow()->get_comments( $args );
-			$post_ids          = wp_list_pluck( $matching_comments, 'comment_post_ID' );
+			$matching_replies = SupportFlow()->get_replies( $args );
+			$post_ids         = wp_list_pluck( $matching_replies, 'post_parent' );
 
 			$args       = array(
 				's'                      => $search,
@@ -367,14 +368,12 @@ public function action_add_meta_boxes() {
 		$respondents_box = 'tagsdiv-' . SupportFlow()->respondents_tax;
 		remove_meta_box( 'submitdiv', SupportFlow()->post_type, 'side' );
 		remove_meta_box( $respondents_box, SupportFlow()->post_type, 'side' );
-		remove_meta_box( 'commentstatusdiv', SupportFlow()->post_type, 'normal' );
 		remove_meta_box( 'slugdiv', SupportFlow()->post_type, 'normal' );
-		remove_meta_box( 'commentsdiv', SupportFlow()->post_type, 'normal' );
 
 		add_meta_box( 'supportflow-details', __( 'Details', 'supportflow' ), array( $this, 'meta_box_details' ), SupportFlow()->post_type, 'side' );
 		add_meta_box( 'supportflow-subject', __( 'Subject', 'supportflow' ), array( $this, 'meta_box_subject' ), SupportFlow()->post_type, 'normal' );
 		add_meta_box( 'supportflow-respondents', __( 'Respondents', 'supportflow' ), array( $this, 'meta_box_respondents' ), SupportFlow()->post_type, 'normal' );
-		add_meta_box( 'supportflow-comments', __( 'Commentss', 'supportflow' ), array( $this, 'meta_box_comments' ), SupportFlow()->post_type, 'normal' );
+		add_meta_box( 'supportflow-replies', __( 'Replies', 'supportflow' ), array( $this, 'meta_box_replies' ), SupportFlow()->post_type, 'normal' );
 	}
 
 	/**
@@ -468,10 +467,10 @@ public function meta_box_respondents() {
 	}
 
 	/**
-	 * Standard listing of comments includes a form at the top
-	 * and any existing comments listed in reverse chronological order
+	 * Standard listing of replies includes a form at the top
+	 * and any existing replies listed in reverse chronological order
 	 */
-	public function meta_box_comments() {
+	public function meta_box_replies() {
 		global $pagenow;
 
 		$placeholders = array(
@@ -481,17 +480,17 @@ public function meta_box_comments() {
 
 		$rand = array_rand( $placeholders );
 		echo '<h4>' . __( 'Conversation', 'supportflow' ) . '</h4>';
-		echo '<div id="comment-reply">';
+		echo '<div id="thread-reply-box">';
 
-		echo "<textarea id='comment' name='comment' class='thread-comment' rows='4' placeholder='" . esc_attr( $placeholders[$rand] ) . "'>";
+		echo "<textarea id='reply' name='reply' class='thread-reply' rows='4' placeholder='" . esc_attr( $placeholders[$rand] ) . "'>";
 		echo "</textarea>";
 
 		echo '<div id="message-tools">';
-		echo '<div id="comment-attachments-wrap">';
+		echo '<div id="replies-attachments-wrap">';
 		echo '<div id="upload-messages">' . __( 'Drop a file in the message to attach it', 'supportflow' ) . '</div>';
-		echo '<ul id="comment-attachments-list">';
+		echo '<ul id="replies-attachments-list">';
 		echo '</ul>';
-		echo '<input type="hidden" id="comment-attachments" name="comment-attachments" />';
+		echo '<input type="hidden" id="reply-attachments" name="reply-attachments" />';
 		echo '</div>';
 		echo '<div id="submit-action">';
 		echo '<input type="checkbox" id="mark-private" name="mark-private" />';
@@ -509,20 +508,21 @@ public function meta_box_comments() {
 
 		echo '<div class="clear"></div>';
 
-		$this->display_thread_comments();
+		$this->display_thread_replies();
 	}
 
-	public function display_thread_comments() {
+	public function display_thread_replies() {
+
+		$private_replies = SupportFlow()->get_thread_replies( get_the_ID(), array( 'status' => 'private' ) );
 
-		$private_comments = SupportFlow()->get_thread_comments( get_the_ID(), array( 'status' => 'private' ) );
-		if ( ! empty( $private_comments ) ) {
-			echo '<ul class="private-comments">';
-			foreach ( $private_comments as $comment ) {
+		if ( ! empty( $private_replies ) ) {
+			echo '<ul class="private-replies">';
+			foreach ( $private_replies as $reply ) {
 				echo '<li>';
-				echo '<div class="thread-comment">';
-				echo wpautop( stripslashes( $comment->comment_content ) );
-				if ( $attachment_ids = get_comment_meta( $comment->comment_ID, 'attachment_ids', true ) ) {
-					echo '<ul class="thread-comment-attachments">';
+				echo '<div class="thread-reply">';
+				echo wpautop( stripslashes( $reply->post_content ) );
+				if ( $attachment_ids = get_post_meta( $reply->ID, 'attachment_ids', true ) ) {
+					echo '<ul class="thread-reply-attachments">';
 					foreach ( $attachment_ids as $attachment_id ) {
 						$attachment_link = wp_get_attachment_url( $attachment_id );
 						echo '<li><a target="_blank" href="' . esc_url( $attachment_link ) . '">' . esc_html( get_the_title( $attachment_id ) ) . '</a></li>';
@@ -530,27 +530,30 @@ public function display_thread_comments() {
 					echo '</ul>';
 				}
 				echo '</div>';
-				$comment_date      = get_comment_date( get_option( 'date_format' ), $comment->comment_ID );
-				$comment_time      = get_comment_date( get_option( 'time_format' ), $comment->comment_ID );
-				$comment_timestamp = sprintf( __( 'Noted by %1$s on %2$s at %3$s', 'supportflow' ), $comment->comment_author, $comment_date, $comment_time );
-				echo '<div class="thread-meta"><span class="comment-timestamp">' . esc_html( $comment_timestamp ) . '</span></div>';
+				$reply_date      = mysql2date( get_option( 'date_format' ), $reply->post_date_gmt );
+				$reply_time      = mysql2date( get_option( 'time_format' ), $reply->post_date_gmt );
+				$reply_author    = get_post_meta( $reply->ID, 'reply_author', true );
+				$reply_timestamp = sprintf( __( 'Noted by %1$s on %2$s at %3$s', 'supportflow' ), $reply_author, $reply_date, $reply_time );
+				echo '<div class="thread-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . '</span></div>';
 				echo '</li>';
 			}
 			echo '</ul>';
 		}
 
-		$comments = SupportFlow()->get_thread_comments( get_the_ID(), array( 'status' => 'public' ) );
-		if ( ! empty( $comments ) ) {
-			echo '<ul class="thread-comments">';
-			foreach ( $comments as $comment ) {
+		$replies = SupportFlow()->get_thread_replies( get_the_ID(), array( 'status' => 'public' ) );
+		if ( ! empty( $replies ) ) {
+			echo '<ul class="thread-replies">';
+			foreach ( $replies as $reply ) {
+				$reply_author       = get_post_meta( $reply->ID, 'reply_author', true );
+				$reply_author_email = get_post_meta( $reply->ID, 'reply_author', true );
 				echo '<li>';
-				echo '<div class="comment-avatar">' . get_avatar( $comment->comment_author_email, 72 );
-				echo '<p class="comment-author">' . esc_html( $comment->comment_author ) . '</p>';
+				echo '<div class="reply-avatar">' . get_avatar( $reply_author_email, 72 );
+				echo '<p class="reply-author">' . esc_html( $reply_author ) . '</p>';
 				echo '</div>';
-				echo '<div class="thread-comment">';
-				echo wpautop( stripslashes( $comment->comment_content ) );
-				if ( $attachment_ids = get_comment_meta( $comment->comment_ID, 'attachment_ids', true ) ) {
-					echo '<ul class="thread-comment-attachments">';
+				echo '<div class="thread-reply">';
+				echo wpautop( stripslashes( $reply->post_content ) );
+				if ( $attachment_ids = get_post_meta( $reply->ID, 'attachment_ids', true ) ) {
+					echo '<ul class="thread-reply-attachments">';
 					foreach ( $attachment_ids as $attachment_id ) {
 						$attachment_link = wp_get_attachment_url( $attachment_id );
 						echo '<li><a target="_blank" href="' . esc_url( $attachment_link ) . '">' . esc_html( get_the_title( $attachment_id ) ) . '</a></li>';
@@ -558,8 +561,10 @@ public function display_thread_comments() {
 					echo '</ul>';
 				}
 				echo '</div>';
-				$comment_timestamp = sprintf( __( '%s at %s', 'supportflow' ), get_comment_date( get_option( 'date_format' ), $comment->comment_ID ), get_comment_date( get_option( 'time_format' ), $comment->comment_ID ) );
-				echo '<div class="thread-meta"><span class="comment-timestamp">' . esc_html( $comment_timestamp ) . '</span></div>';
+				$reply_date      = mysql2date( get_option( 'date_format' ), $reply->post_date_gmt );
+				$reply_time      = mysql2date( get_option( 'time_format' ), $reply->post_date_gmt );
+				$reply_timestamp = sprintf( __( '%s at %s', 'supportflow' ), $reply_date, $reply_time );
+				echo '<div class="thread-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . '</span></div>';
 				echo '</li>';
 			}
 			echo '</ul>';
@@ -583,7 +588,7 @@ public function filter_manage_post_columns( $columns ) {
 			'respondents' => __( 'Respondents', 'supportflow' ),
 			'status'      => __( 'Status', 'supportflow' ),
 			'author'      => __( 'Agent', 'supportflow' ),
-			'sf_comments' => '<span class="vers"><img alt="' . esc_attr__( 'Comments', 'supportflow' ) . '" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></span>',
+			'sf_replies'  => '<span class="vers"><img alt="' . esc_attr__( 'Replies', 'supportflow' ) . '" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></span>',
 			'created'     => __( 'Created', 'support' ),
 		);
 
@@ -601,12 +606,14 @@ public function manage_sortable_columns( $columns ) {
 	}
 
 	/**
-	 * Use the most recent public comment as the post excerpt
+	 * Use the most recent public reply as the post excerpt
 	 * on the Manage Threads view so mode=excerpt works well
 	 */
 	public function filter_get_the_excerpt( $orig ) {
-		if ( $comment = array_pop( SupportFlow()->get_thread_comments( get_the_ID() ) ) ) {
-			return $comment->comment_author . ': "' . wp_trim_excerpt( $comment->comment_content ) . '"';
+		if ( $reply = array_pop( SupportFlow()->get_thread_replies( get_the_ID() ) ) ) {
+			$reply_author = get_post_meta( $reply->ID, 'reply_author' );
+
+			return $reply_author . ': "' . wp_trim_excerpt( $reply->post_content ) . '"';
 		} else {
 			return $orig;
 		}
@@ -647,10 +654,10 @@ function action_manage_posts_custom_column( $column_name, $thread_id ) {
 				$filter_link = add_query_arg( $args, admin_url( 'edit.php' ) );
 				echo '<a href="' . esc_url( $filter_link ) . '">' . esc_html( $status_name ) . '</a>';
 				break;
-			case 'sf_comments':
-				$comments = SupportFlow()->get_thread_comment_count( $thread_id );
+			case 'sf_replies':
+				$replies = SupportFlow()->get_thread_replies_count( $thread_id );
 				echo '<div class="post-com-count-wrapper">';
-				echo "<span class='comment-count'>{$comments}</span>";
+				echo "<span class='replies-count'>{$replies}</span>";
 				echo '</div>';
 				break;
 			case 'created':
@@ -683,7 +690,7 @@ public function is_edit_screen() {
 
 	/**
 	 * When a thread is saved or updated, make sure we save the respondent
-	 * and new comment data
+	 * and new reply data
 	 *
 	 * @todo nonce and cap checks
 	 */
@@ -698,19 +705,19 @@ public function action_save_post( $thread_id ) {
 			SupportFlow()->update_thread_respondents( $thread_id, $respondents );
 		}
 
-		if ( isset( $_POST['comment'] ) && ! empty( $_POST['comment'] ) ) {
-			$comment    = wp_filter_nohtml_kses( $_POST['comment'] );
+		if ( isset( $_POST['reply'] ) && ! empty( $_POST['reply'] ) ) {
+			$reply      = wp_filter_nohtml_kses( $_POST['reply'] );
 			$visibility = ( ! empty( $_POST['mark-private'] ) ) ? 'private' : 'public';
-			if ( ! empty( $_POST['comment-attachments'] ) ) {
-				$attachment_ids = array_map( 'intval', explode( ',', trim( $_POST['comment-attachments'], ',' ) ) );
+			if ( ! empty( $_POST['reply-attachments'] ) ) {
+				$attachment_ids = array_map( 'intval', explode( ',', trim( $_POST['reply-attachments'], ',' ) ) );
 			} else {
 				$attachment_ids = '';
 			}
-			$comment_args = array(
-				'comment_approved' => $visibility,
-				'attachment_ids'   => $attachment_ids,
+			$reply_args = array(
+				'post_status'    => $visibility,
+				'attachment_ids' => $attachment_ids,
 			);
-			SupportFlow()->add_thread_comment( $thread_id, $comment, $comment_args );
+			SupportFlow()->add_thread_reply( $thread_id, $reply, $reply_args );
 		}
 
 	}
diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 3bb8670..d82c6e1 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -14,10 +14,10 @@ function __construct() {
 
 	public function setup_actions() {
 
-		add_filter( 'supportflow_emails_comment_notify_subject', array( $this, 'filter_comment_notify_subject' ), 10, 3 );
+		add_filter( 'supportflow_emails_reply_notify_subject', array( $this, 'filter_reply_notify_subject' ), 10, 3 );
 	}
 
-	public function filter_comment_notify_subject( $subject, $comment_id, $thread_id ) {
+	public function filter_reply_notify_subject( $subject, $reply_id, $thread_id ) {
 
 		$subject = rtrim( $subject ) . ' [' . SupportFlow()->get_secret_for_thread( $thread_id ) . ']';
 
@@ -152,11 +152,11 @@ public function process_email( $email, $i ) {
 		}
 
 		if ( $thread_id ) {
-			$message_args = array(
-				'comment_author'       => $respondent_name,
-				'comment_author_email' => $respondent_email,
+			$reply_args = array(
+				'reply_author'       => $respondent_name,
+				'reply_author_email' => $respondent_email,
 			);
-			SupportFlow()->add_thread_comment( $thread_id, $message, $message_args );
+			SupportFlow()->add_thread_reply( $thread_id, $message, $reply_args );
 		} else {
 			// If this wasn't in reply to an existing message, create a new thread
 			$new_thread_args = array(
@@ -173,7 +173,7 @@ public function process_email( $email, $i ) {
 			wp_update_post( array( 'ID' => $new_attachment_id, 'post_parent' => $thread_id, 'post_status' => 'inherit' ) );
 		}
 
-		$new_comment = array_pop( SupportFlow()->get_thread_comments( $thread_id ) );
+		$new_reply = array_pop( SupportFlow()->get_thread_replies( $thread_id ) );
 
 		// Add anyone else that was in the 'to' or 'cc' fields as respondents
 		$respondents = array();
@@ -192,9 +192,9 @@ public function process_email( $email, $i ) {
 
 		// Store the original email ID so we don't accidentally dupe it
 		$email_id = trim( $email->headers->message_id, '<>' );
-		if ( is_object( $new_comment ) ) {
-			update_comment_meta( $new_comment->comment_ID, self::email_id_key, $email_id );
-			update_comment_meta( $new_comment->comment_ID, 'attachment_ids', $new_attachment_ids );
+		if ( is_object( $new_reply ) ) {
+			update_post_meta( $new_reply->ID, self::email_id_key, $email_id );
+			update_post_meta( $new_reply->ID, 'attachment_ids', $new_attachment_ids );
 		}
 
 		return true;
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 2e8f6e4..dfd3c7b 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -25,24 +25,24 @@ public function setup_actions() {
 			return;
 		}
 
-		// When a new comment is added to a thread, notify the respondents and the agents
-		add_action( 'supportflow_thread_comment_added', array( $this, 'notify_agents_thread_comment' ) );
-		add_action( 'supportflow_thread_comment_added', array( $this, 'notify_respondents_thread_comment' ) );
+		// When a new reply is added to a thread, notify the respondents and the agents
+		add_action( 'supportflow_thread_reply_added', array( $this, 'notify_agents_thread_replies' ) );
+		add_action( 'supportflow_thread_reply_added', array( $this, 'notify_respondents_thread_replies' ) );
 	}
 
 	/**
-	 * When a new comment is added to the thread, notify the agent on the thread if there is one
+	 * When a new reply is added to the thread, notify the agent on the thread if there is one
 	 */
-	public function notify_agents_thread_comment( $comment_id ) {
+	public function notify_agents_thread_replies( $reply_id ) {
 
-		$comment = get_comment( $comment_id );
-		if ( ! $comment ) {
+		$reply = get_post( $reply_id );
+		if ( ! $reply ) {
 			return;
 		}
 
-		$thread = SupportFlow()->get_thread( $comment->comment_post_ID );
+		$thread = SupportFlow()->get_thread( $reply->post_parent );
 		// One agent by default, but easily allow notifications to a triage team
-		$agent_ids = apply_filters( 'supportflow_emails_notify_agent_ids', array( $thread->post_author ), $thread, 'comment' );
+		$agent_ids = apply_filters( 'supportflow_emails_notify_agent_ids', array( $thread->post_author ), $thread, 'reply' );
 
 		if ( empty( $agent_ids ) ) {
 			return;
@@ -55,19 +55,19 @@ public function notify_agents_thread_comment( $comment_id ) {
 			}
 		}
 
-		// Don't email the person creating the comment, unless that's desired behavior
-		if ( ! apply_filters( 'supportflow_emails_notify_creator', false, 'comment' ) ) {
-			$key = array_search( $comment->comment_author_email, $agent_emails );
+		// Don't email the person adding the reply, unless that's desired behavior
+		if ( ! apply_filters( 'supportflow_emails_notify_creator', false, 'reply' ) ) {
+			$key = array_search( get_post_meta( $reply->ID, 'reply_author_email' ), $agent_emails );
 			if ( false !== $key ) {
 				unset( $agent_emails[$key] );
 			}
 		}
 
 		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $thread->ID );
-		$subject = apply_filters( 'supportflow_emails_comment_notify_subject', $subject, $comment_id, $thread->ID, 'agent' );
+		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $thread->ID, 'agent' );
 
-		$message = stripslashes( $comment->comment_content );
-		if ( $attachment_ids = get_comment_meta( $comment->comment_ID, 'attachment_ids', true ) ) {
+		$message = stripslashes( $reply->post_content );
+		if ( $attachment_ids = get_post_meta( $reply->ID, 'attachment_ids', true ) ) {
 			$message .= "\n";
 			foreach ( $attachment_ids as $attachment_id ) {
 				$message .= "\n" . wp_get_attachment_url( $attachment_id );
@@ -82,7 +82,7 @@ public function notify_agents_thread_comment( $comment_id ) {
 		$assigned_agent = ( $thread->post_author ) ? get_user_by( 'id', $thread->post_author )->display_name : __( 'None assigned', 'supportflow' );
 		$message .= "\n" . sprintf( __( "Agent: %s", 'supportflow' ), $assigned_agent );
 
-		$message = apply_filters( 'supportflow_emails_comment_notify_message', $message, $comment_id, $thread->ID, 'agent' );
+		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $thread->ID, 'agent' );
 
 		foreach ( $agent_emails as $agent_email ) {
 			self::mail( $agent_email, $subject, $message );
@@ -90,39 +90,39 @@ public function notify_agents_thread_comment( $comment_id ) {
 	}
 
 	/**
-	 * When a new comment is added to the thread, notify all of the respondents on the thread
+	 * When a new reply is added to the thread, notify all of the respondents on the thread
 	 */
-	public function notify_respondents_thread_comment( $comment_id ) {
+	public function notify_respondents_thread_replies( $reply_id ) {
 
-		// Respondents shouldn't receive private comments
-		$comment = get_comment( $comment_id );
-		if ( ! $comment || 'private' == $comment->comment_approved ) {
+		// Respondents shouldn't receive private replies
+		$reply = get_post( $reply_id );
+		if ( ! $reply || 'private' == $reply->post_status ) {
 			return;
 		}
 
-		$thread      = SupportFlow()->get_thread( $comment->comment_post_ID );
+		$thread      = SupportFlow()->get_thread( $reply->post_parent );
 		$respondents = SupportFlow()->get_thread_respondents( $thread->ID, array( 'fields' => 'emails' ) );
 
-		// Don't email the person creating the comment, unless that's desired behavior
-		if ( ! apply_filters( 'supportflow_emails_notify_creator', false, 'comment' ) ) {
-			$key = array_search( $comment->comment_author_email, $respondents );
+		// Don't email the person creating the reply, unless that's desired behavior
+		if ( ! apply_filters( 'supportflow_emails_notify_creator', false, 'reply' ) ) {
+			$key = array_search( get_post_meta( $reply->ID, 'reply_author_email' ), $respondents );
 			if ( false !== $key ) {
 				unset( $respondents[$key] );
 			}
 		}
 
 		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $thread->ID );
-		$subject = apply_filters( 'supportflow_emails_comment_notify_subject', $subject, $comment_id, $thread->ID, 'respondent' );
+		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $thread->ID, 'respondent' );
 
-		$message = stripslashes( $comment->comment_content );
-		if ( $attachment_ids = get_comment_meta( $comment->comment_ID, 'attachment_ids', true ) ) {
+		$message = stripslashes( $reply->post_content );
+		if ( $attachment_ids = get_post_meta( $reply->ID, 'attachment_ids', true ) ) {
 			$message .= "\n";
 			foreach ( $attachment_ids as $attachment_id ) {
 				$message .= "\n" . wp_get_attachment_url( $attachment_id );
 			}
 		}
 
-		$message = apply_filters( 'supportflow_emails_comment_notify_message', $message, $comment_id, $thread->ID, 'respondent' );
+		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $thread->ID, 'respondent' );
 
 		foreach ( $respondents as $respondent_email ) {
 			self::mail( $respondent_email, $subject, $message );
diff --git a/classes/class-supportflow-json-api.php b/classes/class-supportflow-json-api.php
index aaa47a9..d7821e9 100644
--- a/classes/class-supportflow-json-api.php
+++ b/classes/class-supportflow-json-api.php
@@ -72,27 +72,27 @@ public function action_wp_ajax_supportflow_json() {
 				$response['status']    = 'ok';
 				$response['thread_id'] = $thread_id;
 				break;
-			case 'add-thread-comment':
-				$thread_id    = (int) $_REQUEST['thread_id'];
-				$message      = wp_filter_nohtml_kses( $_REQUEST['message'] );
-				$comment_args = array();
-				if ( ! empty( $_REQUEST['comment_author_email'] ) && is_email( $_REQUEST['comment_author_email'] ) ) {
-					$comment_args['comment_author_email'] = sanitize_email( $_REQUEST['comment_author_email'] );
-					if ( ! empty( $_REQUEST['comment_author'] ) ) {
-						$comment_args['comment_author'] = sanitize_text_field( $_REQUEST['comment_author'] );
+			case 'add-thread-reply':
+				$thread_id  = (int) $_REQUEST['thread_id'];
+				$message    = wp_filter_nohtml_kses( $_REQUEST['message'] );
+				$reply_args = array();
+				if ( ! empty( $_REQUEST['reply_author_email'] ) && is_email( $_REQUEST['reply_author_email'] ) ) {
+					$reply_args['reply_author_email'] = sanitize_email( $_REQUEST['reply_author_email'] );
+					if ( ! empty( $_REQUEST['reply_author'] ) ) {
+						$reply_args['reply_author'] = sanitize_text_field( $_REQUEST['reply_author'] );
 					}
 				} else {
-					$comment_args['comment_author_email'] = $current_user->user_email;
-					$comment_args['comment_author']       = $current_user->display_name;
-					$comment_args['user_id']              = $current_user->ID;
+					$reply_args['reply_author_email'] = $current_user->user_email;
+					$reply_args['reply_author']       = $current_user->display_name;
+					$reply_args['user_id']            = $current_user->ID;
 				}
-				$comment_id = SupportFlow()->add_thread_comment( $thread_id, $message );
-				if ( is_wp_error( $comment_id ) ) {
-					$response['message'] = $comment_id->get_error_message();
+				$reply_id = SupportFlow()->add_thread_reply( $thread_id, $message );
+				if ( is_wp_error( $reply_id ) ) {
+					$response['message'] = $reply_id->get_error_message();
 				} else {
-					$response['status']     = 'ok';
-					$response['thread_id']  = $thread_id;
-					$response['comment_id'] = $comment_id;
+					$response['status']    = 'ok';
+					$response['thread_id'] = $thread_id;
+					$response['reply_id']  = $reply_id;
 				}
 				break;
 			default:
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index ed22b25..7995f18 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -62,14 +62,14 @@ private function _setup_caps() {
 		// Setup the default caps for SupportFlow
 		$this->_caps = apply_filters(
 			'supportflow_caps', array(
-				'close_others_threads'      => 'sf_close_others_threads',
-				'open_others_threads'       => 'sf_open_others_threads',
-				'reopen_others_threads'     => 'sf_reopen_others_threads',
-				'comment_on_others_threads' => 'sf_comment_on_others_threads',
-				'close_threads'             => 'sf_close_threads',
-				'open_threads'              => 'sf_open_threads',
-				'reopen_threads'            => 'sf_reopen_threads',
-				'comment_on_threads'        => 'sf_comment_on_threads',
+				'close_others_threads'    => 'sf_close_others_threads',
+				'open_others_threads'     => 'sf_open_others_threads',
+				'reopen_others_threads'   => 'sf_reopen_others_threads',
+				'reply_on_others_threads' => 'sf_reply_on_others_threads',
+				'close_threads'           => 'sf_close_threads',
+				'open_threads'            => 'sf_open_threads',
+				'reopen_threads'          => 'sf_reopen_threads',
+				'reply_on_threads'        => 'sf_reply_on_threads',
 			)
 		);
 
@@ -79,12 +79,12 @@ private function _setup_caps() {
 				'administrator' => $this->get_caps(), // Apply all caps
 				'editor'        => $this->get_caps(), // Apply all caps
 				'author'        => array(
-					'close_threads'      => $this->get_cap( 'close_threads' ),
-					'open_threads'       => $this->get_cap( 'open_threads' ),
-					'comment_on_threads' => $this->get_cap( 'comment_on_threads' ),
+					'close_threads'    => $this->get_cap( 'close_threads' ),
+					'open_threads'     => $this->get_cap( 'open_threads' ),
+					'reply_on_threads' => $this->get_cap( 'reply_on_threads' ),
 				),
 				'contributor'   => array(
-					'comment_on_threads' => $this->get_cap( 'comment_on_threads' ),
+					'reply_on_threads' => $this->get_cap( 'reply_on_threads' ),
 				),
 			)
 		);
diff --git a/classes/class-supportflow-ui-widget.php b/classes/class-supportflow-ui-widget.php
index 01e640f..126fa06 100644
--- a/classes/class-supportflow-ui-widget.php
+++ b/classes/class-supportflow-ui-widget.php
@@ -29,39 +29,39 @@ public function filter_json_api_response( $response ) {
 			case 'create-thread':
 			case 'get-thread':
 				$response['widget_title'] = get_the_title( (int) $response['thread_id'] );
-				$response['html']         = $this->render_single_thread_comments_html( (int) $response['thread_id'] );
+				$response['html']         = $this->render_single_thread_replies_html( (int) $response['thread_id'] );
 				break;
-			case 'add-thread-comment':
-				$comment          = get_comment( $response['comment_id'] );
-				$response['html'] = '<li>' . $this->render_single_comment_html( $comment ) . '</li>';
+			case 'add-thread-reply':
+				$reply            = get_post( $response['comment_id'] );
+				$response['html'] = '<li>' . $this->render_single_reply_html( $reply ) . '</li>';
 				break;
 		}
 
 		return $response;
 	}
 
-	public function render_single_thread_comments_html( $thread_id ) {
+	public function render_single_thread_replies_html( $thread_id ) {
 
-		$comments = SupportFlow()->get_thread_comments( $thread_id, array( 'status' => 'public', 'order' => 'ASC' ) );
+		$replies = SupportFlow()->get_thread_replies( $thread_id, array( 'status' => 'public', 'order' => 'ASC' ) );
 
-		$output = '<ul class="thread-comments">';
-		foreach ( $comments as $comment ) {
-			$output .= '<li>' . $this->render_single_comment_html( $comment ) . '</li>';
+		$output = '<ul class="thread-replies">';
+		foreach ( $replies as $reply ) {
+			$output .= '<li>' . $this->render_single_reply_html( $reply ) . '</li>';
 		}
 		$output .= '</ul>';
 
 		return $output;
 	}
 
-	public function render_single_comment_html( $comment ) {
-		$comment_timestamp = get_comment_date( 'M. n', $comment->comment_ID );
-
-		$output = '<div class="thread-comment-body">'
-			. wpautop( stripslashes( $comment->comment_content ) )
+	public function render_single_reply_html( $reply ) {
+		$reply_timestamp = mysql2date( 'M. n', $reply->post_date_gmt );
+		$reply_author    = get_post_meta( $reply->ID, 'reply_author' );
+		$output          = '<div class="thread-reply-body">'
+			. wpautop( stripslashes( $reply->post_content ) )
 			. '</div>'
-			. '<div class="thread-comment-meta">'
-			. '<span class="thread-comment-author">' . esc_html( $comment->comment_author ) . '</span>'
-			. '<span class="thread-comment-timestamp">' . esc_html( $comment_timestamp ) . '</span>'
+			. '<div class="thread-reply-meta">'
+			. '<span class="thread-reply-author">' . esc_html( $reply_author ) . '</span>'
+			. '<span class="thread-reply-timestamp">' . esc_html( $reply_timestamp ) . '</span>'
 			. '</div>';
 
 		return $output;
@@ -79,10 +79,10 @@ public function render_all_threads_html() {
 			foreach ( $threads as $thread ) {
 				$output .= '<li id="thread-' . $thread->ID . '">';
 				$output .= '<h4 class="thread-title">' . get_the_title( $thread->ID ) . '</h4>';
-				$output .= '<div class="thread-comments">';
-				$comments     = SupportFlow()->get_thread_comments( $thread->ID, array( 'status' => 'public' ) );
-				$last_comment = array_shift( $comments );
-				$output .= $this->render_single_comment_html( $last_comment );
+				$output .= '<div class="thread-replies">';
+				$replies    = SupportFlow()->get_thread_replies( $thread->ID, array( 'status' => 'public' ) );
+				$last_reply = array_shift( $replies );
+				$output .= $this->render_single_reply_html( $last_reply );
 				$output .= '</div>';
 				$output .= '</li>';
 			}
@@ -131,45 +131,45 @@ public function action_template_redirect() {
 			array(),
 			mt_rand() // For cache busting during development
 		); ?>
-<html>
-<head>
-	<title><?php _e( 'Support', 'supportflow' ); ?></title>
-
-	<?php wp_head(); ?>
-</head>
-<body>
-
-<div id="supportflow-widget">
-	<button id="supportflow-back"><?php _e( 'All Threads', 'supportflow' ); ?></button>
-	<h1 id="widget-title"><?php echo $widget_title; ?></h1>
-
-	<div id="supportflow-newthread-box">
-		<button id="supportflow-newthread"><?php _e( 'Start a new thread', 'supportflow' ); ?></button>
-		<form id="supportflow-newthread-form">
-			<input type="text" id="new-thread-subject" name="new-thread-subject" class="thread-subject" placeholder="<?php esc_attr_e( 'What can we help with?', 'supportflow' ); ?>" autocomplete="off" />
-			<textarea id="new-thread-message" name="new-thread-message" class="thread-message" cols="25" rows="6" placeholder="<?php esc_attr_e( 'Tell us a bit more...', 'supportflow' ); ?>" autocomplete="off"></textarea>
-			<input id="new-thread-submit" type="submit" name="new-thread-submit" class="submit-button" value="<?php echo esc_attr( $start_thread_text ); ?>" />
-		</form>
-	</div>
-
-	<div id="supportflow-all-threads">
-		<?php echo $this->render_all_threads_html(); ?>
-	</div>
-
-	<div id="supportflow-single-thread">
-		<div id="supportflow-thread-body">
+		<html>
+		<head>
+			<title><?php _e( 'Support', 'supportflow' ); ?></title>
+
+			<?php wp_head(); ?>
+		</head>
+		<body>
+
+		<div id="supportflow-widget">
+			<button id="supportflow-back"><?php _e( 'All Threads', 'supportflow' ); ?></button>
+			<h1 id="widget-title"><?php echo $widget_title; ?></h1>
+
+			<div id="supportflow-newthread-box">
+				<button id="supportflow-newthread"><?php _e( 'Start a new thread', 'supportflow' ); ?></button>
+				<form id="supportflow-newthread-form">
+					<input type="text" id="new-thread-subject" name="new-thread-subject" class="thread-subject" placeholder="<?php esc_attr_e( 'What can we help with?', 'supportflow' ); ?>" autocomplete="off" />
+					<textarea id="new-thread-message" name="new-thread-message" class="thread-message" cols="25" rows="6" placeholder="<?php esc_attr_e( 'Tell us a bit more...', 'supportflow' ); ?>" autocomplete="off"></textarea>
+					<input id="new-thread-submit" type="submit" name="new-thread-submit" class="submit-button" value="<?php echo esc_attr( $start_thread_text ); ?>" />
+				</form>
+			</div>
+
+			<div id="supportflow-all-threads">
+				<?php echo $this->render_all_threads_html(); ?>
+			</div>
+
+			<div id="supportflow-single-thread">
+				<div id="supportflow-thread-body">
+				</div>
+				<form id="supportflow-existing-thread-form">
+					<textarea id="existing-thread-message" name="existing-thread-message" class="thread-message" cols="25" rows="6" autocomplete="off"></textarea>
+					<input id="existing-thread-submit" type="submit" name="existing-thread-submit" class="submit-button" value="<?php echo esc_attr( $send_reply_text ); ?>" />
+					<input id="existing-thread-id" name="thread-id" type="hidden" />
+				</form>
+			</div>
 		</div>
-		<form id="supportflow-existing-thread-form">
-			<textarea id="existing-thread-message" name="existing-thread-message" class="thread-message" cols="25" rows="6" autocomplete="off"></textarea>
-			<input id="existing-thread-submit" type="submit" name="existing-thread-submit" class="submit-button" value="<?php echo esc_attr( $send_reply_text ); ?>" />
-			<input id="existing-thread-id" name="thread-id" type="hidden" />
-		</form>
-	</div>
-</div>
-
-</body>
-</html>
-<?php
+
+		</body>
+		</html>
+		<?php
 
 		exit();
 	}
diff --git a/classes/class-supportflow-wp-cli.php b/classes/class-supportflow-wp-cli.php
index a551788..f83acb3 100644
--- a/classes/class-supportflow-wp-cli.php
+++ b/classes/class-supportflow-wp-cli.php
@@ -126,27 +126,27 @@ public function import_remote( $args, $assoc_args ) {
 			SupportFlow()->update_thread_respondents( $thread_id, $old_thread->email );
 
 			// Get the thread's messages and import those too
-			$old_messages   = (array) $spdb->get_results( $spdb->prepare( "SELECT * FROM $spdb->messages WHERE thread_id=%d", $old_thread->thread_id ) );
-			$count_comments = 0;
+			$old_messages  = (array) $spdb->get_results( $spdb->prepare( "SELECT * FROM $spdb->messages WHERE thread_id=%d", $old_thread->thread_id ) );
+			$count_replies = 0;
 			foreach ( $old_messages as $old_message ) {
 				$message_args = array(
-					'comment_author'       => $old_message->email,
-					'comment_author_email' => $old_message->email,
-					'time'                 => $old_message->dt,
-					'comment_approved'     => ( 'note' == $old_message->message_type ) ? 'private' : 'public',
+					'reply_author'       => $old_message->email,
+					'reply_author_email' => $old_message->email,
+					'time'               => $old_message->dt,
+					'post_status'        => ( 'note' == $old_message->message_type ) ? 'private' : 'public',
 				);
 				if ( function_exists( 'What_The_Email' ) ) {
 					$old_message->content = What_The_Email()->get_message( $old_message->content );
 				}
-				$comment_id = SupportFlow()->add_thread_comment( $thread_id, $old_message->content, $message_args );
-				add_comment_meta( $comment_id, '_imported_id', $old_message->message_id );
-				$count_comments ++;
+				$reply_id = SupportFlow()->add_thread_reply( $thread_id, $old_message->content, $message_args );
+				add_post_meta( $reply_id, '_imported_id', $old_message->message_id );
+				$count_replies ++;
 			}
 
 			// One the thread is created, log the old thread ID
 			update_post_meta( $thread_id, '_imported_id', $old_thread->thread_id );
 
-			WP_CLI::line( "Created: #{$old_thread->thread_id} '{$old_thread->subject}' with {$count_comments} comments" );
+			WP_CLI::line( "Created: #{$old_thread->thread_id} '{$old_thread->subject}' with {$count_replies} replies" );
 			$count_threads_created ++;
 		}
 
diff --git a/css/admin.css b/css/admin.css
index c37d50b..79234e5 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -1,6 +1,6 @@
-.wp-list-table.fixed .column-sf_comments {
+.wp-list-table.fixed .column-sf_replies {
 	text-align: left;
-	width: 4em;
+	width:      4em;
 }
 
 .wp-list-table.fixed .column-updated,
@@ -22,7 +22,7 @@
 
 #supportflow-subject.postbox,
 #supportflow-respondents.postbox {
-	border: none;
+	border:     none;
 	background: none;
 }
 
@@ -37,8 +37,8 @@
 #supportflow-subject h3.hndle,
 #supportflow-respondents .handlediv,
 #supportflow-respondents h3.hndle,
-#supportflow-comments .handlediv,
-#supportflow-comments h3.hndle {
+#supportflow-replies .handlediv,
+#supportflow-replies h3.hndle {
 	display: none;
 }
 
@@ -48,7 +48,7 @@
 }
 
 #supportflow-details #misc-publishing-actions label {
-	width: 50px;
+	width:   50px;
 	display: inline-block;
 }
 
@@ -66,131 +66,131 @@
 
 #supportflow-subject h4,
 #supportflow-respondents h4,
-#supportflow-comments h4 {
-	font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
-	font-size: 13px;
-	font-weight: normal;
-	margin-left: 0;
-	margin-right: 0;
-	margin-top: 10px;
+#supportflow-replies h4 {
+	font-family:   Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+	font-size:     13px;
+	font-weight:   normal;
+	margin-left:   0;
+	margin-right:  0;
+	margin-top:    10px;
 	margin-bottom: 6px;
 }
 
 #supportflow-subject.postbox input {
-	width: 100%;
-	font-size: 1.7em;
-	padding-left: 8px;
-	padding-right: 8px;
-	padding-top: 12px;
+	width:          100%;
+	font-size:      1.7em;
+	padding-left:   8px;
+	padding-right:  8px;
+	padding-top:    12px;
 	padding-bottom: 10px;
 }
 
 #supportflow-respondents.postbox input {
-	width: 100%;
-	padding: 8px;
+	width:     100%;
+	padding:   8px;
 	font-size: 1.2em;
 }
 
-#supportflow-comments.postbox #comment-reply {
+#supportflow-replies.postbox #thread-reply-box {
 	width: 100%;
 }
 
-#supportflow-comments.postbox textarea {
-	width: 100%;
-	padding: 8px;
+#supportflow-replies.postbox textarea {
+	width:     100%;
+	padding:   8px;
 	font-size: 1.1em;
 	font-size: 1.2em;
 }
 
-#supportflow-comments.postbox .inside #message-tools #submit-action {
-	padding: 0;
+#supportflow-replies.postbox .inside #message-tools #submit-action {
+	padding:    0;
 	margin-top: 5px;
-	float: right;
+	float:      right;
 }
 
-#supportflow-comments.postbox .inside #message-tools #comment-attachments-wrap {
+#supportflow-replies.postbox .inside #message-tools #replies-attachments-wrap {
 	float: left;
 }
 
-#supportflow-comments #upload-messages,
-#supportflow-comments #comment-attachments-list {
-	margin-top: 9px;
+#supportflow-replies #upload-messages,
+#supportflow-replies #replies-attachments-list {
+	margin-top:  9px;
 	margin-left: 2px;
-	color: #666666;
+	color:       #666666;
 }
 
-#supportflow-comments.postbox .inside #message-tools #submit-action input[type="checkbox"] {
+#supportflow-replies.postbox .inside #message-tools #submit-action input[type="checkbox"] {
 	margin-top: -1px;
 }
 
-#supportflow-comments.postbox .inside #message-tools #submit-action label {
-	padding-top: 2px;
-	padding-left: 5px;
+#supportflow-replies.postbox .inside #message-tools #submit-action label {
+	padding-top:   2px;
+	padding-left:  5px;
 	padding-right: 25px;
 }
 
-#supportflow-comments.postbox ul.private-comments {
+#supportflow-replies.postbox ul.private-replies {
 	background-color: #FFFFE0;
-	border: 1px solid #E6DB55;
-	padding: 5px 10px;
+	border:           1px solid #E6DB55;
+	padding:          5px 10px;
 }
 
-#supportflow-comments.postbox ul.private-comments li {
+#supportflow-replies.postbox ul.private-replies li {
 	border-top: 1px solid #DFDFDF;
 	margin-top: 10px;
 }
 
-#supportflow-comments.postbox ul.private-comments li:first-child {
+#supportflow-replies.postbox ul.private-replies li:first-child {
 	border-top: none;
 	margin-top: 0;
 }
 
-#supportflow-comments.postbox ul.private-comments li .thread-meta {
-	color: #BBB;
-	font-size: 0.9em;
+#supportflow-replies.postbox ul.private-replies li .thread-meta {
+	color:      #BBB;
+	font-size:  0.9em;
 	text-align: right;
 }
 
-#supportflow-comments.postbox ul.thread-comments li {
-	clear: left;
-	margin-top: 20px;
+#supportflow-replies.postbox ul.thread-replies li {
+	clear:         left;
+	margin-top:    20px;
 	margin-bottom: 20px;
 }
 
-#supportflow-comments.postbox ul.thread-comments li .thread-comment-attachments li,
-#supportflow-comments.postbox ul.private-comments li .thread-comment-attachments li {
-	margin-top: 3px;
+#supportflow-replies.postbox ul.thread-replies li .thread-reply-attachments li,
+#supportflow-replies.postbox ul.private-replies li .thread-reply-attachments li {
+	margin-top:    3px;
 	margin-bottom: 3px;
-	font-size: 0.9em;
+	font-size:     0.9em;
 }
 
-#supportflow-comments.postbox ul.thread-comments li .comment-avatar {
+#supportflow-replies.postbox ul.thread-replies li .reply-avatar {
 	float: left;
 }
 
-#supportflow-comments.postbox ul.thread-comments li .comment-author {
-	margin: 0;
+#supportflow-replies.postbox ul.thread-replies li .reply-author {
+	margin:    0;
 	font-size: 0.9em;
-	color: #666666;
+	color:     #666666;
 }
 
-#supportflow-comments.postbox ul.thread-comments li .thread-comment {
-	background-color: #FFFFFF;
-	margin-left: 105px;
-	min-height: 80px;
-	padding: 10px;
-	font-size: 1.1em;
-	border: 1px solid #DFDFDF;
+#supportflow-replies.postbox ul.thread-replies li .thread-reply {
+	background-color:      #FFFFFF;
+	margin-left:           105px;
+	min-height:            80px;
+	padding:               10px;
+	font-size:             1.1em;
+	border:                1px solid #DFDFDF;
 	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-	border-radius: 3px;
+	-moz-border-radius:    3px;
+	border-radius:         3px;
 }
 
-#supportflow-comments.postbox ul.thread-comments li .thread-meta {
+#supportflow-replies.postbox ul.thread-replies li .thread-meta {
 	margin-left: 105px;
-	font-size: 0.9em;
-	color: #666666;
-	margin-top: 5px;
+	font-size:   0.9em;
+	color:       #666666;
+	margin-top:  5px;
 }
 
 .metabox-holder .postbox-container .empty-container {
diff --git a/css/widget.css b/css/widget.css
index 29dc45a..c39b2b8 100644
--- a/css/widget.css
+++ b/css/widget.css
@@ -1,33 +1,33 @@
 body {
-	margin: 10px;
-	padding: 0;
+	margin:           10px;
+	padding:          0;
 	background-color: #f9f9f9;
-	font-family: sans-serif;
-	color: #333;
+	font-family:      sans-serif;
+	color:            #333;
 }
 
 #widget-title {
 	border-bottom: 1px solid #ececec;
-	font: 23px/29px "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif;
-	margin: 0;
-	padding: 0 15px 4px 9px;
+	font:          23px/29px "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", sans-serif;
+	margin:        0;
+	padding:       0 15px 4px 9px;
 }
 
 #supportflow-back {
-	display: none;
-	position: relative;
-	background-color: #fff;
-	border: 1px solid #bbb;
-	font-family: sans-serif;
-	font-size: 12px;
-	line-height: 14px;
-	text-align: center;
-	padding: 5px 10px;
-	white-space: nowrap;
+	display:               none;
+	position:              relative;
+	background-color:      #fff;
+	border:                1px solid #bbb;
+	font-family:           sans-serif;
+	font-size:             12px;
+	line-height:           14px;
+	text-align:            center;
+	padding:               5px 10px;
+	white-space:           nowrap;
 
 	-webkit-border-radius: 15px;
-	-moz-border-radius: 15px;
-	border-radius: 15px;
+	-moz-border-radius:    15px;
+	border-radius:         15px;
 }
 
 #supportflow-back:before {
@@ -40,14 +40,14 @@ body {
 
 #supportflow-newthread,
 #new-thread-submit {
-	background-color: #fff;
-	border: 1px solid #bbb;
-	font-family: sans-serif;
-	font-size: 14px;
-	line-height: 19px;
-	text-align: center;
-	padding: 5px 10px;
-	white-space: nowrap;
+	background-color:      #fff;
+	border:                1px solid #bbb;
+	font-family:           sans-serif;
+	font-size:             14px;
+	line-height:           19px;
+	text-align:            center;
+	padding:               5px 10px;
+	white-space:           nowrap;
 	-webkit-border-radius: 15px;
 }
 
@@ -61,39 +61,39 @@ body {
 
 #supportflow-newthread-form textarea,
 #supportflow-existing-thread-form textarea {
-	width: 100%;
-	font-size: 16px;
-	font-weight: 200;
-	border: 1px solid #BBB;
+	width:                 100%;
+	font-size:             16px;
+	font-weight:           200;
+	border:                1px solid #BBB;
 	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-	border-radius: 3px;
-	color: #333;
-	padding: 3px 8px;
+	-moz-border-radius:    3px;
+	border-radius:         3px;
+	color:                 #333;
+	padding:               3px 8px;
 }
 
 #supportflow-newthread-form input[type='submit'],
 #supportflow-existing-thread-form input[type='submit'] {
-	width: 100%;
-	font-size: 16px;
-	padding-top: 5px;
-	border: none;
-	color: #222;
-	font-weight: 200;
-	font-family: "Helvetica Neue", sans-serif;
-	background-color: #EEE;
-	padding-bottom: 5px;
+	width:                 100%;
+	font-size:             16px;
+	padding-top:           5px;
+	border:                none;
+	color:                 #222;
+	font-weight:           200;
+	font-family:           "Helvetica Neue", sans-serif;
+	background-color:      #EEE;
+	padding-bottom:        5px;
 	-webkit-border-radius: 3px;
-	-moz-border-radius: 3px;
-	border-radius: 3px;
-	border: 1px solid #BBB;
+	-moz-border-radius:    3px;
+	border-radius:         3px;
+	border:                1px solid #BBB;
 }
 
 #supportflow-newthread-form input[type='submit']:hover,
 #supportflow-existing-thread-form input[type='submit']:hover {
-	cursor: pointer;
+	cursor:       pointer;
 	border-color: #888;
-	color: #111;
+	color:        #111;
 }
 
 #supportflow-newthread:hover,
@@ -111,16 +111,16 @@ body {
 
 #supportflow-all-threads .nothreads {
 	border-bottom: 1px solid #989898;
-	border-top: 1px solid #989898;
-	color: #333;
-	font: 16px/21px Georgia, Times, serif;
-	padding: 20px 0;
-	text-align: center;
+	border-top:    1px solid #989898;
+	color:         #333;
+	font:          16px/21px Georgia, Times, serif;
+	padding:       20px 0;
+	text-align:    center;
 }
 
 #supportflow-newthread-form {
 	display: none;
-	margin: 0;
+	margin:  0;
 }
 
 #supportflow-newthread-form input[name="subject"] {
@@ -128,17 +128,17 @@ body {
 }
 
 #supportflow-newthread-form input[type="text"] {
-	font-size: 14px;
+	font-size:   14px;
 	line-height: 150%;
 }
 
 #supportflow-newthread-form input[type="text"] {
-	border: 1px solid #ccc;
+	border:                1px solid #ccc;
 	-webkit-border-radius: 3px;
-	border-radius: 3px;
-	color: #333;
-	padding: 3px 8px;
-	width: 100%;
+	border-radius:         3px;
+	color:                 #333;
+	padding:               3px 8px;
+	width:                 100%;
 }
 
 #supportflow-help:hover,
@@ -153,45 +153,45 @@ body {
 #supportflow-single-thread ul,
 #supportflow-all-threads ul {
 	list-style-type: none;
-	margin: 0;
-	padding: 0;
+	margin:          0;
+	padding:         0;
 }
 
 #supportflow-single-thread ul li,
 #supportflow-all-threads ul li {
 	border-bottom: 1px solid #ECECEC;
-	padding: 5px 5px 10px 5px;
+	padding:       5px 5px 10px 5px;
 }
 
 #supportflow-all-threads ul li:first-child {
-	border-top: 1px solid #ECECEC;
+	border-top:  1px solid #ECECEC;
 	padding-top: 0;
 }
 
 #supportflow-all-threads ul li:hover {
 	background-color: #fff;
-	cursor: pointer;
+	cursor:           pointer;
 }
 
 #supportflow-all-threads ul li h4 {
-	font: bold 14px/18px "Helvetica Neue", sans-serif;
+	font:   bold 14px/18px "Helvetica Neue", sans-serif;
 	margin: 10px 0 0 0;
 }
 
-.thread-comments .thread-comment-body p {
-	font: 13px/18px "Helvetica Neue", sans-serif;
+.thread-replies .thread-reply-body p {
+	font:   13px/18px "Helvetica Neue", sans-serif;
 	margin: 5px 0;
 }
 
-.thread-comments .thread-comment-meta {
+.thread-replies .thread-reply-meta {
 	font-size: 12px;
-	color: #888;
+	color:     #888;
 }
 
-.thread-comments .thread-comment-meta .thread-comment-author {
+.thread-replies .thread-reply-meta .thread-reply-author {
 	font-weight: bold;
 }
 
-.thread-comments .thread-comment-meta .thread-comment-timestamp {
+.thread-replies .thread-reply-meta .thread-reply-timestamp {
 	float: right;
 }
\ No newline at end of file
diff --git a/js/plupload.js b/js/plupload.js
index 81a7f5b..9f87750 100644
--- a/js/plupload.js
+++ b/js/plupload.js
@@ -3,15 +3,15 @@ jQuery(document).ready(function ($) {
 
 		/* Selectors */
 		browser : '#upload-indicator',
-		dropzone: '#comment-reply',
+		dropzone: '#thread-reply-box',
 
 		/* Callbacks */
 		success : function (attachment) {
-			$('#comment-attachments').val($('#comment-attachments').val() + ',' + attachment.id);
+			$('#reply-attachments').val($('#reply-attachments').val() + ',' + attachment.id);
 			$('#upload-messages').hide();
 			$('<li>', {
 				html: '<a target="_blank" href="' + attachment.url + '">' + attachment.title + '</a>',
-			}).appendTo($('ul#comment-attachments-list'));
+			}).appendTo($('ul#replies-attachments-list'));
 			$('#upload-messages').removeClass('uploading');
 		},
 
diff --git a/js/supportflow-user-widget.js b/js/supportflow-user-widget.js
index 2c2395f..9ce1446 100644
--- a/js/supportflow-user-widget.js
+++ b/js/supportflow-user-widget.js
@@ -99,7 +99,7 @@ var supportflow = {};
 			message           : supportflow.single_thread_message.val(),
 			supportflow_widget: true,
 		}
-		$.post(supportflow.get_ajax_url('add-thread-comment'), data, supportflow.handle_new_message_response);
+		$.post(supportflow.get_ajax_url('add-thread-reply'), data, supportflow.handle_new_message_response);
 	}
 
 	supportflow.enable_thread_form = function (form, clear_form, submit_text) {
diff --git a/supportflow.php b/supportflow.php
index 60c5ae7..7b2c5cd 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -162,8 +162,8 @@ private function setup_globals() {
 
 		$this->post_type       = apply_filters( 'supportflow_thread_post_type', 'sf_thread' );
 		$this->respondents_tax = apply_filters( 'supportflow_respondents_taxonomy', 'sf_respondent' );
+		$this->reply_type      = apply_filters( 'supportflow_thread_reply_type', 'sf_thread' );
 		$this->tags_tax        = apply_filters( 'supportflow_tags_taxonomy', 'sf_tags' );
-		$this->comment_type    = apply_filters( 'supportflow_thread_comment_type', 'sf_comment' );
 
 		$this->email_term_prefix = 'sf-';
 
@@ -278,7 +278,7 @@ public function action_init_register_post_type() {
 				'public'        => true,
 				'menu_position' => 3,
 				'supports'      => array(
-					'comments',
+					''
 				),
 			)
 		);
@@ -427,12 +427,12 @@ public function create_thread( $args ) {
 
 		// If there was a message, add it to the thread
 		if ( ! empty( $args['message'] ) && ! empty( $args['respondent_email'] ) ) {
-			$comment_details = array(
-				'comment_author'       => $args['respondent_name'],
-				'comment_author_email' => $args['respondent_email'],
-				'user_id'              => $args['respondent_id'],
+			$reply_details = array(
+				'reply_author'       => $args['respondent_name'],
+				'reply_author_email' => $args['respondent_email'],
+				'user_id'            => $args['respondent_id'],
 			);
-			$this->add_thread_comment( $thread_id, $args['message'], $comment_details );
+			$this->add_thread_reply( $thread_id, $args['message'], $reply_details );
 		}
 
 		return $thread_id;
@@ -455,7 +455,7 @@ public function filter_wp_insert_post_empty_content( $maybe_empty, $postarr ) {
 	}
 
 	/**
-	 * @todo This should produce an object with thread details, respondents, and comments
+	 * @todo This should produce an object with thread details, respondents, and replies
 	 */
 	public function get_thread( $thread_id ) {
 
@@ -463,7 +463,7 @@ public function get_thread( $thread_id ) {
 	}
 
 	/**
-	 * @todo This should produce a series of thread objects with respondents, comments, etc.
+	 * @todo This should produce a series of thread objects with respondents, replies, etc.
 	 */
 	public function get_threads( $args = array() ) {
 
@@ -587,20 +587,20 @@ public function update_thread_respondents( $thread_id, $respondents, $append = f
 	}
 
 	/**
-	 * Get all of the comments associated with a thread
+	 * Get all of the replies associated with a thread
 	 */
-	public function get_thread_comments( $thread_id, $args = array() ) {
+	public function get_thread_replies( $thread_id, $args = array() ) {
 
 		$args['post_id'] = $thread_id;
-		$thread_comments = SupportFlow()->get_comments( $args );
+		$thread_replies  = SupportFlow()->get_replies( $args );
 
-		return $thread_comments;
+		return $thread_replies;
 	}
 
 	/**
-	 * Get all comments based on various arguments
+	 * Get all replies based on various arguments
 	 */
-	public function get_comments( $args ) {
+	public function get_replies( $args ) {
 
 		$default_args = array(
 			'status'  => 'public', // 'public', 'private', 'all'
@@ -609,70 +609,71 @@ public function get_comments( $args ) {
 			'order'   => 'DESC', // 'DESC', 'ASC',
 		);
 
-		$args         = array_merge( $default_args, $args );
-		$comment_args = array(
-			'search'       => $args['search'],
-			'post_id'      => $args['post_id'],
-			'status'       => $args['status'],
-			'comment_type' => $this->comment_type,
-			'order'        => $args['order'],
+		$args      = array_merge( $default_args, $args );
+		$post_args = array(
+			'search'      => $args['search'],
+			'post_parent' => $args['post_id'],
+			'post_status' => $args['status'],
+			'post_type'   => $this->reply_type,
+			'order'       => $args['order'],
 		);
+		add_filter( 'posts_clauses', array( $this, 'filter_reply_clauses' ), 10, 2 );
+		$thread_replies = get_posts( $post_args );
 
-		add_filter( 'comments_clauses', array( $this, 'filter_comment_clauses' ), 10, 2 );
-		$thread_comments = get_comments( $comment_args );
-		remove_filter( 'comments_clauses', array( $this, 'filter_comment_clauses' ) );
+		remove_filter( 'posts_clauses', array( $this, 'filter_reply_clauses' ) );
 
-		return $thread_comments;
+		return $thread_replies;
 	}
 
 	/**
-	 * Convert 'any' comment_approved requests to the proper SQL
+	 * Convert 'any' reply approved requests to the proper SQL
 	 */
-	public function filter_comment_clauses( $clauses, $query ) {
-		$old_comment_approved = "( comment_approved = '0' OR comment_approved = '1' )";
+	public function filter_reply_clauses( $clauses, $query ) {
+
+		$old_reply_approved = "( post_status = '0' OR post_status = '1' )";
 		if ( in_array( $query->query_vars['status'], array( 'public', 'private' ) ) ) {
-			$new_comment_approved = "comment_approved = '{$query->query_vars['status']}' ";
+			$new_reply_approved = "post_status = '{$query->query_vars['status']}' ";
 		} else {
-			$new_comment_approved = "comment_approved IN ( 'private', 'public' )";
+			$new_reply_approved = "post_status IN ( 'private', 'public' )";
 		}
-		$clauses['where'] = str_replace( $old_comment_approved, $new_comment_approved, $clauses['where'] );
+		$clauses['where'] = str_replace( $old_reply_approved, $new_reply_approved, $clauses['where'] );
 
 		return $clauses;
 	}
 
 	/**
-	 * Get the total number of comments associated with a thread
+	 * Get the total number of replies associated with a thread
 	 *
-	 * @todo support filtering to specific types or commenters
+	 * @todo support filtering to specific types or replier
 	 */
-	public function get_thread_comment_count( $thread_id, $args = array() ) {
+	public function get_thread_replies_count( $thread_id, $args = array() ) {
 		global $wpdb;
 
-		$count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_post_ID =%s AND comment_type = %s", $thread_id, $this->comment_type ) );
+		$count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM $wpdb->posts WHERE post_parent =%s AND post_type = %s", $thread_id, $this->post_type ) );
 
 		return (int) $count;
 	}
 
 	/**
-	 * Add a comment to a given thread
+	 * Add a reply to a given thread
 	 */
-	public function add_thread_comment( $thread_id, $comment_text, $details = array() ) {
+	public function add_thread_reply( $thread_id, $reply_text, $details = array() ) {
 		global $wpdb;
 
 		$default_details = array(
-			'time'                 => current_time( 'mysql' ),
-			'comment_author'       => '',
-			'comment_author_email' => '',
-			'user_id'              => '',
-			'comment_approved'     => 'public',
+			'time'               => current_time( 'mysql' ),
+			'reply_author'       => '',
+			'reply_author_email' => '',
+			'user_id'            => '',
+			'post_status'        => 'public',
 		);
 
 		// @todo This actually probably shouldn't default to current user, so
 		// we don't have to mandate the arguments be assigned each time
 		if ( $user = wp_get_current_user() ) {
-			$default_details['comment_author']       = $user->display_name;
-			$default_details['comment_author_email'] = $user->user_email;
-			$default_details['user_id']              = $user->ID;
+			$default_details['reply_author']       = $user->display_name;
+			$default_details['reply_author_email'] = $user->user_email;
+			$default_details['user_id']            = $user->ID;
 		}
 
 		$details = array_merge( $default_details, $details );
@@ -685,31 +686,37 @@ public function add_thread_comment( $thread_id, $comment_text, $details = array(
 			$attachment_ids = false;
 		}
 
-		$comment    = array(
-			'comment_content'      => esc_sql( $comment_text ),
-			'comment_post_ID'      => (int) $thread_id,
-			'comment_date'         => esc_sql( $details['time'] ),
-			'comment_approved'     => esc_sql( $details['comment_approved'] ),
-			'comment_type'         => esc_sql( $this->comment_type ),
-			'comment_author'       => esc_sql( $details['comment_author'] ),
-			'comment_author_email' => esc_sql( $details['comment_author_email'] ),
-			'user_id'              => (int) $details['user_id'],
+		$reply = array(
+			'post_content' => esc_sql( $reply_text ),
+			'post_parent'  => (int) $thread_id,
+			'post_date'    => esc_sql( $details['time'] ),
+			'post_status'  => esc_sql( $details['post_status'] ),
+			'post_type'    => esc_sql( $this->reply_type ),
+			'post_title'   => 'supportflow reply',
+			'user_id'      => (int) $details['user_id'],
 		);
-		$comment    = apply_filters( 'supportflow_pre_insert_thread_comment', $comment );
-		$comment_id = wp_insert_comment( $comment );
 
+
+		$reply = apply_filters( 'supportflow_pre_insert_thread_reply', $reply );
+		remove_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
+		$reply_id = wp_insert_post( $reply, true );
+		add_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
 		// If there are attachment IDs store them as meta
 		if ( ! empty( $attachment_ids ) ) {
-			add_comment_meta( $comment_id, 'attachment_ids', $attachment_ids, true );
+			add_post_meta( $reply_id, 'attachment_ids', $attachment_ids, true );
 		}
 
-		// Adding a thread comment updates the post modified time for the thread
+		add_post_meta( $reply_id, 'reply_author', esc_sql( $details['reply_author'] ) );
+		add_post_meta( $reply_id, 'reply_author_email', esc_sql( $details['reply_author_email'] ) );
+
+
+		// Adding a thread reply updates the post modified time for the thread
 		$query = $wpdb->update( $wpdb->posts, array( 'post_modified' => current_time( 'mysql' ) ), array( 'ID' => $thread_id ) );
 		clean_post_cache( $thread_id );
 
-		do_action( 'supportflow_thread_comment_added', $comment_id );
+		do_action( 'supportflow_thread_reply_added', $reply_id );
 
-		return $comment_id;
+		return $reply_id;
 	}
 
 	/**
@@ -764,4 +771,4 @@ function SupportFlow() {
 	return SupportFlow::instance();
 }
 
-add_action( 'plugins_loaded', 'SupportFlow' );
\ No newline at end of file
+add_action( 'plugins_loaded', 'SupportFlow' );

From 183c543b99dd2631b581d1f13f62513d14cecaac Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 25 May 2014 04:58:38 +0530
Subject: [PATCH 037/485] Created a new custom post type to store predefined
 replies

---
 supportflow.php | 58 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 5 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index 60c5ae7..3bd7267 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -160,10 +160,12 @@ private function setup_globals() {
 
 		/** Identifiers *******************************************************/
 
-		$this->post_type       = apply_filters( 'supportflow_thread_post_type', 'sf_thread' );
-		$this->respondents_tax = apply_filters( 'supportflow_respondents_taxonomy', 'sf_respondent' );
-		$this->tags_tax        = apply_filters( 'supportflow_tags_taxonomy', 'sf_tags' );
-		$this->comment_type    = apply_filters( 'supportflow_thread_comment_type', 'sf_comment' );
+		$this->post_type                = apply_filters( 'supportflow_thread_post_type', 'sf_thread' );
+		$this->predefinded_replies_type = apply_filters( 'supportflow_predefinded_replies_type', 'sf_predefs' );
+		$this->respondents_tax          = apply_filters( 'supportflow_respondents_taxonomy', 'sf_respondent' );
+		$this->tags_tax                 = apply_filters( 'supportflow_tags_taxonomy', 'sf_tags' );
+		$this->comment_type             = apply_filters( 'supportflow_thread_comment_type', 'sf_comment' );
+		$this->post_type                = apply_filters( 'supportflow_thread_post_type', 'sf_thread' );
 
 		$this->email_term_prefix = 'sf-';
 
@@ -246,6 +248,8 @@ private function setup_actions() {
 		add_action( 'init', array( $this, 'action_init_register_post_type' ) );
 		add_action( 'init', array( $this, 'action_init_register_taxonomies' ) );
 		add_action( 'init', array( $this, 'action_init_register_post_statuses' ) );
+		add_action( 'init', array( $this, 'action_init_register_predefined_replies' ) );
+		add_action( 'admin_menu', array( $this, 'action_admin_menu_predefined_replies' ) );
 
 		add_filter( 'wp_insert_post_empty_content', array( $this, 'filter_wp_insert_post_empty_content' ), 10, 2 );
 
@@ -284,6 +288,50 @@ public function action_init_register_post_type() {
 		);
 	}
 
+	/**
+	 * Register the custom post type to create predefined replies
+	 * @uses  register_post_type() To register the post type
+	 */
+	function action_init_register_predefined_replies() {
+		register_post_type(
+			$this->predefinded_replies_type, array(
+				'labels'             => array(
+					'menu_name'          => __( 'SupportFlow', 'supportflow' ),
+					'name'               => __( 'Predefined replies', 'supportflow' ),
+					'singular_name'      => __( 'Predefined Reply', 'supportflow' ),
+					'all_items'          => __( 'All predefined replies', 'supportflow' ),
+					'add_new'            => __( 'New predefined reply', 'supportflow' ),
+					'add_new_item'       => __( 'New predefined reply', 'supportflow' ),
+					'edit_item'          => __( 'Edit predefined reply', 'supportflow' ),
+					'new_item'           => __( 'New predefined reply', 'supportflow' ),
+					'view_item'          => __( 'View predefined reply', 'supportflow' ),
+					'search_items'       => __( 'Search predefined replies', 'supportflow' ),
+					'not_found'          => __( 'No predefined reply found', 'supportflow' ),
+					'not_found_in_trash' => __( 'No predefined reply found in trash', 'supportflow' ),
+				),
+				'public'             => true,
+				'show_ui'            => true,
+				'publicly_queryable' => false,
+				'show_in_menu'       => false,
+				'supports'           => array(
+					'title', 'editor', 'revisions',
+				),
+			)
+		);
+	}
+
+	/**
+	 * Add predefined options under Supportflow menu
+	 */
+	public function action_admin_menu_predefined_replies() {
+		$post_type                = $this->post_type;
+		$predefinded_replies_type = $this->predefinded_replies_type;
+
+		add_submenu_page( "edit.php?post_type=$post_type", 'All predefined replies', 'All predefined replies', 'manage_options', "edit.php?post_type=$predefinded_replies_type" );
+		add_submenu_page( "edit.php?post_type=$post_type", 'New predefined reply', 'New predefined reply', 'manage_options', "post-new.php?post_type=$predefinded_replies_type" );
+
+	}
+
 	/**
 	 * Register our custom taxonomies
 	 */
@@ -764,4 +812,4 @@ function SupportFlow() {
 	return SupportFlow::instance();
 }
 
-add_action( 'plugins_loaded', 'SupportFlow' );
\ No newline at end of file
+add_action( 'plugins_loaded', 'SupportFlow' );

From 470af997be24b765f8f0b2adb04cbfb3a8eddec2 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 25 May 2014 05:04:01 +0530
Subject: [PATCH 038/485] Converted menu titles of predefined replies to title
 case and disabled revisions

---
 supportflow.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index 3bd7267..0a887ff 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -297,13 +297,13 @@ function action_init_register_predefined_replies() {
 			$this->predefinded_replies_type, array(
 				'labels'             => array(
 					'menu_name'          => __( 'SupportFlow', 'supportflow' ),
-					'name'               => __( 'Predefined replies', 'supportflow' ),
+					'name'               => __( 'Predefined Replies', 'supportflow' ),
 					'singular_name'      => __( 'Predefined Reply', 'supportflow' ),
 					'all_items'          => __( 'All predefined replies', 'supportflow' ),
 					'add_new'            => __( 'New predefined reply', 'supportflow' ),
 					'add_new_item'       => __( 'New predefined reply', 'supportflow' ),
-					'edit_item'          => __( 'Edit predefined reply', 'supportflow' ),
-					'new_item'           => __( 'New predefined reply', 'supportflow' ),
+					'edit_item'          => __( 'Edit Predefined reply', 'supportflow' ),
+					'new_item'           => __( 'New Predefined Reply', 'supportflow' ),
 					'view_item'          => __( 'View predefined reply', 'supportflow' ),
 					'search_items'       => __( 'Search predefined replies', 'supportflow' ),
 					'not_found'          => __( 'No predefined reply found', 'supportflow' ),
@@ -314,7 +314,7 @@ function action_init_register_predefined_replies() {
 				'publicly_queryable' => false,
 				'show_in_menu'       => false,
 				'supports'           => array(
-					'title', 'editor', 'revisions',
+					'title', 'editor',
 				),
 			)
 		);
@@ -327,8 +327,8 @@ public function action_admin_menu_predefined_replies() {
 		$post_type                = $this->post_type;
 		$predefinded_replies_type = $this->predefinded_replies_type;
 
-		add_submenu_page( "edit.php?post_type=$post_type", 'All predefined replies', 'All predefined replies', 'manage_options', "edit.php?post_type=$predefinded_replies_type" );
-		add_submenu_page( "edit.php?post_type=$post_type", 'New predefined reply', 'New predefined reply', 'manage_options', "post-new.php?post_type=$predefinded_replies_type" );
+		add_submenu_page( "edit.php?post_type=$post_type", 'All Predefined replies', 'All Predefined Replies', 'manage_options', "edit.php?post_type=$predefinded_replies_type" );
+		add_submenu_page( "edit.php?post_type=$post_type", 'New Predefined reply', 'New Predefined Reply', 'manage_options', "post-new.php?post_type=$predefinded_replies_type" );
 
 	}
 

From b6ae250481a01f8f357f4d60e1b2853b52f5ba08 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 22 May 2014 03:48:53 +0530
Subject: [PATCH 039/485] Added CSRF protection in Email account setting page

---
 classes/class-supportflow-email-accounts.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index d077d0c..eb21fd8 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -101,7 +101,7 @@ function settings_page() {
 			<h2>' . __( 'E-Mail Accounts', 'supportflow' ) . '</h2>';
 
 		// Create new account
-		if ( 'add' == $action && isset( $_POST['imap_host'], $_POST['imap_port'], $_POST['smtp_host'], $_POST['smtp_port'], $_POST['username'], $_POST['password'] ) ) {
+		if ( 'add' == $action && isset( $_POST['imap_host'], $_POST['imap_port'], $_POST['smtp_host'], $_POST['smtp_port'], $_POST['username'], $_POST['password'], $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'add_email_account' ) ) {
 			$res = $this->add_email_account( $_POST['imap_host'], $_POST['imap_port'], $_POST['smtp_host'], $_POST['smtp_port'], $_POST['username'], $_POST['password'] );
 			switch ( $res ) {
 
@@ -128,7 +128,7 @@ function settings_page() {
 		}
 
 		// Delete existing account
-		if ( 'delete' == $action && isset( $_POST['account_id'] ) ) {
+		if ( 'delete' == $action && isset( $_POST['account_id'], $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'delete_email_account' ) ) {
 			$res = $this->remove_email_account( $_POST['account_id'] );
 			switch ( $res ) {
 
@@ -150,6 +150,7 @@ function settings_page() {
 		<?php _e( 'Please enter IMAP Server Settings', 'supportflow' ) ?><br />
 		<form method="POST" action="edit.php?post_type=sf_thread&page=sf_accounts">
 			<input type="hidden" name="action" value="add" />
+			<?php wp_nonce_field( 'add_email_account' ) ?>
 			<table class="form-table">
 				<tr valign="top">
 					<th scope="row"><?php _e( 'IMAP Host:', 'supportflow' ) ?></th>
@@ -202,10 +203,11 @@ function settings_page() {
 				}
 
 				var account_key = jQuery(this).data('account-id');
-				var form = "<form method='POST' action='edit.php?post_type=sf_thread&page=sf_accounts'>" +
-					"<input type='hidden' name='action' value='delete' />" +
-					"<input type='hidden' name='account_id' value=" + account_key + " />" +
-					"</form>";
+				var form = '<form method="POST" action="edit.php?post_type=sf_thread&page=sf_accounts">' +
+					'<input type="hidden" name="action" value="delete" />' +
+					'<?php wp_nonce_field( 'delete_email_account') ?>' +
+					'<input type="hidden" name="account_id" value=' + account_key + ' />' +
+					'</form>';
 
 				jQuery(form).submit();
 			});

From 3ef398a2ffade38cae3718fae33be59cfaf24645 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 25 May 2014 19:54:53 +0530
Subject: [PATCH 040/485] Removed
 SupportFlow_Email_Accounts::get_email_accounts method allowing direct data
 access

---
 classes/class-supportflow-email-accounts.php | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index eb21fd8..be5abea 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -54,7 +54,7 @@ function prepare_items() {
 }
 
 class SupportFlow_Email_Accounts extends SupportFlow {
-	protected $_email_accounts;
+	protected $email_accounts;
 
 	const SUCCESS                  = 0;
 	const ACCOUNT_EXISTS           = 1;
@@ -69,7 +69,7 @@ function __construct() {
 		add_action( 'admin_menu', array( $this, 'action_admin_menu' ) );
 
 		// Get existing E-Mail accounts from database
-		$email_accounts = & $this->_email_accounts;
+		$email_accounts = & $this->email_accounts;
 		$email_accounts = get_option( 'sf_email_accounts' );
 		if ( ! is_array( $email_accounts ) ) {
 			$email_accounts = array();
@@ -141,7 +141,7 @@ function settings_page() {
 			}
 		}
 
-		$email_accounts_table = new SupportFlow_Email_Accounts_Table( $this->get_email_accounts() );
+		$email_accounts_table = new SupportFlow_Email_Accounts_Table( $this->email_accounts );
 		$email_accounts_table->prepare_items();
 		$email_accounts_table->display();
 
@@ -219,7 +219,7 @@ function settings_page() {
 	 * Add a new E-Mail account to database
 	 */
 	function add_email_account( $imap_host, $imap_port, $smtp_host, $smtp_port, $username, $password, $test_login = true ) {
-		$email_accounts = & $this->_email_accounts;
+		$email_accounts = & $this->email_accounts;
 		sanitize_text_field( $imap_host, $imap_port, $smtp_port, $username, $password );
 
 		if ( $this->is_exist_email_account( $imap_host, $smtp_host, $username ) ) {
@@ -262,7 +262,7 @@ function add_email_account( $imap_host, $imap_port, $smtp_host, $smtp_port, $use
 	 * Remove an E-Mail account from database
 	 */
 	function remove_email_account( $account_id ) {
-		$email_accounts = & $this->_email_accounts;
+		$email_accounts = & $this->email_accounts;
 
 		if ( ! isset( $email_accounts[$account_id] ) ) {
 			return self::NO_ACCOUNT_EXISTS;
@@ -274,20 +274,12 @@ function remove_email_account( $account_id ) {
 		}
 	}
 
-	/**
-	 * Return the list of all existing E-Mail accounts
-	 * @return array
-	 */
-	function get_email_accounts() {
-		return $this->_email_accounts;
-	}
-
 	/**
 	 * Check if E-Mail account exists in database
 	 * @return boolean
 	 */
 	function is_exist_email_account( $imap_host, $smtp_host, $username ) {
-		$email_accounts = & $this->_email_accounts;
+		$email_accounts = & $this->email_accounts;
 
 		foreach ( $email_accounts as $email_account ) {
 			if (

From 0fb1a537bad70a0a9658cf2a4c516c9814662c4d Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 25 May 2014 21:06:59 +0530
Subject: [PATCH 041/485] Splitted SupportFlow_Email_Accounts::settings_page in
 multiple smaller methods

---
 classes/class-supportflow-email-accounts.php | 45 ++++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index be5abea..96412f6 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -95,11 +95,27 @@ function action_admin_menu() {
 	 * Loads the setting page to add/remove E-Mail accounts
 	 */
 	function settings_page() {
-		$action = isset( $_POST['action'] ) ? $_POST['action'] : '';
-
 		echo '<div class="wrap">
 			<h2>' . __( 'E-Mail Accounts', 'supportflow' ) . '</h2>';
 
+		// Add/remove E-Mail accounts if submitted by user
+		$this->process_form_submission();
+
+		$this->list_email_accounts();
+
+		$this->insert_add_new_account_form();
+
+		echo '</div>';
+
+		$this->insert_js_code();
+	}
+
+	/*
+	 * Add/remove E-Mail accounts if submitted by user
+	 */
+	function process_form_submission() {
+		$action = isset( $_POST['action'] ) ? $_POST['action'] : '';
+
 		// Create new account
 		if ( 'add' == $action && isset( $_POST['imap_host'], $_POST['imap_port'], $_POST['smtp_host'], $_POST['smtp_port'], $_POST['username'], $_POST['password'], $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'add_email_account' ) ) {
 			$res = $this->add_email_account( $_POST['imap_host'], $_POST['imap_port'], $_POST['smtp_host'], $_POST['smtp_port'], $_POST['username'], $_POST['password'] );
@@ -126,7 +142,6 @@ function settings_page() {
 					break;
 			}
 		}
-
 		// Delete existing account
 		if ( 'delete' == $action && isset( $_POST['account_id'], $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'delete_email_account' ) ) {
 			$res = $this->remove_email_account( $_POST['account_id'] );
@@ -141,10 +156,22 @@ function settings_page() {
 			}
 		}
 
+	}
+
+	/**
+	 * List all the existing E-Mail accounts in a table
+	 */
+	public function list_email_accounts() {
 		$email_accounts_table = new SupportFlow_Email_Accounts_Table( $this->email_accounts );
 		$email_accounts_table->prepare_items();
 		$email_accounts_table->display();
 
+	}
+
+	/*
+	 * Create a form to enter new E-Mail account details
+	 */
+	public function insert_add_new_account_form() {
 		?>
 		<h3><?php _e( 'Add New Account', 'supportflow' ) ?></h3>
 		<?php _e( 'Please enter IMAP Server Settings', 'supportflow' ) ?><br />
@@ -158,35 +185,30 @@ function settings_page() {
 						<input type="text" required name="imap_host" value="<?php echo esc_html( isset( $_POST['imap_host'] ) ? $_POST['imap_host'] : '' ) ?>" />
 					</td>
 				</tr>
-
 				<tr valign="top">
 					<th scope="row"><?php _e( 'IMAP Port Number: ', 'supportflow' ) ?></th>
 					<td>
 						<input type="number" required name="imap_port" value="<?php echo esc_html( isset( $_POST['imap_port'] ) ? $_POST['imap_port'] : '993' ) ?>" />
 					</td>
 				</tr>
-
 				<tr valign="top">
 					<th scope="row"><?php _e( 'SMTP Host:', 'supportflow' ) ?></th>
 					<td>
 						<input type="text" required name="smtp_host" value="<?php echo esc_html( isset( $_POST['smtp_host'] ) ? $_POST['smtp_host'] : '' ) ?>" />
 					</td>
 				</tr>
-
 				<tr valign="top">
 					<th scope="row"><?php _e( 'SMTP Port Number: ', 'supportflow' ) ?></th>
 					<td>
 						<input type="number" required name="smtp_port" value="<?php echo esc_html( isset( $_POST['smtp_port'] ) ? $_POST['smtp_port'] : '465' ) ?>" />
 					</td>
 				</tr>
-
 				<tr valign="top">
 					<th scope="row"><?php _e( 'Username:', 'supportflow' ) ?></th>
 					<td>
 						<input type="text" required name="username" value="<?php echo esc_html( isset( $_POST['username'] ) ? $_POST['username'] : '' ) ?>" />
 					</td>
 				</tr>
-
 				<tr valign="top">
 					<th scope="row"><?php _e( 'Password:', 'supportflow' ) ?></th>
 					<td><input type="password" required name="password" /></td>
@@ -194,7 +216,14 @@ function settings_page() {
 			</table>
 			<?php submit_button( __( 'Add New Server', 'supportflow' ) ); ?>
 		</form>
+	<?php
+	}
 
+	/*
+	 * Insert JS code required for form submission
+	 */
+	public function insert_js_code() {
+		?>
 		<script type="text/javascript">
 			jQuery('#delete_email_account').click(function (e) {
 				e.preventDefault();

From cb42360c7090eb3ff8dd792804caff9169a898ed Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 25 May 2014 22:51:52 +0530
Subject: [PATCH 042/485] Made minor changes to E-Mail accounts settings page

Renamed is_exist_email_account method with email_account_exists
Corrected I18n format using sprintf
Used esc_attr instead of esc_html for escaping attributes
Fixed implementation of sanitize_text_string
---
 classes/class-supportflow-email-accounts.php | 38 +++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 96412f6..f062561 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -13,11 +13,10 @@ class SupportFlow_Email_Accounts_Table extends WP_List_Table {
 	function __construct( $accounts ) {
 		parent::__construct();
 
-		$data = & $this->_data;
-		$data = array();
+		$this->_data = array();
 
 		foreach ( $accounts as $account_id => $account ) {
-			$data[] = array(
+			$this->_data[] = array(
 				'username'  => $account['username'],
 				'imap_host' => $account['imap_host'],
 				'imap_port' => $account['imap_port'],
@@ -54,7 +53,7 @@ function prepare_items() {
 }
 
 class SupportFlow_Email_Accounts extends SupportFlow {
-	protected $email_accounts;
+	var $email_accounts;
 
 	const SUCCESS                  = 0;
 	const ACCOUNT_EXISTS           = 1;
@@ -129,10 +128,10 @@ function process_form_submission() {
 					echo '<h3>' . __( 'There is an account already exists with same host name and user name. Please create a new account with different settings.', 'supportflow' ) . '</h3>';
 					break;
 				case self::IMAP_HOST_NOT_FOUND:
-					echo '<h3>' . __( 'Unable to connect to ' . esc_html( $_POST['imap_host'] ) . '. Please check your IMAP host name.', 'supportflow' ) . '</h3>';
+					echo '<h3>' . sprintf( __( 'Unable to connect to %s. Please check your IMAP host name.', 'supportflow' ), esc_html( $_POST['imap_host'] ) ) . '</h3>';
 					break;
 				case self::IMAP_TIME_OUT:
-					echo '<h3>' . __( 'Time out while connecting to ' . esc_html( $_POST['imap_host'] ) . '. Please check your IMAP port number and host name.', 'supportflow' ) . '</h3>';
+					echo '<h3>' . sprintf( __( 'Time out while connecting to %s. Please check your IMAP port number and host name.', 'supportflow' ), esc_html( $_POST['imap_host'] ) ) . '</h3>';
 					break;
 				case self::IMAP_INVALID_CRIDENTIALS:
 					echo '<h3>' . __( 'Unable to connect with given username/password combination. Please re-check your username and password', 'supportflow' ) . '</h3>';
@@ -182,31 +181,31 @@ public function insert_add_new_account_form() {
 				<tr valign="top">
 					<th scope="row"><?php _e( 'IMAP Host:', 'supportflow' ) ?></th>
 					<td>
-						<input type="text" required name="imap_host" value="<?php echo esc_html( isset( $_POST['imap_host'] ) ? $_POST['imap_host'] : '' ) ?>" />
+						<input type="text" required name="imap_host" value="<?php echo esc_attr( isset( $_POST['imap_host'] ) ? $_POST['imap_host'] : '' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
 					<th scope="row"><?php _e( 'IMAP Port Number: ', 'supportflow' ) ?></th>
 					<td>
-						<input type="number" required name="imap_port" value="<?php echo esc_html( isset( $_POST['imap_port'] ) ? $_POST['imap_port'] : '993' ) ?>" />
+						<input type="number" required name="imap_port" value="<?php echo esc_attr( isset( $_POST['imap_port'] ) ? $_POST['imap_port'] : '993' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
 					<th scope="row"><?php _e( 'SMTP Host:', 'supportflow' ) ?></th>
 					<td>
-						<input type="text" required name="smtp_host" value="<?php echo esc_html( isset( $_POST['smtp_host'] ) ? $_POST['smtp_host'] : '' ) ?>" />
+						<input type="text" required name="smtp_host" value="<?php echo esc_attr( isset( $_POST['smtp_host'] ) ? $_POST['smtp_host'] : '' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
 					<th scope="row"><?php _e( 'SMTP Port Number: ', 'supportflow' ) ?></th>
 					<td>
-						<input type="number" required name="smtp_port" value="<?php echo esc_html( isset( $_POST['smtp_port'] ) ? $_POST['smtp_port'] : '465' ) ?>" />
+						<input type="number" required name="smtp_port" value="<?php echo esc_attr( isset( $_POST['smtp_port'] ) ? $_POST['smtp_port'] : '465' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
 					<th scope="row"><?php _e( 'Username:', 'supportflow' ) ?></th>
 					<td>
-						<input type="text" required name="username" value="<?php echo esc_html( isset( $_POST['username'] ) ? $_POST['username'] : '' ) ?>" />
+						<input type="text" required name="username" value="<?php echo esc_attr( isset( $_POST['username'] ) ? $_POST['username'] : '' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
@@ -249,13 +248,18 @@ public function insert_js_code() {
 	 */
 	function add_email_account( $imap_host, $imap_port, $smtp_host, $smtp_port, $username, $password, $test_login = true ) {
 		$email_accounts = & $this->email_accounts;
-		sanitize_text_field( $imap_host, $imap_port, $smtp_port, $username, $password );
-
-		if ( $this->is_exist_email_account( $imap_host, $smtp_host, $username ) ) {
+		$imap_host      = sanitize_text_field( $imap_host );
+		$imap_port      = sanitize_text_field( $imap_port );
+		$smtp_host      = sanitize_text_field( $smtp_host );
+		$smtp_port      = sanitize_text_field( $smtp_port );
+		$username       = sanitize_text_field( $username );
+		$password       = sanitize_text_field( $password );
+
+		if ( $this->email_account_exists( $imap_host, $smtp_host, $username ) ) {
 			return self::ACCOUNT_EXISTS;
 		}
 
-		if ( true == $test_login ) {
+		if ( $test_login ) {
 			imap_timeout( IMAP_OPENTIMEOUT, apply_filters( 'supportflow_imap_open_timeout', 5 ) );
 			if ( $imap_stream = imap_open( "{{$imap_host}:{$imap_port}/ssl}", $username, $password, 0, 0 ) ) {
 				imap_close( $imap_stream );
@@ -292,7 +296,7 @@ function add_email_account( $imap_host, $imap_port, $smtp_host, $smtp_port, $use
 	 */
 	function remove_email_account( $account_id ) {
 		$email_accounts = & $this->email_accounts;
-
+		$account_id     = sanitize_text_field( $account_id );
 		if ( ! isset( $email_accounts[$account_id] ) ) {
 			return self::NO_ACCOUNT_EXISTS;
 		} else {
@@ -307,7 +311,7 @@ function remove_email_account( $account_id ) {
 	 * Check if E-Mail account exists in database
 	 * @return boolean
 	 */
-	function is_exist_email_account( $imap_host, $smtp_host, $username ) {
+	function email_account_exists( $imap_host, $smtp_host, $username ) {
 		$email_accounts = & $this->email_accounts;
 
 		foreach ( $email_accounts as $email_account ) {

From 715de4f80dc205316298c6b628c1c2b7c67a84e3 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 25 May 2014 23:25:07 +0530
Subject: [PATCH 043/485] Using variables instead of a fixed value for slugs

---
 classes/class-supportflow-email-accounts.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index f062561..68b15ea 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -76,15 +76,15 @@ function __construct() {
 	}
 
 	function action_admin_menu() {
-		$post_type = SupportFlow()->post_type;
-
+		$post_type  = SupportFlow()->post_type;
+		$this->slug = 'sf_accounts';
 		// Create a menu (SupportFlow->E-Mail Accounts)
 		add_submenu_page(
 			"edit.php?post_type=$post_type",
 			__( 'SupportFlow E-Mail Accounts', 'supportflow' ),
 			__( 'E-Mail Accounts', 'supportflow' ),
 			'manage_options',
-			'sf_accounts',
+			$this->slug,
 			array( $this, 'settings_page' )
 		);
 
@@ -171,10 +171,11 @@ public function list_email_accounts() {
 	 * Create a form to enter new E-Mail account details
 	 */
 	public function insert_add_new_account_form() {
+		$form_action = "edit.php?post_type=" . SupportFlow()->post_type . "&page=" . $this->slug;
 		?>
 		<h3><?php _e( 'Add New Account', 'supportflow' ) ?></h3>
 		<?php _e( 'Please enter IMAP Server Settings', 'supportflow' ) ?><br />
-		<form method="POST" action="edit.php?post_type=sf_thread&page=sf_accounts">
+		<form method="POST" action="<?php echo $form_action ?>">
 			<input type="hidden" name="action" value="add" />
 			<?php wp_nonce_field( 'add_email_account' ) ?>
 			<table class="form-table">
@@ -222,18 +223,20 @@ public function insert_add_new_account_form() {
 	 * Insert JS code required for form submission
 	 */
 	public function insert_js_code() {
+		$msg_title   = __( 'Are you sure want to delete this account.', 'supportflow' );
+		$form_action = "edit.php?post_type=" . SupportFlow()->post_type . "&page=" . $this->slug;
 		?>
 		<script type="text/javascript">
 			jQuery('#delete_email_account').click(function (e) {
 				e.preventDefault();
-				if (!confirm('<?php _e( 'Are you sure want to delete this account.', 'supportflow' ) ?>')) {
+				if (!confirm('<?php echo $msg_title ?>')) {
 					return;
 				}
 
 				var account_key = jQuery(this).data('account-id');
-				var form = '<form method="POST" action="edit.php?post_type=sf_thread&page=sf_accounts">' +
+				var form = '<form method="POST" action="<?php echo $form_action ?>">' +
 					'<input type="hidden" name="action" value="delete" />' +
-					'<?php wp_nonce_field( 'delete_email_account') ?>' +
+					'<?php wp_nonce_field( 'delete_email_account'  ) ?>' +
 					'<input type="hidden" name="account_id" value=' + account_key + ' />' +
 					'</form>';
 

From 1062154646c58b63f617c1cb208e3cdf07f880d3 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 26 May 2014 02:50:54 +0530
Subject: [PATCH 044/485] Add option to choose SSL ports in E-Mail account
 setting page

---
 classes/class-supportflow-email-accounts.php | 69 ++++++++++++++++----
 1 file changed, 58 insertions(+), 11 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 68b15ea..ed8f555 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -20,8 +20,10 @@ function __construct( $accounts ) {
 				'username'  => $account['username'],
 				'imap_host' => $account['imap_host'],
 				'imap_port' => $account['imap_port'],
+				'imap_ssl'  => $account['imap_ssl'] ? 'True' : 'False',
 				'smtp_host' => $account['smtp_host'],
 				'smtp_port' => $account['smtp_port'],
+				'smtp_ssl'  => $account['smtp_ssl'] ? 'True' : 'False',
 				'action'    => "<a href='#' data-account-id='$account_id' id='delete_email_account'>Delete</a>",
 			);
 		}
@@ -36,8 +38,10 @@ function get_columns() {
 			'username'  => __( 'Username', 'supportflow' ),
 			'imap_host' => __( 'IMAP Host', 'supportflow' ),
 			'imap_port' => __( 'IMAP Port', 'supportflow' ),
+			'imap_ssl'  => __( 'IMAP use SSL', 'supportflow' ),
 			'smtp_host' => __( 'SMTP Host', 'supportflow' ),
 			'smtp_port' => __( 'SMTP Port', 'supportflow' ),
+			'smtp_ssl'  => __( 'SMTP use SSL', 'supportflow' ),
 			'action'    => __( 'Action', 'supportflow' ),
 		);
 	}
@@ -113,11 +117,15 @@ function settings_page() {
 	 * Add/remove E-Mail accounts if submitted by user
 	 */
 	function process_form_submission() {
-		$action = isset( $_POST['action'] ) ? $_POST['action'] : '';
+		$action   = isset( $_POST['action'] ) ? $_POST['action'] : '';
+		$imap_ssl = isset( $_POST['imap_ssl'] ) && 'on' == $_POST['imap_ssl'] ? true : false;
+		$smtp_ssl = isset( $_POST['smtp_ssl'] ) && 'on' == $_POST['smtp_ssl'] ? true : false;
 
 		// Create new account
 		if ( 'add' == $action && isset( $_POST['imap_host'], $_POST['imap_port'], $_POST['smtp_host'], $_POST['smtp_port'], $_POST['username'], $_POST['password'], $_POST['_wpnonce'] ) && wp_verify_nonce( $_POST['_wpnonce'], 'add_email_account' ) ) {
-			$res = $this->add_email_account( $_POST['imap_host'], $_POST['imap_port'], $_POST['smtp_host'], $_POST['smtp_port'], $_POST['username'], $_POST['password'] );
+
+			$res = $this->add_email_account( $_POST['imap_host'], $_POST['imap_port'], $imap_ssl, $_POST['smtp_host'], $_POST['smtp_port'], $smtp_ssl, $_POST['username'], $_POST['password'] );
+
 			switch ( $res ) {
 
 				case self::SUCCESS:
@@ -175,43 +183,55 @@ public function insert_add_new_account_form() {
 		?>
 		<h3><?php _e( 'Add New Account', 'supportflow' ) ?></h3>
 		<?php _e( 'Please enter IMAP Server Settings', 'supportflow' ) ?><br />
-		<form method="POST" action="<?php echo $form_action ?>">
+		<form method="POST" id="add_new_email_account" action="<?php echo $form_action ?>">
 			<input type="hidden" name="action" value="add" />
 			<?php wp_nonce_field( 'add_email_account' ) ?>
 			<table class="form-table">
 				<tr valign="top">
 					<th scope="row"><?php _e( 'IMAP Host:', 'supportflow' ) ?></th>
 					<td>
-						<input type="text" required name="imap_host" value="<?php echo esc_attr( isset( $_POST['imap_host'] ) ? $_POST['imap_host'] : '' ) ?>" />
+						<input type="text" required id="imap_host" name="imap_host" value="<?php echo esc_attr( isset( $_POST['imap_host'] ) ? $_POST['imap_host'] : '' ) ?>" />
+					</td>
+				</tr>
+				<tr valign="top">
+					<th scope="row"><?php _e( 'IMAP Server requires SSL: ', 'supportflow' ) ?></th>
+					<td>
+						<input type="checkbox" id="imap_ssl" name="imap_ssl" <?php echo esc_attr( isset( $_POST['imap_ssl'] ) && $_POST['imap_ssl'] == 'on' ? 'checked="checked"' : '' ) ?> />
 					</td>
 				</tr>
 				<tr valign="top">
 					<th scope="row"><?php _e( 'IMAP Port Number: ', 'supportflow' ) ?></th>
 					<td>
-						<input type="number" required name="imap_port" value="<?php echo esc_attr( isset( $_POST['imap_port'] ) ? $_POST['imap_port'] : '993' ) ?>" />
+						<input type="number" required id="imap_port" name="imap_port" value="<?php echo esc_attr( isset( $_POST['imap_port'] ) ? $_POST['imap_port'] : '143' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
 					<th scope="row"><?php _e( 'SMTP Host:', 'supportflow' ) ?></th>
 					<td>
-						<input type="text" required name="smtp_host" value="<?php echo esc_attr( isset( $_POST['smtp_host'] ) ? $_POST['smtp_host'] : '' ) ?>" />
+						<input type="text" required id="smtp_host" name="smtp_host" value="<?php echo esc_attr( isset( $_POST['smtp_host'] ) ? $_POST['smtp_host'] : '' ) ?>" />
+					</td>
+				</tr>
+				<tr valign="top">
+					<th scope="row"><?php _e( 'SMTP Server requires SSL: ', 'supportflow' ) ?></th>
+					<td>
+						<input type="checkbox" id="smtp_ssl" name="smtp_ssl" <?php echo esc_attr( isset( $_POST['smtp_ssl'] ) && $_POST['smtp_ssl'] == 'on' ? 'checked="checked"' : '' ) ?> />
 					</td>
 				</tr>
 				<tr valign="top">
 					<th scope="row"><?php _e( 'SMTP Port Number: ', 'supportflow' ) ?></th>
 					<td>
-						<input type="number" required name="smtp_port" value="<?php echo esc_attr( isset( $_POST['smtp_port'] ) ? $_POST['smtp_port'] : '465' ) ?>" />
+						<input type="number" required id="smtp_port" name="smtp_port" value="<?php echo esc_attr( isset( $_POST['smtp_port'] ) ? $_POST['smtp_port'] : '25' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
 					<th scope="row"><?php _e( 'Username:', 'supportflow' ) ?></th>
 					<td>
-						<input type="text" required name="username" value="<?php echo esc_attr( isset( $_POST['username'] ) ? $_POST['username'] : '' ) ?>" />
+						<input type="text" required id="username" name="username" value="<?php echo esc_attr( isset( $_POST['username'] ) ? $_POST['username'] : '' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
 					<th scope="row"><?php _e( 'Password:', 'supportflow' ) ?></th>
-					<td><input type="password" required name="password" /></td>
+					<td><input type="password" required id="password" name="password" /></td>
 				</tr>
 			</table>
 			<?php submit_button( __( 'Add New Server', 'supportflow' ) ); ?>
@@ -242,6 +262,27 @@ public function insert_js_code() {
 
 				jQuery(form).submit();
 			});
+
+
+			jQuery('#add_new_email_account #imap_ssl').change(function () {
+				if (this.checked) {
+					// Change to default IMAP SSL port on enabling SSL
+					jQuery('#add_new_email_account #imap_port').val('993');
+				} else {
+					// Change to default IMAP non-SSL port on disabling SSL
+					jQuery('#add_new_email_account #imap_port').val('143');
+				}
+			});
+
+			jQuery('#add_new_email_account #smtp_ssl').change(function () {
+				if (this.checked) {
+					// Change to default SMTP SSL port on enabling SSL
+					jQuery('#add_new_email_account #smtp_port').val('465');
+				} else {
+					// Change to default SMTP non-SSL port on disabling SSL
+					jQuery('#add_new_email_account #smtp_port').val('25');
+				}
+			});
 		</script>
 	<?php
 	}
@@ -249,12 +290,14 @@ public function insert_js_code() {
 	/**
 	 * Add a new E-Mail account to database
 	 */
-	function add_email_account( $imap_host, $imap_port, $smtp_host, $smtp_port, $username, $password, $test_login = true ) {
+	function add_email_account( $imap_host, $imap_port, $imap_ssl, $smtp_host, $smtp_port, $smtp_ssl, $username, $password, $test_login = true ) {
 		$email_accounts = & $this->email_accounts;
 		$imap_host      = sanitize_text_field( $imap_host );
 		$imap_port      = sanitize_text_field( $imap_port );
+		$imap_ssl       = sanitize_text_field( $imap_ssl );
 		$smtp_host      = sanitize_text_field( $smtp_host );
 		$smtp_port      = sanitize_text_field( $smtp_port );
+		$smtp_ssl       = sanitize_text_field( $smtp_ssl );
 		$username       = sanitize_text_field( $username );
 		$password       = sanitize_text_field( $password );
 
@@ -264,7 +307,9 @@ function add_email_account( $imap_host, $imap_port, $smtp_host, $smtp_port, $use
 
 		if ( $test_login ) {
 			imap_timeout( IMAP_OPENTIMEOUT, apply_filters( 'supportflow_imap_open_timeout', 5 ) );
-			if ( $imap_stream = imap_open( "{{$imap_host}:{$imap_port}/ssl}", $username, $password, 0, 0 ) ) {
+			$ssl     = $imap_ssl ? '/ssl' : '';
+			$mailbox = '{' . $imap_host . ':' . $imap_port . $ssl . '}';
+			if ( $imap_stream = imap_open( $mailbox, $username, $password, 0, 0 ) ) {
 				imap_close( $imap_stream );
 			} else {
 				$error = imap_errors()[0];
@@ -283,8 +328,10 @@ function add_email_account( $imap_host, $imap_port, $smtp_host, $smtp_port, $use
 		$email_accounts[] = array(
 			'imap_host' => $imap_host,
 			'imap_port' => $imap_port,
+			'imap_ssl'  => $imap_ssl,
 			'smtp_host' => $smtp_host,
 			'smtp_port' => $smtp_port,
+			'smtp_ssl'  => $smtp_ssl,
 			'username'  => $username,
 			'password'  => $password,
 		);

From 90523433e7cfa5f5af29559736df432462071309 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 29 May 2014 16:54:47 +0530
Subject: [PATCH 045/485] Checking SSL option on by default in E-Mail accounts
 add form

---
 classes/class-supportflow-email-accounts.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index ed8f555..c671244 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -194,15 +194,15 @@ public function insert_add_new_account_form() {
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><?php _e( 'IMAP Server requires SSL: ', 'supportflow' ) ?></th>
+					<th scope="row"><?php _e( 'IMAP Server supports SSL: ', 'supportflow' ) ?></th>
 					<td>
-						<input type="checkbox" id="imap_ssl" name="imap_ssl" <?php echo esc_attr( isset( $_POST['imap_ssl'] ) && $_POST['imap_ssl'] == 'on' ? 'checked="checked"' : '' ) ?> />
+						<input type="checkbox" id="imap_ssl" name="imap_ssl" <?php echo esc_attr( ( isset( $_POST['imap_ssl'], $_POST['action'] ) && $_POST['imap_ssl'] == 'on' ) || ! isset( $_POST['action'] ) ? 'checked="checked"' : '' ) ?> />
 					</td>
 				</tr>
 				<tr valign="top">
 					<th scope="row"><?php _e( 'IMAP Port Number: ', 'supportflow' ) ?></th>
 					<td>
-						<input type="number" required id="imap_port" name="imap_port" value="<?php echo esc_attr( isset( $_POST['imap_port'] ) ? $_POST['imap_port'] : '143' ) ?>" />
+						<input type="number" required id="imap_port" name="imap_port" value="<?php echo esc_attr( isset( $_POST['imap_port'] ) ? $_POST['imap_port'] : '993' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
@@ -212,15 +212,15 @@ public function insert_add_new_account_form() {
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><?php _e( 'SMTP Server requires SSL: ', 'supportflow' ) ?></th>
+					<th scope="row"><?php _e( 'SMTP Server supports SSL: ', 'supportflow' ) ?></th>
 					<td>
-						<input type="checkbox" id="smtp_ssl" name="smtp_ssl" <?php echo esc_attr( isset( $_POST['smtp_ssl'] ) && $_POST['smtp_ssl'] == 'on' ? 'checked="checked"' : '' ) ?> />
+						<input type="checkbox" id="smtp_ssl" name="smtp_ssl" <?php echo esc_attr( ( isset( $_POST['smtp_ssl'], $_POST['action'] ) && $_POST['smtp_ssl'] == 'on' ) || ! isset( $_POST['action'] ) ? 'checked="checked"' : '' ) ?> />
 					</td>
 				</tr>
 				<tr valign="top">
 					<th scope="row"><?php _e( 'SMTP Port Number: ', 'supportflow' ) ?></th>
 					<td>
-						<input type="number" required id="smtp_port" name="smtp_port" value="<?php echo esc_attr( isset( $_POST['smtp_port'] ) ? $_POST['smtp_port'] : '25' ) ?>" />
+						<input type="number" required id="smtp_port" name="smtp_port" value="<?php echo esc_attr( isset( $_POST['smtp_port'] ) ? $_POST['smtp_port'] : '465' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">

From 75c9476bf6b1819fefaf049b2fc53fddbd659d54 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 29 May 2014 17:02:55 +0530
Subject: [PATCH 046/485] Using intval() to sanitize integer field

---
 classes/class-supportflow-email-accounts.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index c671244..b0bc457 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -293,10 +293,10 @@ public function insert_js_code() {
 	function add_email_account( $imap_host, $imap_port, $imap_ssl, $smtp_host, $smtp_port, $smtp_ssl, $username, $password, $test_login = true ) {
 		$email_accounts = & $this->email_accounts;
 		$imap_host      = sanitize_text_field( $imap_host );
-		$imap_port      = sanitize_text_field( $imap_port );
+		$imap_port      = intval( $imap_port );
 		$imap_ssl       = sanitize_text_field( $imap_ssl );
 		$smtp_host      = sanitize_text_field( $smtp_host );
-		$smtp_port      = sanitize_text_field( $smtp_port );
+		$smtp_port      = intval( $smtp_port );
 		$smtp_ssl       = sanitize_text_field( $smtp_ssl );
 		$username       = sanitize_text_field( $username );
 		$password       = sanitize_text_field( $password );
@@ -346,7 +346,7 @@ function add_email_account( $imap_host, $imap_port, $imap_ssl, $smtp_host, $smtp
 	 */
 	function remove_email_account( $account_id ) {
 		$email_accounts = & $this->email_accounts;
-		$account_id     = sanitize_text_field( $account_id );
+		$account_id     = intval( $account_id );
 		if ( ! isset( $email_accounts[$account_id] ) ) {
 			return self::NO_ACCOUNT_EXISTS;
 		} else {

From b29bab3c98af3fc891d90fcde9065fe36def3599 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 29 May 2014 17:22:12 +0530
Subject: [PATCH 047/485] Fix remove E-Mail account form submission for
 firefox/IE

---
 classes/class-supportflow-email-accounts.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index b0bc457..e0286c6 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -243,7 +243,7 @@ public function insert_add_new_account_form() {
 	 * Insert JS code required for form submission
 	 */
 	public function insert_js_code() {
-		$msg_title   = __( 'Are you sure want to delete this account.', 'supportflow' );
+		$msg_title   = __( 'Are you sure want to delete this account?', 'supportflow' );
 		$form_action = "edit.php?post_type=" . SupportFlow()->post_type . "&page=" . $this->slug;
 		?>
 		<script type="text/javascript">
@@ -254,13 +254,14 @@ public function insert_js_code() {
 				}
 
 				var account_key = jQuery(this).data('account-id');
-				var form = '<form method="POST" action="<?php echo $form_action ?>">' +
+				var form = '<form method="POST" id="remove_email_account" action="<?php echo $form_action ?>">' +
 					'<input type="hidden" name="action" value="delete" />' +
 					'<?php wp_nonce_field( 'delete_email_account'  ) ?>' +
 					'<input type="hidden" name="account_id" value=' + account_key + ' />' +
 					'</form>';
 
-				jQuery(form).submit();
+				jQuery('body').append(form);
+				jQuery('#remove_email_account').submit();
 			});
 
 

From 428a4730caf07a1b3bc9be43c41e7b176a363481 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 5 Jun 2014 04:57:51 +0530
Subject: [PATCH 048/485] Added description to class and file

---
 classes/class-supportflow-email-accounts.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index e0286c6..8238df1 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -1,12 +1,15 @@
 <?php
 /**
- *
+ * Setting page to add/remove new E-Mail accounts to get replies
  */
 
 if ( ! class_exists( 'WP_List_Table' ) ) {
 	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
 }
 
+/**
+ * Table to show existing E-Mail accounts with a option to remove existing
+ */
 class SupportFlow_Email_Accounts_Table extends WP_List_Table {
 	protected $_data;
 
@@ -56,6 +59,9 @@ function prepare_items() {
 	}
 }
 
+/**
+ * Setting page to add/remove new E-Mail accounts to get replies
+ */
 class SupportFlow_Email_Accounts extends SupportFlow {
 	var $email_accounts;
 

From c8edbdf3f05b3919fb9342c431246898ad31448e Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 5 Jun 2014 04:59:13 +0530
Subject: [PATCH 049/485] Corrected whitespace

---
 classes/class-supportflow-email-accounts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 8238df1..99a6435 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -33,7 +33,7 @@ function __construct( $accounts ) {
 	}
 
 	function column_default( $item, $column_name ) {
-		return $item[$column_name];
+		return $item[ $column_name ];
 	}
 
 	function get_columns() {

From eca2325150b9391c6e1b9c5c82a9b7b721ff53d0 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 5 Jun 2014 05:06:26 +0530
Subject: [PATCH 050/485] Add labels to form elements

---
 classes/class-supportflow-email-accounts.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 99a6435..41ad092 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -194,49 +194,49 @@ public function insert_add_new_account_form() {
 			<?php wp_nonce_field( 'add_email_account' ) ?>
 			<table class="form-table">
 				<tr valign="top">
-					<th scope="row"><?php _e( 'IMAP Host:', 'supportflow' ) ?></th>
+					<th scope="row"><label for="imap_host"><?php _e( 'IMAP Host:', 'supportflow' ) ?></label></th>
 					<td>
 						<input type="text" required id="imap_host" name="imap_host" value="<?php echo esc_attr( isset( $_POST['imap_host'] ) ? $_POST['imap_host'] : '' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><?php _e( 'IMAP Server supports SSL: ', 'supportflow' ) ?></th>
+					<th scope="row"><label for="imap_ssl"><?php _e( 'IMAP Server supports SSL: ', 'supportflow' ) ?></label></th>
 					<td>
 						<input type="checkbox" id="imap_ssl" name="imap_ssl" <?php echo esc_attr( ( isset( $_POST['imap_ssl'], $_POST['action'] ) && $_POST['imap_ssl'] == 'on' ) || ! isset( $_POST['action'] ) ? 'checked="checked"' : '' ) ?> />
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><?php _e( 'IMAP Port Number: ', 'supportflow' ) ?></th>
+					<th scope="row"><label for="imap_port"><?php _e( 'IMAP Port Number: ', 'supportflow' ) ?></label></th>
 					<td>
 						<input type="number" required id="imap_port" name="imap_port" value="<?php echo esc_attr( isset( $_POST['imap_port'] ) ? $_POST['imap_port'] : '993' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><?php _e( 'SMTP Host:', 'supportflow' ) ?></th>
+					<th scope="row"><label for="smtp_host"><?php _e( 'SMTP Host:', 'supportflow' ) ?></label></th>
 					<td>
 						<input type="text" required id="smtp_host" name="smtp_host" value="<?php echo esc_attr( isset( $_POST['smtp_host'] ) ? $_POST['smtp_host'] : '' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><?php _e( 'SMTP Server supports SSL: ', 'supportflow' ) ?></th>
+					<th scope="row"><label for="smtp_ssl"><?php _e( 'SMTP Server supports SSL: ', 'supportflow' ) ?></label></th>
 					<td>
 						<input type="checkbox" id="smtp_ssl" name="smtp_ssl" <?php echo esc_attr( ( isset( $_POST['smtp_ssl'], $_POST['action'] ) && $_POST['smtp_ssl'] == 'on' ) || ! isset( $_POST['action'] ) ? 'checked="checked"' : '' ) ?> />
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><?php _e( 'SMTP Port Number: ', 'supportflow' ) ?></th>
+					<th scope="row"><label for="smtp_port"><?php _e( 'SMTP Port Number: ', 'supportflow' ) ?></label></th>
 					<td>
 						<input type="number" required id="smtp_port" name="smtp_port" value="<?php echo esc_attr( isset( $_POST['smtp_port'] ) ? $_POST['smtp_port'] : '465' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><?php _e( 'Username:', 'supportflow' ) ?></th>
+					<th scope="row"><label for="username"><?php _e( 'Username:', 'supportflow' ) ?></label></th>
 					<td>
 						<input type="text" required id="username" name="username" value="<?php echo esc_attr( isset( $_POST['username'] ) ? $_POST['username'] : '' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><?php _e( 'Password:', 'supportflow' ) ?></th>
+					<th scope="row"><label for="password"><?php _e( 'Password:', 'supportflow' ) ?></label></th>
 					<td><input type="password" required id="password" name="password" /></td>
 				</tr>
 			</table>

From 24ca7280b5111c551c8113e234e7807a94a70a79 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 5 Jun 2014 05:30:14 +0530
Subject: [PATCH 051/485] Using WP selected() function to output checked
 attribute

---
 classes/class-supportflow-email-accounts.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 41ad092..7d180c2 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -202,7 +202,7 @@ public function insert_add_new_account_form() {
 				<tr valign="top">
 					<th scope="row"><label for="imap_ssl"><?php _e( 'IMAP Server supports SSL: ', 'supportflow' ) ?></label></th>
 					<td>
-						<input type="checkbox" id="imap_ssl" name="imap_ssl" <?php echo esc_attr( ( isset( $_POST['imap_ssl'], $_POST['action'] ) && $_POST['imap_ssl'] == 'on' ) || ! isset( $_POST['action'] ) ? 'checked="checked"' : '' ) ?> />
+						<input type="checkbox" id="imap_ssl" name="imap_ssl" <?php echo checked( ( isset( $_POST['imap_ssl'], $_POST['action'] ) && $_POST['imap_ssl'] == 'on' ) || ! isset( $_POST['action'] ) ) ?> />
 					</td>
 				</tr>
 				<tr valign="top">
@@ -220,7 +220,7 @@ public function insert_add_new_account_form() {
 				<tr valign="top">
 					<th scope="row"><label for="smtp_ssl"><?php _e( 'SMTP Server supports SSL: ', 'supportflow' ) ?></label></th>
 					<td>
-						<input type="checkbox" id="smtp_ssl" name="smtp_ssl" <?php echo esc_attr( ( isset( $_POST['smtp_ssl'], $_POST['action'] ) && $_POST['smtp_ssl'] == 'on' ) || ! isset( $_POST['action'] ) ? 'checked="checked"' : '' ) ?> />
+						<input type="checkbox" id="smtp_ssl" name="smtp_ssl" <?php echo checked( ( isset( $_POST['smtp_ssl'], $_POST['action'] ) && $_POST['smtp_ssl'] == 'on' ) || ! isset( $_POST['action'] ) ) ?> />
 					</td>
 				</tr>
 				<tr valign="top">

From e5c655d5a582225976ac6f38439b17c01fb89882 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 6 Jun 2014 04:30:34 +0530
Subject: [PATCH 052/485] Using variables to store imap/smtp ssl preference

---
 classes/class-supportflow-email-accounts.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 7d180c2..a5aaa4c 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -186,6 +186,8 @@ public function list_email_accounts() {
 	 */
 	public function insert_add_new_account_form() {
 		$form_action = "edit.php?post_type=" . SupportFlow()->post_type . "&page=" . $this->slug;
+		$imap_ssl_enabled = ( isset( $_POST['imap_ssl'], $_POST['action'] ) && $_POST['imap_ssl'] == 'on' ) || ! isset( $_POST['action'] );
+		$smtp_ssl_enabled = ( isset( $_POST['smtp_ssl'], $_POST['action'] ) && $_POST['smtp_ssl'] == 'on' ) || ! isset( $_POST['action'] );
 		?>
 		<h3><?php _e( 'Add New Account', 'supportflow' ) ?></h3>
 		<?php _e( 'Please enter IMAP Server Settings', 'supportflow' ) ?><br />
@@ -202,7 +204,7 @@ public function insert_add_new_account_form() {
 				<tr valign="top">
 					<th scope="row"><label for="imap_ssl"><?php _e( 'IMAP Server supports SSL: ', 'supportflow' ) ?></label></th>
 					<td>
-						<input type="checkbox" id="imap_ssl" name="imap_ssl" <?php echo checked( ( isset( $_POST['imap_ssl'], $_POST['action'] ) && $_POST['imap_ssl'] == 'on' ) || ! isset( $_POST['action'] ) ) ?> />
+						<input type="checkbox" id="imap_ssl" name="imap_ssl" <?php echo checked( $imap_ssl_enabled ) ?> />
 					</td>
 				</tr>
 				<tr valign="top">
@@ -220,7 +222,7 @@ public function insert_add_new_account_form() {
 				<tr valign="top">
 					<th scope="row"><label for="smtp_ssl"><?php _e( 'SMTP Server supports SSL: ', 'supportflow' ) ?></label></th>
 					<td>
-						<input type="checkbox" id="smtp_ssl" name="smtp_ssl" <?php echo checked( ( isset( $_POST['smtp_ssl'], $_POST['action'] ) && $_POST['smtp_ssl'] == 'on' ) || ! isset( $_POST['action'] ) ) ?> />
+						<input type="checkbox" id="smtp_ssl" name="smtp_ssl" <?php checked( $smtp_ssl_enabled ) ?> />
 					</td>
 				</tr>
 				<tr valign="top">

From 55d769f5f55cdd6cd98140c9123fc458b546fa09 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 6 Jun 2014 16:13:23 +0530
Subject: [PATCH 053/485] Prefixing table elements with 'table_' to avoid
 mutiple elements with same ID

---
 classes/class-supportflow-email-accounts.php | 32 ++++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index a5aaa4c..04f3b52 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -20,14 +20,14 @@ function __construct( $accounts ) {
 
 		foreach ( $accounts as $account_id => $account ) {
 			$this->_data[] = array(
-				'username'  => $account['username'],
-				'imap_host' => $account['imap_host'],
-				'imap_port' => $account['imap_port'],
-				'imap_ssl'  => $account['imap_ssl'] ? 'True' : 'False',
-				'smtp_host' => $account['smtp_host'],
-				'smtp_port' => $account['smtp_port'],
-				'smtp_ssl'  => $account['smtp_ssl'] ? 'True' : 'False',
-				'action'    => "<a href='#' data-account-id='$account_id' id='delete_email_account'>Delete</a>",
+				'table_username'  => $account['username'],
+				'table_imap_host' => $account['imap_host'],
+				'table_imap_port' => $account['imap_port'],
+				'table_imap_ssl'  => $account['imap_ssl'] ? 'True' : 'False',
+				'table_smtp_host' => $account['smtp_host'],
+				'table_smtp_port' => $account['smtp_port'],
+				'table_smtp_ssl'  => $account['smtp_ssl'] ? 'True' : 'False',
+				'table_action'    => "<a href='#' data-account-id='$account_id' id='delete_email_account'>Delete</a>",
 			);
 		}
 	}
@@ -38,14 +38,14 @@ function column_default( $item, $column_name ) {
 
 	function get_columns() {
 		return array(
-			'username'  => __( 'Username', 'supportflow' ),
-			'imap_host' => __( 'IMAP Host', 'supportflow' ),
-			'imap_port' => __( 'IMAP Port', 'supportflow' ),
-			'imap_ssl'  => __( 'IMAP use SSL', 'supportflow' ),
-			'smtp_host' => __( 'SMTP Host', 'supportflow' ),
-			'smtp_port' => __( 'SMTP Port', 'supportflow' ),
-			'smtp_ssl'  => __( 'SMTP use SSL', 'supportflow' ),
-			'action'    => __( 'Action', 'supportflow' ),
+			'table_username'  => __( 'Username', 'supportflow' ),
+			'table_imap_host' => __( 'IMAP Host', 'supportflow' ),
+			'table_imap_port' => __( 'IMAP Port', 'supportflow' ),
+			'table_imap_ssl'  => __( 'IMAP use SSL', 'supportflow' ),
+			'table_smtp_host' => __( 'SMTP Host', 'supportflow' ),
+			'table_smtp_port' => __( 'SMTP Port', 'supportflow' ),
+			'table_smtp_ssl'  => __( 'SMTP use SSL', 'supportflow' ),
+			'table_action'    => __( 'Action', 'supportflow' ),
 		);
 	}
 

From 8c8abb8e8aafb507c7be00c62d128f4e545fe82e Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 7 Jun 2014 02:22:53 +0530
Subject: [PATCH 054/485] Set account data to null instead of removing it to
 maintain unique account ID

---
 classes/class-supportflow-email-accounts.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 04f3b52..c0817f3 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -19,6 +19,11 @@ function __construct( $accounts ) {
 		$this->_data = array();
 
 		foreach ( $accounts as $account_id => $account ) {
+			// Account is deleted
+			if ( empty( $account ) ) {
+				continue;
+			}
+
 			$this->_data[] = array(
 				'table_username'  => $account['username'],
 				'table_imap_host' => $account['imap_host'],
@@ -359,7 +364,7 @@ function remove_email_account( $account_id ) {
 		if ( ! isset( $email_accounts[$account_id] ) ) {
 			return self::NO_ACCOUNT_EXISTS;
 		} else {
-			unset( $email_accounts[$account_id] );
+			$email_accounts[$account_id] = null;
 			update_option( 'sf_email_accounts', $email_accounts );
 
 			return self::SUCCESS;
@@ -374,6 +379,11 @@ function email_account_exists( $imap_host, $smtp_host, $username ) {
 		$email_accounts = & $this->email_accounts;
 
 		foreach ( $email_accounts as $email_account ) {
+			// Account is deleted
+			if ( empty( $email_account ) ) {
+				continue;
+			}
+
 			if (
 				$email_account['imap_host'] == $imap_host &&
 				$email_account['smtp_host'] == $smtp_host &&

From 750694cf06263822bb866034bed080ca4589ac48 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 7 Jun 2014 02:27:52 +0530
Subject: [PATCH 055/485] Corrected IMAP_INVALID_CREDENTIALS constant spelling

---
 classes/class-supportflow-email-accounts.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index c0817f3..a889b0f 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -74,7 +74,7 @@ class SupportFlow_Email_Accounts extends SupportFlow {
 	const ACCOUNT_EXISTS           = 1;
 	const NO_ACCOUNT_EXISTS        = 2;
 	const IMAP_HOST_NOT_FOUND      = 3;
-	const IMAP_INVALID_CRIDENTIALS = 4;
+	const IMAP_INVALID_CREDENTIALS = 4;
 	const IMAP_TIME_OUT            = 5;
 	const IMAP_CONNECTION_FAILED   = 6;
 
@@ -152,7 +152,7 @@ function process_form_submission() {
 				case self::IMAP_TIME_OUT:
 					echo '<h3>' . sprintf( __( 'Time out while connecting to %s. Please check your IMAP port number and host name.', 'supportflow' ), esc_html( $_POST['imap_host'] ) ) . '</h3>';
 					break;
-				case self::IMAP_INVALID_CRIDENTIALS:
+				case self::IMAP_INVALID_CREDENTIALS:
 					echo '<h3>' . __( 'Unable to connect with given username/password combination. Please re-check your username and password', 'supportflow' ) . '</h3>';
 					break;
 				case self::IMAP_CONNECTION_FAILED:
@@ -332,7 +332,7 @@ function add_email_account( $imap_host, $imap_port, $imap_ssl, $smtp_host, $smtp
 				} elseif ( (string) strpos( $error, 'Timed out' ) != '' ) {
 					return self::IMAP_TIME_OUT;
 				} elseif ( (string) strpos( $error, 'Invalid credentials' ) != '' ) {
-					return self::IMAP_INVALID_CRIDENTIALS;
+					return self::IMAP_INVALID_CREDENTIALS;
 				} else {
 					return self::IMAP_CONNECTION_FAILED;
 				}

From d75147e3a73c80fd1673adac85c2710ddc24fc04 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 7 Jun 2014 02:44:15 +0530
Subject: [PATCH 056/485] Using get_the_date/get_the_time instead of
 mysql2date/mysql2time

---
 classes/class-supportflow-admin.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index d23a5f0..a0df633 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -530,10 +530,8 @@ public function display_thread_replies() {
 					echo '</ul>';
 				}
 				echo '</div>';
-				$reply_date      = mysql2date( get_option( 'date_format' ), $reply->post_date_gmt );
-				$reply_time      = mysql2date( get_option( 'time_format' ), $reply->post_date_gmt );
 				$reply_author    = get_post_meta( $reply->ID, 'reply_author', true );
-				$reply_timestamp = sprintf( __( 'Noted by %1$s on %2$s at %3$s', 'supportflow' ), $reply_author, $reply_date, $reply_time );
+				$reply_timestamp = sprintf( __( 'Noted by %1$s on %2$s at %3$s', 'supportflow' ), $reply_author, get_the_date(), get_the_time() );
 				echo '<div class="thread-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . '</span></div>';
 				echo '</li>';
 			}
@@ -561,9 +559,7 @@ public function display_thread_replies() {
 					echo '</ul>';
 				}
 				echo '</div>';
-				$reply_date      = mysql2date( get_option( 'date_format' ), $reply->post_date_gmt );
-				$reply_time      = mysql2date( get_option( 'time_format' ), $reply->post_date_gmt );
-				$reply_timestamp = sprintf( __( '%s at %s', 'supportflow' ), $reply_date, $reply_time );
+				$reply_timestamp = sprintf( __( '%s at %s', 'supportflow' ), get_the_date(), get_the_time() );
 				echo '<div class="thread-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . '</span></div>';
 				echo '</li>';
 			}

From 00adeba9b40cd284ebc891a4a1377d4a43c7f299 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 7 Jun 2014 03:16:22 +0530
Subject: [PATCH 057/485] Using WP_Query class to get replies count instead of
 querying db directly

---
 supportflow.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index 7b2c5cd..aa2f802 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -647,10 +647,15 @@ public function filter_reply_clauses( $clauses, $query ) {
 	 * @todo support filtering to specific types or replier
 	 */
 	public function get_thread_replies_count( $thread_id, $args = array() ) {
-		global $wpdb;
-
-		$count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(ID) FROM $wpdb->posts WHERE post_parent =%s AND post_type = %s", $thread_id, $this->post_type ) );
+		$args = array(
+			'posts_per_page' => 1,
+			'post_type'      => $this->post_type,
+			'post_status'    => 'public',
+			'post_parent'    => $thread_id,
+		);
 
+		$query = new WP_Query( $args );
+		$count = $query->found_posts;
 		return (int) $count;
 	}
 

From 1f138c7c51200d57f7a142b26116f4759c2a6f6c Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 7 Jun 2014 05:18:09 +0530
Subject: [PATCH 058/485] Setting `supports` as false instead of an empty array
 to make code look better

---
 supportflow.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index aa2f802..02fab44 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -277,9 +277,7 @@ public function action_init_register_post_type() {
 				),
 				'public'        => true,
 				'menu_position' => 3,
-				'supports'      => array(
-					''
-				),
+				'supports'      => false,
 			)
 		);
 	}

From e041393e8e22c56a1b3f3ddeabb8ce265b0a05f7 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 9 Jun 2014 16:32:06 +0530
Subject: [PATCH 059/485] Identifying 'Delete" link by class rather than ID as
 they can be more than one

---
 classes/class-supportflow-email-accounts.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index a889b0f..a5242d4 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -32,7 +32,7 @@ function __construct( $accounts ) {
 				'table_smtp_host' => $account['smtp_host'],
 				'table_smtp_port' => $account['smtp_port'],
 				'table_smtp_ssl'  => $account['smtp_ssl'] ? 'True' : 'False',
-				'table_action'    => "<a href='#' data-account-id='$account_id' id='delete_email_account'>Delete</a>",
+				'table_action'    => "<a href='#' data-account-id='$account_id' class='delete_email_account'>Delete</a>",
 			);
 		}
 	}
@@ -260,7 +260,7 @@ public function insert_js_code() {
 		$form_action = "edit.php?post_type=" . SupportFlow()->post_type . "&page=" . $this->slug;
 		?>
 		<script type="text/javascript">
-			jQuery('#delete_email_account').click(function (e) {
+			jQuery('.delete_email_account').click(function (e) {
 				e.preventDefault();
 				if (!confirm('<?php echo $msg_title ?>')) {
 					return;

From a37525da162346d8ee7d781f2f03acae512ad484 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 16 Jun 2014 22:00:03 +0530
Subject: [PATCH 060/485] Combobox to insert predefined reply in post

---
 classes/class-supportflow-admin.php | 35 +++++++++++++++++++++++++++--
 js/predefined-replies.js            | 32 ++++++++++++++++++++++++++
 2 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 js/predefined-replies.js

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index a0df633..13e0b47 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -63,9 +63,11 @@ public function action_admin_enqueue_scripts() {
 			wp_enqueue_script( 'supportflow-plupload', SupportFlow()->plugin_url . 'js/plupload.js', array( 'wp-plupload', 'jquery' ) );
 			self::add_default_plupload_settings();
 			wp_enqueue_script( 'supportflow-respondents-autocomplete', SupportFlow()->plugin_url . 'js/respondents-autocomplete.js', array( 'jquery', 'jquery-ui-autocomplete' ) );
-
 			$ajaxurl = add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) );
 			wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
+			wp_enqueue_script( 'supportflow-predefined-replies', SupportFlow()->plugin_url . 'js/predefined-replies.js', array( 'jquery' ) );
+			$message = __( 'Are you sure want to proceed? It will replace your existing content.', 'supportflow' );
+			wp_localize_script( 'supportflow-respondents-autocomplete', 'SFPredefinedReplies', array( 'message' => $message ) );
 		}
 	}
 
@@ -473,13 +475,42 @@ public function meta_box_respondents() {
 	public function meta_box_replies() {
 		global $pagenow;
 
+		$predefined_replies = get_posts( array( 'post_type' => 'sf_predefs' ) );
+		$pre_defs           = array( array( 'title' => __( 'Pre-defined Replies', 'supportflow' ), 'content' => '' ) );
+
+		foreach ( $predefined_replies as $predefined_reply ) {
+			if ( ! empty( $predefined_reply->post_title ) ) {
+				$content = $predefined_reply->post_title;
+			} else {
+				$content = $predefined_reply->post_content;
+			}
+
+			// Limit size to 25 characters
+			if ( strlen( $content ) > 25 ) {
+				$title = substr( $content, 0, 25 - 3 ) . '...';
+			} else {
+				$title = $content;
+			}
+
+			if ( 0 != strlen( $content ) ) {
+				$pre_defs[] = array( 'title' => $title, 'content' => $content );
+			}
+		}
+
 		$placeholders = array(
 			__( "What's burning?", 'supportflow' ),
 			__( 'What do you need to get off your chest?', 'supportflow' ),
 		);
 
 		$rand = array_rand( $placeholders );
-		echo '<h4>' . __( 'Conversation', 'supportflow' ) . '</h4>';
+		echo '<div style="float:left"><h4>' . __( 'Conversation', 'supportflow' ) . '</h4></div>';
+		echo '<div style="float: right" >';
+		echo '<select id="predefs"  class="pre-defs">';
+		foreach ( $pre_defs as $pre_def ) {
+			echo '<option class="predef" data-content="' . esc_attr( $pre_def['content'] ) . '">' . esc_html( $pre_def['title'] ) . "</option>\n";
+		}
+		echo '</select></div>';
+
 		echo '<div id="thread-reply-box">';
 
 		echo "<textarea id='reply' name='reply' class='thread-reply' rows='4' placeholder='" . esc_attr( $placeholders[$rand] ) . "'>";
diff --git a/js/predefined-replies.js b/js/predefined-replies.js
new file mode 100644
index 0000000..54ae9e4
--- /dev/null
+++ b/js/predefined-replies.js
@@ -0,0 +1,32 @@
+jQuery(document).ready(function () {
+
+	jQuery('#predefs').change(function () {
+		if (this.old_child == undefined) {
+			this.old_child = 1;
+		}
+		
+		// New selection of combo box
+		new_content = jQuery('#predefs').find('option:selected').data('content');
+		
+		// Previous selection of combo box
+		old_content = jQuery('.predef:nth-child(' + this.old_child + ')').data('content');
+		
+		// Current value of reply text box
+		current_content = jQuery('#reply').val();
+
+		if (0 == new_content.length) {
+			return;
+		}
+		
+		// Show confirmation message if reply box content is manually changed by user
+		if (current_content != old_content) {
+			if (false == window.confirm(SFPredefinedReplies.message)) {
+				jQuery('.predef:nth-child(' + this.old_child + ')').prop('selected', true);
+				return;
+			}
+		}
+
+		jQuery('#reply').val(new_content);
+		this.old_child = jQuery('#predefs').find('option:selected').index() + 1;
+	});
+});
\ No newline at end of file

From 754ffccc51f3cfc543a4ea530bf351e07dd25521 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 18 Jun 2014 18:10:32 +0530
Subject: [PATCH 061/485] Added an option to filter by tag in 'All Threads'
 page

---
 classes/class-supportflow-admin.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index a0df633..55b3092 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -185,6 +185,18 @@ public function action_restrict_manage_posts() {
 		);
 		$agent_dropdown_args = apply_filters( 'supportflow_admin_agent_dropdown_args', $agent_dropdown_args );
 		wp_dropdown_users( $agent_dropdown_args );
+
+		// Filter to specify tag
+		$tax_slug = SupportFlow()->tags_tax;
+		$terms    = get_terms( 'sf_tags', array( 'hide_empty' => false ) );
+
+		echo "<select name='$tax_slug' id='$tax_slug' class='postform'>";
+		echo "<option value=''>" . __( 'Show All tags', 'supportflow' ) . "</option>";
+		foreach ( $terms as $term ) {
+			$selected = selected( isset( $_REQUEST[$tax_slug] ) && ( $_REQUEST[$tax_slug] == $term->slug ), true, false );
+			echo "<option value='" . esc_attr( $term->slug ) . "'$selected>" . esc_html( $term->name ) . '</option>';
+		}
+		echo "</select>";
 	}
 
 	/**

From fffd1bc04e076beacf572d9b08255e6abee7c326 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 19 Jun 2014 03:15:12 +0530
Subject: [PATCH 062/485] Added an option to filter by email-account in 'All
 Threads' page

---
 classes/class-supportflow-admin.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 55b3092..252901c 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -197,6 +197,22 @@ public function action_restrict_manage_posts() {
 			echo "<option value='" . esc_attr( $term->slug ) . "'$selected>" . esc_html( $term->name ) . '</option>';
 		}
 		echo "</select>";
+
+
+		// Filter to specify E-Mail account
+		$email_accounts = get_option( 'sf_email_accounts' );
+
+		echo "<select name='email_account' id='email_account' class='postform'>";
+		echo "<option value=''>" . __( 'Show All Accounts', 'supportflow' ) . "</option>";
+		foreach ( $email_accounts as $id => $email_account ) {
+			if ( empty( $email_account ) ) {
+				continue;
+			}
+			$selected = selected( isset( $_REQUEST['email_account'] ) && ( $_REQUEST['email_account'] == $id ), true, false );
+			echo "<option value='" . esc_attr( $id ) . "'$selected>" . esc_html( $email_account['username'] . ' (' . $email_account['imap_host'] . ')' ) . '</option>';
+		}
+		echo "</select>";
+
 	}
 
 	/**
@@ -328,6 +344,11 @@ function action_pre_get_posts( $query ) {
 			$query->set( 'post_status', $status_slugs );
 		}
 
+
+		if ( isset( $_GET['email_account'] ) ) {
+			$query->set( 'meta_key', 'email_account' );
+			$query->set( 'meta_value', (int) $_GET['email_account'] );
+		}
 	}
 
 	/**

From b26a341f4a6961c404ca248785f5c9bfcabb394e Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 21 Jun 2014 16:57:09 +0530
Subject: [PATCH 063/485] Displaying labels in sentence case

---
 supportflow.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index 9ffe540..1706f36 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -301,7 +301,7 @@ function action_init_register_predefined_replies() {
 					'all_items'          => __( 'All predefined replies', 'supportflow' ),
 					'add_new'            => __( 'New predefined reply', 'supportflow' ),
 					'add_new_item'       => __( 'New predefined reply', 'supportflow' ),
-					'edit_item'          => __( 'Edit Predefined reply', 'supportflow' ),
+					'edit_item'          => __( 'Edit predefined reply', 'supportflow' ),
 					'new_item'           => __( 'New Predefined Reply', 'supportflow' ),
 					'view_item'          => __( 'View predefined reply', 'supportflow' ),
 					'search_items'       => __( 'Search predefined replies', 'supportflow' ),
@@ -326,8 +326,8 @@ public function action_admin_menu_predefined_replies() {
 		$post_type                = $this->post_type;
 		$predefinded_replies_type = $this->predefinded_replies_type;
 
-		add_submenu_page( "edit.php?post_type=$post_type", 'All Predefined replies', 'All Predefined Replies', 'manage_options', "edit.php?post_type=$predefinded_replies_type" );
-		add_submenu_page( "edit.php?post_type=$post_type", 'New Predefined reply', 'New Predefined Reply', 'manage_options', "post-new.php?post_type=$predefinded_replies_type" );
+		add_submenu_page( "edit.php?post_type=$post_type", 'All predefined replies', 'All predefined replies', 'manage_options', "edit.php?post_type=$predefinded_replies_type" );
+		add_submenu_page( "edit.php?post_type=$post_type", 'New predefined reply', 'New predefined reply', 'manage_options', "post-new.php?post_type=$predefinded_replies_type" );
 
 	}
 

From b6268991924133e751cd10578c10afdeb86b2b6d Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 24 Jun 2014 22:50:49 +0530
Subject: [PATCH 064/485] Escaping tags taxonomy slugs when outputting them

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 252901c..f9029ec 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -190,7 +190,7 @@ public function action_restrict_manage_posts() {
 		$tax_slug = SupportFlow()->tags_tax;
 		$terms    = get_terms( 'sf_tags', array( 'hide_empty' => false ) );
 
-		echo "<select name='$tax_slug' id='$tax_slug' class='postform'>";
+		echo "<select name='" . esc_attr($tax_slug) . "' id='" . esc_attr($tax_slug) . "' class='postform'>";
 		echo "<option value=''>" . __( 'Show All tags', 'supportflow' ) . "</option>";
 		foreach ( $terms as $term ) {
 			$selected = selected( isset( $_REQUEST[$tax_slug] ) && ( $_REQUEST[$tax_slug] == $term->slug ), true, false );

From 87d2144750e9ffd296bb50a35a5996c13d93a99d Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 24 Jun 2014 23:26:36 +0530
Subject: [PATCH 065/485] Modularize pre-defined replies by creating its own
 class

---
 classes/class-supportflow-admin.php           |  3 -
 .../class-supportflow-predefined-replies.php  | 78 +++++++++++++++++++
 supportflow.php                               | 48 +-----------
 3 files changed, 80 insertions(+), 49 deletions(-)
 create mode 100644 classes/class-supportflow-predefined-replies.php

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 13e0b47..0cfa28c 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -65,9 +65,6 @@ public function action_admin_enqueue_scripts() {
 			wp_enqueue_script( 'supportflow-respondents-autocomplete', SupportFlow()->plugin_url . 'js/respondents-autocomplete.js', array( 'jquery', 'jquery-ui-autocomplete' ) );
 			$ajaxurl = add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) );
 			wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
-			wp_enqueue_script( 'supportflow-predefined-replies', SupportFlow()->plugin_url . 'js/predefined-replies.js', array( 'jquery' ) );
-			$message = __( 'Are you sure want to proceed? It will replace your existing content.', 'supportflow' );
-			wp_localize_script( 'supportflow-respondents-autocomplete', 'SFPredefinedReplies', array( 'message' => $message ) );
 		}
 	}
 
diff --git a/classes/class-supportflow-predefined-replies.php b/classes/class-supportflow-predefined-replies.php
new file mode 100644
index 0000000..26a042a
--- /dev/null
+++ b/classes/class-supportflow-predefined-replies.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * Class to create/insert predefined replies into the threads
+ */
+
+class SupportFlow_Predefined_Replies extends SupportFlow {
+
+	function __construct() {
+		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
+	}
+
+	public function setup_actions() {
+		add_action( 'init', array( $this, 'action_init_register_predefined_replies' ) );
+		add_action( 'admin_menu', array( $this, 'action_admin_menu_predefined_replies' ) );
+
+		add_action( 'admin_enqueue_scripts', array( $this, 'action_admin_enqueue_scripts' ) );
+	}
+
+	/**
+	 * Add any CSS or JS we need for the admin
+	 */
+	public function action_admin_enqueue_scripts() {
+		global $pagenow;
+
+		if ( 'post.php' == $pagenow || 'post-new.php' == $pagenow ) {
+			wp_enqueue_script( 'supportflow-predefined-replies', SupportFlow()->plugin_url . 'js/predefined-replies.js', array( 'jquery' ) );
+			$message = __( 'Are you sure want to proceed? It will replace your existing content.', 'supportflow' );
+			wp_localize_script( 'supportflow-predefined-replies', 'SFPredefinedReplies', array( 'message' => $message ) );
+
+		}
+	}
+
+	/**
+	 * Register the custom post type to create predefined replies
+	 * @uses  register_post_type() To register the post type
+	 */
+	function action_init_register_predefined_replies() {
+		register_post_type(
+			SupportFlow()->predefinded_replies_type, array(
+				'labels'             => array(
+					'menu_name'          => __( 'SupportFlow', 'supportflow' ),
+					'name'               => __( 'Predefined Replies', 'supportflow' ),
+					'singular_name'      => __( 'Predefined Reply', 'supportflow' ),
+					'all_items'          => __( 'All predefined replies', 'supportflow' ),
+					'add_new'            => __( 'New predefined reply', 'supportflow' ),
+					'add_new_item'       => __( 'New predefined reply', 'supportflow' ),
+					'edit_item'          => __( 'Edit predefined reply', 'supportflow' ),
+					'new_item'           => __( 'New Predefined Reply', 'supportflow' ),
+					'view_item'          => __( 'View predefined reply', 'supportflow' ),
+					'search_items'       => __( 'Search predefined replies', 'supportflow' ),
+					'not_found'          => __( 'No predefined reply found', 'supportflow' ),
+					'not_found_in_trash' => __( 'No predefined reply found in trash', 'supportflow' ),
+				),
+				'public'             => true,
+				'show_ui'            => true,
+				'publicly_queryable' => false,
+				'show_in_menu'       => false,
+				'supports'           => array(
+					'title', 'editor',
+				),
+			)
+		);
+	}
+
+	/**
+	 * Add predefined options under Supportflow menu
+	 */
+	public function action_admin_menu_predefined_replies() {
+		$post_type                = SupportFlow()->post_type;
+		$predefinded_replies_type = SupportFlow()->predefinded_replies_type;
+
+		add_submenu_page( "edit.php?post_type=$post_type", 'All predefined replies', 'All predefined replies', 'manage_options', "edit.php?post_type=$predefinded_replies_type" );
+		add_submenu_page( "edit.php?post_type=$post_type", 'New predefined reply', 'New predefined reply', 'manage_options', "post-new.php?post_type=$predefinded_replies_type" );
+
+	}
+}
+
+SupportFlow()->extend->predefined_replies = new SupportFlow_Predefined_Replies();
\ No newline at end of file
diff --git a/supportflow.php b/supportflow.php
index 1706f36..632ad90 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -217,6 +217,7 @@ private function includes() {
 		require_once( $this->plugin_dir . 'classes/class-supportflow-email-replies.php' );
 		require_once( $this->plugin_dir . 'classes/class-supportflow-permissions.php' );
 		require_once( $this->plugin_dir . 'classes/class-supportflow-email-accounts.php' );
+		require_once( $this->plugin_dir . 'classes/class-supportflow-predefined-replies.php' );
 
 		/** Extensions ********************************************************/
 
@@ -249,8 +250,7 @@ private function setup_actions() {
 		add_action( 'init', array( $this, 'action_init_register_post_type' ) );
 		add_action( 'init', array( $this, 'action_init_register_taxonomies' ) );
 		add_action( 'init', array( $this, 'action_init_register_post_statuses' ) );
-		add_action( 'init', array( $this, 'action_init_register_predefined_replies' ) );
-		add_action( 'admin_menu', array( $this, 'action_admin_menu_predefined_replies' ) );
+
 
 		add_filter( 'wp_insert_post_empty_content', array( $this, 'filter_wp_insert_post_empty_content' ), 10, 2 );
 
@@ -287,50 +287,6 @@ public function action_init_register_post_type() {
 		);
 	}
 
-	/**
-	 * Register the custom post type to create predefined replies
-	 * @uses  register_post_type() To register the post type
-	 */
-	function action_init_register_predefined_replies() {
-		register_post_type(
-			$this->predefinded_replies_type, array(
-				'labels'             => array(
-					'menu_name'          => __( 'SupportFlow', 'supportflow' ),
-					'name'               => __( 'Predefined Replies', 'supportflow' ),
-					'singular_name'      => __( 'Predefined Reply', 'supportflow' ),
-					'all_items'          => __( 'All predefined replies', 'supportflow' ),
-					'add_new'            => __( 'New predefined reply', 'supportflow' ),
-					'add_new_item'       => __( 'New predefined reply', 'supportflow' ),
-					'edit_item'          => __( 'Edit predefined reply', 'supportflow' ),
-					'new_item'           => __( 'New Predefined Reply', 'supportflow' ),
-					'view_item'          => __( 'View predefined reply', 'supportflow' ),
-					'search_items'       => __( 'Search predefined replies', 'supportflow' ),
-					'not_found'          => __( 'No predefined reply found', 'supportflow' ),
-					'not_found_in_trash' => __( 'No predefined reply found in trash', 'supportflow' ),
-				),
-				'public'             => true,
-				'show_ui'            => true,
-				'publicly_queryable' => false,
-				'show_in_menu'       => false,
-				'supports'           => array(
-					'title', 'editor',
-				),
-			)
-		);
-	}
-
-	/**
-	 * Add predefined options under Supportflow menu
-	 */
-	public function action_admin_menu_predefined_replies() {
-		$post_type                = $this->post_type;
-		$predefinded_replies_type = $this->predefinded_replies_type;
-
-		add_submenu_page( "edit.php?post_type=$post_type", 'All predefined replies', 'All predefined replies', 'manage_options', "edit.php?post_type=$predefinded_replies_type" );
-		add_submenu_page( "edit.php?post_type=$post_type", 'New predefined reply', 'New predefined reply', 'manage_options', "post-new.php?post_type=$predefinded_replies_type" );
-
-	}
-
 	/**
 	 * Register our custom taxonomies
 	 */

From c9e3f062afd4ab5cef7fa43d29e707c91a1bbe51 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 24 Jun 2014 23:53:59 +0530
Subject: [PATCH 066/485] Using only predefined reply content to determine its
 title in combo box

---
 classes/class-supportflow-admin.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 0cfa28c..65a1f03 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -476,11 +476,7 @@ public function meta_box_replies() {
 		$pre_defs           = array( array( 'title' => __( 'Pre-defined Replies', 'supportflow' ), 'content' => '' ) );
 
 		foreach ( $predefined_replies as $predefined_reply ) {
-			if ( ! empty( $predefined_reply->post_title ) ) {
-				$content = $predefined_reply->post_title;
-			} else {
-				$content = $predefined_reply->post_content;
-			}
+			$content = $predefined_reply->post_content;
 
 			// Limit size to 25 characters
 			if ( strlen( $content ) > 25 ) {

From 47f217044984a1d3295ebb6130f5494d22a54028 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 25 Jun 2014 00:24:37 +0530
Subject: [PATCH 067/485] Using CSS class instead of inline CSS

---
 classes/class-supportflow-admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 65a1f03..da71615 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -496,8 +496,8 @@ public function meta_box_replies() {
 		);
 
 		$rand = array_rand( $placeholders );
-		echo '<div style="float:left"><h4>' . __( 'Conversation', 'supportflow' ) . '</h4></div>';
-		echo '<div style="float: right" >';
+		echo '<div class="alignleft"><h4>' . __( 'Conversation', 'supportflow' ) . '</h4></div>';
+		echo '<div class="alignright">';
 		echo '<select id="predefs"  class="pre-defs">';
 		foreach ( $pre_defs as $pre_def ) {
 			echo '<option class="predef" data-content="' . esc_attr( $pre_def['content'] ) . '">' . esc_html( $pre_def['title'] ) . "</option>\n";

From a06d2cda807322400a8e7d3086e2ccfe7f0e0a92 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 25 Jun 2014 00:27:20 +0530
Subject: [PATCH 068/485] Using width property to set predefined-replies combo
 box width

---
 classes/class-supportflow-admin.php | 2 +-
 css/admin.css                       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index da71615..aa19904 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -498,7 +498,7 @@ public function meta_box_replies() {
 		$rand = array_rand( $placeholders );
 		echo '<div class="alignleft"><h4>' . __( 'Conversation', 'supportflow' ) . '</h4></div>';
 		echo '<div class="alignright">';
-		echo '<select id="predefs"  class="pre-defs">';
+		echo '<select id="predefs"  class="predefined_replies_dropdown">';
 		foreach ( $pre_defs as $pre_def ) {
 			echo '<option class="predef" data-content="' . esc_attr( $pre_def['content'] ) . '">' . esc_html( $pre_def['title'] ) . "</option>\n";
 		}
diff --git a/css/admin.css b/css/admin.css
index 79234e5..0d187e5 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -193,6 +193,10 @@
 	margin-top:  5px;
 }
 
+#supportflow-replies.postbox .predefined_replies_dropdown {
+	width: 200px;
+}
+
 .metabox-holder .postbox-container .empty-container {
 	border: none;
 }

From 4295c6471060d14e8e7a70e85a8fe0a8d4784fa0 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 25 Jun 2014 00:30:33 +0530
Subject: [PATCH 069/485] Increase number of characters of predefined reply
 that can be viewed in dropdown to 75

---
 classes/class-supportflow-admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index aa19904..d14e7b8 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -479,8 +479,8 @@ public function meta_box_replies() {
 			$content = $predefined_reply->post_content;
 
 			// Limit size to 25 characters
-			if ( strlen( $content ) > 25 ) {
-				$title = substr( $content, 0, 25 - 3 ) . '...';
+			if ( strlen( $content ) > 75 ) {
+				$title = substr( $content, 0, 75 - 3 ) . '...';
 			} else {
 				$title = $content;
 			}

From 8067dfbc963884dedbf1e7141a37608713a61525 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 25 Jun 2014 03:00:59 +0530
Subject: [PATCH 070/485] Showing predefined reply title in combobox

---
 classes/class-supportflow-admin.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index d14e7b8..b05ce46 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -478,11 +478,15 @@ public function meta_box_replies() {
 		foreach ( $predefined_replies as $predefined_reply ) {
 			$content = $predefined_reply->post_content;
 
-			// Limit size to 25 characters
-			if ( strlen( $content ) > 75 ) {
-				$title = substr( $content, 0, 75 - 3 ) . '...';
-			} else {
-				$title = $content;
+			if ( ! empty( $predefined_reply->post_title ) ) {
+ 				$title = $predefined_reply->post_title;
+ 			} else {
+ 				$title = $predefined_reply->post_content;
+ 			}
+
+			// Limit size to 75 characters
+			if ( strlen( $title ) > 75 ) {
+				$title = substr( $title, 0, 75 - 3 ) . '...';
 			}
 
 			if ( 0 != strlen( $content ) ) {

From 52d2ab40130e71e59fafbca0c66a53706d0ff8c9 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 24 Jun 2014 22:54:06 +0530
Subject: [PATCH 071/485] Corrected WordPress coding standard

---
 classes/class-supportflow-admin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index f9029ec..c8d0754 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -190,11 +190,11 @@ public function action_restrict_manage_posts() {
 		$tax_slug = SupportFlow()->tags_tax;
 		$terms    = get_terms( 'sf_tags', array( 'hide_empty' => false ) );
 
-		echo "<select name='" . esc_attr($tax_slug) . "' id='" . esc_attr($tax_slug) . "' class='postform'>";
+		echo "<select name='" . esc_attr( $tax_slug ) . "' id='" . esc_attr( $tax_slug ) . "' class='postform'>";
 		echo "<option value=''>" . __( 'Show All tags', 'supportflow' ) . "</option>";
 		foreach ( $terms as $term ) {
-			$selected = selected( isset( $_REQUEST[$tax_slug] ) && ( $_REQUEST[$tax_slug] == $term->slug ), true, false );
-			echo "<option value='" . esc_attr( $term->slug ) . "'$selected>" . esc_html( $term->name ) . '</option>';
+			$selected = selected( isset( $_REQUEST[ $tax_slug ] ) && ( $_REQUEST[ $tax_slug ] == $term->slug ), true, false );
+			echo "<option value='" . esc_attr( $term->slug ) . "' $selected>" . esc_html( $term->name ) . '</option>';
 		}
 		echo "</select>";
 

From 42be7ec6b887ee98282b238edb877f56f013b5ae Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 25 Jun 2014 05:34:02 +0530
Subject: [PATCH 072/485] Don't filter by E-Mail account if it is empty

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index c8d0754..9bf1ff3 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -345,7 +345,7 @@ function action_pre_get_posts( $query ) {
 		}
 
 
-		if ( isset( $_GET['email_account'] ) ) {
+		if ( isset( $_GET['email_account'] ) && ! empty( $_GET['email_account'] ) ) {
 			$query->set( 'meta_key', 'email_account' );
 			$query->set( 'meta_value', (int) $_GET['email_account'] );
 		}

From 91af57b9c54c8131363dc907f45be32331d75925 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 5 Jun 2014 03:16:07 +0530
Subject: [PATCH 073/485] Setup wp-cron to retrieve E-Mail replies from IMAP
 server

---
 classes/class-supportflow-email-replies.php | 22 +++++++++++++++++++++
 supportflow.php                             | 19 +++++++++++++++++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index d82c6e1..b0ec3e6 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -15,6 +15,8 @@ function __construct() {
 	public function setup_actions() {
 
 		add_filter( 'supportflow_emails_reply_notify_subject', array( $this, 'filter_reply_notify_subject' ), 10, 3 );
+		add_action( 'sf_cron_retrieve_email_replies', array( $this, 'retrieve_email_replies' ) );
+
 	}
 
 	public function filter_reply_notify_subject( $subject, $reply_id, $thread_id ) {
@@ -24,6 +26,26 @@ public function filter_reply_notify_subject( $subject, $reply_id, $thread_id ) {
 		return $subject;
 	}
 
+
+	function retrieve_email_replies() {
+		require_once ABSPATH . 'wp-admin/includes/admin.php';
+
+		$email_accounts = get_option( 'sf_email_accounts' );
+		foreach ( $email_accounts as $email_account ) {
+			$imap_account = array(
+				'host'     => $email_account['imap_host'],
+				'port'     => $email_account['imap_port'],
+				'ssl'      => $email_account['imap_ssl'],
+				'username' => $email_account['username'],
+				'password' => $email_account['password'],
+				'inbox'    => 'INBOX',
+				'archive'  => 'ARCHIVE',
+			);
+
+			$this->download_and_process_email_replies( $imap_account );
+		}
+	}
+
 	/**
 	 * Primary method for downloading and processing email replies
 	 */
diff --git a/supportflow.php b/supportflow.php
index 632ad90..d8a9360 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -779,4 +779,21 @@ function SupportFlow() {
 	return SupportFlow::instance();
 }
 
-add_action( 'plugins_loaded', 'SupportFlow' );
+add_filter( 'cron_schedules', function ( $schedules ) {
+	$schedules['five_minutes'] = array(
+		'interval' => 300,
+		'display'  => __( 'Five Minutes' )
+	);
+
+	return $schedules;
+} );
+
+register_activation_hook( __FILE__, function () {
+	wp_schedule_event( time(), 'five_minutes', 'sf_cron_retrieve_email_replies' );
+} );
+
+register_deactivation_hook( __FILE__, function () {
+	wp_clear_scheduled_hook( 'sf_cron_retrieve_email_replies' );
+} );
+
+add_action( 'plugins_loaded', 'SupportFlow' );
\ No newline at end of file

From d6f1bfe31821b8f35b82d740b1af1d7b749c8f76 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 5 Jun 2014 03:29:35 +0530
Subject: [PATCH 074/485] Add comma automatically after e-mail ID to save user
 time Prevent suggesting E-Mail ID's that are already entered

---
 classes/class-supportflow-admin.php |  3 ++-
 js/respondents-autocomplete.js      | 22 +++++++++++++---------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index e9c1422..01f363c 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -492,7 +492,8 @@ public function meta_box_respondents() {
 
 		$respondents        = SupportFlow()->get_thread_respondents( get_the_ID(), array( 'fields' => 'emails' ) );
 		$respondents_string = implode( ', ', $respondents );
-		$placeholder        = __( 'Who are you starting a conversation with?', 'supportflow' );
+		$respondents_string .= empty( $respondents_string ) ? '' : ', ';
+		$placeholder = __( 'Who are you starting a conversation with?', 'supportflow' );
 		echo '<h4>' . __( 'Respondent(s)', 'supportflow' ) . '</h4>';
 		echo '<input type="text" id="respondents" name="respondents" placeholder="' . $placeholder . '" value="' . esc_attr( $respondents_string ) . '" autocomplete="off" />';
 		echo '<p class="description">' . __( 'Enter each respondent email address, separated with a comma', 'supportflow' ) . '</p>';
diff --git a/js/respondents-autocomplete.js b/js/respondents-autocomplete.js
index 514e9b0..5b98d31 100644
--- a/js/respondents-autocomplete.js
+++ b/js/respondents-autocomplete.js
@@ -33,21 +33,25 @@ jQuery(document).ready(function ($) {
 					response($.map(data.respondents, function (item) {
 
 						// normaliz input
-						var resps = $('#respondents').val().replace(" ", '').split(",");
+						var resps = $('#respondents').val().split(' ').join('').split(",");
 
 						// remove partial respondent
 						resps.pop();
 
-						// replace with full email
-						resps.push(item.name);
+						// Check if e-mail id already exists
+						if (-1 == $.inArray(item.name, resps)) {
 
-						// make it a string
-						var retval = resps.join(", ");
+							// replace with full email
+							resps.push(item.name);
 
-						// return those respondents!
-						return {
-							label: item.name,
-							value: retval
+							// make it a string
+							var retval = resps.join(", ") + ", ";
+
+							// return those respondents!
+							return {
+								label: item.name,
+								value: retval
+							}
 						}
 					}));
 				}

From 188a240ef392fdffcb9f049896aa7df97ad23f40 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 5 Jun 2014 03:33:08 +0530
Subject: [PATCH 075/485] Improved SupportFlow_Emails->mail method to support
 cc and bcc Using headers instead of hook to set E-Mail 'from' ID

---
 classes/class-supportflow-emails.php | 51 ++++++++++++----------------
 1 file changed, 21 insertions(+), 30 deletions(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index dfd3c7b..e773bbc 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -5,9 +5,6 @@
 
 class SupportFlow_Emails extends SupportFlow {
 
-	private $from_name = false;
-	private $from_email = false;
-
 	function __construct() {
 		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
 	}
@@ -17,9 +14,6 @@ function __construct() {
 	 */
 	public function setup_actions() {
 
-		$this->from_name  = apply_filters( 'supportflow_emails_from_name', $this->from_name );
-		$this->from_email = apply_filters( 'supportflow_emails_from_address', $this->from_email );
-
 		// Don't send out any notifications when importing or using WP-CLI
 		if ( ( defined( 'WP_IMPORTING' ) && WP_IMPORTING ) || ( defined( 'WP_CLI' ) && WP_CLI ) ) {
 			return;
@@ -132,35 +126,32 @@ public function notify_respondents_thread_replies( $reply_id ) {
 	/**
 	 * Send an email from SupportFlow
 	 */
-	public function mail( $respondent_email, $subject, $message ) {
+	public function mail( $subject, $message, $to, $cc = array(), $bcc = array(), $from_email = null, $from_name = null ) {
 
-		add_filter( 'wp_mail_from', array( $this, 'filter_wp_mail_from' ) );
-		add_filter( 'wp_mail_from_name', array( $this, 'filter_wp_mail_from_name' ) );
-		wp_mail( $respondent_email, $subject, $message );
-		remove_filter( 'wp_mail_from', array( $this, 'filter_wp_mail_from' ) );
-		remove_filter( 'wp_mail_from_name', array( $this, 'filter_wp_mail_from_name' ) );
-	}
+		$from_email = apply_filters( 'supportflow_mail_from_email', $from_email );
+		$from_name  = apply_filters( 'supportflow_mail_from_name', $from_name );
 
-	/**
-	 * Filter the 'from address' value used by wp_mail
-	 */
-	public function filter_wp_mail_from( $from_email ) {
-		if ( $this->from_email ) {
-			return $this->from_email;
-		} else {
-			$from_email;
+		$headers = '';
+
+		if ( ! empty( $from_email ) && ! empty( $from_name ) ) {
+			$headers .= "From: $from_name <$from_email>\r\n";
+		} elseif ( ! empty( $from_email ) && empty( $from_name ) ) {
+			$headers .= "From: $from_email\r\n";
 		}
-	}
 
-	/**
-	 * Filter the 'from name' value used by wp_mail
-	 */
-	public function filter_wp_mail_from_name( $from_name ) {
-		if ( $this->from_name ) {
-			return $this->from_name;
-		} else {
-			$from_name;
+		if ( is_array( $cc ) && ! empty( $cc ) ) {
+			$headers .= "Cc: " . implode( ', ', $cc ) . "\r\n";
+		} elseif ( is_string( $cc ) && ! empty( $cc ) ) {
+			$headers .= "Cc: $cc\r\n";
 		}
+
+		if ( is_array( $bcc ) && ! empty( $bcc ) ) {
+			$headers .= "Bcc: " . implode( ', ', $bcc ) . "\r\n";
+		} elseif ( is_string( $bcc ) && ! empty( $cc ) ) {
+			$headers .= "Bcc: $bcc\r\n";
+		}
+
+		wp_mail( $to, $subject, $message, $headers );
 	}
 }
 

From 97bf7008eb505df3124d4f32eff2982483b6d83f Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 5 Jun 2014 03:54:54 +0530
Subject: [PATCH 076/485] Improved E-Mail retrieval code, fixed bugs

---
 classes/class-supportflow-email-replies.php | 154 ++++++++++----------
 1 file changed, 81 insertions(+), 73 deletions(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index b0ec3e6..feb98b9 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -4,8 +4,6 @@
  */
 class SupportFlow_Email_Replies extends SupportFlow {
 
-	var $imap_connection;
-
 	const email_id_key = 'orig_email_id';
 
 	function __construct() {
@@ -50,23 +48,27 @@ function retrieve_email_replies() {
 	 * Primary method for downloading and processing email replies
 	 */
 	public function download_and_process_email_replies( $connection_details ) {
+		imap_timeout( IMAP_OPENTIMEOUT, apply_filters( 'supportflow_imap_open_timeout', 5 ) );
+
+		$ssl = $connection_details['ssl'] ? '/ssl' : '';
 
-		$inbox   = $connection_details['inbox'];
-		$archive = $connection_details['archive'];
+		$mailbox     = "{{$connection_details['host']}:{$connection_details['port']}{$ssl}}";
+		$inbox       = "{$mailbox}{$connection_details['inbox']}";
+		$archive_box = "{$mailbox}{$connection_details['archive']}";
 
-		$this->imap_connection = imap_open( $connection_details['host'], $connection_details['username'], $connection_details['password'] );
-		if ( ! $this->imap_connection ) {
+		$imap_connection = imap_open( $mailbox, $connection_details['username'], $connection_details['password'] );
+		if ( ! $imap_connection ) {
 			return new WP_Error( 'connection-error', __( 'Error connecting to mailbox', 'supportflow' ) );
 		}
 
 		// Check to see if the archive mailbox exists, and create it if it doesn't
-		$mailboxes = imap_getmailboxes( $this->imap_connection, $connection_details['host'], '*' );
-		if ( ! wp_filter_object_list( $mailboxes, array( 'name' => $connection_details['host'] . $archive ) ) ) {
-			imap_createmailbox( $this->imap_connection, $connection_details['host'] . $archive );
-		}
+		$mailboxes = imap_getmailboxes( $imap_connection, $mailbox, '*' );
 
+		if ( ! wp_filter_object_list( $mailboxes, array( 'name' => $archive_box ) ) ) {
+			imap_createmailbox( $imap_connection, $archive_box );
+		}
 		// Make sure here are new emails to process
-		$email_count = imap_num_msg( $this->imap_connection );
+		$email_count = imap_num_msg( $imap_connection );
 		if ( $email_count < 1 ) {
 			return false;
 		}
@@ -75,15 +77,15 @@ public function download_and_process_email_replies( $connection_details ) {
 		$success = 0;
 		for ( $i = 1; $i <= $email_count; $i ++ ) {
 			$email            = new stdClass;
-			$email->headers   = imap_headerinfo( $this->imap_connection, $i );
-			$email->structure = imap_fetchstructure( $this->imap_connection, $i );
-			$email->body      = $this->get_body_from_connection( $this->imap_connection, $i );
+			$email->headers   = imap_headerinfo( $imap_connection, $i );
+			$email->structure = imap_fetchstructure( $imap_connection, $i );
+			$email->body      = $this->get_body_from_connection( $imap_connection, $i );
 
 			// @todo Confirm this a message we want to process
-			$ret = $this->process_email( $email, $i );
+			$ret = $this->process_email($imap_connection, $email, $i, $connection_details['username'] );
 			// If it was successful, move the email to the archive
 			if ( $ret ) {
-				imap_mail_move( $this->imap_connection, $i, $archive );
+				imap_mail_move( $imap_connection, $i, $connection_details['archive'] );
 				$success ++;
 			}
 		}
@@ -94,47 +96,49 @@ public function download_and_process_email_replies( $connection_details ) {
 	/**
 	 * Given an email object, maybe create a new ticket
 	 */
-	public function process_email( $email, $i ) {
+	public function process_email($imap_connection, $email, $i, $to ) {
 
 		$new_attachment_ids = array();
 
 		$k = 0;
-		foreach ( $email->structure->parts as $email_part ) {
+		if ( isset( $email->structure->parts ) ) {
+			foreach ( $email->structure->parts as $email_part ) {
 
-			// We should at least be dealing with something that resembles an email object at this point
-			if ( ! isset( $email_part->disposition ) || ! isset( $email_part->subtype ) || ! isset( $email_part->dparameters[0]->value ) ) {
-				continue;
-			}
+				// We should at least be dealing with something that resembles an email object at this point
+				if ( ! isset( $email_part->disposition ) || ! isset( $email_part->subtype ) || ! isset( $email_part->dparameters[0]->value ) ) {
+					continue;
+				}
 
-			if ( 'ATTACHMENT' == $email_part->disposition ) {
-				// We need to add 2 to our array key each time to get the correct email part
-				//@todo this needs more testing with different emails, should be smarter about which parts
-				$raw_attachment_data = imap_fetchbody( $this->imap_connection, $i, $k + 2 );
+				if ( 'ATTACHMENT' == $email_part->disposition ) {
+					// We need to add 2 to our array key each time to get the correct email part
+					//@todo this needs more testing with different emails, should be smarter about which parts
+					$raw_attachment_data = imap_fetchbody( $imap_connection, $i, $k + 2 );
 
-				// The raw data from imap is base64 encoded, but php-imap has us covered!
-				$attachment_data = imap_base64( $raw_attachment_data );
+					// The raw data from imap is base64 encoded, but php-imap has us covered!
+					$attachment_data = imap_base64( $raw_attachment_data );
 
-				$temp_file = get_temp_dir() . time() . '_supportflow_temp.tmp';
-				touch( $temp_file );
-				$temp_handle = fopen( $temp_file, 'w+' );
-				fwrite( $temp_handle, $attachment_data );
-				fclose( $temp_handle );
+					$temp_file = get_temp_dir() . time() . '_supportflow_temp.tmp';
+					touch( $temp_file );
+					$temp_handle = fopen( $temp_file, 'w+' );
+					fwrite( $temp_handle, $attachment_data );
+					fclose( $temp_handle );
 
-				$file_array = array(
-					'tmp_name' => $temp_file,
-					'name'     => $email_part->dparameters[0]->value,
-				);
+					$file_array = array(
+						'tmp_name' => $temp_file,
+						'name'     => $email_part->dparameters[0]->value,
+					);
 
-				$upload_result = media_handle_sideload( $file_array, null );
+					$upload_result = media_handle_sideload( $file_array, null );
 
-				if ( is_wp_error( $upload_result ) ) {
-					WP_CLI::warning( $upload_result->get_error_message() );
-				} else {
-					$new_attachment_ids[] = $upload_result;
-				}
+					if ( is_wp_error( $upload_result ) ) {
+						WP_CLI::warning( $upload_result->get_error_message() );
+					} else {
+						$new_attachment_ids[] = $upload_result;
+					}
 
+				}
+				$k ++;
 			}
-			$k ++;
 		}
 
 		if ( ! empty( $email->headers->subject ) ) {
@@ -143,8 +147,8 @@ public function process_email( $email, $i ) {
 			$subject = sprintf( __( 'New thread from %s', 'supportflow' ), $email->headers->fromaddress );
 		}
 
-		$respondent_name  = $email->headers->from[0]->personal;
-		$respondent_email = $email->headers->from[0]->mailbox . '@' . $email->headers->from[0]->host;
+		$reply_author       = isset( $email->headers->from[0]->personal ) ? $email->headers->from[0]->personal : '';
+		$reply_author_email = $email->headers->from[0]->mailbox . '@' . $email->headers->from[0]->host;
 
 		// Parse out the reply body
 		if ( function_exists( 'What_The_Email' ) ) {
@@ -157,7 +161,7 @@ public function process_email( $email, $i ) {
 		if ( function_exists( 'What_The_Email' ) ) {
 			$check_strings = array(
 				'subject' => $subject,
-				'sender'  => $respondent_email,
+				'sender'  => $reply_author_email,
 				'message' => $message,
 			);
 			foreach ( $check_strings as $key => $value ) {
@@ -173,50 +177,54 @@ public function process_email( $email, $i ) {
 			$thread_id = SupportFlow()->get_thread_from_secret( $matches[1] );
 		}
 
+		// Add anyone else that was in the 'to' or 'cc' fields as respondents
+		$respondents = array();
+		$fields      = array( 'to', 'cc' );
+		foreach ( $fields as $field ) {
+			if ( ! empty( $email->headers->$field ) ) {
+				foreach ( $email->headers->$field as $recipient ) {
+					$email_address = $recipient->mailbox . '@' . $recipient->host;
+					if ( is_email( $email_address ) && $email_address != SupportFlow()->extend->emails->from_address && strcasecmp( $email_address, $to ) != 0 ) {
+						$respondents[] = $email_address;
+					}
+				}
+			}
+		}
+		$respondents[] = $reply_author_email;
+
 		if ( $thread_id ) {
 			$reply_args = array(
-				'reply_author'       => $respondent_name,
-				'reply_author_email' => $respondent_email,
+				'reply_author'       => $reply_author,
+				'reply_author_email' => $reply_author_email,
 			);
+			SupportFlow()->update_thread_respondents( $thread_id, $respondents, true );
 			SupportFlow()->add_thread_reply( $thread_id, $message, $reply_args );
+
 		} else {
 			// If this wasn't in reply to an existing message, create a new thread
 			$new_thread_args = array(
-				'subject'          => $subject,
-				'respondent_name'  => $respondent_name,
-				'respondent_email' => $respondent_email,
-				'message'          => $message,
+				'subject'            => $subject,
+				'reply_author'       => $reply_author,
+				'reply_author_email' => $reply_author_email,
+				'message'            => $message,
+				'respondent_email'   => $respondents,
 			);
-			$thread_id       = SupportFlow()->create_thread( $new_thread_args );
-		}
 
-		foreach ( $new_attachment_ids as $new_attachment_id ) {
-			// Associate the thread ID as the parent to our new attachment
-			wp_update_post( array( 'ID' => $new_attachment_id, 'post_parent' => $thread_id, 'post_status' => 'inherit' ) );
+			$thread_id = SupportFlow()->create_thread( $new_thread_args );
 		}
 
-		$new_reply = array_pop( SupportFlow()->get_thread_replies( $thread_id ) );
+		$all_replies = SupportFlow()->get_thread_replies( $thread_id );
+		$new_reply   = $all_replies[count( $all_replies ) - 1];
 
-		// Add anyone else that was in the 'to' or 'cc' fields as respondents
-		$respondents = array();
-		$fields      = array( 'to', 'cc' );
-		foreach ( $fields as $field ) {
-			if ( ! empty( $email->headers->$field ) ) {
-				foreach ( $email->headers->$field as $recipient ) {
-					$email_address = $recipient->mailbox . '@' . $recipient->host;
-					if ( is_email( $email_address ) && $email_address != SupportFlow()->extend->emails->from_address ) {
-						$respondents[] = $email_address;
-					}
-				}
-			}
+		foreach ( $new_attachment_ids as $new_attachment_id ) {
+			// Associate the thread ID as the parent to our new attachment
+			wp_update_post( array( 'ID' => $new_attachment_id, 'post_parent' => $new_reply->ID, 'post_status' => 'inherit' ) );
 		}
-		SupportFlow()->update_thread_respondents( $thread_id, $respondents, true );
 
 		// Store the original email ID so we don't accidentally dupe it
 		$email_id = trim( $email->headers->message_id, '<>' );
 		if ( is_object( $new_reply ) ) {
 			update_post_meta( $new_reply->ID, self::email_id_key, $email_id );
-			update_post_meta( $new_reply->ID, 'attachment_ids', $new_attachment_ids );
 		}
 
 		return true;

From 1c5321d15cf82a89dacce773c8ccb4ec220c0efc Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 5 Jun 2014 04:05:28 +0530
Subject: [PATCH 077/485] Updated plupload to newer version and finished
 frontend part

---
 classes/class-supportflow-admin.php | 62 +++++++++++++++++------------
 js/plupload.js                      | 35 ----------------
 js/thread_attachments.js            | 25 ++++++++++++
 3 files changed, 61 insertions(+), 61 deletions(-)
 delete mode 100644 js/plupload.js
 create mode 100644 js/thread_attachments.js

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 01f363c..7573027 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -6,6 +6,7 @@
 class SupportFlow_Admin extends SupportFlow {
 
 	function __construct() {
+		add_action( 'wp_ajax_thread_attachment_upload', array( $this, 'action_wp_ajax_thread_attachment_upload' ) );
 		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
 	}
 
@@ -60,52 +61,60 @@ public function action_admin_enqueue_scripts() {
 
 		wp_enqueue_style( 'supportflow-admin', SupportFlow()->plugin_url . 'css/admin.css', array(), SupportFlow()->version );
 		if ( 'post.php' == $pagenow || 'post-new.php' == $pagenow ) {
-			wp_enqueue_script( 'supportflow-plupload', SupportFlow()->plugin_url . 'js/plupload.js', array( 'wp-plupload', 'jquery' ) );
-			self::add_default_plupload_settings();
+			wp_enqueue_script( 'supportflow-thread_attachments', SupportFlow()->plugin_url . 'js/thread_attachments.js', array( 'wp-plupload', 'jquery' ) );
 			wp_enqueue_script( 'supportflow-respondents-autocomplete', SupportFlow()->plugin_url . 'js/respondents-autocomplete.js', array( 'jquery', 'jquery-ui-autocomplete' ) );
 			$ajaxurl = add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) );
-			wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
 		}
+		wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
+		wp_localize_script( 'supportflow-thread_attachments', 'SFThreadAttachments', array(
+			'uploading'        => __( 'Uploading: ', 'supportflow' ),
+			'failed_uploading' => __( 'Failed uploading: ', 'supportflow' ),
+			'uploaded'         => __( 'Uploaded: ', 'supportflow' )
+		) );
 	}
 
 	/**
-	 * Sets up some default Plupload settings so we can upload media
+	 * Sets up Plupload settings so we can upload media
 	 */
-	private static function add_default_plupload_settings() {
+	private function add_plupload_settings( $js_var_name, $plupload_args = array() ) {
+
 		global $wp_scripts;
 
-		$defaults = array(
+		$plupload_default_settings = array(
 			'runtimes'            => 'html5,silverlight,flash,html4',
 			'file_data_name'      => 'async-upload',
 			'multiple_queues'     => true,
-			'url'                 => add_query_arg( 'post_id', get_the_id(), admin_url( 'admin-ajax.php', 'relative' ) ),
+			'max_file_size'       => wp_max_upload_size(),
+			'url'                 => admin_url( 'admin-ajax.php' ),
 			'flash_swf_url'       => includes_url( 'js/plupload/plupload.flash.swf' ),
 			'silverlight_xap_url' => includes_url( 'js/plupload/plupload.silverlight.xap' ),
 			'filters'             => array( array( 'title' => __( 'Allowed Files' ), 'extensions' => '*' ) ),
 			'multipart'           => true,
 			'urlstream_upload'    => true,
+			'browse_button'       => '',
+			'container'           => '',
+			'drop_element'        => '',
 			'multipart_params'    => array(
-				'action'   => 'upload-attachment',
-				'_wpnonce' => wp_create_nonce( 'media-form' )
-			)
+				'_ajax_nonce' => '',
+				'action'      => '',
+			),
 		);
 
-		$settings = array(
-			'defaults' => $defaults,
-			'browser'  => array(
-				'mobile'    => wp_is_mobile(),
-				'supported' => _device_can_upload(),
-			)
-		);
+		$plupload_args = array_replace( $plupload_default_settings, $plupload_args );
+		echo "<script type='text/javascript'>var $js_var_name = " . json_encode( $plupload_args ) . ";</script>";
+	}
 
-		$script = 'var _wpPluploadSettings = ' . json_encode( $settings ) . ';';
-		$data   = $wp_scripts->get_data( 'wp-plupload', 'data' );
+	public function action_wp_ajax_thread_attachment_upload() {
+		check_ajax_referer( 'thread_attachment_upload' );
+		$attachment_id  = media_handle_upload( 'async-upload', 0 );
+		$attachment_url = wp_get_attachment_url( $attachment_id );
 
-		if ( ! empty( $data ) ) {
-			$script = "$data\n$script";
-		}
+		echo json_encode( array(
+			'id'  => $attachment_id,
+			'url' => $attachment_url,
+		) );
 
-		$wp_scripts->add_data( 'wp-plupload', 'data', $script );
+		exit;
 	}
 
 	/**
@@ -543,13 +552,14 @@ public function meta_box_replies() {
 		echo '</select></div>';
 
 		echo '<div id="thread-reply-box">';
-
 		echo "<textarea id='reply' name='reply' class='thread-reply' rows='4' placeholder='" . esc_attr( $placeholders[$rand] ) . "'>";
 		echo "</textarea>";
 
 		echo '<div id="message-tools">';
 		echo '<div id="replies-attachments-wrap">';
-		echo '<div id="upload-messages">' . __( 'Drop a file in the message to attach it', 'supportflow' ) . '</div>';
+		echo '<div class="drag-drop-buttons">';
+		echo '<input id="reply-attachment-browse-button" type="button" value="' . esc_attr( __( 'Select Files', 'supportflow' ) ) . '" class="button" />';
+		echo '</div>';
 		echo '<ul id="replies-attachments-list">';
 		echo '</ul>';
 		echo '<input type="hidden" id="reply-attachments" name="reply-attachments" />';
@@ -781,4 +791,4 @@ public function action_save_post( $thread_id ) {
 	}
 }
 
-SupportFlow()->extend->admin = new SupportFlow_Admin();
\ No newline at end of file
+SupportFlow()->extend->admin = new SupportFlow_Admin();
diff --git a/js/plupload.js b/js/plupload.js
deleted file mode 100644
index 9f87750..0000000
--- a/js/plupload.js
+++ /dev/null
@@ -1,35 +0,0 @@
-jQuery(document).ready(function ($) {
-	new wp.Uploader({
-
-		/* Selectors */
-		browser : '#upload-indicator',
-		dropzone: '#thread-reply-box',
-
-		/* Callbacks */
-		success : function (attachment) {
-			$('#reply-attachments').val($('#reply-attachments').val() + ',' + attachment.id);
-			$('#upload-messages').hide();
-			$('<li>', {
-				html: '<a target="_blank" href="' + attachment.url + '">' + attachment.title + '</a>',
-			}).appendTo($('ul#replies-attachments-list'));
-			$('#upload-messages').removeClass('uploading');
-		},
-
-		error: function (reason) {
-			$('#upload-indicator').html(reason).addClass('error');
-		},
-
-		added: function () {
-			$('#upload-indicator').addClass('uploading');
-		},
-
-		// TypeError: file is undefined
-		// progress : function( up, file ) {
-		// 	$( '#upload-indicator' ).html( "Uploading: " + file.name + ' ' + file.percent + '%' );
-		// },
-
-		complete: function () {
-			$('#upload-indicator').html('All done!');
-		}
-	});
-});
diff --git a/js/thread_attachments.js b/js/thread_attachments.js
new file mode 100644
index 0000000..54304c6
--- /dev/null
+++ b/js/thread_attachments.js
@@ -0,0 +1,25 @@
+jQuery(document).ready(function () {
+
+	var sf_thread_attachment_uploader = new plupload.Uploader(sf_thread_attachment_plupload_settings);
+	sf_thread_attachment_uploader.init();
+
+	sf_thread_attachment_uploader.bind('FilesAdded', function (uploader, files) {
+		plupload.each(files, function (file) {
+			jQuery('#replies-attachments-list').append('<li id="reply-attachment-' + file.id + '">' + SFThreadAttachments.uploading + file.name + '</li>');
+		});
+
+		uploader.refresh();
+		uploader.start();
+	});
+
+	sf_thread_attachment_uploader.bind('FileUploaded', function (uploader, file, response) {
+		if (null == response.response || 0 == response.response) {
+			jQuery('#reply-attachment-' + file.id).html('<li>' + SFThreadAttachments.failed_uploading + file.name + '</li>');
+		} else {
+			var attachment = jQuery.parseJSON(response.response);
+			jQuery('#reply-attachment-' + file.id).html('<li>' + SFThreadAttachments.uploaded + '<a target="_blank" href="' + attachment.url + '">' + file.name + '</a></li>');
+			jQuery('#reply-attachments').val(jQuery('#reply-attachments').val() + attachment.id + ',');
+		}
+	});
+
+});

From 6cba252ce6799efe3cf09f64d6dccbf29eaa5ca3 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 5 Jun 2014 04:07:52 +0530
Subject: [PATCH 078/485] Created function to generate an array from multiple
 comma seperated E-Mail ID's

---
 supportflow.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/supportflow.php b/supportflow.php
index d8a9360..20f77e5 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -762,6 +762,15 @@ public function get_cap( $cap ) {
 		return SupportFlow()->extend->permissions->get_cap( $cap );
 	}
 
+	public function extract_email_ids( $string ) {
+		$emails = str_replace( ' ', '', $string );
+		$emails = explode( ',', $emails );
+		$emails = array_filter( $emails, function ( $email ) {
+			return sanitize_email( $email ) == $email && '' != $email;
+		} );
+
+		return $emails;
+	}
 }
 
 /**

From 404415144ba8e37db0f999fd2b86b38d930e8ba3 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 5 Jun 2014 04:12:50 +0530
Subject: [PATCH 079/485] Added meta box to set cc and bcc receviers of reply

---
 classes/class-supportflow-admin.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 7573027..5365c19 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -414,6 +414,7 @@ public function action_add_meta_boxes() {
 		add_meta_box( 'supportflow-details', __( 'Details', 'supportflow' ), array( $this, 'meta_box_details' ), SupportFlow()->post_type, 'side' );
 		add_meta_box( 'supportflow-subject', __( 'Subject', 'supportflow' ), array( $this, 'meta_box_subject' ), SupportFlow()->post_type, 'normal' );
 		add_meta_box( 'supportflow-respondents', __( 'Respondents', 'supportflow' ), array( $this, 'meta_box_respondents' ), SupportFlow()->post_type, 'normal' );
+		add_meta_box( 'supportflow-cc-bcc', __( 'CC and BCC', 'supportflow' ), array( $this, 'meta_box_cc_bcc' ), SupportFlow()->post_type, 'normal' );
 		add_meta_box( 'supportflow-replies', __( 'Replies', 'supportflow' ), array( $this, 'meta_box_replies' ), SupportFlow()->post_type, 'normal' );
 	}
 
@@ -508,6 +509,19 @@ public function meta_box_respondents() {
 		echo '<p class="description">' . __( 'Enter each respondent email address, separated with a comma', 'supportflow' ) . '</p>';
 	}
 
+	/**
+	 * Add a form element where you can choose cc and bcc receiver of reply
+	 */
+	public function meta_box_cc_bcc() {
+		?>
+		<p class="description"> <?php _e( "Please add all the E-Mail ID's seperated by comma.", 'supportflow' ) ?></p>
+		<h4 class="inline"><?php _e( "CC: ", 'supportflow' ) ?></h4>
+		<input type="text" id="cc" name="cc" style="width:100%" />
+		<h4 class="inline"> <?php _e( "BCC: ", 'supportflow' ) ?></h4>
+		<input type="text" id="bcc" name="bcc" style="width:100%" />
+	<?php
+	}
+
 	/**
 	 * Standard listing of replies includes a form at the top
 	 * and any existing replies listed in reverse chronological order

From 341c954b98fb033b2998c2ba0a7ae03c653a94d0 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 5 Jun 2014 04:21:17 +0530
Subject: [PATCH 080/485] Attachments are now save as custom post in database

---
 classes/class-supportflow-admin.php | 34 ++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 5365c19..553a94b 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -606,12 +606,19 @@ public function display_thread_replies() {
 			foreach ( $private_replies as $reply ) {
 				echo '<li>';
 				echo '<div class="thread-reply">';
-				echo wpautop( stripslashes( $reply->post_content ) );
-				if ( $attachment_ids = get_post_meta( $reply->ID, 'attachment_ids', true ) ) {
+				$post_content = wpautop( stripslashes( $reply->post_content ) );
+				// Make link clickable
+				$post_content = preg_replace( '!(((f|ht)tp(s)?://)[-a-zA-Zа-яА-Я()0-9@:%_+.~#?&;//=]+)!i', '<a href="$1">$1</a>', $post_content );
+				echo $post_content;
+				$attachment_args = array(
+					'post_parent' => $reply->ID,
+					'post_type'   => 'attachment'
+				);
+				if ( $attachments = get_posts( $attachment_args ) ) {
 					echo '<ul class="thread-reply-attachments">';
-					foreach ( $attachment_ids as $attachment_id ) {
-						$attachment_link = wp_get_attachment_url( $attachment_id );
-						echo '<li><a target="_blank" href="' . esc_url( $attachment_link ) . '">' . esc_html( get_the_title( $attachment_id ) ) . '</a></li>';
+					foreach ( $attachments as $attachment ) {
+						$attachment_link = wp_get_attachment_url( $attachment->ID );
+						echo '<li><a target="_blank" href="' . esc_url( $attachment_link ) . '">' . esc_html( $attachment->post_title ) . '</a></li>';
 					}
 					echo '</ul>';
 				}
@@ -635,12 +642,19 @@ public function display_thread_replies() {
 				echo '<p class="reply-author">' . esc_html( $reply_author ) . '</p>';
 				echo '</div>';
 				echo '<div class="thread-reply">';
-				echo wpautop( stripslashes( $reply->post_content ) );
-				if ( $attachment_ids = get_post_meta( $reply->ID, 'attachment_ids', true ) ) {
+				$post_content = wpautop( stripslashes( $reply->post_content ) );
+				// Make link clickable
+				$post_content = preg_replace( '!(((f|ht)tp(s)?://)[-a-zA-Zа-яА-Я()0-9@:%_+.~#?&;//=]+)!i', '<a href="$1">$1</a>', $post_content );
+				echo $post_content;
+				$attachment_args = array(
+					'post_parent' => $reply->ID,
+					'post_type'   => 'attachment'
+				);
+				if ( $attachments = get_posts( $attachment_args ) ) {
 					echo '<ul class="thread-reply-attachments">';
-					foreach ( $attachment_ids as $attachment_id ) {
-						$attachment_link = wp_get_attachment_url( $attachment_id );
-						echo '<li><a target="_blank" href="' . esc_url( $attachment_link ) . '">' . esc_html( get_the_title( $attachment_id ) ) . '</a></li>';
+					foreach ( $attachments as $attachment ) {
+						$attachment_link = wp_get_attachment_url( $attachment->ID );
+						echo '<li><a target="_blank" href="' . esc_url( $attachment_link ) . '">' . esc_html( $attachment->post_title ) . '</a></li>';
 					}
 					echo '</ul>';
 				}

From 96e99fe1e34243e422f7cb04972b93ef4a09683a Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 5 Jun 2014 04:27:05 +0530
Subject: [PATCH 081/485] Updated code to send mail to cc and bcc setted

---
 classes/class-supportflow-admin.php  |  5 +++++
 classes/class-supportflow-emails.php | 13 ++++---------
 supportflow.php                      |  5 +++--
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 553a94b..04e0099 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -809,9 +809,14 @@ public function action_save_post( $thread_id ) {
 			} else {
 				$attachment_ids = '';
 			}
+			$cc  = ( ! empty( $_POST['cc'] ) ) ? SupportFlow()->extract_email_ids( $_POST['cc'] ) : '';
+			$bcc = ( ! empty( $_POST['bcc'] ) ) ? SupportFlow()->extract_email_ids( $_POST['bcc'] ) : '';
+
 			$reply_args = array(
 				'post_status'    => $visibility,
 				'attachment_ids' => $attachment_ids,
+				'cc'             => $cc,
+				'bcc'            => $bcc,
 			);
 			SupportFlow()->add_thread_reply( $thread_id, $reply, $reply_args );
 		}
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index e773bbc..01657c4 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -21,7 +21,7 @@ public function setup_actions() {
 
 		// When a new reply is added to a thread, notify the respondents and the agents
 		add_action( 'supportflow_thread_reply_added', array( $this, 'notify_agents_thread_replies' ) );
-		add_action( 'supportflow_thread_reply_added', array( $this, 'notify_respondents_thread_replies' ) );
+		add_action( 'supportflow_thread_reply_added', array( $this, 'notify_respondents_thread_replies' ), 10, 3 );
 	}
 
 	/**
@@ -78,16 +78,13 @@ public function notify_agents_thread_replies( $reply_id ) {
 
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $thread->ID, 'agent' );
 
-		foreach ( $agent_emails as $agent_email ) {
-			self::mail( $agent_email, $subject, $message );
-		}
+		self::mail( $subject, $message, $agent_emails );
 	}
 
 	/**
 	 * When a new reply is added to the thread, notify all of the respondents on the thread
 	 */
-	public function notify_respondents_thread_replies( $reply_id ) {
-
+	public function notify_respondents_thread_replies( $reply_id, $cc = array(), $bcc = array() ) {
 		// Respondents shouldn't receive private replies
 		$reply = get_post( $reply_id );
 		if ( ! $reply || 'private' == $reply->post_status ) {
@@ -118,9 +115,7 @@ public function notify_respondents_thread_replies( $reply_id ) {
 
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $thread->ID, 'respondent' );
 
-		foreach ( $respondents as $respondent_email ) {
-			self::mail( $respondent_email, $subject, $message );
-		}
+		self::mail( $subject, $message, $respondents, $cc, $bcc );
 	}
 
 	/**
diff --git a/supportflow.php b/supportflow.php
index 20f77e5..e4e5194 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -674,6 +674,8 @@ public function add_thread_reply( $thread_id, $reply_text, $details = array() )
 			'reply_author_email' => '',
 			'user_id'            => '',
 			'post_status'        => 'public',
+			'cc'                 => array(),
+			'bcc'                => array(),
 		);
 
 		// @todo This actually probably shouldn't default to current user, so
@@ -721,8 +723,7 @@ public function add_thread_reply( $thread_id, $reply_text, $details = array() )
 		// Adding a thread reply updates the post modified time for the thread
 		$query = $wpdb->update( $wpdb->posts, array( 'post_modified' => current_time( 'mysql' ) ), array( 'ID' => $thread_id ) );
 		clean_post_cache( $thread_id );
-
-		do_action( 'supportflow_thread_reply_added', $reply_id );
+		do_action( 'supportflow_thread_reply_added', $reply_id, $details['cc'], $details['bcc'] );
 
 		return $reply_id;
 	}

From d2d816f18ead36d4b5fd85a8c7b050f3e901ce7e Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 5 Jun 2014 04:31:32 +0530
Subject: [PATCH 082/485] Fixed broken code because of conversion from custom
 comment to custom post

---
 classes/class-supportflow-emails.php | 15 +++++++------
 supportflow.php                      | 32 +++++++++++++++-------------
 2 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 01657c4..1d6406d 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -61,10 +61,10 @@ public function notify_agents_thread_replies( $reply_id ) {
 		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $thread->ID, 'agent' );
 
 		$message = stripslashes( $reply->post_content );
-		if ( $attachment_ids = get_post_meta( $reply->ID, 'attachment_ids', true ) ) {
+		if ( $attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply->ID ) ) ) {
 			$message .= "\n";
-			foreach ( $attachment_ids as $attachment_id ) {
-				$message .= "\n" . wp_get_attachment_url( $attachment_id );
+			foreach ( $attachments as $attachment ) {
+				$message .= "\n" . wp_get_attachment_url( $attachment->ID );
 			}
 		}
 		// Ticket details that are relevant to the agent
@@ -96,7 +96,8 @@ public function notify_respondents_thread_replies( $reply_id, $cc = array(), $bc
 
 		// Don't email the person creating the reply, unless that's desired behavior
 		if ( ! apply_filters( 'supportflow_emails_notify_creator', false, 'reply' ) ) {
-			$key = array_search( get_post_meta( $reply->ID, 'reply_author_email' ), $respondents );
+			$reply_author_email = get_post_meta( $reply->ID, 'reply_author_email', true );
+			$key                = array_search( $reply_author_email, $respondents );
 			if ( false !== $key ) {
 				unset( $respondents[$key] );
 			}
@@ -106,10 +107,10 @@ public function notify_respondents_thread_replies( $reply_id, $cc = array(), $bc
 		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $thread->ID, 'respondent' );
 
 		$message = stripslashes( $reply->post_content );
-		if ( $attachment_ids = get_post_meta( $reply->ID, 'attachment_ids', true ) ) {
+		if ( $attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply->ID ) ) ) {
 			$message .= "\n";
-			foreach ( $attachment_ids as $attachment_id ) {
-				$message .= "\n" . wp_get_attachment_url( $attachment_id );
+			foreach ( $attachments as $attachment ) {
+				$message .= "\n" . wp_get_attachment_url( $attachment->ID );
 			}
 		}
 
diff --git a/supportflow.php b/supportflow.php
index e4e5194..634bbe4 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -392,14 +392,15 @@ public function create_thread( $args ) {
 		$post_statuses = $this->post_statuses;
 
 		$defaults = array(
-			'subject'          => '',
-			'message'          => '',
-			'date'             => '',
-			'respondent_id'    => 0, // If the requester has a WordPress account (ID or username)
-			'respondent_name'  => '', // Otherwise supply a name
-			'respondent_email' => '', // And an e-mail address
-			'status'           => key( $post_statuses ),
-			'assignee'         => - 1, // WordPress user ID or username of ticket assignee/owner
+			'subject'            => '',
+			'message'            => '',
+			'date'               => '',
+			'respondent_id'      => 0, // If the requester has a WordPress account (ID or username)
+			'respondent_email'   => array(), // And an e-mail address
+			'reply_author'       => '',
+			'reply_author_email' => '',
+			'status'             => key( $post_statuses ),
+			'assignee'           => - 1, // WordPress user ID or username of ticket assignee/owner
 		);
 
 		$args = wp_parse_args( $args, $defaults );
@@ -416,8 +417,7 @@ public function create_thread( $args ) {
 			$args['status'] = $defaults['status'];
 		}
 		$thread['post_status'] = $args['status'];
-
-		$thread_id = wp_insert_post( $thread, true );
+		$thread_id             = wp_insert_post( $thread );
 
 		if ( is_wp_error( $thread_id ) ) {
 			return $thread_id;
@@ -431,8 +431,8 @@ public function create_thread( $args ) {
 		// If there was a message, add it to the thread
 		if ( ! empty( $args['message'] ) && ! empty( $args['respondent_email'] ) ) {
 			$reply_details = array(
-				'reply_author'       => $args['respondent_name'],
-				'reply_author_email' => $args['respondent_email'],
+				'reply_author'       => $args['reply_author'],
+				'reply_author_email' => $args['reply_author_email'],
 				'user_id'            => $args['respondent_id'],
 			);
 			$this->add_thread_reply( $thread_id, $args['message'], $reply_details );
@@ -697,7 +697,7 @@ public function add_thread_reply( $thread_id, $reply_text, $details = array() )
 		}
 
 		$reply = array(
-			'post_content' => esc_sql( $reply_text ),
+			'post_content' => ( $reply_text ),
 			'post_parent'  => (int) $thread_id,
 			'post_date'    => esc_sql( $details['time'] ),
 			'post_status'  => esc_sql( $details['post_status'] ),
@@ -712,8 +712,10 @@ public function add_thread_reply( $thread_id, $reply_text, $details = array() )
 		$reply_id = wp_insert_post( $reply, true );
 		add_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
 		// If there are attachment IDs store them as meta
-		if ( ! empty( $attachment_ids ) ) {
-			add_post_meta( $reply_id, 'attachment_ids', $attachment_ids, true );
+		if ( is_array( $attachment_ids ) ) {
+			foreach ( $attachment_ids as $attachment_id ) {
+				wp_update_post( array( 'ID' => $attachment_id, 'post_parent' => $reply_id ) );
+			}
 		}
 
 		add_post_meta( $reply_id, 'reply_author', esc_sql( $details['reply_author'] ) );

From 8eef1abecc72b9f832e399c3d4de0d5a33b2b9a9 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 5 Jun 2014 04:40:17 +0530
Subject: [PATCH 083/485] Added description to SupportFlow->extract_email_ids()
 method

---
 supportflow.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/supportflow.php b/supportflow.php
index 634bbe4..fa13afc 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -765,6 +765,10 @@ public function get_cap( $cap ) {
 		return SupportFlow()->extend->permissions->get_cap( $cap );
 	}
 
+	/**
+	 * Convert multiple comma seperated E-Mail ID's into a array
+	 * @return array
+	 */
 	public function extract_email_ids( $string ) {
 		$emails = str_replace( ' ', '', $string );
 		$emails = explode( ',', $emails );

From a906ecd623f3638d5f91ba81e0f8f4e5d39dfa05 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 8 Jun 2014 04:46:33 +0530
Subject: [PATCH 084/485] Save thread E-Mail account ID in database on creation

---
 classes/class-supportflow-admin.php         | 21 +++++++++++++++++++++
 classes/class-supportflow-email-replies.php |  8 +++++---
 supportflow.php                             |  5 +++++
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 04e0099..bce2e3b 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -451,6 +451,22 @@ public function meta_box_details() {
 		echo '</select>';
 		echo '</div>';
 
+		// Post E-Mail account drop down
+		if ( 'post-new.php' == $pagenow ) {
+			$email_accounts = get_option( 'sf_email_accounts' );
+			echo '<div class="misc-pub-section">';
+			echo '<label for="post_email_account">' . __( 'Account', 'supportflow' ) . ':</label>';
+			echo '<select id="post_email_account" name="post_email_account">';
+			foreach ( $email_accounts as $id => $email_account ) {
+				if ( empty( $email_account ) ) {
+					continue;
+				}
+				echo '<option value="' . esc_attr( $id ) . '" ' . '>' . esc_html( $email_account['username'] ) . '</option>';
+			}
+			echo '</select>';
+			echo '</div>';
+		}
+
 		// Agent assignment dropdown
 		$post_author = get_post( get_the_ID() )->post_author;
 		echo '<div class="misc-pub-section">';
@@ -801,6 +817,11 @@ public function action_save_post( $thread_id ) {
 			SupportFlow()->update_thread_respondents( $thread_id, $respondents );
 		}
 
+		if ( isset( $_POST['post_email_account'] ) && ! empty( $_POST['post_email_account'] ) ) {
+			$email_account = (int) $_POST['post_email_account'];
+			update_post_meta( $thread_id, 'email_account', $email_account );
+		}
+
 		if ( isset( $_POST['reply'] ) && ! empty( $_POST['reply'] ) ) {
 			$reply      = wp_filter_nohtml_kses( $_POST['reply'] );
 			$visibility = ( ! empty( $_POST['mark-private'] ) ) ? 'private' : 'public';
diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index feb98b9..2fc8f68 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -29,7 +29,7 @@ function retrieve_email_replies() {
 		require_once ABSPATH . 'wp-admin/includes/admin.php';
 
 		$email_accounts = get_option( 'sf_email_accounts' );
-		foreach ( $email_accounts as $email_account ) {
+		foreach ( $email_accounts as $id => $email_account ) {
 			$imap_account = array(
 				'host'     => $email_account['imap_host'],
 				'port'     => $email_account['imap_port'],
@@ -38,6 +38,7 @@ function retrieve_email_replies() {
 				'password' => $email_account['password'],
 				'inbox'    => 'INBOX',
 				'archive'  => 'ARCHIVE',
+				'account_id' => $id,
 			);
 
 			$this->download_and_process_email_replies( $imap_account );
@@ -82,7 +83,7 @@ public function download_and_process_email_replies( $connection_details ) {
 			$email->body      = $this->get_body_from_connection( $imap_connection, $i );
 
 			// @todo Confirm this a message we want to process
-			$ret = $this->process_email($imap_connection, $email, $i, $connection_details['username'] );
+			$ret = $this->process_email( $imap_connection, $email, $i, $connection_details['username'], $connection_details['account_id'] );
 			// If it was successful, move the email to the archive
 			if ( $ret ) {
 				imap_mail_move( $imap_connection, $i, $connection_details['archive'] );
@@ -96,7 +97,7 @@ public function download_and_process_email_replies( $connection_details ) {
 	/**
 	 * Given an email object, maybe create a new ticket
 	 */
-	public function process_email($imap_connection, $email, $i, $to ) {
+	public function process_email( $imap_connection, $email, $i, $to, $email_account_id ) {
 
 		$new_attachment_ids = array();
 
@@ -208,6 +209,7 @@ public function process_email($imap_connection, $email, $i, $to ) {
 				'reply_author_email' => $reply_author_email,
 				'message'            => $message,
 				'respondent_email'   => $respondents,
+				'email_account'      => $email_account_id,
 			);
 
 			$thread_id = SupportFlow()->create_thread( $new_thread_args );
diff --git a/supportflow.php b/supportflow.php
index fa13afc..aa1a477 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -401,6 +401,7 @@ public function create_thread( $args ) {
 			'reply_author_email' => '',
 			'status'             => key( $post_statuses ),
 			'assignee'           => - 1, // WordPress user ID or username of ticket assignee/owner
+			'email_account'      => 0,
 		);
 
 		$args = wp_parse_args( $args, $defaults );
@@ -428,6 +429,10 @@ public function create_thread( $args ) {
 			$this->update_thread_respondents( $thread_id, $args['respondent_email'] );
 		}
 
+		if ( ! empty( $args['email_account'] ) ) {
+			update_post_meta( $thread_id, 'email_account', $args['email_account'] );
+		}
+
 		// If there was a message, add it to the thread
 		if ( ! empty( $args['message'] ) && ! empty( $args['respondent_email'] ) ) {
 			$reply_details = array(

From c8c2cbbfdb274171df6dd4ddc674a288239af3d1 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 8 Jun 2014 04:49:34 +0530
Subject: [PATCH 085/485] Skipping E-Mail account if empty

---
 classes/class-supportflow-email-replies.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 2fc8f68..228251f 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -30,6 +30,9 @@ function retrieve_email_replies() {
 
 		$email_accounts = get_option( 'sf_email_accounts' );
 		foreach ( $email_accounts as $id => $email_account ) {
+			if ( empty( $email_account ) ) {
+				continue;
+			}
 			$imap_account = array(
 				'host'     => $email_account['imap_host'],
 				'port'     => $email_account['imap_port'],

From 130ebe9ef0b0b41e7226811772e13e0d44844a50 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 8 Jun 2014 05:05:19 +0530
Subject: [PATCH 086/485] Placing wp_localize_script() inside if condition

It was accidentaly placed outside in commit
6600cda004c142a7eda8d3eeee1955f7df50427a
---
 classes/class-supportflow-admin.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index bce2e3b..a32c77a 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -64,13 +64,14 @@ public function action_admin_enqueue_scripts() {
 			wp_enqueue_script( 'supportflow-thread_attachments', SupportFlow()->plugin_url . 'js/thread_attachments.js', array( 'wp-plupload', 'jquery' ) );
 			wp_enqueue_script( 'supportflow-respondents-autocomplete', SupportFlow()->plugin_url . 'js/respondents-autocomplete.js', array( 'jquery', 'jquery-ui-autocomplete' ) );
 			$ajaxurl = add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) );
+
+			wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
+			wp_localize_script( 'supportflow-thread_attachments', 'SFThreadAttachments', array(
+				'uploading'        => __( 'Uploading: ', 'supportflow' ),
+				'failed_uploading' => __( 'Failed uploading: ', 'supportflow' ),
+				'uploaded'         => __( 'Uploaded: ', 'supportflow' )
+			) );
 		}
-		wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
-		wp_localize_script( 'supportflow-thread_attachments', 'SFThreadAttachments', array(
-			'uploading'        => __( 'Uploading: ', 'supportflow' ),
-			'failed_uploading' => __( 'Failed uploading: ', 'supportflow' ),
-			'uploaded'         => __( 'Uploaded: ', 'supportflow' )
-		) );
 	}
 
 	/**

From f82d6c292767579e2ef7cfedaf1f37676e8f4889 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 8 Jun 2014 05:36:46 +0530
Subject: [PATCH 087/485] Sending E-Mail through SMTP server

---
 classes/class-supportflow-emails.php | 47 ++++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 3 deletions(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 1d6406d..ed731fa 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -38,6 +38,16 @@ public function notify_agents_thread_replies( $reply_id ) {
 		// One agent by default, but easily allow notifications to a triage team
 		$agent_ids = apply_filters( 'supportflow_emails_notify_agent_ids', array( $thread->post_author ), $thread, 'reply' );
 
+		$email_accounts   = get_option( 'sf_email_accounts' );
+		$email_account_id = get_post_meta( $thread->ID, 'email_account', true );
+		$smtp_account     = array(
+			'host'     => $email_accounts[$email_account_id]['smtp_host'],
+			'port'     => $email_accounts[$email_account_id]['smtp_port'],
+			'ssl'      => $email_accounts[$email_account_id]['smtp_ssl'],
+			'username' => $email_accounts[$email_account_id]['username'],
+			'password' => $email_accounts[$email_account_id]['password'],
+		);
+
 		if ( empty( $agent_ids ) ) {
 			return;
 		}
@@ -78,7 +88,7 @@ public function notify_agents_thread_replies( $reply_id ) {
 
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $thread->ID, 'agent' );
 
-		self::mail( $subject, $message, $agent_emails );
+		self::mail( $subject, $message, $agent_emails, $smtp_account );
 	}
 
 	/**
@@ -94,6 +104,16 @@ public function notify_respondents_thread_replies( $reply_id, $cc = array(), $bc
 		$thread      = SupportFlow()->get_thread( $reply->post_parent );
 		$respondents = SupportFlow()->get_thread_respondents( $thread->ID, array( 'fields' => 'emails' ) );
 
+		$email_accounts   = get_option( 'sf_email_accounts' );
+		$email_account_id = get_post_meta( $thread->ID, 'email_account', true );
+		$smtp_account     = array(
+			'host'     => $email_accounts[$email_account_id]['smtp_host'],
+			'port'     => $email_accounts[$email_account_id]['smtp_port'],
+			'ssl'      => $email_accounts[$email_account_id]['smtp_ssl'],
+			'username' => $email_accounts[$email_account_id]['username'],
+			'password' => $email_accounts[$email_account_id]['password'],
+		);
+
 		// Don't email the person creating the reply, unless that's desired behavior
 		if ( ! apply_filters( 'supportflow_emails_notify_creator', false, 'reply' ) ) {
 			$reply_author_email = get_post_meta( $reply->ID, 'reply_author_email', true );
@@ -116,13 +136,13 @@ public function notify_respondents_thread_replies( $reply_id, $cc = array(), $bc
 
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $thread->ID, 'respondent' );
 
-		self::mail( $subject, $message, $respondents, $cc, $bcc );
+		self::mail( $subject, $message, $respondents, $smtp_account, $cc, $bcc );
 	}
 
 	/**
 	 * Send an email from SupportFlow
 	 */
-	public function mail( $subject, $message, $to, $cc = array(), $bcc = array(), $from_email = null, $from_name = null ) {
+	public function mail( $subject, $message, $to, $smtp_account = null, $cc = array(), $bcc = array(), $from_email = null, $from_name = null ) {
 
 		$from_email = apply_filters( 'supportflow_mail_from_email', $from_email );
 		$from_name  = apply_filters( 'supportflow_mail_from_name', $from_name );
@@ -147,8 +167,29 @@ public function mail( $subject, $message, $to, $cc = array(), $bcc = array(), $f
 			$headers .= "Bcc: $bcc\r\n";
 		}
 
+		if ( ! empty( $smtp_account ) ) {
+			$this->smtp_account = $smtp_account;
+			add_action( 'phpmailer_init', array( $this, 'action_set_smtp_settings' ) );
+		}
+
 		wp_mail( $to, $subject, $message, $headers );
+
+		if ( ! empty( $smtp_account ) ) {
+			$this->smtp_account = null;
+			remove_action( 'phpmailer_init', array( $this, 'action_set_smtp_settings' ) );
+		}
+	}
+
+	public function action_set_smtp_settings( $phpmailer ) {
+		$phpmailer->IsSMTP();
+		$phpmailer->Host       = $this->smtp_account['host'];
+		$phpmailer->Port       = (int) $this->smtp_account['port'];
+		$phpmailer->SMTPSecure = $this->smtp_account['ssl'] ? 'ssl' : '';
+		$phpmailer->Username   = $this->smtp_account['username'];
+		$phpmailer->Password   = $this->smtp_account['password'];
+		$phpmailer->SMTPAuth   = true;
 	}
+
 }
 
 SupportFlow()->extend->emails = new SupportFlow_Emails();
\ No newline at end of file

From a4bb901dfdb5af36f3a9894b034ce39521024c1f Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 9 Jun 2014 17:13:42 +0530
Subject: [PATCH 088/485] Adding missing space in "Opened" field of Details
 meta box

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index a32c77a..413bcdc 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -436,7 +436,7 @@ public function meta_box_details() {
 
 			echo '<div class="misc-pub-section created-on">';
 			echo '<label for="created_on">' . __( 'Opened', 'supportflow' ) . ':</label>';
-			echo '<span class="the-date">' . get_the_date() . ' ' . get_the_time() . '</span>';
+			echo '<span class="the-date"> ' . get_the_date() . ' ' . get_the_time() . '</span>';
 			echo '<div clas="last-activity" title="' . get_the_modified_date( 'l, M j, Y ' ) . get_the_modified_time() . '">' . __( 'Last Activity', 'SupportFlow' ) . ': <strong>' . $last_activity . '</strong></div>';
 			echo '</div>';
 		}

From 6cf3549e2b3d6746a5c9b3989eabd67718b0b081 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 9 Jun 2014 17:34:59 +0530
Subject: [PATCH 089/485] Using reply_author_email instead of reply_author to
 get reply author E-Mail

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 413bcdc..0921c0c 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -653,7 +653,7 @@ public function display_thread_replies() {
 			echo '<ul class="thread-replies">';
 			foreach ( $replies as $reply ) {
 				$reply_author       = get_post_meta( $reply->ID, 'reply_author', true );
-				$reply_author_email = get_post_meta( $reply->ID, 'reply_author', true );
+				$reply_author_email = get_post_meta( $reply->ID, 'reply_author_email', true );
 				echo '<li>';
 				echo '<div class="reply-avatar">' . get_avatar( $reply_author_email, 72 );
 				echo '<p class="reply-author">' . esc_html( $reply_author ) . '</p>';

From f86e9e4e5467e612271001b867c6e7638318bcc6 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 9 Jun 2014 18:06:40 +0530
Subject: [PATCH 090/485] Using boolval() to sanitize boolean variables

---
 classes/class-supportflow-email-accounts.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index a5242d4..4179b8d 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -308,10 +308,10 @@ function add_email_account( $imap_host, $imap_port, $imap_ssl, $smtp_host, $smtp
 		$email_accounts = & $this->email_accounts;
 		$imap_host      = sanitize_text_field( $imap_host );
 		$imap_port      = intval( $imap_port );
-		$imap_ssl       = sanitize_text_field( $imap_ssl );
+		$imap_ssl       = boolval( $imap_ssl );
 		$smtp_host      = sanitize_text_field( $smtp_host );
 		$smtp_port      = intval( $smtp_port );
-		$smtp_ssl       = sanitize_text_field( $smtp_ssl );
+		$smtp_ssl       = boolval( $smtp_ssl );
 		$username       = sanitize_text_field( $username );
 		$password       = sanitize_text_field( $password );
 

From 128be601afd88df079b3344b90450c1332373c4c Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 9 Jun 2014 22:45:47 +0530
Subject: [PATCH 091/485] Not processing incoming E-Mails from ID same as imap
 username

---
 classes/class-supportflow-email-replies.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 228251f..2076a82 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -85,6 +85,10 @@ public function download_and_process_email_replies( $connection_details ) {
 			$email->structure = imap_fetchstructure( $imap_connection, $i );
 			$email->body      = $this->get_body_from_connection( $imap_connection, $i );
 
+			if ( 0 === strcasecmp( $connection_details['username'], $email->headers->from[0]->mailbox . '@' . $email->headers->from[0]->host ) ) {
+				continue;
+			}
+
 			// @todo Confirm this a message we want to process
 			$ret = $this->process_email( $imap_connection, $email, $i, $connection_details['username'], $connection_details['account_id'] );
 			// If it was successful, move the email to the archive

From df9af28852da2d145732c96a81485a453423f595 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 10 Jun 2014 01:11:49 +0530
Subject: [PATCH 092/485] Fixed filter_reply_clauses() bug

---
 supportflow.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index aa1a477..f45017a 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -624,6 +624,7 @@ public function get_replies( $args ) {
 			'post_status' => $args['status'],
 			'post_type'   => $this->reply_type,
 			'order'       => $args['order'],
+			'suppress_filters' => false,
 		);
 		add_filter( 'posts_clauses', array( $this, 'filter_reply_clauses' ), 10, 2 );
 		$thread_replies = get_posts( $post_args );
@@ -637,14 +638,17 @@ public function get_replies( $args ) {
 	 * Convert 'any' reply approved requests to the proper SQL
 	 */
 	public function filter_reply_clauses( $clauses, $query ) {
+		if ( in_array( $query->query_vars['post_status'], array( 'public', 'private' ) ) ) {
+			$new_post_status = "post_status = '{$query->query_vars['post_status']}' ";
+		} else {
+			$new_post_status = "post_status IN ( 'private', 'public' )";
+		}
 
-		$old_reply_approved = "( post_status = '0' OR post_status = '1' )";
-		if ( in_array( $query->query_vars['status'], array( 'public', 'private' ) ) ) {
-			$new_reply_approved = "post_status = '{$query->query_vars['status']}' ";
+		if ( preg_match( "~post_status = '[^']+'~", $clauses['where'] ) ) {
+			$clauses['where'] = preg_replace( "~post_status = '[^']+'~", $new_post_status, $clauses['where'] );
 		} else {
-			$new_reply_approved = "post_status IN ( 'private', 'public' )";
+			$clauses['where'] .= " AND ($new_post_status)";
 		}
-		$clauses['where'] = str_replace( $old_reply_approved, $new_reply_approved, $clauses['where'] );
 
 		return $clauses;
 	}
@@ -702,7 +706,7 @@ public function add_thread_reply( $thread_id, $reply_text, $details = array() )
 		}
 
 		$reply = array(
-			'post_content' => ( $reply_text ),
+			'post_content' => esc_sql( $reply_text ),
 			'post_parent'  => (int) $thread_id,
 			'post_date'    => esc_sql( $details['time'] ),
 			'post_status'  => esc_sql( $details['post_status'] ),

From 9fa55a564dcf8e2b5fb642e9f3a3082b59c8ad6b Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 7 Jun 2014 03:16:22 +0530
Subject: [PATCH 093/485] Using WP_Query class to get replies count instead of
 querying db directly

---
 supportflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index f45017a..8338c6b 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -821,4 +821,4 @@ function SupportFlow() {
 	wp_clear_scheduled_hook( 'sf_cron_retrieve_email_replies' );
 } );
 
-add_action( 'plugins_loaded', 'SupportFlow' );
\ No newline at end of file
+add_action( 'plugins_loaded', 'SupportFlow' );

From acb2d4317e773005da52efddaa232cef77311aa8 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 14 Jun 2014 03:11:35 +0530
Subject: [PATCH 094/485] Removed esc_sql() as it is already filtered by
 wordpress

---
 supportflow.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index 8338c6b..b7bedda 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -706,16 +706,15 @@ public function add_thread_reply( $thread_id, $reply_text, $details = array() )
 		}
 
 		$reply = array(
-			'post_content' => esc_sql( $reply_text ),
+			'post_content' => $reply_text,
 			'post_parent'  => (int) $thread_id,
-			'post_date'    => esc_sql( $details['time'] ),
-			'post_status'  => esc_sql( $details['post_status'] ),
-			'post_type'    => esc_sql( $this->reply_type ),
+			'post_date'    => $details['time'],
+			'post_status'  => $details['post_status'],
+			'post_type'    => $this->reply_type,
 			'post_title'   => 'supportflow reply',
 			'user_id'      => (int) $details['user_id'],
 		);
 
-
 		$reply = apply_filters( 'supportflow_pre_insert_thread_reply', $reply );
 		remove_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
 		$reply_id = wp_insert_post( $reply, true );

From 15dd16076b6d3717102e9b9098acfae77039e2c6 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 14 Jun 2014 03:17:58 +0530
Subject: [PATCH 095/485] Maintaining parameter consistency for IMAP account
 settings

---
 classes/class-supportflow-email-replies.php | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 2076a82..540ef85 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -33,16 +33,11 @@ function retrieve_email_replies() {
 			if ( empty( $email_account ) ) {
 				continue;
 			}
-			$imap_account = array(
-				'host'     => $email_account['imap_host'],
-				'port'     => $email_account['imap_port'],
-				'ssl'      => $email_account['imap_ssl'],
-				'username' => $email_account['username'],
-				'password' => $email_account['password'],
-				'inbox'    => 'INBOX',
-				'archive'  => 'ARCHIVE',
+			$imap_account = array_merge( $email_account, array(
+				'inbox'      => 'INBOX',
+				'archive'    => 'ARCHIVE',
 				'account_id' => $id,
-			);
+			) );
 
 			$this->download_and_process_email_replies( $imap_account );
 		}
@@ -54,9 +49,9 @@ function retrieve_email_replies() {
 	public function download_and_process_email_replies( $connection_details ) {
 		imap_timeout( IMAP_OPENTIMEOUT, apply_filters( 'supportflow_imap_open_timeout', 5 ) );
 
-		$ssl = $connection_details['ssl'] ? '/ssl' : '';
+		$ssl = $connection_details['imap_ssl'] ? '/ssl' : '';
 
-		$mailbox     = "{{$connection_details['host']}:{$connection_details['port']}{$ssl}}";
+		$mailbox     = "{{$connection_details['imap_host']}:{$connection_details['imap_port']}{$ssl}}";
 		$inbox       = "{$mailbox}{$connection_details['inbox']}";
 		$archive_box = "{$mailbox}{$connection_details['archive']}";
 

From cbd62ccb7030a7804d2ba06379c8ed2a3ff81278 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 14 Jun 2014 03:19:56 +0530
Subject: [PATCH 096/485] Added missing text domain

---
 supportflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index b7bedda..faa7dea 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -806,7 +806,7 @@ function SupportFlow() {
 add_filter( 'cron_schedules', function ( $schedules ) {
 	$schedules['five_minutes'] = array(
 		'interval' => 300,
-		'display'  => __( 'Five Minutes' )
+		'display'  => __( 'Five Minutes', 'supportflow' )
 	);
 
 	return $schedules;

From 5aad8707e0dd991e2888aaaef54500508c99d3a5 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 14 Jun 2014 03:57:07 +0530
Subject: [PATCH 097/485] Passing headers to mail() method instead of cc/bcc as
 parameters

---
 classes/class-supportflow-emails.php | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index ed731fa..5d4cfe2 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -88,7 +88,7 @@ public function notify_agents_thread_replies( $reply_id ) {
 
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $thread->ID, 'agent' );
 
-		self::mail( $subject, $message, $agent_emails, $smtp_account );
+		self::mail( $subject, $message, $agent_emails, '', $smtp_account );
 	}
 
 	/**
@@ -136,25 +136,8 @@ public function notify_respondents_thread_replies( $reply_id, $cc = array(), $bc
 
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $thread->ID, 'respondent' );
 
-		self::mail( $subject, $message, $respondents, $smtp_account, $cc, $bcc );
-	}
-
-	/**
-	 * Send an email from SupportFlow
-	 */
-	public function mail( $subject, $message, $to, $smtp_account = null, $cc = array(), $bcc = array(), $from_email = null, $from_name = null ) {
-
-		$from_email = apply_filters( 'supportflow_mail_from_email', $from_email );
-		$from_name  = apply_filters( 'supportflow_mail_from_name', $from_name );
-
 		$headers = '';
 
-		if ( ! empty( $from_email ) && ! empty( $from_name ) ) {
-			$headers .= "From: $from_name <$from_email>\r\n";
-		} elseif ( ! empty( $from_email ) && empty( $from_name ) ) {
-			$headers .= "From: $from_email\r\n";
-		}
-
 		if ( is_array( $cc ) && ! empty( $cc ) ) {
 			$headers .= "Cc: " . implode( ', ', $cc ) . "\r\n";
 		} elseif ( is_string( $cc ) && ! empty( $cc ) ) {
@@ -167,6 +150,14 @@ public function mail( $subject, $message, $to, $smtp_account = null, $cc = array
 			$headers .= "Bcc: $bcc\r\n";
 		}
 
+		self::mail( $subject, $message, $respondents, $headers, $smtp_account );
+	}
+
+	/**
+	 * Send an email from SupportFlow
+	 */
+	public function mail( $subject, $message, $to, $headers = '', $smtp_account = null ) {
+
 		if ( ! empty( $smtp_account ) ) {
 			$this->smtp_account = $smtp_account;
 			add_action( 'phpmailer_init', array( $this, 'action_set_smtp_settings' ) );

From 389d58b47ee7329d44c5ca05826f7802d4626263 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 14 Jun 2014 03:58:42 +0530
Subject: [PATCH 098/485] Setting mail() method parameters position to match
 with wp_mail() parameter positions

---
 classes/class-supportflow-emails.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 5d4cfe2..9091612 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -88,7 +88,7 @@ public function notify_agents_thread_replies( $reply_id ) {
 
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $thread->ID, 'agent' );
 
-		self::mail( $subject, $message, $agent_emails, '', $smtp_account );
+		self::mail( $agent_emails, $subject, $message, '', $smtp_account );
 	}
 
 	/**
@@ -150,13 +150,13 @@ public function notify_respondents_thread_replies( $reply_id, $cc = array(), $bc
 			$headers .= "Bcc: $bcc\r\n";
 		}
 
-		self::mail( $subject, $message, $respondents, $headers, $smtp_account );
+		self::mail( $respondents, $subject, $message, $headers, $smtp_account );
 	}
 
 	/**
 	 * Send an email from SupportFlow
 	 */
-	public function mail( $subject, $message, $to, $headers = '', $smtp_account = null ) {
+	public function mail( $to, $subject, $message, $headers = '', $smtp_account = null ) {
 
 		if ( ! empty( $smtp_account ) ) {
 			$this->smtp_account = $smtp_account;

From 3b89185220e7f1f88ee807394a57f19ddfc772e0 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 14 Jun 2014 04:01:45 +0530
Subject: [PATCH 099/485] Maintaining parameter consistency for SMTP account
 settings

---
 classes/class-supportflow-emails.php | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 9091612..3206d8d 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -40,13 +40,7 @@ public function notify_agents_thread_replies( $reply_id ) {
 
 		$email_accounts   = get_option( 'sf_email_accounts' );
 		$email_account_id = get_post_meta( $thread->ID, 'email_account', true );
-		$smtp_account     = array(
-			'host'     => $email_accounts[$email_account_id]['smtp_host'],
-			'port'     => $email_accounts[$email_account_id]['smtp_port'],
-			'ssl'      => $email_accounts[$email_account_id]['smtp_ssl'],
-			'username' => $email_accounts[$email_account_id]['username'],
-			'password' => $email_accounts[$email_account_id]['password'],
-		);
+		$smtp_account     = $email_accounts[$email_account_id];
 
 		if ( empty( $agent_ids ) ) {
 			return;
@@ -106,13 +100,7 @@ public function notify_respondents_thread_replies( $reply_id, $cc = array(), $bc
 
 		$email_accounts   = get_option( 'sf_email_accounts' );
 		$email_account_id = get_post_meta( $thread->ID, 'email_account', true );
-		$smtp_account     = array(
-			'host'     => $email_accounts[$email_account_id]['smtp_host'],
-			'port'     => $email_accounts[$email_account_id]['smtp_port'],
-			'ssl'      => $email_accounts[$email_account_id]['smtp_ssl'],
-			'username' => $email_accounts[$email_account_id]['username'],
-			'password' => $email_accounts[$email_account_id]['password'],
-		);
+		$smtp_account     = $email_accounts[$email_account_id];
 
 		// Don't email the person creating the reply, unless that's desired behavior
 		if ( ! apply_filters( 'supportflow_emails_notify_creator', false, 'reply' ) ) {
@@ -173,9 +161,9 @@ public function mail( $to, $subject, $message, $headers = '', $smtp_account = nu
 
 	public function action_set_smtp_settings( $phpmailer ) {
 		$phpmailer->IsSMTP();
-		$phpmailer->Host       = $this->smtp_account['host'];
-		$phpmailer->Port       = (int) $this->smtp_account['port'];
-		$phpmailer->SMTPSecure = $this->smtp_account['ssl'] ? 'ssl' : '';
+		$phpmailer->Host       = $this->smtp_account['smtp_host'];
+		$phpmailer->Port       = (int) $this->smtp_account['smtp_port'];
+		$phpmailer->SMTPSecure = $this->smtp_account['smtp_ssl'] ? 'smtp_ssl' : '';
 		$phpmailer->Username   = $this->smtp_account['username'];
 		$phpmailer->Password   = $this->smtp_account['password'];
 		$phpmailer->SMTPAuth   = true;

From c6f61289fbb46bf8e45c4e6732efff7eb164fcd3 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 14 Jun 2014 04:23:39 +0530
Subject: [PATCH 100/485] Moved inline CSS to admin.css

---
 classes/class-supportflow-admin.php | 4 ++--
 css/admin.css                       | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 0921c0c..6276f08 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -533,9 +533,9 @@ public function meta_box_cc_bcc() {
 		?>
 		<p class="description"> <?php _e( "Please add all the E-Mail ID's seperated by comma.", 'supportflow' ) ?></p>
 		<h4 class="inline"><?php _e( "CC: ", 'supportflow' ) ?></h4>
-		<input type="text" id="cc" name="cc" style="width:100%" />
+		<input type="text" id="cc" name="cc" />
 		<h4 class="inline"> <?php _e( "BCC: ", 'supportflow' ) ?></h4>
-		<input type="text" id="bcc" name="bcc" style="width:100%" />
+		<input type="text" id="bcc" name="bcc" />
 	<?php
 	}
 
diff --git a/css/admin.css b/css/admin.css
index 0d187e5..285d4a8 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -91,6 +91,11 @@
 	font-size: 1.2em;
 }
 
+#supportflow-cc-bcc.postbox input {
+	width:     100%;
+	font-size: 1.2em;
+}
+
 #supportflow-replies.postbox #thread-reply-box {
 	width: 100%;
 }

From ac82c3df842e9324feb07a01dcd9d69acb69f6ae Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 14 Jun 2014 04:26:49 +0530
Subject: [PATCH 101/485] Using WP core function to make link clickables

---
 classes/class-supportflow-admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 6276f08..86c56a3 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -625,7 +625,7 @@ public function display_thread_replies() {
 				echo '<div class="thread-reply">';
 				$post_content = wpautop( stripslashes( $reply->post_content ) );
 				// Make link clickable
-				$post_content = preg_replace( '!(((f|ht)tp(s)?://)[-a-zA-Zа-яА-Я()0-9@:%_+.~#?&;//=]+)!i', '<a href="$1">$1</a>', $post_content );
+				$post_content = make_clickable( $post_content );
 				echo $post_content;
 				$attachment_args = array(
 					'post_parent' => $reply->ID,
@@ -661,7 +661,7 @@ public function display_thread_replies() {
 				echo '<div class="thread-reply">';
 				$post_content = wpautop( stripslashes( $reply->post_content ) );
 				// Make link clickable
-				$post_content = preg_replace( '!(((f|ht)tp(s)?://)[-a-zA-Zа-яА-Я()0-9@:%_+.~#?&;//=]+)!i', '<a href="$1">$1</a>', $post_content );
+				$post_content = make_clickable( $post_content );
 				echo $post_content;
 				$attachment_args = array(
 					'post_parent' => $reply->ID,

From 295911fb6ed4a9115ea1301f9ebded15f9f31575 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 14 Jun 2014 04:33:28 +0530
Subject: [PATCH 102/485] Loading WP admin function where there are actually
 required

---
 classes/class-supportflow-email-replies.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 540ef85..16cca59 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -26,8 +26,6 @@ public function filter_reply_notify_subject( $subject, $reply_id, $thread_id ) {
 
 
 	function retrieve_email_replies() {
-		require_once ABSPATH . 'wp-admin/includes/admin.php';
-
 		$email_accounts = get_option( 'sf_email_accounts' );
 		foreach ( $email_accounts as $id => $email_account ) {
 			if ( empty( $email_account ) ) {
@@ -100,6 +98,7 @@ public function download_and_process_email_replies( $connection_details ) {
 	 * Given an email object, maybe create a new ticket
 	 */
 	public function process_email( $imap_connection, $email, $i, $to, $email_account_id ) {
+		require_once ABSPATH . 'wp-admin/includes/admin.php';
 
 		$new_attachment_ids = array();
 

From 5a3ed176130a9f33a167550a4c27b87aeff48e86 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 14 Jun 2014 04:34:28 +0530
Subject: [PATCH 103/485] Making code more readable

---
 classes/class-supportflow-email-replies.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 16cca59..10df88f 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -101,8 +101,8 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 		require_once ABSPATH . 'wp-admin/includes/admin.php';
 
 		$new_attachment_ids = array();
-
 		$k = 0;
+
 		if ( isset( $email->structure->parts ) ) {
 			foreach ( $email->structure->parts as $email_part ) {
 

From f4a6979c99e69e0b4980ac022ff6b6f68c145dd4 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 6 Jun 2014 01:21:15 +0530
Subject: [PATCH 104/485] Created a submenu under Supportflow menu to set user
 permissions

---
 classes/class-supportflow-permissions.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 7995f18..934ece1 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -33,6 +33,25 @@ class SupportFlow_Permissions extends SupportFlow {
 	 */
 	public function __construct() {
 		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
+		add_action( 'admin_menu', array( $this, 'action_admin_menu' ) );
+	}
+
+	public function action_admin_menu() {
+		$this->slug = 'sf_permissions';
+
+		add_submenu_page(
+			'edit.php?post_type=' . SupportFlow()->post_type,
+			__( 'Permissions', 'supportflow' ),
+			__( 'Permissions', 'supportflow' ),
+			'manage_options',
+			$this->slug,
+			array( $this, 'permissions_page' )
+		);
+
+	}
+
+	public function permissions_page() {
+
 	}
 
 	/**

From 29838d843b49ea920b9b94d197b76e0b05cef032 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 7 Jun 2014 01:26:34 +0530
Subject: [PATCH 105/485] Create an UI to set users access to tag/email
 accounts

---
 classes/class-supportflow-permissions.php | 263 ++++++++++++++++++++++
 1 file changed, 263 insertions(+)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 934ece1..0dc1052 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -4,6 +4,61 @@
  *
  * @since    0.1
  */
+
+if ( ! class_exists( 'WP_List_Table' ) ) {
+	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+}
+
+/**
+ * Table to show existing E-Mail accounts with a option to remove existing
+ */
+class SupportFlow_User_Permissions_Table extends WP_List_Table {
+	protected $_data;
+
+	function __construct( $user_permissions ) {
+		parent::__construct( array( 'screen' => 'sf_user_permissions_table' ) );
+
+		$this->_data = array();
+		foreach ( $user_permissions as $user_permission ) {
+			$identfier = json_encode( array(
+				'user_id'        => $user_permission['user_id'],
+				'privilege_type' => $user_permission['privilege_type'],
+				'privilege_id'   => $user_permission['privilege_id'],
+			) );
+			$status    = "<input type='checkbox' class='toggle_privilege' data-permission-identifier='" . $identfier . "' " . checked( $user_permission['allowed'], true, false ) . '>';
+			$status .= " <span class='privilege_status'> " . ( $user_permission['allowed'] ? 'Allowed' : 'Not allowed' ) . "</span>";
+			$this->_data[] = array(
+				'status'    => $status,
+				'privilege' => esc_html( $user_permission['privilege'] ),
+				'type'      => $user_permission['type'],
+				'user'      => esc_html( $user_permission['user'] ),
+			);
+		}
+	}
+
+	function column_default( $item, $column_name ) {
+		return $item[$column_name];
+	}
+
+	function get_columns() {
+		return array(
+			'status'    => __( 'Status', 'supportflow' ),
+			'privilege' => __( 'Privilege', 'supportflow' ),
+			'type'      => __( 'Type', 'supportflow' ),
+			'user'      => __( 'User', 'supportflow' ),
+		);
+	}
+
+	function prepare_items() {
+		$columns               = $this->get_columns();
+		$data                  = $this->_data;
+		$hidden                = array();
+		$sortable              = array();
+		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->items           = $data;
+	}
+}
+
 class SupportFlow_Permissions extends SupportFlow {
 
 	/**
@@ -34,6 +89,8 @@ class SupportFlow_Permissions extends SupportFlow {
 	public function __construct() {
 		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
 		add_action( 'admin_menu', array( $this, 'action_admin_menu' ) );
+		add_action( 'wp_ajax_get_user_permissions', array( $this, 'action_wp_ajax_get_user_permissions' ) );
+		add_action( 'wp_ajax_set_user_permission', array( $this, 'action_wp_ajax_set_user_permission' ) );
 	}
 
 	public function action_admin_menu() {
@@ -51,7 +108,213 @@ public function action_admin_menu() {
 	}
 
 	public function permissions_page() {
+		?>
+		<div class="wrap">
+		<h2><?php _e( 'Permissions', 'supportflow' ) ?></h2><br />
+
+		<h3 style="display: inline">User: </h3>
+		<select id="change_user">
+			<option data-user-id=0>All</option>
+			;
+			<?php
+			foreach ( get_users() as $user ) {
+				if ( ! $user->has_cap( 'manage_options' ) ) {
+					$user_id       = $user->data->ID;
+					$user_nicename = esc_html( $user->data->user_nicename );
+					$user_email    = esc_html( $user->data->user_email );
+					echo "<option data-user-id=$user_id>$user_nicename ($user_email)</option>";
+				}
+			}
+			?>
+		</select>
+
+		<div id="user_permissions_table">
+			<?php
+			$user_permissions_table = new SupportFlow_User_Permissions_Table( $this->get_user_permissions( 0 ) );
+			$user_permissions_table->prepare_items();
+			$user_permissions_table->display();
+			?>
+		</div>
+		<script type="text/javascript">
+			jQuery(document).ready(function () {
+				jQuery('#change_user').change(function () {
+					var user_id = jQuery('#change_user option:selected').data('user-id');
+
+					jQuery.ajax(ajaxurl, {
+						type   : 'post',
+						data   : {
+							action                     : 'get_user_permissions',
+							user_id                    : user_id,
+							_get_user_permissions_nonce: '<?php echo wp_create_nonce() ?>',
+						},
+						success: function (content) {
+							jQuery('#user_permissions_table').html(content);
+						},
+					});
+				});
+
+				jQuery(document).on('change', '.toggle_privilege', function () {
+					var checkbox = jQuery(this);
+					var permission_identifier = checkbox.data('permission-identifier');
+
+					var allowed = checkbox.prop('checked');
+					var user_id = permission_identifier.user_id;
+					var privilege_type = permission_identifier.privilege_type;
+					var privilege_id = permission_identifier.privilege_id;
+
+					jQuery.ajax(ajaxurl, {
+						type    : 'post',
+						data    : {
+							action                    : 'set_user_permission',
+							user_id                   : user_id,
+							privilege_type            : privilege_type,
+							privilege_id              : privilege_id,
+							allowed                   : allowed,
+							_set_user_permission_nonce: '<?php echo wp_create_nonce() ?>',
+						},
+						success : function (content) {
+							if (1 == content) {
+								var allowed = checkbox.prop('checked');
+								if (true == allowed) {
+									checkbox.siblings('.privilege_status').html('Allowed');
+								} else {
+									checkbox.siblings('.privilege_status').html('Not allowed');
+								}
+							} else {
+								checkbox.prop('checked', !checkbox.prop('checked'));
+								alert('Failed changing state. Old state is reverted');
+							}
+						},
+						error   : function () {
+							checkbox.prop('checked', !checkbox.prop('checked'));
+							alert('Failed changing state. Old state is reverted');
+						},
+					});
+				});
+			});
+		</script>
+	<?php
+
+	}
+
+	public function action_wp_ajax_get_user_permissions() {
+		check_ajax_referer( - 1, '_get_user_permissions_nonce' );
+
+		if ( ! isset( $_POST['user_id'] ) ) {
+			exit;
+		}
+		$user_id = (int) $_POST['user_id'];
+
+		$user_permissions_table = new SupportFlow_User_Permissions_Table( $this->get_user_permissions( $user_id ) );
+		$user_permissions_table->prepare_items();
+		$user_permissions_table->display();
+
+		exit;
+	}
+
+
+	public function get_user_permissions( $user_id ) {
+		$tags             = get_terms( 'sf_tags', 'hide_empty=0' );
+		$email_accounts   = get_option( 'sf_email_accounts' );
+		$permissions      = array();
+		$user_permissions = array();
+
+		if ( 0 == $user_id ) {
+			$users = get_users();
+		} else {
+			$users = array( get_userdata( $user_id ) );
+		}
+
+		foreach ( $users as $user ) {
+			if ( ! $user->has_cap( 'manage_options' ) ) {
+				$permission = get_user_meta( $user->ID, 'sf_permissions', true );
+				if ( ! is_array( $permission ) || empty( $permission ) || ! is_array( $permission['tags'] ) || ! is_array( $permission['email_accounts'] ) ) {
+					$permission = array( 'tags' => array(), 'email_accounts' => array() );
+				}
+
+				$permissions[$user->ID] = $permission;
+			}
+		}
+
+		foreach ( $permissions as $user_id => $permission ) {
+			$user_data = get_userdata( $user_id );
+
+			foreach ( $email_accounts as $id => $email_account ) {
+				if ( empty( $email_account ) ) {
+					continue;
+				}
+				$user_permissions[] = array(
+					'user_id'        => $user_id,
+					'user'           => $user_data->data->user_nicename . ' (' . $user_data->data->user_email . ')',
+					'privilege_type' => 'email_accounts',
+					'type'           => 'E-Mail Account',
+					'privilege_id'   => $id,
+					'privilege'      => $email_account['username'] . ' (' . $email_account['imap_host'] . ')',
+					'allowed'        => in_array( $id, $permission['email_accounts'] ),
+				);
+			}
+			foreach ( $tags as $tag ) {
+				$user_permissions[] = array(
+					'user_id'        => $user_id,
+					'user'           => $user_data->data->user_nicename . ' (' . $user_data->data->user_email . ')',
+					'privilege_type' => 'tags',
+					'type'           => 'Tag',
+					'privilege_id'   => $tag->slug,
+					'privilege'      => $tag->name . ' (' . $tag->slug . ')',
+					'allowed'        => in_array( $tag->slug, $permission['tags'] ),
+				);
+			}
+		}
+
+		return $user_permissions;
+	}
+
+	public function action_wp_ajax_set_user_permission() {
+		check_ajax_referer( - 1, '_set_user_permission_nonce' );
+
+		if ( ! isset( $_POST['user_id'] )
+			|| ! isset( $_POST['privilege_type'] )
+			|| ! isset( $_POST['privilege_id'] )
+			|| ! isset( $_POST['allowed'] )
+			|| ! in_array( $_POST['privilege_type'], array( 'email_accounts', 'tags' ) )
+		) {
+			exit;
+		}
+
+		$user_id        = (int) $_POST['user_id'];
+		$privilege_type = $_POST['privilege_type'];
+		$privilege_id   = $_POST['privilege_id'];
+		$allowed        = 'true' == $_POST['allowed'] ? true : false;
+
+		echo $this->set_user_permission( $user_id, $privilege_type, $privilege_id, $allowed );
+		exit;
+	}
+
+
+	public function set_user_permission( $user_id, $privilege_type, $privilege_id, $allowed ) {
+		$permission = get_user_meta( $user_id, 'sf_permissions', true );
+
+		if ( ! is_array( $permission ) || ! isset( $permission['tags'] ) || ! isset( $permission['email_accounts'] ) ) {
+			$permission = array( 'tags' => array(), 'email_accounts' => array() );
+		}
+
+		if ( true == $allowed ) {
+			if ( ! in_array( $privilege_id, $permission[$privilege_type] ) ) {
+				$permission[$privilege_type][] = (string) $privilege_id;
+				update_user_meta( $user_id, 'sf_permissions', $permission );
+
+				return true;
+			}
+		} else {
+			if ( false !== ( $key = array_search( $privilege_id, $permission[$privilege_type] ) ) ) {
+				unset( $permission[$privilege_type][$key] );
+				update_user_meta( $user_id, 'sf_permissions', $permission );
+
+				return true;
+			}
+		}
 
+		return false;
 	}
 
 	/**

From a080afb585733fada004f59dfc9b4ca1e8b00922 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 15 Jun 2014 02:02:39 +0530
Subject: [PATCH 106/485] Disable closing of ticket by unprivileged users

---
 classes/class-supportflow-admin.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 86c56a3..78063dd 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -269,7 +269,10 @@ function filter_post_row_actions( $row_actions, $post ) {
 				$title_attr  = esc_attr__( 'Reopen Thread', 'supportflow' );
 				$action_text = esc_html__( 'Reopen', 'supportflow' );
 			}
-			$row_actions['change_status'] = '<a href="' . esc_url( $action_link ) . '" title="' . $title_attr . '">' . $action_text . '</a>';
+
+			if ( current_user_can( 'edit_post', $post->ID ) ) {
+				$row_actions['change_status'] = '<a href="' . esc_url( $action_link ) . '" title="' . $title_attr . '">' . $action_text . '</a>';
+			}
 		}
 
 		// Actions we don't want
@@ -382,10 +385,14 @@ function handle_action_change_status() {
 			wp_die( __( "Doin' something phishy, huh?", 'supportflow' ) );
 		}
 
-		$post_status = sanitize_key( $_GET['post_status'] );
-		$thread_id   = (int) $_GET['thread_id'];
+		$thread_id = (int) $_GET['thread_id'];
 
-		$new_thread = array(
+		if ( ! current_user_can( 'edit_post', $thread_id ) ) {
+			wp_die( __( 'You are not allowed to edit this item.' ) );
+		}
+
+		$post_status = sanitize_key( $_GET['post_status'] );
+		$new_thread  = array(
 			'ID'          => $thread_id,
 			'post_status' => $post_status,
 		);

From d24706d37c33cfa55e9617a84e3bccb83ae77e24 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 15 Jun 2014 02:04:02 +0530
Subject: [PATCH 107/485] Limited under-privileged user acces to only allowed
 E-Mail accounts

---
 classes/class-supportflow-admin.php       |  3 +-
 classes/class-supportflow-permissions.php | 70 ++++++++++++++++++++++-
 2 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 78063dd..186269d 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -465,8 +465,9 @@ public function meta_box_details() {
 			echo '<div class="misc-pub-section">';
 			echo '<label for="post_email_account">' . __( 'Account', 'supportflow' ) . ':</label>';
 			echo '<select id="post_email_account" name="post_email_account">';
+			$user_permissions = get_user_meta( get_current_user_id(), 'sf_permissions', true )['email_accounts'];
 			foreach ( $email_accounts as $id => $email_account ) {
-				if ( empty( $email_account ) ) {
+				if ( empty( $email_account ) || ( ! current_user_can( 'manage_options' ) && ! in_array( $id, $user_permissions ) ) ) {
 					continue;
 				}
 				echo '<option value="' . esc_attr( $id ) . '" ' . '>' . esc_html( $email_account['username'] ) . '</option>';
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 0dc1052..218956d 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -89,6 +89,7 @@ class SupportFlow_Permissions extends SupportFlow {
 	public function __construct() {
 		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
 		add_action( 'admin_menu', array( $this, 'action_admin_menu' ) );
+		add_action( 'admin_init', array( $this, 'action_admin_init' ) );
 		add_action( 'wp_ajax_get_user_permissions', array( $this, 'action_wp_ajax_get_user_permissions' ) );
 		add_action( 'wp_ajax_set_user_permission', array( $this, 'action_wp_ajax_set_user_permission' ) );
 	}
@@ -107,6 +108,10 @@ public function action_admin_menu() {
 
 	}
 
+	public function action_admin_init() {
+		add_filter( 'user_has_cap', array( $this, 'limit_user_permissions' ), 10, 3 );
+	}
+
 	public function permissions_page() {
 		?>
 		<div class="wrap">
@@ -212,7 +217,6 @@ public function action_wp_ajax_get_user_permissions() {
 		exit;
 	}
 
-
 	public function get_user_permissions( $user_id ) {
 		$tags             = get_terms( 'sf_tags', 'hide_empty=0' );
 		$email_accounts   = get_option( 'sf_email_accounts' );
@@ -317,6 +321,70 @@ public function set_user_permission( $user_id, $privilege_type, $privilege_id, $
 		return false;
 	}
 
+	/*
+	 * Limited under-privileged user acces to only allowed E-Mail accounts
+	 */
+	function limit_user_permissions( $allcaps, $cap, $args ) {
+		if (
+			! in_array( $args[0], array( 'edit_post', 'edit_posts', 'delete_post',	'manage_categories' ) ) ||
+			( ! empty( $allcaps['manage_options'] ) && true == $allcaps['manage_options'] )
+		) {
+			return $allcaps;
+		}
+
+		if ( 'manage_categories' == $args[0] ) {
+			$allcaps["manage_categories"] = false;
+		}
+
+		if ( 'edit_post' == $args[0] ) {
+			if ( $this->is_user_allowed_post( $args[1], $args[2] ) ) {
+				$allcaps["edit_others_posts"] = true;
+				$allcaps["edit_posts"]        = true;
+			} else {
+				$allcaps["edit_others_posts"] = false;
+				$allcaps["edit_posts"]        = false;
+			}
+		}
+
+		if ( 'delete_post' == $args[0] && $this->is_user_allowed_post( $args[1], $args[2] ) ) {
+			$allcaps["delete_others_posts"] = true;
+		} else {
+			$allcaps["delete_others_posts"] = false;
+		}
+
+		if ( 'edit_posts' == $args[0] ) {
+			if ( ! empty( get_user_meta( $args[1], 'sf_permissions', true )['email_accounts'] ) ) {
+				$allcaps["edit_posts"] = true;
+			} else {
+				$allcaps["edit_posts"] = false;
+			}
+		}
+
+		return $allcaps;
+	}
+
+	/*
+	 * Check if user has access to a particular post
+	 */
+	public function is_user_allowed_post( $user_id, $post_id ) {
+		$user_permissions   = get_user_meta( $user_id, 'sf_permissions', true );
+		$post_email_account = get_post_meta( $post_id, 'email_account', true );
+		$post_tags          = wp_get_post_terms( $post_id, 'sf_tags' );
+
+		if ( in_array( $post_email_account, $user_permissions['email_accounts'] ) ) {
+			return true;
+		}
+
+		foreach ( $post_tags as $post_tag ) {
+			$post_tag_slug = $post_tag->slug;
+			if ( in_array( $post_tag_slug, $user_permissions['tags'] ) ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 	/**
 	 * Initiates the actions for the permissions class.
 	 *

From d999fb969be61295bb57f8c5420ef6d482093fb8 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 20 Jun 2014 00:45:03 +0530
Subject: [PATCH 108/485] Allow only admin to access/modify tags and
 respondents taxonomy

---
 classes/class-supportflow-permissions.php | 6 +-----
 supportflow.php                           | 9 +++++++++
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 218956d..89fb2bb 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -326,16 +326,12 @@ public function set_user_permission( $user_id, $privilege_type, $privilege_id, $
 	 */
 	function limit_user_permissions( $allcaps, $cap, $args ) {
 		if (
-			! in_array( $args[0], array( 'edit_post', 'edit_posts', 'delete_post',	'manage_categories' ) ) ||
+			! in_array( $args[0], array( 'edit_post', 'edit_posts', 'delete_post' ) ) ||
 			( ! empty( $allcaps['manage_options'] ) && true == $allcaps['manage_options'] )
 		) {
 			return $allcaps;
 		}
 
-		if ( 'manage_categories' == $args[0] ) {
-			$allcaps["manage_categories"] = false;
-		}
-
 		if ( 'edit_post' == $args[0] ) {
 			if ( $this->is_user_allowed_post( $args[1], $args[2] ) ) {
 				$allcaps["edit_others_posts"] = true;
diff --git a/supportflow.php b/supportflow.php
index faa7dea..1084be1 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -292,6 +292,13 @@ public function action_init_register_post_type() {
 	 */
 	public function action_init_register_taxonomies() {
 
+		$capabilities = array(
+			'manage_terms' => 'manage_options',
+			'edit_terms'   => 'manage_options',
+			'delete_terms' => 'manage_options',
+			'assign_terms' => 'manage_options',
+		);
+
 		$args_respondents_tax = array(
 			'label'             => __( 'Respondents', 'supportflow' ),
 			'labels'            => array(
@@ -303,6 +310,7 @@ public function action_init_register_taxonomies() {
 			'public'            => true,
 			'show_in_nav_menus' => true,
 			'rewrite'           => false,
+			'capabilities'      => $capabilities,
 		);
 
 		$args_tags_tax = array(
@@ -316,6 +324,7 @@ public function action_init_register_taxonomies() {
 			'public'            => true,
 			'show_in_nav_menus' => true,
 			'rewrite'           => false,
+			'capabilities'      => $capabilities,
 		);
 
 		register_taxonomy( $this->respondents_tax, $this->post_type, $args_respondents_tax );

From 06a86fe40c21221a03706a000d595ef9e7252a2f Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 20 Jun 2014 00:57:25 +0530
Subject: [PATCH 109/485] Limited permissions of under-privileged users

A) Now user need access to atleast one E-Mail account to create ticket.
B) User with access to a E-Mail account can access all tickets under it
C) User with access to a particular tag can view/modify only those tickets
---
 classes/class-supportflow-permissions.php | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 89fb2bb..3df6ca9 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -325,17 +325,30 @@ public function set_user_permission( $user_id, $privilege_type, $privilege_id, $
 	 * Limited under-privileged user acces to only allowed E-Mail accounts
 	 */
 	function limit_user_permissions( $allcaps, $cap, $args ) {
+		global $pagenow, $post_type;
+
 		if (
 			! in_array( $args[0], array( 'edit_post', 'edit_posts', 'delete_post' ) ) ||
-			( ! empty( $allcaps['manage_options'] ) && true == $allcaps['manage_options'] )
+			( ! empty( $allcaps['manage_options'] ) && true == $allcaps['manage_options'] ) ||
+			SupportFlow()->post_type != $post_type
 		) {
 			return $allcaps;
 		}
 
+		$user_permissions = get_user_meta( $args[1], 'sf_permissions', true );
+
 		if ( 'edit_post' == $args[0] ) {
 			if ( $this->is_user_allowed_post( $args[1], $args[2] ) ) {
 				$allcaps["edit_others_posts"] = true;
 				$allcaps["edit_posts"]        = true;
+			} elseif (
+				'post.php' == $pagenow &&
+				isset ( $_REQUEST['action'], $_REQUEST['post_email_account'] ) &&
+				'editpost' == $_REQUEST['action'] &&
+				in_array( $_REQUEST['post_email_account'], $user_permissions['email_accounts'] )
+			) {
+				$allcaps["edit_others_posts"] = true;
+				$allcaps["edit_posts"]        = true;
 			} else {
 				$allcaps["edit_others_posts"] = false;
 				$allcaps["edit_posts"]        = false;
@@ -349,7 +362,9 @@ function limit_user_permissions( $allcaps, $cap, $args ) {
 		}
 
 		if ( 'edit_posts' == $args[0] ) {
-			if ( ! empty( get_user_meta( $args[1], 'sf_permissions', true )['email_accounts'] ) ) {
+			if ( 'post-new.php' != $pagenow && ( ! empty( $user_permissions['email_accounts'] ) || ! empty( $user_permissions['tags'] ) ) ) {
+				$allcaps["edit_posts"] = true;
+			} elseif ( 'post-new.php' == $pagenow && ! empty( $user_permissions['email_accounts'] ) ) {
 				$allcaps["edit_posts"] = true;
 			} else {
 				$allcaps["edit_posts"] = false;

From adfaa664d87781456ac715ffc17a2e65c86c4319 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 20 Jun 2014 01:11:11 +0530
Subject: [PATCH 110/485] Added comments to explain limit_user_permissions()
 method

---
 classes/class-supportflow-permissions.php | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 3df6ca9..95ce9de 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -328,19 +328,30 @@ function limit_user_permissions( $allcaps, $cap, $args ) {
 		global $pagenow, $post_type;
 
 		if (
+			// Return if required capability is not one of them
 			! in_array( $args[0], array( 'edit_post', 'edit_posts', 'delete_post' ) ) ||
+
+			// Return if user is admin
 			( ! empty( $allcaps['manage_options'] ) && true == $allcaps['manage_options'] ) ||
+
+			// Return if posts are not supportflow threads
 			SupportFlow()->post_type != $post_type
 		) {
 			return $allcaps;
 		}
 
+		// Get all supportflow permissions granted to the current user
 		$user_permissions = get_user_meta( $args[1], 'sf_permissions', true );
 
+		// This capability is requested if user is viewing/modifying existing ticket
 		if ( 'edit_post' == $args[0] ) {
+
+			// Allow if user have access to the tag/E-Mail account used by the thread
 			if ( $this->is_user_allowed_post( $args[1], $args[2] ) ) {
 				$allcaps["edit_others_posts"] = true;
 				$allcaps["edit_posts"]        = true;
+
+			// Allow if user is creating new thread with permitted E-Mail account
 			} elseif (
 				'post.php' == $pagenow &&
 				isset ( $_REQUEST['action'], $_REQUEST['post_email_account'] ) &&
@@ -349,23 +360,33 @@ function limit_user_permissions( $allcaps, $cap, $args ) {
 			) {
 				$allcaps["edit_others_posts"] = true;
 				$allcaps["edit_posts"]        = true;
+
+			// Disallow user access to thread in other cases
 			} else {
 				$allcaps["edit_others_posts"] = false;
 				$allcaps["edit_posts"]        = false;
 			}
 		}
 
+		// Allow deleting thread if user have access to the tag/E-Mail account used by the thread
 		if ( 'delete_post' == $args[0] && $this->is_user_allowed_post( $args[1], $args[2] ) ) {
 			$allcaps["delete_others_posts"] = true;
 		} else {
 			$allcaps["delete_others_posts"] = false;
 		}
 
+		// This capability is requested if user is creating new thread or listing all threads
 		if ( 'edit_posts' == $args[0] ) {
+
+			// List All threads if user have access to atleast one E-Mail account or tag
 			if ( 'post-new.php' != $pagenow && ( ! empty( $user_permissions['email_accounts'] ) || ! empty( $user_permissions['tags'] ) ) ) {
 				$allcaps["edit_posts"] = true;
+
+			// Allow creating new thread if user have access to atleast one E-Mail account
 			} elseif ( 'post-new.php' == $pagenow && ! empty( $user_permissions['email_accounts'] ) ) {
 				$allcaps["edit_posts"] = true;
+
+			// Disallow in other cases
 			} else {
 				$allcaps["edit_posts"] = false;
 			}

From 318277e82c85fa04d080d0f74e6acd5385fbceca Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 25 Jun 2014 00:48:42 +0530
Subject: [PATCH 111/485] Removed accidentally added extra character from HTML

---
 classes/class-supportflow-permissions.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 95ce9de..d585b48 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -120,7 +120,6 @@ public function permissions_page() {
 		<h3 style="display: inline">User: </h3>
 		<select id="change_user">
 			<option data-user-id=0>All</option>
-			;
 			<?php
 			foreach ( get_users() as $user ) {
 				if ( ! $user->has_cap( 'manage_options' ) ) {

From ad8187d05093fefc1535adf69e1f65b451a77e5c Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 25 Jun 2014 00:54:40 +0530
Subject: [PATCH 112/485] Using class instead of inline CSS

---
 classes/class-supportflow-permissions.php | 2 +-
 css/admin.css                             | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index d585b48..5797ff9 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -117,7 +117,7 @@ public function permissions_page() {
 		<div class="wrap">
 		<h2><?php _e( 'Permissions', 'supportflow' ) ?></h2><br />
 
-		<h3 style="display: inline">User: </h3>
+		<h3 class="inline">User: </h3>
 		<select id="change_user">
 			<option data-user-id=0>All</option>
 			<?php
diff --git a/css/admin.css b/css/admin.css
index 285d4a8..505ac13 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -12,6 +12,10 @@
 	color: #BC0B0B;
 }
 
+.inline {
+    display: inline;
+}
+
 #poststuff {
 	padding-top: 0;
 }

From d1f7e80d2e1c097db9a26bb5f5013bd41139a529 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 25 Jun 2014 01:12:25 +0530
Subject: [PATCH 113/485] Adding support for I18n in permission setting page

---
 classes/class-supportflow-permissions.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 5797ff9..35d9dd7 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -26,7 +26,7 @@ function __construct( $user_permissions ) {
 				'privilege_id'   => $user_permission['privilege_id'],
 			) );
 			$status    = "<input type='checkbox' class='toggle_privilege' data-permission-identifier='" . $identfier . "' " . checked( $user_permission['allowed'], true, false ) . '>';
-			$status .= " <span class='privilege_status'> " . ( $user_permission['allowed'] ? 'Allowed' : 'Not allowed' ) . "</span>";
+			$status .= " <span class='privilege_status'> " . __( $user_permission['allowed'] ? 'Allowed' : 'Not allowed', 'supportflow' ) . "</span>";
 			$this->_data[] = array(
 				'status'    => $status,
 				'privilege' => esc_html( $user_permission['privilege'] ),
@@ -117,9 +117,9 @@ public function permissions_page() {
 		<div class="wrap">
 		<h2><?php _e( 'Permissions', 'supportflow' ) ?></h2><br />
 
-		<h3 class="inline">User: </h3>
+		<h3 class="inline"><?php _e( 'User', 'supportflow' ) ?>: </h3>
 		<select id="change_user">
-			<option data-user-id=0>All</option>
+			<option data-user-id=0><?php _e( 'All', 'supportflow' ) ?></option>
 			<?php
 			foreach ( get_users() as $user ) {
 				if ( ! $user->has_cap( 'manage_options' ) ) {
@@ -180,18 +180,18 @@ public function permissions_page() {
 							if (1 == content) {
 								var allowed = checkbox.prop('checked');
 								if (true == allowed) {
-									checkbox.siblings('.privilege_status').html('Allowed');
+									checkbox.siblings('.privilege_status').html('<?php _e( 'Allowed', 'supportflow' ) ?>');
 								} else {
-									checkbox.siblings('.privilege_status').html('Not allowed');
+									checkbox.siblings('.privilege_status').html('<?php _e( 'Not Allowed', 'supportflow' ) ?>');
 								}
 							} else {
 								checkbox.prop('checked', !checkbox.prop('checked'));
-								alert('Failed changing state. Old state is reverted');
+								alert('<?php _e( 'Failed changing state. Old state is reverted', 'supportflow' ) ?>');
 							}
 						},
 						error   : function () {
 							checkbox.prop('checked', !checkbox.prop('checked'));
-							alert('Failed changing state. Old state is reverted');
+							alert('<?php _e( 'Failed changing state. Old state is reverted', 'supportflow' ) ?>');
 						},
 					});
 				});

From a19f395c4a79c590bc7ebf2fea00b176f1c0a6dc Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 25 Jun 2014 01:35:56 +0530
Subject: [PATCH 114/485] Using labels for form elements

---
 classes/class-supportflow-permissions.php | 15 ++++++++-------
 css/admin.css                             | 10 ++++++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 35d9dd7..bc3d44d 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -19,14 +19,14 @@ function __construct( $user_permissions ) {
 		parent::__construct( array( 'screen' => 'sf_user_permissions_table' ) );
 
 		$this->_data = array();
-		foreach ( $user_permissions as $user_permission ) {
+		foreach ( $user_permissions as $id=>$user_permission ) {
 			$identfier = json_encode( array(
 				'user_id'        => $user_permission['user_id'],
 				'privilege_type' => $user_permission['privilege_type'],
 				'privilege_id'   => $user_permission['privilege_id'],
 			) );
-			$status    = "<input type='checkbox' class='toggle_privilege' data-permission-identifier='" . $identfier . "' " . checked( $user_permission['allowed'], true, false ) . '>';
-			$status .= " <span class='privilege_status'> " . __( $user_permission['allowed'] ? 'Allowed' : 'Not allowed', 'supportflow' ) . "</span>";
+			$status    = "<input type='checkbox' id='permission_$id' class='toggle_privilege' data-permission-identifier='" . $identfier . "' " . checked( $user_permission['allowed'], true, false ) . '>';
+			$status .= " <label for='permission_$id' class='privilege_status'> " . __( $user_permission['allowed'] ? 'Allowed' : 'Not allowed', 'supportflow' ) . "</label";
 			$this->_data[] = array(
 				'status'    => $status,
 				'privilege' => esc_html( $user_permission['privilege'] ),
@@ -117,8 +117,8 @@ public function permissions_page() {
 		<div class="wrap">
 		<h2><?php _e( 'Permissions', 'supportflow' ) ?></h2><br />
 
-		<h3 class="inline"><?php _e( 'User', 'supportflow' ) ?>: </h3>
-		<select id="change_user">
+		<label for="change_user" id="change_user_label"><?php _e( 'User', 'supportflow' ) ?>: </label>
+		<select name="change_user" id="change_user">
 			<option data-user-id=0><?php _e( 'All', 'supportflow' ) ?></option>
 			<?php
 			foreach ( get_users() as $user ) {
@@ -159,6 +159,7 @@ public function permissions_page() {
 
 				jQuery(document).on('change', '.toggle_privilege', function () {
 					var checkbox = jQuery(this);
+					var checkbox_label = checkbox.siblings('.privilege_status');
 					var permission_identifier = checkbox.data('permission-identifier');
 
 					var allowed = checkbox.prop('checked');
@@ -180,9 +181,9 @@ public function permissions_page() {
 							if (1 == content) {
 								var allowed = checkbox.prop('checked');
 								if (true == allowed) {
-									checkbox.siblings('.privilege_status').html('<?php _e( 'Allowed', 'supportflow' ) ?>');
+									checkbox_label.html('<?php _e( 'Allowed', 'supportflow' ) ?>');
 								} else {
-									checkbox.siblings('.privilege_status').html('<?php _e( 'Not Allowed', 'supportflow' ) ?>');
+									checkbox_label.html('<?php _e( 'Not Allowed', 'supportflow' ) ?>');
 								}
 							} else {
 								checkbox.prop('checked', !checkbox.prop('checked'));
diff --git a/css/admin.css b/css/admin.css
index 505ac13..f90b4d6 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -12,10 +12,6 @@
 	color: #BC0B0B;
 }
 
-.inline {
-    display: inline;
-}
-
 #poststuff {
 	padding-top: 0;
 }
@@ -24,6 +20,12 @@
 	margin-top: 34px;
 }
 
+#change_user_label {
+    display:     inline;
+    font-weight: bold;
+    font-size:   16px;
+}
+
 #supportflow-subject.postbox,
 #supportflow-respondents.postbox {
 	border:     none;

From dcf6263d004bc4e5da303ae984cadaa91208c2de Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 25 Jun 2014 01:45:10 +0530
Subject: [PATCH 115/485] Disable checkbox while AJAX request is processed

---
 classes/class-supportflow-permissions.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index bc3d44d..7b60957 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -167,6 +167,9 @@ public function permissions_page() {
 					var privilege_type = permission_identifier.privilege_type;
 					var privilege_id = permission_identifier.privilege_id;
 
+					checkbox_label.html('<?php _e( 'Changing status, please wait.', 'supportflow' ) ?>');
+					checkbox.prop('disabled', true);
+
 					jQuery.ajax(ajaxurl, {
 						type    : 'post',
 						data    : {
@@ -178,14 +181,7 @@ public function permissions_page() {
 							_set_user_permission_nonce: '<?php echo wp_create_nonce() ?>',
 						},
 						success : function (content) {
-							if (1 == content) {
-								var allowed = checkbox.prop('checked');
-								if (true == allowed) {
-									checkbox_label.html('<?php _e( 'Allowed', 'supportflow' ) ?>');
-								} else {
-									checkbox_label.html('<?php _e( 'Not Allowed', 'supportflow' ) ?>');
-								}
-							} else {
+							if (1 != content) {
 								checkbox.prop('checked', !checkbox.prop('checked'));
 								alert('<?php _e( 'Failed changing state. Old state is reverted', 'supportflow' ) ?>');
 							}
@@ -194,6 +190,15 @@ public function permissions_page() {
 							checkbox.prop('checked', !checkbox.prop('checked'));
 							alert('<?php _e( 'Failed changing state. Old state is reverted', 'supportflow' ) ?>');
 						},
+						complete: function() {
+							var allowed = checkbox.prop('checked');
+							if (true == allowed) {
+								checkbox_label.html('<?php _e( 'Allowed', 'supportflow' ) ?>');
+							} else {
+								checkbox_label.html('<?php _e( 'Not Allowed', 'supportflow' ) ?>');
+							}
+							checkbox.prop('disabled', false);
+						},
 					});
 				});
 			});

From 432121432fe7f06c0f855ad59242ea11accb71bd Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 26 Jun 2014 01:42:57 +0530
Subject: [PATCH 116/485] Corrected WP coding standards

---
 classes/class-supportflow-permissions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 7b60957..cbd2d35 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -19,7 +19,7 @@ function __construct( $user_permissions ) {
 		parent::__construct( array( 'screen' => 'sf_user_permissions_table' ) );
 
 		$this->_data = array();
-		foreach ( $user_permissions as $id=>$user_permission ) {
+		foreach ( $user_permissions as $id => $user_permission ) {
 			$identfier = json_encode( array(
 				'user_id'        => $user_permission['user_id'],
 				'privilege_type' => $user_permission['privilege_type'],
@@ -190,7 +190,7 @@ public function permissions_page() {
 							checkbox.prop('checked', !checkbox.prop('checked'));
 							alert('<?php _e( 'Failed changing state. Old state is reverted', 'supportflow' ) ?>');
 						},
-						complete: function() {
+						complete: function () {
 							var allowed = checkbox.prop('checked');
 							if (true == allowed) {
 								checkbox_label.html('<?php _e( 'Allowed', 'supportflow' ) ?>');

From d958a06bb2a53c0b541870032feb2233d45628a7 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 5 Jun 2014 04:05:28 +0530
Subject: [PATCH 117/485] Updated plupload to newer version and finished
 frontend part

---
 classes/class-supportflow-admin.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 186269d..cab60f2 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -64,14 +64,13 @@ public function action_admin_enqueue_scripts() {
 			wp_enqueue_script( 'supportflow-thread_attachments', SupportFlow()->plugin_url . 'js/thread_attachments.js', array( 'wp-plupload', 'jquery' ) );
 			wp_enqueue_script( 'supportflow-respondents-autocomplete', SupportFlow()->plugin_url . 'js/respondents-autocomplete.js', array( 'jquery', 'jquery-ui-autocomplete' ) );
 			$ajaxurl = add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) );
-
-			wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
-			wp_localize_script( 'supportflow-thread_attachments', 'SFThreadAttachments', array(
-				'uploading'        => __( 'Uploading: ', 'supportflow' ),
-				'failed_uploading' => __( 'Failed uploading: ', 'supportflow' ),
-				'uploaded'         => __( 'Uploaded: ', 'supportflow' )
-			) );
 		}
+		wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
+		wp_localize_script( 'supportflow-thread_attachments', 'SFThreadAttachments', array(
+			'uploading'        => __( 'Uploading: ', 'supportflow' ),
+			'failed_uploading' => __( 'Failed uploading: ', 'supportflow' ),
+			'uploaded'         => __( 'Uploaded: ', 'supportflow' )
+		) );
 	}
 
 	/**

From 2bd0420dc06d1987149ffb528cec98321ab3db18 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 8 Jun 2014 05:05:19 +0530
Subject: [PATCH 118/485] Placing wp_localize_script() inside if condition

It was accidentaly placed outside in commit
6600cda004c142a7eda8d3eeee1955f7df50427a
---
 classes/class-supportflow-admin.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index cab60f2..186269d 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -64,13 +64,14 @@ public function action_admin_enqueue_scripts() {
 			wp_enqueue_script( 'supportflow-thread_attachments', SupportFlow()->plugin_url . 'js/thread_attachments.js', array( 'wp-plupload', 'jquery' ) );
 			wp_enqueue_script( 'supportflow-respondents-autocomplete', SupportFlow()->plugin_url . 'js/respondents-autocomplete.js', array( 'jquery', 'jquery-ui-autocomplete' ) );
 			$ajaxurl = add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) );
+
+			wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
+			wp_localize_script( 'supportflow-thread_attachments', 'SFThreadAttachments', array(
+				'uploading'        => __( 'Uploading: ', 'supportflow' ),
+				'failed_uploading' => __( 'Failed uploading: ', 'supportflow' ),
+				'uploaded'         => __( 'Uploaded: ', 'supportflow' )
+			) );
 		}
-		wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
-		wp_localize_script( 'supportflow-thread_attachments', 'SFThreadAttachments', array(
-			'uploading'        => __( 'Uploading: ', 'supportflow' ),
-			'failed_uploading' => __( 'Failed uploading: ', 'supportflow' ),
-			'uploaded'         => __( 'Uploaded: ', 'supportflow' )
-		) );
 	}
 
 	/**

From 553c7ea3227cf1cde3c5ced463a8aa7ba1a791ec Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 20 Jun 2014 23:27:56 +0530
Subject: [PATCH 119/485] Created an UI to to allow user to set E-Mail
 notification settings

---
 .../class-supportflow-email-notifications.php | 261 ++++++++++++++++++
 supportflow.php                               |   1 +
 2 files changed, 262 insertions(+)
 create mode 100644 classes/class-supportflow-email-notifications.php

diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
new file mode 100644
index 0000000..60d13b5
--- /dev/null
+++ b/classes/class-supportflow-email-notifications.php
@@ -0,0 +1,261 @@
+<?php
+/**
+ * Sets up the E-Mail notifications preference for users
+ *
+ * @since    0.1
+ */
+
+if ( ! class_exists( 'WP_List_Table' ) ) {
+	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+}
+
+/**
+ * Table to show existing preference with a option to change them
+ */
+class SupportFlow_Email_Notifications_Table extends WP_List_Table {
+	protected $_data;
+
+	function __construct( $notification_settings ) {
+		parent::__construct( array( 'screen' => 'sf_user_email_notifications_table' ) );
+
+		$this->_data = array();
+		foreach ( $notification_settings as $notification_setting ) {
+			$identfier = json_encode( array(
+				'privilege_type' => $notification_setting['privilege_type'],
+				'privilege_id'   => $notification_setting['privilege_id'],
+			) );
+			$status    = "<input type='checkbox' class='toggle_privilege' data-email-notfication-identifier='" . $identfier . "' " . checked( $notification_setting['allowed'], true, false ) . '>';
+			$status .= " <span class='privilege_status'> " . ( $notification_setting['allowed'] ? 'Allowed' : 'Not allowed' ) . "</span>";
+			$this->_data[] = array(
+				'status'    => $status,
+				'privilege' => esc_html( $notification_setting['privilege'] ),
+				'type'      => $notification_setting['type'],
+			);
+		}
+	}
+
+	function column_default( $item, $column_name ) {
+		return $item[$column_name];
+	}
+
+	function get_columns() {
+		return array(
+			'status'    => __( 'Status', 'supportflow' ),
+			'privilege' => __( 'Privilege', 'supportflow' ),
+			'type'      => __( 'Type', 'supportflow' ),
+		);
+	}
+
+	function prepare_items() {
+		$columns               = $this->get_columns();
+		$data                  = $this->_data;
+		$hidden                = array();
+		$sortable              = array();
+		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->items           = $data;
+	}
+}
+
+class SupportFlow_Email_Notifications extends SupportFlow {
+
+	public function __construct() {
+		add_action( 'admin_menu', array( $this, 'action_admin_menu' ) );
+		add_action( 'wp_ajax_set_email_notfication', array( $this, 'action_wp_ajax_set_email_notfication' ) );
+	}
+
+	public function action_admin_menu() {
+		$this->slug = 'sf_email_notifications';
+
+		add_submenu_page(
+			'edit.php?post_type=' . SupportFlow()->post_type,
+			__( 'E-Mail Notifications', 'supportflow' ),
+			__( 'E-Mail Notifications', 'supportflow' ),
+			'read',
+			$this->slug,
+			array( $this, 'tag_setting_page' )
+		);
+
+	}
+
+	public function tag_setting_page() {
+		?>
+		<div class="wrap">
+		<h2><?php _e( 'E-Mail Notifications', 'supportflow' ) ?></h2><br />
+
+		<div id="email_notification_table">
+			<?php
+			$email_notifications_table = new SupportFlow_Email_Notifications_Table( $this->get_notifications_settings() );
+			$email_notifications_table->prepare_items();
+			$email_notifications_table->display();
+			?>
+		</div>
+		<script type="text/javascript">
+			jQuery(document).ready(function () {
+
+				jQuery(document).on('change', '.toggle_privilege', function () {
+					var checkbox = jQuery(this);
+					var email_notfication_identifier = checkbox.data('email-notfication-identifier');
+
+					var allowed = checkbox.prop('checked');
+					var privilege_type = email_notfication_identifier.privilege_type;
+					var privilege_id = email_notfication_identifier.privilege_id;
+
+					jQuery.ajax(ajaxurl, {
+						type   : 'post',
+						data   : {
+							action                      : 'set_email_notfication',
+							privilege_type              : privilege_type,
+							privilege_id                : privilege_id,
+							allowed                     : allowed,
+							_set_email_notfication_nonce: '<?php echo wp_create_nonce() ?>',
+						},
+						success: function (content) {
+							if (1 == content) {
+								var allowed = checkbox.prop('checked');
+								if (true == allowed) {
+									checkbox.siblings('.privilege_status').html('Allowed');
+								} else {
+									checkbox.siblings('.privilege_status').html('Not allowed');
+								}
+							} else {
+								checkbox.prop('checked', !checkbox.prop('checked'));
+								alert('Failed changing state. Old state is reverted');
+							}
+						},
+						error  : function () {
+							checkbox.prop('checked', !checkbox.prop('checked'));
+							alert('Failed changing state. Old state is reverted');
+						},
+					});
+				});
+			});
+		</script>
+	<?php
+
+	}
+
+	public function get_notifications_settings( $user_id = null ) {
+		// Get settings for current user if user not specified
+		if ( null == $user_id ) {
+			$user_id = get_current_user_id();
+		}
+
+		// Load all tags and E-Mail accounts
+		$tags           = get_terms( 'sf_tags', 'hide_empty=0' );
+		$email_accounts = get_option( 'sf_email_accounts' );
+
+		// User is admin (has complete access to all tags, E-Mail account)
+		if ( current_user_can( 'manage_options' ) ) {
+
+			$permitted_tags = $permitted_email_accounts = array();
+
+			foreach ( $tags as $tag ) {
+				$permitted_tags[] = $tag->slug;
+			}
+			foreach ( $email_accounts as $id => $email_account ) {
+				$permitted_email_accounts[] = (string) $id;
+			}
+			$user_permissions = array( 'tags' => $permitted_tags, 'email_accounts' => $permitted_email_accounts );
+			unset( $permitted_tags, $permitted_email_accounts );
+
+			// Allow user to show notifications settings of only tags/E-Mail account he is permitted
+		} else {
+			$user_permissions = get_user_meta( $user_id, 'sf_permissions', true );
+			if ( ! is_array( $user_permissions ) || empty( $user_permissions ) || ! is_array( $user_permissions['tags'] ) || ! is_array( $user_permissions['email_accounts'] ) ) {
+				$user_permissions = array( 'tags' => array(), 'email_accounts' => array() );
+			}
+		}
+
+
+		// Get tag/E-Mail account for which user already receive notifications
+		$email_notifications = get_user_meta( $user_id, 'sf_email_notifications', true );
+		if ( ! is_array( $email_notifications ) || empty( $email_notifications ) || ! is_array( $email_notifications['tags'] ) || ! is_array( $email_notifications['email_accounts'] ) ) {
+			$email_notifications = array( 'tags' => array(), 'email_accounts' => array() );
+		}
+
+
+		// Return exiting notifications settings of user
+		$notification_settings = array();
+		foreach ( $user_permissions['email_accounts'] as $id ) {
+			if ( empty( $email_accounts[$id] ) ) {
+				continue;
+			}
+			$email_account           = $email_accounts[$id];
+			$notification_settings[] = array(
+				'privilege_type' => 'email_accounts',
+				'type'           => 'E-Mail Account',
+				'privilege_id'   => $id,
+				'privilege'      => $email_account['username'] . ' (' . $email_account['imap_host'] . ')',
+				'allowed'        => in_array( $id, $email_notifications['email_accounts'] ),
+			);
+		}
+
+		foreach ( $user_permissions['tags'] as $slug ) {
+			$tag                     = get_term_by( 'slug', $slug, 'sf_tags' );
+			$notification_settings[] = array(
+				'privilege_type' => 'tags',
+				'type'           => 'Tag',
+				'privilege_id'   => $slug,
+				'privilege'      => $tag->name . ' (' . $tag->slug . ')',
+				'allowed'        => in_array( $slug, $email_notifications['tags'] ),
+			);
+		}
+
+		return $notification_settings;
+	}
+
+	public function action_wp_ajax_set_email_notfication() {
+		check_ajax_referer( - 1, '_set_email_notfication_nonce' );
+
+		if ( ! isset( $_POST['privilege_type'] )
+			|| ! isset( $_POST['privilege_id'] )
+			|| ! isset( $_POST['allowed'] )
+			|| ! in_array( $_POST['privilege_type'], array( 'email_accounts', 'tags' ) )
+		) {
+			exit;
+		}
+
+		$privilege_type = $_POST['privilege_type'];
+		$privilege_id   = $_POST['privilege_id'];
+		$allowed        = 'true' == $_POST['allowed'] ? true : false;
+
+		echo $this->set_notfication_settings( $privilege_type, $privilege_id, $allowed );
+		exit;
+	}
+
+
+	public function set_notfication_settings( $privilege_type, $privilege_id, $allowed, $user_id = null ) {
+		// Get settings for current user if user not specified
+		if ( null == $user_id ) {
+			$user_id = get_current_user_id();
+		}
+
+		// Get tag/E-Mail account for which user already receive notifications
+		$email_notifications = get_user_meta( $user_id, 'sf_email_notifications', true );
+		if ( ! is_array( $email_notifications ) || empty( $email_notifications ) || ! is_array( $email_notifications['tags'] ) || ! is_array( $email_notifications['email_accounts'] ) ) {
+			$email_notifications = array( 'tags' => array(), 'email_accounts' => array() );
+		}
+
+		if ( true == $allowed ) {
+			if ( ! in_array( $privilege_id, $email_notifications[$privilege_type] ) ) {
+				$email_notifications[$privilege_type][] = (string) $privilege_id;
+				update_user_meta( $user_id, 'sf_email_notifications', $email_notifications );
+
+				return true;
+			}
+		} else {
+			if ( false !== ( $key = array_search( $privilege_id, $email_notifications[$privilege_type] ) ) ) {
+				unset( $email_notifications[$privilege_type][$key] );
+				update_user_meta( $user_id, 'sf_email_notifications', $email_notifications );
+
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+
+}
+
+SupportFlow()->extend->email_notifications = new SupportFlow_Email_Notifications();
\ No newline at end of file
diff --git a/supportflow.php b/supportflow.php
index 1084be1..7a29c65 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -218,6 +218,7 @@ private function includes() {
 		require_once( $this->plugin_dir . 'classes/class-supportflow-permissions.php' );
 		require_once( $this->plugin_dir . 'classes/class-supportflow-email-accounts.php' );
 		require_once( $this->plugin_dir . 'classes/class-supportflow-predefined-replies.php' );
+		require_once( $this->plugin_dir . 'classes/class-supportflow-email-notifications.php' );
 
 		/** Extensions ********************************************************/
 

From fa7f0be06983a9f15a2c55ed41537ee4e8790d84 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 23 Jun 2014 00:23:59 +0530
Subject: [PATCH 120/485] Implemented a combo box to override E-Mail
 notification settings of a thread

---
 classes/class-supportflow-admin.php | 37 +++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 186269d..b94a0b5 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -490,6 +490,37 @@ public function meta_box_details() {
 		wp_dropdown_users( $args );
 		echo '</div>';
 
+		// E-Mail notifications override
+		echo '<div class="misc-pub-section">';
+		echo '<label for="post_email_notifications_override">' . __( 'E-Mail Notification', 'supportflow' ) . ':</label>';
+		echo '<select name="post_email_notifications_override" id="post_email_notifications_override" class="">';
+
+		if ( 'post-new.php' == $pagenow ) {
+			echo '<option value="default">' . __( 'Default', 'supportflow' ) . '</option>';
+			echo '<option value="enable">' . __( 'Enabled', 'supportflow' ) . '</option>';
+			echo '<option value="disable">' . __( 'Disabled', 'supportflow' ) . '</option>';
+
+		} elseif ( 'post.php' == $pagenow ) {
+			$email_notifications_override = get_post_meta( get_the_ID(), 'email_notifications_override', true );
+			$current_user_id              = get_current_user_id();
+			$selected                     = 0;
+
+			if ( isset( $email_notifications_override[$current_user_id] ) ) {
+				$override_status = $email_notifications_override[$current_user_id];
+				if ( 'enable' == $override_status ) {
+					$selected = 1;
+				} elseif ( 'disable' == $override_status ) {
+					$selected = 2;
+				}
+			}
+
+			echo '<option value="default"' . selected( $selected, 0 ) . '>' . __( 'Default', 'supportflow' ) . '</option>';
+			echo '<option value="enable"' . selected( $selected, 1 ) . '>' . __( 'Enabled', 'supportflow' ) . '</option>';
+			echo '<option value="disable"' . selected( $selected, 2 ) . '>' . __( 'Disabled', 'supportflow' ) . '</option>';
+		}
+		echo '</select>';
+		echo '</div>';
+
 		echo '</div>'; // end div#misc-publishing-actions
 
 
@@ -831,6 +862,12 @@ public function action_save_post( $thread_id ) {
 			update_post_meta( $thread_id, 'email_account', $email_account );
 		}
 
+		if ( isset( $_POST['post_email_notifications_override'] ) && in_array( $_POST['post_email_notifications_override'], array( 'default', 'enable', 'disable' ) ) ) {
+			$email_notifications_override                        = get_post_meta( $thread_id, 'email_notifications_override', true );
+			$email_notifications_override[get_current_user_id()] = $_POST['post_email_notifications_override'];
+			update_post_meta( $thread_id, 'email_notifications_override', $email_notifications_override );
+		}
+
 		if ( isset( $_POST['reply'] ) && ! empty( $_POST['reply'] ) ) {
 			$reply      = wp_filter_nohtml_kses( $_POST['reply'] );
 			$visibility = ( ! empty( $_POST['mark-private'] ) ) ? 'private' : 'public';

From eb5a6101504e094d214dabe0063a525808cbdb76 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 23 Jun 2014 14:49:40 +0530
Subject: [PATCH 121/485] Allow retrieval of notification setting of all users
 at once

---
 .../class-supportflow-email-notifications.php | 113 +++++++++---------
 1 file changed, 59 insertions(+), 54 deletions(-)

diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 60d13b5..3ecabcd 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -84,7 +84,7 @@ public function tag_setting_page() {
 
 		<div id="email_notification_table">
 			<?php
-			$email_notifications_table = new SupportFlow_Email_Notifications_Table( $this->get_notifications_settings() );
+			$email_notifications_table = new SupportFlow_Email_Notifications_Table( $this->get_notifications_settings( get_current_user_id() ) );
 			$email_notifications_table->prepare_items();
 			$email_notifications_table->display();
 			?>
@@ -136,71 +136,76 @@ public function tag_setting_page() {
 
 	public function get_notifications_settings( $user_id = null ) {
 		// Get settings for current user if user not specified
-		if ( null == $user_id ) {
-			$user_id = get_current_user_id();
+		if ( 0 == $user_id || ! is_int( $user_id ) ) {
+			$users = get_users();
+		} else {
+			$users = array( get_userdata( $user_id ) );
 		}
 
 		// Load all tags and E-Mail accounts
-		$tags           = get_terms( 'sf_tags', 'hide_empty=0' );
-		$email_accounts = get_option( 'sf_email_accounts' );
+		$tags                  = get_terms( 'sf_tags', 'hide_empty=0' );
+		$email_accounts        = get_option( 'sf_email_accounts' );
+		$notification_settings = array();
 
 		// User is admin (has complete access to all tags, E-Mail account)
-		if ( current_user_can( 'manage_options' ) ) {
-
-			$permitted_tags = $permitted_email_accounts = array();
-
-			foreach ( $tags as $tag ) {
-				$permitted_tags[] = $tag->slug;
-			}
-			foreach ( $email_accounts as $id => $email_account ) {
-				$permitted_email_accounts[] = (string) $id;
+		foreach ( $users as $user ) {
+			if ( user_can( $user->ID, 'manage_options' ) ) {
+
+				$permitted_tags = $permitted_email_accounts = array();
+
+				foreach ( $tags as $tag ) {
+					$permitted_tags[] = $tag->slug;
+				}
+				foreach ( $email_accounts as $id => $email_account ) {
+					$permitted_email_accounts[] = (string) $id;
+				}
+				$user_permissions = array( 'tags' => $permitted_tags, 'email_accounts' => $permitted_email_accounts );
+				unset( $permitted_tags, $permitted_email_accounts );
+
+				// Allow user to show notifications settings of only tags/E-Mail account he is permitted
+			} else {
+				$user_permissions = get_user_meta( $user->ID, 'sf_permissions', true );
+				if ( ! is_array( $user_permissions ) || empty( $user_permissions ) || ! is_array( $user_permissions['tags'] ) || ! is_array( $user_permissions['email_accounts'] ) ) {
+					$user_permissions = array( 'tags' => array(), 'email_accounts' => array() );
+				}
 			}
-			$user_permissions = array( 'tags' => $permitted_tags, 'email_accounts' => $permitted_email_accounts );
-			unset( $permitted_tags, $permitted_email_accounts );
 
-			// Allow user to show notifications settings of only tags/E-Mail account he is permitted
-		} else {
-			$user_permissions = get_user_meta( $user_id, 'sf_permissions', true );
-			if ( ! is_array( $user_permissions ) || empty( $user_permissions ) || ! is_array( $user_permissions['tags'] ) || ! is_array( $user_permissions['email_accounts'] ) ) {
-				$user_permissions = array( 'tags' => array(), 'email_accounts' => array() );
-			}
-		}
 
-
-		// Get tag/E-Mail account for which user already receive notifications
-		$email_notifications = get_user_meta( $user_id, 'sf_email_notifications', true );
-		if ( ! is_array( $email_notifications ) || empty( $email_notifications ) || ! is_array( $email_notifications['tags'] ) || ! is_array( $email_notifications['email_accounts'] ) ) {
-			$email_notifications = array( 'tags' => array(), 'email_accounts' => array() );
-		}
+			// Get tag/E-Mail account for which user already receive notifications
+			$email_notifications = get_user_meta( $user->ID, 'sf_email_notifications', true );
+			if ( ! is_array( $email_notifications ) || empty( $email_notifications ) || ! is_array( $email_notifications['tags'] ) || ! is_array( $email_notifications['email_accounts'] ) ) {
+				$email_notifications = array( 'tags' => array(), 'email_accounts' => array() );
+			}
 
 
-		// Return exiting notifications settings of user
-		$notification_settings = array();
-		foreach ( $user_permissions['email_accounts'] as $id ) {
-			if ( empty( $email_accounts[$id] ) ) {
-				continue;
+			// Return exiting notifications settings of user
+			foreach ( $user_permissions['email_accounts'] as $id ) {
+				if ( empty( $email_accounts[$id] ) ) {
+					continue;
+				}
+				$email_account           = $email_accounts[$id];
+				$notification_settings[] = array(
+					'user_id'        => $user->ID,
+					'privilege_type' => 'email_accounts',
+					'type'           => 'E-Mail Account',
+					'privilege_id'   => $id,
+					'privilege'      => $email_account['username'] . ' (' . $email_account['imap_host'] . ')',
+					'allowed'        => in_array( $id, $email_notifications['email_accounts'] ),
+				);
 			}
-			$email_account           = $email_accounts[$id];
-			$notification_settings[] = array(
-				'privilege_type' => 'email_accounts',
-				'type'           => 'E-Mail Account',
-				'privilege_id'   => $id,
-				'privilege'      => $email_account['username'] . ' (' . $email_account['imap_host'] . ')',
-				'allowed'        => in_array( $id, $email_notifications['email_accounts'] ),
-			);
-		}
 
-		foreach ( $user_permissions['tags'] as $slug ) {
-			$tag                     = get_term_by( 'slug', $slug, 'sf_tags' );
-			$notification_settings[] = array(
-				'privilege_type' => 'tags',
-				'type'           => 'Tag',
-				'privilege_id'   => $slug,
-				'privilege'      => $tag->name . ' (' . $tag->slug . ')',
-				'allowed'        => in_array( $slug, $email_notifications['tags'] ),
-			);
+			foreach ( $user_permissions['tags'] as $slug ) {
+				$tag                     = get_term_by( 'slug', $slug, 'sf_tags' );
+				$notification_settings[] = array(
+					'user_id'        => $user->ID,
+					'privilege_type' => 'tags',
+					'type'           => 'Tag',
+					'privilege_id'   => $slug,
+					'privilege'      => $tag->name . ' (' . $tag->slug . ')',
+					'allowed'        => in_array( $slug, $email_notifications['tags'] ),
+				);
+			}
 		}
-
 		return $notification_settings;
 	}
 
@@ -226,7 +231,7 @@ public function action_wp_ajax_set_email_notfication() {
 
 	public function set_notfication_settings( $privilege_type, $privilege_id, $allowed, $user_id = null ) {
 		// Get settings for current user if user not specified
-		if ( null == $user_id ) {
+		if ( ! is_int( $user_id ) || 0 == $user_id ) {
 			$user_id = get_current_user_id();
 		}
 

From b33480061109ffbac2eeb72c789bfa3831695dba Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 23 Jun 2014 15:06:59 +0530
Subject: [PATCH 122/485] Allow retrieving only tag/E-Mail account for which
 user get notifications

---
 classes/class-supportflow-email-notifications.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 3ecabcd..c8962d5 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -134,7 +134,7 @@ public function tag_setting_page() {
 
 	}
 
-	public function get_notifications_settings( $user_id = null ) {
+	public function get_notifications_settings( $user_id = null, $allowed_only = false ) {
 		// Get settings for current user if user not specified
 		if ( 0 == $user_id || ! is_int( $user_id ) ) {
 			$users = get_users();
@@ -180,7 +180,10 @@ public function get_notifications_settings( $user_id = null ) {
 
 			// Return exiting notifications settings of user
 			foreach ( $user_permissions['email_accounts'] as $id ) {
-				if ( empty( $email_accounts[$id] ) ) {
+				if (
+					( empty( $email_accounts[$id] ) ) ||
+					( ! in_array( $id, $email_notifications['email_accounts'] ) && $allowed_only )
+				) {
 					continue;
 				}
 				$email_account           = $email_accounts[$id];
@@ -195,6 +198,9 @@ public function get_notifications_settings( $user_id = null ) {
 			}
 
 			foreach ( $user_permissions['tags'] as $slug ) {
+				if ( ! in_array( $slug, $email_notifications['tags'] ) && $allowed_only ) {
+					continue;
+				}
 				$tag                     = get_term_by( 'slug', $slug, 'sf_tags' );
 				$notification_settings[] = array(
 					'user_id'        => $user->ID,

From 338e0a02bba2d6b0a06cccf6486802aa55ca8e6c Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 24 Jun 2014 22:36:54 +0530
Subject: [PATCH 123/485] Send E-Mail reply notifications to only users who
 subscribed for them

---
 .../class-supportflow-email-notifications.php | 40 +++++++++++++++++++
 classes/class-supportflow-emails.php          |  5 ++-
 2 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index c8962d5..473ecfc 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -266,6 +266,46 @@ public function set_notfication_settings( $privilege_type, $privilege_id, $allow
 		return false;
 	}
 
+	/**
+	 * Get user id of all the users that will receive e-mail notifications for a thread reply
+	 * @param type $thread_id
+	 * @return type array
+	 */
+	public function get_notified_user( $thread_id ) {
+		$tags                         = wp_get_post_terms( $thread_id, 'sf_tags', array( 'fields' => 'slugs' ) );
+		$email_account                = get_post_meta( $thread_id, 'email_account', true );
+		$email_notifications_override = get_post_meta( $thread_id, 'email_notifications_override', true );
+
+		$notifications_settings = $this->get_notifications_settings( null, true );
+
+		$allowed_users = array();
+		foreach ( $notifications_settings as $notifications_setting ) {
+			if ( in_array( $notifications_setting['user_id'], $allowed_users ) ) {
+				continue;
+			}
+			if ( 'tags' == $notifications_setting['privilege_type'] ) {
+				$user_notified = in_array( $notifications_setting['privilege_id'], $tags );
+			} elseif ( 'email_accounts' == $notifications_setting['privilege_type'] ) {
+				$user_notified = $email_account == $notifications_setting['privilege_id'];
+			}
+
+			if ( $user_notified ) {
+				$allowed_users[] = $notifications_setting['user_id'];
+			}
+		}
+
+		foreach ( $email_notifications_override as $user_id => $status ) {
+			if ( 'disable' == $status && in_array( $user_id, $allowed_users ) ) {
+				unset( $allowed_users[array_search( $user_id, $allowed_users )] );
+			}
+			if ( 'enable' == $status && ! in_array( $user_id, $allowed_users ) ) {
+				$allowed_users[] = $user_id;
+			}
+
+		}
+
+		return $allowed_users;
+	}
 
 }
 
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 3206d8d..558dfb1 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -36,7 +36,8 @@ public function notify_agents_thread_replies( $reply_id ) {
 
 		$thread = SupportFlow()->get_thread( $reply->post_parent );
 		// One agent by default, but easily allow notifications to a triage team
-		$agent_ids = apply_filters( 'supportflow_emails_notify_agent_ids', array( $thread->post_author ), $thread, 'reply' );
+		$agent_ids = SupportFlow()->extend->email_notifications->get_notified_user( get_the_ID() );
+		$agent_ids = apply_filters( 'supportflow_emails_notify_agent_ids', $agent_ids, $thread, 'reply' );
 
 		$email_accounts   = get_option( 'sf_email_accounts' );
 		$email_account_id = get_post_meta( $thread->ID, 'email_account', true );
@@ -55,7 +56,7 @@ public function notify_agents_thread_replies( $reply_id ) {
 
 		// Don't email the person adding the reply, unless that's desired behavior
 		if ( ! apply_filters( 'supportflow_emails_notify_creator', false, 'reply' ) ) {
-			$key = array_search( get_post_meta( $reply->ID, 'reply_author_email' ), $agent_emails );
+			$key = array_search( get_post_meta( $reply->ID, 'reply_author_email' , true ), $agent_emails );
 			if ( false !== $key ) {
 				unset( $agent_emails[$key] );
 			}

From 3abd44ef853750715e8881cd0236d16fd32ced91 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 26 Jun 2014 01:21:30 +0530
Subject: [PATCH 124/485] Renamed tag_setting_page() method to
 notification_setting_page()

---
 classes/class-supportflow-email-notifications.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 473ecfc..d1c963b 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -72,12 +72,12 @@ public function action_admin_menu() {
 			__( 'E-Mail Notifications', 'supportflow' ),
 			'read',
 			$this->slug,
-			array( $this, 'tag_setting_page' )
+			array( $this, 'notification_setting_page' )
 		);
 
 	}
 
-	public function tag_setting_page() {
+	public function notification_setting_page() {
 		?>
 		<div class="wrap">
 		<h2><?php _e( 'E-Mail Notifications', 'supportflow' ) ?></h2><br />

From c8183f58fe5d3e0a59d6ce5a765c34a8f86c1818 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 26 Jun 2014 01:28:35 +0530
Subject: [PATCH 125/485] Using labels for form elements

---
 classes/class-supportflow-email-notifications.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index d1c963b..45f66c7 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -19,13 +19,13 @@ function __construct( $notification_settings ) {
 		parent::__construct( array( 'screen' => 'sf_user_email_notifications_table' ) );
 
 		$this->_data = array();
-		foreach ( $notification_settings as $notification_setting ) {
+		foreach ( $notification_settings as $id => $notification_setting ) {
 			$identfier = json_encode( array(
 				'privilege_type' => $notification_setting['privilege_type'],
 				'privilege_id'   => $notification_setting['privilege_id'],
 			) );
-			$status    = "<input type='checkbox' class='toggle_privilege' data-email-notfication-identifier='" . $identfier . "' " . checked( $notification_setting['allowed'], true, false ) . '>';
-			$status .= " <span class='privilege_status'> " . ( $notification_setting['allowed'] ? 'Allowed' : 'Not allowed' ) . "</span>";
+			$status    = "<input type='checkbox' id='permission_$id' class='toggle_privilege' data-email-notfication-identifier='" . $identfier . "' " . checked( $notification_setting['allowed'], true, false ) . '>';
+			$status .= " <label for='permission_$id' class='privilege_status'> " . ( $notification_setting['allowed'] ? 'Allowed' : 'Not allowed' ) . "</label>";
 			$this->_data[] = array(
 				'status'    => $status,
 				'privilege' => esc_html( $notification_setting['privilege'] ),
@@ -212,6 +212,7 @@ public function get_notifications_settings( $user_id = null, $allowed_only = fal
 				);
 			}
 		}
+
 		return $notification_settings;
 	}
 
@@ -268,7 +269,9 @@ public function set_notfication_settings( $privilege_type, $privilege_id, $allow
 
 	/**
 	 * Get user id of all the users that will receive e-mail notifications for a thread reply
+	 *
 	 * @param type $thread_id
+	 *
 	 * @return type array
 	 */
 	public function get_notified_user( $thread_id ) {
@@ -309,4 +312,4 @@ public function get_notified_user( $thread_id ) {
 
 }
 
-SupportFlow()->extend->email_notifications = new SupportFlow_Email_Notifications();
\ No newline at end of file
+SupportFlow()->extend->email_notifications = new SupportFlow_Email_Notifications();  
\ No newline at end of file

From e0c66b21ba749c56ab65d5b7311d80e5958c282a Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 26 Jun 2014 01:33:35 +0530
Subject: [PATCH 126/485] Disable checkbox while AJAX request is processed

---
 .../class-supportflow-email-notifications.php | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 45f66c7..4824c2b 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -94,12 +94,16 @@ public function notification_setting_page() {
 
 				jQuery(document).on('change', '.toggle_privilege', function () {
 					var checkbox = jQuery(this);
+					var checkbox_label = checkbox.siblings('.privilege_status');
 					var email_notfication_identifier = checkbox.data('email-notfication-identifier');
 
 					var allowed = checkbox.prop('checked');
 					var privilege_type = email_notfication_identifier.privilege_type;
 					var privilege_id = email_notfication_identifier.privilege_id;
 
+					checkbox_label.html('Changing status, please wait.');
+					checkbox.prop('disabled', true);
+
 					jQuery.ajax(ajaxurl, {
 						type   : 'post',
 						data   : {
@@ -109,23 +113,25 @@ public function notification_setting_page() {
 							allowed                     : allowed,
 							_set_email_notfication_nonce: '<?php echo wp_create_nonce() ?>',
 						},
-						success: function (content) {
-							if (1 == content) {
-								var allowed = checkbox.prop('checked');
-								if (true == allowed) {
-									checkbox.siblings('.privilege_status').html('Allowed');
-								} else {
-									checkbox.siblings('.privilege_status').html('Not allowed');
-								}
-							} else {
+						success : function (content) {
+							if (1 != content) {
 								checkbox.prop('checked', !checkbox.prop('checked'));
 								alert('Failed changing state. Old state is reverted');
 							}
 						},
-						error  : function () {
+						error   : function () {
 							checkbox.prop('checked', !checkbox.prop('checked'));
 							alert('Failed changing state. Old state is reverted');
 						},
+						complete: function() {
+							var allowed = checkbox.prop('checked');
+							if (true == allowed) {
+								checkbox_label.html('Allowed');
+							} else {
+								checkbox_label.html('Not Allowed');
+							}
+							checkbox.prop('disabled', false);
+						},
 					});
 				});
 			});
@@ -312,4 +318,4 @@ public function get_notified_user( $thread_id ) {
 
 }
 
-SupportFlow()->extend->email_notifications = new SupportFlow_Email_Notifications();  
\ No newline at end of file
+SupportFlow()->extend->email_notifications = new SupportFlow_Email_Notifications();
\ No newline at end of file

From c66f3d44fb57df31e1a6f99c2278dcf0844f6997 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 26 Jun 2014 01:37:55 +0530
Subject: [PATCH 127/485] Adding support for I18n in e-mail notification
 setting page

---
 classes/class-supportflow-email-notifications.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 4824c2b..1a222f3 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -25,7 +25,7 @@ function __construct( $notification_settings ) {
 				'privilege_id'   => $notification_setting['privilege_id'],
 			) );
 			$status    = "<input type='checkbox' id='permission_$id' class='toggle_privilege' data-email-notfication-identifier='" . $identfier . "' " . checked( $notification_setting['allowed'], true, false ) . '>';
-			$status .= " <label for='permission_$id' class='privilege_status'> " . ( $notification_setting['allowed'] ? 'Allowed' : 'Not allowed' ) . "</label>";
+			$status .= " <label for='permission_$id' class='privilege_status'> " . __( $notification_setting['allowed'] ? 'Allowed' : 'Not allowed', 'supportflow' ) . "</label>";
 			$this->_data[] = array(
 				'status'    => $status,
 				'privilege' => esc_html( $notification_setting['privilege'] ),
@@ -101,7 +101,7 @@ public function notification_setting_page() {
 					var privilege_type = email_notfication_identifier.privilege_type;
 					var privilege_id = email_notfication_identifier.privilege_id;
 
-					checkbox_label.html('Changing status, please wait.');
+					checkbox_label.html('<?php _e( 'Changing status, please wait.', 'supportflow' ) ?>');
 					checkbox.prop('disabled', true);
 
 					jQuery.ajax(ajaxurl, {
@@ -116,19 +116,19 @@ public function notification_setting_page() {
 						success : function (content) {
 							if (1 != content) {
 								checkbox.prop('checked', !checkbox.prop('checked'));
-								alert('Failed changing state. Old state is reverted');
+								alert('<?php _e( 'Failed changing state. Old state is reverted', 'supportflow' ) ?>');
 							}
 						},
 						error   : function () {
 							checkbox.prop('checked', !checkbox.prop('checked'));
-							alert('Failed changing state. Old state is reverted');
+							alert('<?php _e( 'Failed changing state. Old state is reverted', 'supportflow' ) ?>');
 						},
 						complete: function() {
 							var allowed = checkbox.prop('checked');
 							if (true == allowed) {
-								checkbox_label.html('Allowed');
+								checkbox_label.html('<?php _e( 'Allowed', 'supportflow' ) ?>');
 							} else {
-								checkbox_label.html('Not Allowed');
+								checkbox_label.html('<?php _e( 'Not Allowed', 'supportflow' ) ?>');
 							}
 							checkbox.prop('disabled', false);
 						},
@@ -318,4 +318,4 @@ public function get_notified_user( $thread_id ) {
 
 }
 
-SupportFlow()->extend->email_notifications = new SupportFlow_Email_Notifications();
\ No newline at end of file
+SupportFlow()->extend->email_notifications = new SupportFlow_Email_Notifications();

From 4801dfcb193135a71f32b6b47c7236b2bdfa1235 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 26 Jun 2014 01:39:28 +0530
Subject: [PATCH 128/485] Corrected WP coding standards

---
 classes/class-supportflow-email-notifications.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 1a222f3..f38a26e 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -105,8 +105,8 @@ public function notification_setting_page() {
 					checkbox.prop('disabled', true);
 
 					jQuery.ajax(ajaxurl, {
-						type   : 'post',
-						data   : {
+						type    : 'post',
+						data    : {
 							action                      : 'set_email_notfication',
 							privilege_type              : privilege_type,
 							privilege_id                : privilege_id,
@@ -123,7 +123,7 @@ public function notification_setting_page() {
 							checkbox.prop('checked', !checkbox.prop('checked'));
 							alert('<?php _e( 'Failed changing state. Old state is reverted', 'supportflow' ) ?>');
 						},
-						complete: function() {
+						complete: function () {
 							var allowed = checkbox.prop('checked');
 							if (true == allowed) {
 								checkbox_label.html('<?php _e( 'Allowed', 'supportflow' ) ?>');

From f4c7a6448c337c21c7911c48c6ef277936026f09 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 26 Jun 2014 01:53:56 +0530
Subject: [PATCH 129/485] Added inline comments to method

---
 .../class-supportflow-email-notifications.php | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index f38a26e..5cfac0a 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -77,6 +77,9 @@ public function action_admin_menu() {
 
 	}
 
+	/**
+	 * Loads the page to change E-Mail notfication settings
+	 */
 	public function notification_setting_page() {
 		?>
 		<div class="wrap">
@@ -140,6 +143,12 @@ public function notification_setting_page() {
 
 	}
 
+	/**
+	 * Get E-Mail notification setting of a user(s) in an array
+	 * @param integer $user_id
+	 * @param boolean $allowed_only
+	 * @return array
+	 */
 	public function get_notifications_settings( $user_id = null, $allowed_only = false ) {
 		// Get settings for current user if user not specified
 		if ( 0 == $user_id || ! is_int( $user_id ) ) {
@@ -222,6 +231,9 @@ public function get_notifications_settings( $user_id = null, $allowed_only = fal
 		return $notification_settings;
 	}
 
+	/**
+	 * AJAX request to change user E-Mail notification settings
+	 */
 	public function action_wp_ajax_set_email_notfication() {
 		check_ajax_referer( - 1, '_set_email_notfication_nonce' );
 
@@ -241,7 +253,14 @@ public function action_wp_ajax_set_email_notfication() {
 		exit;
 	}
 
-
+	/**
+	 * Change E-Mail notification of a user for particular tag/E-Mail account
+	 * @param string $privilege_type
+	 * @param int $privilege_id
+	 * @param boolean $allowed
+	 * @param int $user_id
+	 * @return boolean
+	 */
 	public function set_notfication_settings( $privilege_type, $privilege_id, $allowed, $user_id = null ) {
 		// Get settings for current user if user not specified
 		if ( ! is_int( $user_id ) || 0 == $user_id ) {

From 612744aed292a8d76ee82575982868b6f46b76bc Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 26 Jun 2014 02:06:21 +0530
Subject: [PATCH 130/485] Created a short describing use of E-Mail notification
 setting page to end user

---
 classes/class-supportflow-email-notifications.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 5cfac0a..fcc44b3 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -83,7 +83,8 @@ public function action_admin_menu() {
 	public function notification_setting_page() {
 		?>
 		<div class="wrap">
-		<h2><?php _e( 'E-Mail Notifications', 'supportflow' ) ?></h2><br />
+		<h2><?php _e( 'E-Mail Notifications', 'supportflow' ) ?></h2>
+		<p><?php _e( 'Please check the tags/E-Mail accounts for which you want to receive E-Mail notifications of replies. You will be able to override E-Mail notifications settings for individual threads.', 'supportflow' ) ?></p>
 
 		<div id="email_notification_table">
 			<?php

From 04b2db970bf263e20a95eef2d9f921726c803cb5 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 26 Jun 2014 02:28:23 +0530
Subject: [PATCH 131/485] Showing labels properly in Details meta box in thread
 page

---
 css/admin.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/css/admin.css b/css/admin.css
index f90b4d6..b537967 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -54,7 +54,6 @@
 }
 
 #supportflow-details #misc-publishing-actions label {
-	width:   50px;
 	display: inline-block;
 }
 

From c7c386294c7afc2d532737ecc7d80b90e95e3907 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 5 Jun 2014 04:05:28 +0530
Subject: [PATCH 132/485] Updated plupload to newer version and finished
 frontend part

---
 classes/class-supportflow-admin.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index b94a0b5..6bab578 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -64,14 +64,13 @@ public function action_admin_enqueue_scripts() {
 			wp_enqueue_script( 'supportflow-thread_attachments', SupportFlow()->plugin_url . 'js/thread_attachments.js', array( 'wp-plupload', 'jquery' ) );
 			wp_enqueue_script( 'supportflow-respondents-autocomplete', SupportFlow()->plugin_url . 'js/respondents-autocomplete.js', array( 'jquery', 'jquery-ui-autocomplete' ) );
 			$ajaxurl = add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) );
-
-			wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
-			wp_localize_script( 'supportflow-thread_attachments', 'SFThreadAttachments', array(
-				'uploading'        => __( 'Uploading: ', 'supportflow' ),
-				'failed_uploading' => __( 'Failed uploading: ', 'supportflow' ),
-				'uploaded'         => __( 'Uploaded: ', 'supportflow' )
-			) );
 		}
+		wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
+		wp_localize_script( 'supportflow-thread_attachments', 'SFThreadAttachments', array(
+			'uploading'        => __( 'Uploading: ', 'supportflow' ),
+			'failed_uploading' => __( 'Failed uploading: ', 'supportflow' ),
+			'uploaded'         => __( 'Uploaded: ', 'supportflow' )
+		) );
 	}
 
 	/**

From 1bed5b0675d3a1224908a9f25ca513e8d2bb10d3 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 25 Jun 2014 06:13:32 +0530
Subject: [PATCH 133/485] Using WP time constants to denote time period

---
 supportflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index 7a29c65..5963d44 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -815,7 +815,7 @@ function SupportFlow() {
 
 add_filter( 'cron_schedules', function ( $schedules ) {
 	$schedules['five_minutes'] = array(
-		'interval' => 300,
+		'interval' => 5 * MINUTE_IN_SECONDS,
 		'display'  => __( 'Five Minutes', 'supportflow' )
 	);
 

From ee39e58d65ceeae668843e66805c05489fbb8af2 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 25 Jun 2014 06:19:21 +0530
Subject: [PATCH 134/485] Refactored `if` condition

---
 classes/class-supportflow-email-replies.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 10df88f..49b014e 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -107,7 +107,7 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 			foreach ( $email->structure->parts as $email_part ) {
 
 				// We should at least be dealing with something that resembles an email object at this point
-				if ( ! isset( $email_part->disposition ) || ! isset( $email_part->subtype ) || ! isset( $email_part->dparameters[0]->value ) ) {
+				if ( ! isset( $email_part->disposition, $email_part->subtype, $email_part->dparameters[0]->value ) ) {
 					continue;
 				}
 

From 83df05407b4ae48db7ea89fda579dce327ef2464 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 26 Jun 2014 00:57:45 +0530
Subject: [PATCH 135/485] Using WP media uploader to add attachments rather
 accessing plupload directly

---
 classes/class-supportflow-admin.php | 60 ++++---------------------
 js/thread_attachments.js            | 68 ++++++++++++++++++-----------
 2 files changed, 52 insertions(+), 76 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 6bab578..e2af8dd 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -61,60 +61,18 @@ public function action_admin_enqueue_scripts() {
 
 		wp_enqueue_style( 'supportflow-admin', SupportFlow()->plugin_url . 'css/admin.css', array(), SupportFlow()->version );
 		if ( 'post.php' == $pagenow || 'post-new.php' == $pagenow ) {
-			wp_enqueue_script( 'supportflow-thread_attachments', SupportFlow()->plugin_url . 'js/thread_attachments.js', array( 'wp-plupload', 'jquery' ) );
+			wp_enqueue_media();
+
+			wp_enqueue_script( 'supportflow-thread-attachments', SupportFlow()->plugin_url . 'js/thread_attachments.js', array( 'jquery' ) );
 			wp_enqueue_script( 'supportflow-respondents-autocomplete', SupportFlow()->plugin_url . 'js/respondents-autocomplete.js', array( 'jquery', 'jquery-ui-autocomplete' ) );
 			$ajaxurl = add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) );
-		}
-		wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
-		wp_localize_script( 'supportflow-thread_attachments', 'SFThreadAttachments', array(
-			'uploading'        => __( 'Uploading: ', 'supportflow' ),
-			'failed_uploading' => __( 'Failed uploading: ', 'supportflow' ),
-			'uploaded'         => __( 'Uploaded: ', 'supportflow' )
-		) );
-	}
-
-	/**
-	 * Sets up Plupload settings so we can upload media
-	 */
-	private function add_plupload_settings( $js_var_name, $plupload_args = array() ) {
-
-		global $wp_scripts;
-
-		$plupload_default_settings = array(
-			'runtimes'            => 'html5,silverlight,flash,html4',
-			'file_data_name'      => 'async-upload',
-			'multiple_queues'     => true,
-			'max_file_size'       => wp_max_upload_size(),
-			'url'                 => admin_url( 'admin-ajax.php' ),
-			'flash_swf_url'       => includes_url( 'js/plupload/plupload.flash.swf' ),
-			'silverlight_xap_url' => includes_url( 'js/plupload/plupload.silverlight.xap' ),
-			'filters'             => array( array( 'title' => __( 'Allowed Files' ), 'extensions' => '*' ) ),
-			'multipart'           => true,
-			'urlstream_upload'    => true,
-			'browse_button'       => '',
-			'container'           => '',
-			'drop_element'        => '',
-			'multipart_params'    => array(
-				'_ajax_nonce' => '',
-				'action'      => '',
-			),
-		);
 
-		$plupload_args = array_replace( $plupload_default_settings, $plupload_args );
-		echo "<script type='text/javascript'>var $js_var_name = " . json_encode( $plupload_args ) . ";</script>";
-	}
-
-	public function action_wp_ajax_thread_attachment_upload() {
-		check_ajax_referer( 'thread_attachment_upload' );
-		$attachment_id  = media_handle_upload( 'async-upload', 0 );
-		$attachment_url = wp_get_attachment_url( $attachment_id );
-
-		echo json_encode( array(
-			'id'  => $attachment_id,
-			'url' => $attachment_url,
-		) );
-
-		exit;
+			wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
+			wp_localize_script( 'supportflow-thread-attachments', 'SFThreadAttachments', array(
+				'frame_title'  => __( 'Select files', 'supportflow' ),
+				'button_title' => __( 'Insert as attachment', 'supportflow' ),
+			) );
+		}
 	}
 
 	/**
diff --git a/js/thread_attachments.js b/js/thread_attachments.js
index 54304c6..43346bd 100644
--- a/js/thread_attachments.js
+++ b/js/thread_attachments.js
@@ -1,25 +1,43 @@
-jQuery(document).ready(function () {
-
-	var sf_thread_attachment_uploader = new plupload.Uploader(sf_thread_attachment_plupload_settings);
-	sf_thread_attachment_uploader.init();
-
-	sf_thread_attachment_uploader.bind('FilesAdded', function (uploader, files) {
-		plupload.each(files, function (file) {
-			jQuery('#replies-attachments-list').append('<li id="reply-attachment-' + file.id + '">' + SFThreadAttachments.uploading + file.name + '</li>');
-		});
-
-		uploader.refresh();
-		uploader.start();
-	});
-
-	sf_thread_attachment_uploader.bind('FileUploaded', function (uploader, file, response) {
-		if (null == response.response || 0 == response.response) {
-			jQuery('#reply-attachment-' + file.id).html('<li>' + SFThreadAttachments.failed_uploading + file.name + '</li>');
-		} else {
-			var attachment = jQuery.parseJSON(response.response);
-			jQuery('#reply-attachment-' + file.id).html('<li>' + SFThreadAttachments.uploaded + '<a target="_blank" href="' + attachment.url + '">' + file.name + '</a></li>');
-			jQuery('#reply-attachments').val(jQuery('#reply-attachments').val() + attachment.id + ',');
-		}
-	});
-
-});
+jQuery(document).ready(function ($) {
+
+	attachment_uploader = {
+		// Initialization
+		init    : function () {
+			// Setup variables
+			if (undefined == attachment_uploader.events_registered)
+				attachment_uploader.events_registered = false;
+
+			// Register event handlers. Avoid doing it when the widget re-initializes because that would cause multiple modals to open when the button is clicked, etc
+			if (!attachment_uploader.events_registered) {
+				$(document).on('click', '#reply-attachment-browse-button', {}, attachment_uploader.uploader);
+				attachment_uploader.events_registered = true;
+			}
+		},
+
+		// Call this from the upload button to initiate the upload frame.
+		uploader: function (event) {
+			var frame = wp.media({
+				title   : SFThreadAttachments.frame_title,
+				multiple: true,
+				button  : { text: SFThreadAttachments.button_title },
+			});
+
+			// Handle results from media manager.
+			frame.on('close', function () {
+				var attachments = frame.state().get('selection').toJSON();
+				jQuery.each(attachments, function () {
+					jQuery('#replies-attachments-list').append('<li>' + '<a target="_blank" href="' + this.url + '">' + this.filename + '</a></li>');
+					jQuery('#reply-attachments').val(jQuery('#reply-attachments').val() + this.id + ',');
+				});
+			});
+
+			frame.open();
+			return false;
+		},
+
+
+	};
+
+	attachment_uploader.init();
+
+});
\ No newline at end of file

From b3a8c3121b36ac36832339d7150a9f04ab49b593 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 26 Jun 2014 02:57:06 +0530
Subject: [PATCH 136/485] Removed check for events_registered as it is not
 required

---
 js/thread_attachments.js | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/js/thread_attachments.js b/js/thread_attachments.js
index 43346bd..eae615d 100644
--- a/js/thread_attachments.js
+++ b/js/thread_attachments.js
@@ -3,15 +3,7 @@ jQuery(document).ready(function ($) {
 	attachment_uploader = {
 		// Initialization
 		init    : function () {
-			// Setup variables
-			if (undefined == attachment_uploader.events_registered)
-				attachment_uploader.events_registered = false;
-
-			// Register event handlers. Avoid doing it when the widget re-initializes because that would cause multiple modals to open when the button is clicked, etc
-			if (!attachment_uploader.events_registered) {
-				$(document).on('click', '#reply-attachment-browse-button', {}, attachment_uploader.uploader);
-				attachment_uploader.events_registered = true;
-			}
+			$(document).on('click', '#reply-attachment-browse-button', {}, attachment_uploader.uploader);
 		},
 
 		// Call this from the upload button to initiate the upload frame.

From 9eef733b8653469fd2f7caf104da3fd98b1571f6 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 26 Jun 2014 03:33:44 +0530
Subject: [PATCH 137/485] Corrected phpmailer SMTPSecure parameter

---
 classes/class-supportflow-emails.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 558dfb1..047060c 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -164,7 +164,7 @@ public function action_set_smtp_settings( $phpmailer ) {
 		$phpmailer->IsSMTP();
 		$phpmailer->Host       = $this->smtp_account['smtp_host'];
 		$phpmailer->Port       = (int) $this->smtp_account['smtp_port'];
-		$phpmailer->SMTPSecure = $this->smtp_account['smtp_ssl'] ? 'smtp_ssl' : '';
+		$phpmailer->SMTPSecure = $this->smtp_account['smtp_ssl'] ? 'ssl' : '';
 		$phpmailer->Username   = $this->smtp_account['username'];
 		$phpmailer->Password   = $this->smtp_account['password'];
 		$phpmailer->SMTPAuth   = true;

From 1b84367aa9d9c4ac0948d26745e2a66aaf2ef928 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 27 Jun 2014 02:11:30 +0530
Subject: [PATCH 138/485] Removed unrequired JSON API's

JSON API will be included by default in WordPress 4.1
---
 classes/class-supportflow-json-api.php | 61 --------------------------
 1 file changed, 61 deletions(-)

diff --git a/classes/class-supportflow-json-api.php b/classes/class-supportflow-json-api.php
index d7821e9..bfcbf60 100644
--- a/classes/class-supportflow-json-api.php
+++ b/classes/class-supportflow-json-api.php
@@ -14,8 +14,6 @@ public function setup_actions() {
 
 	public function action_wp_ajax_supportflow_json() {
 
-		$current_user = wp_get_current_user();
-
 		$response = array(
 			'api-action' => ( ! empty( $_REQUEST['api-action'] ) ) ? sanitize_key( $_REQUEST['api-action'] ) : '',
 			'status'     => 'error',
@@ -23,37 +21,6 @@ public function action_wp_ajax_supportflow_json() {
 			'html'       => '',
 		);
 		switch ( $response['api-action'] ) {
-
-			case 'create-thread':
-
-				$thread_args = array(
-					'subject' => sanitize_text_field( $_REQUEST['subject'] ),
-					'message' => wp_filter_nohtml_kses( $_REQUEST['message'] ),
-				);
-				if ( ! empty( $_REQUEST['respondent_email'] ) && is_email( $_REQUEST['respondent_email'] ) ) {
-					$thread_args['respondent_email'] = sanitize_email( $_REQUEST['respondent_email'] );
-					if ( ! empty( $_REQUEST['respondent_name'] ) ) {
-						$thread_args['respondent_name'] = sanitize_text_field( $_REQUEST['respondent_name'] );
-					}
-				} else {
-					$thread_args['respondent_email'] = $current_user->user_email;
-					$thread_args['respondent_name']  = $current_user->display_name;
-					$thread_args['respondent_id']    = $current_user->ID;
-				}
-
-				$thread_id = SupportFlow()->create_thread( $thread_args );
-				if ( is_wp_error( $thread_id ) ) {
-					$response['message'] = $thread_id->get_error_message();
-				} else {
-					$response['status']    = 'ok';
-					$response['thread_id'] = $thread_id;
-				}
-				break;
-
-			case 'get-respondent-threads':
-
-				break;
-
 			case 'get-respondents':
 				$search_for         = sanitize_text_field( $_REQUEST['respondents'] );
 				$respondent_matches = SupportFlow()->get_respondents( array( 'search' => $search_for ) );
@@ -67,34 +34,6 @@ public function action_wp_ajax_supportflow_json() {
 
 				break;
 
-			case 'get-thread':
-				$thread_id             = (int) $_REQUEST['thread_id'];
-				$response['status']    = 'ok';
-				$response['thread_id'] = $thread_id;
-				break;
-			case 'add-thread-reply':
-				$thread_id  = (int) $_REQUEST['thread_id'];
-				$message    = wp_filter_nohtml_kses( $_REQUEST['message'] );
-				$reply_args = array();
-				if ( ! empty( $_REQUEST['reply_author_email'] ) && is_email( $_REQUEST['reply_author_email'] ) ) {
-					$reply_args['reply_author_email'] = sanitize_email( $_REQUEST['reply_author_email'] );
-					if ( ! empty( $_REQUEST['reply_author'] ) ) {
-						$reply_args['reply_author'] = sanitize_text_field( $_REQUEST['reply_author'] );
-					}
-				} else {
-					$reply_args['reply_author_email'] = $current_user->user_email;
-					$reply_args['reply_author']       = $current_user->display_name;
-					$reply_args['user_id']            = $current_user->ID;
-				}
-				$reply_id = SupportFlow()->add_thread_reply( $thread_id, $message );
-				if ( is_wp_error( $reply_id ) ) {
-					$response['message'] = $reply_id->get_error_message();
-				} else {
-					$response['status']    = 'ok';
-					$response['thread_id'] = $thread_id;
-					$response['reply_id']  = $reply_id;
-				}
-				break;
 			default:
 				$response['message'] = __( "There's no API method registered under that action.", 'supportflow' );
 				break;

From 5efa83dc5e613e7509cabf23c0e4cbf5560427e3 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 27 Jun 2014 02:18:29 +0530
Subject: [PATCH 139/485] Checking presence of ['respondents'] before using it

---
 classes/class-supportflow-json-api.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-json-api.php b/classes/class-supportflow-json-api.php
index bfcbf60..7a2aa54 100644
--- a/classes/class-supportflow-json-api.php
+++ b/classes/class-supportflow-json-api.php
@@ -22,7 +22,7 @@ public function action_wp_ajax_supportflow_json() {
 		);
 		switch ( $response['api-action'] ) {
 			case 'get-respondents':
-				$search_for         = sanitize_text_field( $_REQUEST['respondents'] );
+				$search_for         = sanitize_text_field( isset($_REQUEST['respondents']) ? $_REQUEST['respondents'] : '' );
 				$respondent_matches = SupportFlow()->get_respondents( array( 'search' => $search_for ) );
 				if ( is_wp_error( $respondent_matches ) ) {
 					$response['message'] = $respondent_matches->get_error_message();

From 61d41089a0009fa1719b22166abd644f0b5a051f Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 27 Jun 2014 02:49:08 +0530
Subject: [PATCH 140/485] Removed a todo comment as feature is already
 implemented

---
 classes/class-supportflow-admin.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index e2af8dd..e576df6 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -329,8 +329,6 @@ public function filter_posts_search( $posts_search ) {
 
 	/**
 	 * Handle $_GET actions in the admin
-	 *
-	 * @todo need a caps check too to make sure this user can edit the thread
 	 */
 	function handle_action_change_status() {
 

From c96544b186df1334a2429bdf257441dc37c60f0b Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 27 Jun 2014 02:58:17 +0530
Subject: [PATCH 141/485] Not accessing arrays directly returned from a
 function

---
 classes/class-supportflow-admin.php          | 3 ++-
 classes/class-supportflow-email-accounts.php | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index e2af8dd..b9f4c98 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -422,7 +422,8 @@ public function meta_box_details() {
 			echo '<div class="misc-pub-section">';
 			echo '<label for="post_email_account">' . __( 'Account', 'supportflow' ) . ':</label>';
 			echo '<select id="post_email_account" name="post_email_account">';
-			$user_permissions = get_user_meta( get_current_user_id(), 'sf_permissions', true )['email_accounts'];
+			$user_permissions = get_user_meta( get_current_user_id(), 'sf_permissions', true );
+			$user_permissions = $user_permissions['email_accounts'];
 			foreach ( $email_accounts as $id => $email_account ) {
 				if ( empty( $email_account ) || ( ! current_user_can( 'manage_options' ) && ! in_array( $id, $user_permissions ) ) ) {
 					continue;
diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 4179b8d..1c73c58 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -326,7 +326,8 @@ function add_email_account( $imap_host, $imap_port, $imap_ssl, $smtp_host, $smtp
 			if ( $imap_stream = imap_open( $mailbox, $username, $password, 0, 0 ) ) {
 				imap_close( $imap_stream );
 			} else {
-				$error = imap_errors()[0];
+				$error = imap_errors();
+				$error = $error[0];
 				if ( (string) strpos( $error, 'Host not found' ) != '' ) {
 					return self::IMAP_HOST_NOT_FOUND;
 				} elseif ( (string) strpos( $error, 'Timed out' ) != '' ) {

From 0c9e0d5ee68e3a5f36343ea026e891028e5b14c3 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 27 Jun 2014 03:20:30 +0530
Subject: [PATCH 142/485] Removed nonce and cap check todo from
 action_save_post

nonce verifications is done by WordPress
capability check is done by SupportFlow()->extend->permissions->limit_user_permissions()
---
 classes/class-supportflow-admin.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index e2af8dd..1572bae 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -800,8 +800,6 @@ public function is_edit_screen() {
 	/**
 	 * When a thread is saved or updated, make sure we save the respondent
 	 * and new reply data
-	 *
-	 * @todo nonce and cap checks
 	 */
 	public function action_save_post( $thread_id ) {
 

From b1afc1de1a88235aa4fe25628431abd3439ad8d6 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 27 Jun 2014 03:27:32 +0530
Subject: [PATCH 143/485] Removed capability check todo comment as it is
 already done

---
 classes/class-supportflow-admin.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 1572bae..bde9d24 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -329,8 +329,6 @@ public function filter_posts_search( $posts_search ) {
 
 	/**
 	 * Handle $_GET actions in the admin
-	 *
-	 * @todo need a caps check too to make sure this user can edit the thread
 	 */
 	function handle_action_change_status() {
 

From e96e8db1fb8efe3a6c1ee0d31468fbea249d3ec0 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 27 Jun 2014 18:27:42 +0530
Subject: [PATCH 144/485] Typecasting to boolean rather using boolval()

Currently it uses boolbal() which was not present in PHP 5.3
---
 classes/class-supportflow-email-accounts.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 1c73c58..7ace4c4 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -308,10 +308,10 @@ function add_email_account( $imap_host, $imap_port, $imap_ssl, $smtp_host, $smtp
 		$email_accounts = & $this->email_accounts;
 		$imap_host      = sanitize_text_field( $imap_host );
 		$imap_port      = intval( $imap_port );
-		$imap_ssl       = boolval( $imap_ssl );
+		$imap_ssl       = (boolean) $imap_ssl;
 		$smtp_host      = sanitize_text_field( $smtp_host );
 		$smtp_port      = intval( $smtp_port );
-		$smtp_ssl       = boolval( $smtp_ssl );
+		$smtp_ssl       = (boolean) $smtp_ssl;
 		$username       = sanitize_text_field( $username );
 		$password       = sanitize_text_field( $password );
 

From 44affc94f178817cf3bb77c5622c8ec92d7194c6 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 27 Jun 2014 20:44:26 +0530
Subject: [PATCH 145/485] Checkbox were unselected after deleting an account

---
 classes/class-supportflow-email-accounts.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 7ace4c4..ae802ac 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -141,7 +141,7 @@ function process_form_submission() {
 
 				case self::SUCCESS:
 					echo '<h3>' . __( 'Account added successfully', 'supportflow' ) . '</h3>';
-					unset( $_POST['imap_host'], $_POST['imap_port'], $_POST['smtp_host'], $_POST['smtp_port'], $_POST['username'], $_POST['password'] );
+					unset( $_POST['imap_host'], $_POST['action'], $_POST['imap_port'], $_POST['imap_ssl'], $_POST['smtp_host'], $_POST['smtp_port'], $_POST['smtp_ssl'], $_POST['username'], $_POST['password'] );
 					break;
 				case self::ACCOUNT_EXISTS:
 					echo '<h3>' . __( 'There is an account already exists with same host name and user name. Please create a new account with different settings.', 'supportflow' ) . '</h3>';
@@ -191,8 +191,16 @@ public function list_email_accounts() {
 	 */
 	public function insert_add_new_account_form() {
 		$form_action = "edit.php?post_type=" . SupportFlow()->post_type . "&page=" . $this->slug;
-		$imap_ssl_enabled = ( isset( $_POST['imap_ssl'], $_POST['action'] ) && $_POST['imap_ssl'] == 'on' ) || ! isset( $_POST['action'] );
-		$smtp_ssl_enabled = ( isset( $_POST['smtp_ssl'], $_POST['action'] ) && $_POST['smtp_ssl'] == 'on' ) || ! isset( $_POST['action'] );
+
+		$imap_ssl_enabled =
+			! isset( $_POST['action'] )
+			|| 'add' != $_POST['action']
+			|| ( isset( $_POST['imap_ssl'] ) && 'on' == $_POST['imap_ssl'] );
+
+		$smtp_ssl_enabled =
+			! isset( $_POST['action'] )
+			|| 'add' != $_POST['action']
+			|| ( isset( $_POST['smtp_ssl'] ) && 'on' == $_POST['smtp_ssl'] );
 		?>
 		<h3><?php _e( 'Add New Account', 'supportflow' ) ?></h3>
 		<?php _e( 'Please enter IMAP Server Settings', 'supportflow' ) ?><br />

From 6fef41f320ab5b6f0d11c8aab0272a11a5fa3a4a Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 27 Jun 2014 21:42:26 +0530
Subject: [PATCH 146/485] Open SupportFlow menu when viewing 'Edit Predefined
 reply' page

Currently if you visit "Edit Predefined reply" page, the SupportFlow menu
in sidebar get closed
---
 classes/class-supportflow-predefined-replies.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/classes/class-supportflow-predefined-replies.php b/classes/class-supportflow-predefined-replies.php
index 26a042a..c124134 100644
--- a/classes/class-supportflow-predefined-replies.php
+++ b/classes/class-supportflow-predefined-replies.php
@@ -12,10 +12,25 @@ function __construct() {
 	public function setup_actions() {
 		add_action( 'init', array( $this, 'action_init_register_predefined_replies' ) );
 		add_action( 'admin_menu', array( $this, 'action_admin_menu_predefined_replies' ) );
+		add_action( 'admin_head', array( $this, 'action_admin_head' ) );
 
 		add_action( 'admin_enqueue_scripts', array( $this, 'action_admin_enqueue_scripts' ) );
 	}
 
+
+	public function action_admin_head() {
+		global $menu, $pagenow, $post_type;
+
+		//
+		if ( 'post.php' == $pagenow && SupportFlow()->predefinded_replies_type == $post_type ) {
+			foreach ( $menu as $key => $single_menu ) {
+				if ( 'edit.php?post_type=' . SupportFlow()->post_type == $single_menu[2] ) {
+					$menu[$key][4] .= ' wp-has-current-submenu wp-menu-open open-if-no-js ';
+				}
+			}
+		}
+	}
+
 	/**
 	 * Add any CSS or JS we need for the admin
 	 */

From d020895d7f1232a62c71b27f297e2cced7aece94 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 28 Jun 2014 00:14:53 +0530
Subject: [PATCH 147/485] E-Mail account not saved when saving thread

empty( $_POST['post_email_account'] ) was returning true
when $_POST['post_email_account'] was '0'.
---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 2a3c4cd..d250935 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -811,7 +811,7 @@ public function action_save_post( $thread_id ) {
 			SupportFlow()->update_thread_respondents( $thread_id, $respondents );
 		}
 
-		if ( isset( $_POST['post_email_account'] ) && ! empty( $_POST['post_email_account'] ) ) {
+		if ( isset( $_POST['post_email_account'] ) && is_numeric( $_POST['post_email_account']  ) ) {
 			$email_account = (int) $_POST['post_email_account'];
 			update_post_meta( $thread_id, 'email_account', $email_account );
 		}

From ec6531d09f38525885301fad3f536a236fd78416 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 28 Jun 2014 00:53:11 +0530
Subject: [PATCH 148/485] Using an empty array if
 'email_notifications_override' post meta array doesn't exist

---
 classes/class-supportflow-email-notifications.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index fcc44b3..5de208f 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -305,6 +305,10 @@ public function get_notified_user( $thread_id ) {
 		$email_account                = get_post_meta( $thread_id, 'email_account', true );
 		$email_notifications_override = get_post_meta( $thread_id, 'email_notifications_override', true );
 
+		if ( ! is_array( $email_notifications_override ) ) {
+			$email_notifications_override = array();
+		}
+
 		$notifications_settings = $this->get_notifications_settings( null, true );
 
 		$allowed_users = array();

From 96a51f0bd36e13dded18734bd5f3e037c4936b6d Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 27 Jun 2014 23:28:33 +0530
Subject: [PATCH 149/485] Showing permissions filter using tables

---
 classes/class-supportflow-permissions.php | 38 +++++++++++++----------
 css/admin.css                             |  6 ----
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index cbd2d35..33b89c8 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -115,22 +115,28 @@ public function action_admin_init() {
 	public function permissions_page() {
 		?>
 		<div class="wrap">
-		<h2><?php _e( 'Permissions', 'supportflow' ) ?></h2><br />
-
-		<label for="change_user" id="change_user_label"><?php _e( 'User', 'supportflow' ) ?>: </label>
-		<select name="change_user" id="change_user">
-			<option data-user-id=0><?php _e( 'All', 'supportflow' ) ?></option>
-			<?php
-			foreach ( get_users() as $user ) {
-				if ( ! $user->has_cap( 'manage_options' ) ) {
-					$user_id       = $user->data->ID;
-					$user_nicename = esc_html( $user->data->user_nicename );
-					$user_email    = esc_html( $user->data->user_email );
-					echo "<option data-user-id=$user_id>$user_nicename ($user_email)</option>";
-				}
-			}
-			?>
-		</select>
+		<h2><?php _e( 'Permissions', 'supportflow' ) ?></h2>
+
+		<table class="form-table">
+			<tr valign="top">
+				<th scope="row"><label for="change_user"><?php _e( 'User', 'supportflow' ) ?></label></th>
+				<td>
+					<select name="change_user" id="change_user">
+						<option data-user-id=0><?php _e( 'All', 'supportflow' ) ?></option>
+						<?php
+						foreach ( get_users() as $user ) {
+							if ( ! $user->has_cap( 'manage_options' ) ) {
+								$user_id       = $user->data->ID;
+								$user_nicename = esc_html( $user->data->user_nicename );
+								$user_email    = esc_html( $user->data->user_email );
+								echo "<option data-user-id=$user_id>$user_nicename ($user_email)</option>";
+							}
+						}
+						?>
+					</select>
+				</td>
+			</tr>
+		</table>
 
 		<div id="user_permissions_table">
 			<?php
diff --git a/css/admin.css b/css/admin.css
index b537967..8d2ae89 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -20,12 +20,6 @@
 	margin-top: 34px;
 }
 
-#change_user_label {
-    display:     inline;
-    font-weight: bold;
-    font-size:   16px;
-}
-
 #supportflow-subject.postbox,
 #supportflow-respondents.postbox {
 	border:     none;

From 0efaf68437cacfeb8ba1c4d6e26d1f6c6eea13e5 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 28 Jun 2014 04:12:57 +0530
Subject: [PATCH 150/485] Add option to filter user permissions by status

---
 classes/class-supportflow-permissions.php | 52 +++++++++++++++++++----
 1 file changed, 44 insertions(+), 8 deletions(-)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 33b89c8..373680d 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -121,7 +121,7 @@ public function permissions_page() {
 			<tr valign="top">
 				<th scope="row"><label for="change_user"><?php _e( 'User', 'supportflow' ) ?></label></th>
 				<td>
-					<select name="change_user" id="change_user">
+					<select name="change_user" id="change_user" class="permission_filters">
 						<option data-user-id=0><?php _e( 'All', 'supportflow' ) ?></option>
 						<?php
 						foreach ( get_users() as $user ) {
@@ -136,6 +136,16 @@ public function permissions_page() {
 					</select>
 				</td>
 			</tr>
+			<tr valign="top">
+				<th scope="row"><label for="change_status"><?php _e( 'Status', 'supportflow' ) ?></label></th>
+				<td>
+					<select name="change_status" id="change_status" class="permission_filters">
+						<option data-status="any"><?php _e( 'Any', 'supportflow' ) ?></option>
+						<option data-status="allowed_only"><?php _e( 'Allowed only', 'supportflow' ) ?></option>
+						<option data-status="disallowed_only"><?php _e( 'Disallowed only', 'supportflow' ) ?></option>
+					</select>
+				</td>
+			</tr>
 		</table>
 
 		<div id="user_permissions_table">
@@ -147,14 +157,15 @@ public function permissions_page() {
 		</div>
 		<script type="text/javascript">
 			jQuery(document).ready(function () {
-				jQuery('#change_user').change(function () {
+				jQuery('.permission_filters').change(function () {
 					var user_id = jQuery('#change_user option:selected').data('user-id');
-
+					var status = jQuery('#change_status option:selected').data('status');
 					jQuery.ajax(ajaxurl, {
 						type   : 'post',
 						data   : {
 							action                     : 'get_user_permissions',
 							user_id                    : user_id,
+							status                     : status,
 							_get_user_permissions_nonce: '<?php echo wp_create_nonce() ?>',
 						},
 						success: function (content) {
@@ -216,19 +227,36 @@ public function permissions_page() {
 	public function action_wp_ajax_get_user_permissions() {
 		check_ajax_referer( - 1, '_get_user_permissions_nonce' );
 
-		if ( ! isset( $_POST['user_id'] ) ) {
+		if (
+			! isset( $_POST['user_id'], $_POST['status'] ) ||
+			! is_numeric( $_POST['user_id'] ) ||
+			! in_array( $_POST['status'], array( 'any', 'allowed_only', 'disallowed_only' ) )
+		) {
 			exit;
 		}
+
 		$user_id = (int) $_POST['user_id'];
+		$status  = $_POST['status'];
+
+		if ( 'allowed_only' == $status ) {
+			$get_allowed    = true;
+			$get_disallowed = false;
+		} elseif ( 'disallowed_only' == $status ) {
+			$get_allowed    = false;
+			$get_disallowed = true;
+		} else {
+			$get_allowed    = true;
+			$get_disallowed = true;
+		}
 
-		$user_permissions_table = new SupportFlow_User_Permissions_Table( $this->get_user_permissions( $user_id ) );
+		$user_permissions_table = new SupportFlow_User_Permissions_Table( $this->get_user_permissions( $user_id, $get_allowed, $get_disallowed ) );
 		$user_permissions_table->prepare_items();
 		$user_permissions_table->display();
 
 		exit;
 	}
 
-	public function get_user_permissions( $user_id ) {
+	public function get_user_permissions( $user_id, $return_allowed = true, $return_disallowed = true ) {
 		$tags             = get_terms( 'sf_tags', 'hide_empty=0' );
 		$email_accounts   = get_option( 'sf_email_accounts' );
 		$permissions      = array();
@@ -258,6 +286,10 @@ public function get_user_permissions( $user_id ) {
 				if ( empty( $email_account ) ) {
 					continue;
 				}
+				$allowed = in_array( $id, $permission['email_accounts'] );
+				if ( ( $allowed && ! $return_allowed ) || ( ! $allowed && ! $return_disallowed ) ) {
+					continue;
+				}
 				$user_permissions[] = array(
 					'user_id'        => $user_id,
 					'user'           => $user_data->data->user_nicename . ' (' . $user_data->data->user_email . ')',
@@ -265,10 +297,14 @@ public function get_user_permissions( $user_id ) {
 					'type'           => 'E-Mail Account',
 					'privilege_id'   => $id,
 					'privilege'      => $email_account['username'] . ' (' . $email_account['imap_host'] . ')',
-					'allowed'        => in_array( $id, $permission['email_accounts'] ),
+					'allowed'        => $allowed,
 				);
 			}
 			foreach ( $tags as $tag ) {
+				$allowed = in_array( $tag->slug, $permission['tags'] );
+				if ( ( $allowed && ! $return_allowed ) || ( ! $allowed && ! $return_disallowed ) ) {
+					continue;
+				}
 				$user_permissions[] = array(
 					'user_id'        => $user_id,
 					'user'           => $user_data->data->user_nicename . ' (' . $user_data->data->user_email . ')',
@@ -276,7 +312,7 @@ public function get_user_permissions( $user_id ) {
 					'type'           => 'Tag',
 					'privilege_id'   => $tag->slug,
 					'privilege'      => $tag->name . ' (' . $tag->slug . ')',
-					'allowed'        => in_array( $tag->slug, $permission['tags'] ),
+					'allowed'        => $allowed,
 				);
 			}
 		}

From 52b2364bc1d3111905693f08b8a82f6afe365800 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 28 Jun 2014 04:40:52 +0530
Subject: [PATCH 151/485] Change "Select Files" label to "Attach Files"

Fixes #111
---
 classes/class-supportflow-admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index d250935..029141f 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -69,7 +69,7 @@ public function action_admin_enqueue_scripts() {
 
 			wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
 			wp_localize_script( 'supportflow-thread-attachments', 'SFThreadAttachments', array(
-				'frame_title'  => __( 'Select files', 'supportflow' ),
+				'frame_title'  => __( 'Attach files', 'supportflow' ),
 				'button_title' => __( 'Insert as attachment', 'supportflow' ),
 			) );
 		}
@@ -584,7 +584,7 @@ public function meta_box_replies() {
 		echo '<div id="message-tools">';
 		echo '<div id="replies-attachments-wrap">';
 		echo '<div class="drag-drop-buttons">';
-		echo '<input id="reply-attachment-browse-button" type="button" value="' . esc_attr( __( 'Select Files', 'supportflow' ) ) . '" class="button" />';
+		echo '<input id="reply-attachment-browse-button" type="button" value="' . esc_attr( __( 'Attach files', 'supportflow' ) ) . '" class="button" />';
 		echo '</div>';
 		echo '<ul id="replies-attachments-list">';
 		echo '</ul>';

From 6e24122a13e2a1911e9c9647dc0934ea072d252f Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 28 Jun 2014 05:20:57 +0530
Subject: [PATCH 152/485] Filter out tag/E-Mail account from user permission
 array that are later removed

---
 classes/class-supportflow-email-notifications.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 5de208f..c28f460 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -184,6 +184,17 @@ public function get_notifications_settings( $user_id = null, $allowed_only = fal
 				if ( ! is_array( $user_permissions ) || empty( $user_permissions ) || ! is_array( $user_permissions['tags'] ) || ! is_array( $user_permissions['email_accounts'] ) ) {
 					$user_permissions = array( 'tags' => array(), 'email_accounts' => array() );
 				}
+
+				foreach ( $user_permissions['tags'] as $id => $tag ) {
+					if ( ! in_array( $tag, $tags ) ) {
+						unset ( $user_permissions['tags'][ $id ] );
+					}
+				}
+				foreach ( $user_permissions['email_accounts'] as $id => $email_account ) {
+					if ( ! in_array( $email_account, $email_accounts ) ) {
+						unset ( $user_permissions['email_accounts'][ $id ] );
+					}
+				}
 			}
 
 

From b5247e581b6c43bffe92a0791a12de0daddeeed1 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 26 Jun 2014 04:44:04 +0530
Subject: [PATCH 153/485] Create a JS file to manage thread JS code

---
 classes/class-supportflow-admin.php | 5 +++++
 js/threads.js                       | 3 +++
 2 files changed, 8 insertions(+)
 create mode 100644 js/threads.js

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index d250935..b331106 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -65,6 +65,8 @@ public function action_admin_enqueue_scripts() {
 
 			wp_enqueue_script( 'supportflow-thread-attachments', SupportFlow()->plugin_url . 'js/thread_attachments.js', array( 'jquery' ) );
 			wp_enqueue_script( 'supportflow-respondents-autocomplete', SupportFlow()->plugin_url . 'js/respondents-autocomplete.js', array( 'jquery', 'jquery-ui-autocomplete' ) );
+			wp_enqueue_script( 'supportflow-threads', SupportFlow()->plugin_url . 'js/threads.js', array( 'jquery') );
+
 			$ajaxurl = add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) );
 
 			wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
@@ -72,6 +74,9 @@ public function action_admin_enqueue_scripts() {
 				'frame_title'  => __( 'Select files', 'supportflow' ),
 				'button_title' => __( 'Insert as attachment', 'supportflow' ),
 			) );
+			wp_localize_script( 'supportflow-threads', 'SFThreads', array(
+
+			) );
 		}
 	}
 
diff --git a/js/threads.js b/js/threads.js
new file mode 100644
index 0000000..38a8cf7
--- /dev/null
+++ b/js/threads.js
@@ -0,0 +1,3 @@
+jQuery(document).ready(function () {
+    
+});
\ No newline at end of file

From fed8fea7895659f98c774d082887d6be52eed4d8 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 27 Jun 2014 02:05:57 +0530
Subject: [PATCH 154/485] Requiring title and respondent to save a thread

---
 classes/class-supportflow-admin.php |  3 ++-
 js/threads.js                       | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index b331106..343c36a 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -75,7 +75,8 @@ public function action_admin_enqueue_scripts() {
 				'button_title' => __( 'Insert as attachment', 'supportflow' ),
 			) );
 			wp_localize_script( 'supportflow-threads', 'SFThreads', array(
-
+			    'no_title_msg'      => __( 'You must need to specify the subject of the thread', 'supportpress' ),
+			    'no_respondent_msg' => __( 'You must need to add atleast one thread respondent', 'supportpress' ),
 			) );
 		}
 	}
diff --git a/js/threads.js b/js/threads.js
index 38a8cf7..23db0c9 100644
--- a/js/threads.js
+++ b/js/threads.js
@@ -1,3 +1,16 @@
 jQuery(document).ready(function () {
-    
+
+	// Require title and atleast respondent before saving a thread
+	jQuery('#save').click(function (event) {
+		if ('' == jQuery('#subject').val()) {
+			alert(SFThreads.no_title_msg);
+			event.preventDefault();
+			return;
+		}
+		if ('' == jQuery('#respondents').val()) {
+			alert(SFThreads.no_respondent_msg);
+			event.preventDefault();
+			return;
+		}
+	});
 });
\ No newline at end of file

From 6c8a112bdb012e4694053529257b676ea20be120 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 27 Jun 2014 02:42:24 +0530
Subject: [PATCH 155/485] Removed server side check for title and respondents

---
 supportflow.php | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index 5963d44..bc3afb3 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -252,9 +252,6 @@ private function setup_actions() {
 		add_action( 'init', array( $this, 'action_init_register_taxonomies' ) );
 		add_action( 'init', array( $this, 'action_init_register_post_statuses' ) );
 
-
-		add_filter( 'wp_insert_post_empty_content', array( $this, 'filter_wp_insert_post_empty_content' ), 10, 2 );
-
 		do_action_ref_array( 'supportflow_after_setup_actions', array( &$this ) );
 	}
 
@@ -456,22 +453,6 @@ public function create_thread( $args ) {
 		return $thread_id;
 	}
 
-	/**
-	 * Threads must have subjects
-	 */
-	public function filter_wp_insert_post_empty_content( $maybe_empty, $postarr ) {
-
-		if ( $this->post_type != $postarr['post_type'] ) {
-			return $maybe_empty;
-		}
-
-		if ( empty( $postarr['post_title'] ) ) {
-			return true;
-		}
-
-		return $maybe_empty;
-	}
-
 	/**
 	 * @todo This should produce an object with thread details, respondents, and replies
 	 */

From a69519aed94a3ef3bae24d1275928ac31cadb1ed Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 28 Jun 2014 01:27:06 +0530
Subject: [PATCH 156/485] Using $thread->ID instead of get_the_ID();

get_the_ID(); reply is inserted using cron job
---
 classes/class-supportflow-emails.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 047060c..7e13b0f 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -36,7 +36,7 @@ public function notify_agents_thread_replies( $reply_id ) {
 
 		$thread = SupportFlow()->get_thread( $reply->post_parent );
 		// One agent by default, but easily allow notifications to a triage team
-		$agent_ids = SupportFlow()->extend->email_notifications->get_notified_user( get_the_ID() );
+		$agent_ids = SupportFlow()->extend->email_notifications->get_notified_user( $thread->ID );
 		$agent_ids = apply_filters( 'supportflow_emails_notify_agent_ids', $agent_ids, $thread, 'reply' );
 
 		$email_accounts   = get_option( 'sf_email_accounts' );

From 4828613a3a401c40d6671277282975e8e26a6809 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 28 Jun 2014 01:56:51 +0530
Subject: [PATCH 157/485] Using is_numeric() to validate email_account numeric
 id

---
 supportflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index bc3afb3..2e3595b 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -436,7 +436,7 @@ public function create_thread( $args ) {
 			$this->update_thread_respondents( $thread_id, $args['respondent_email'] );
 		}
 
-		if ( ! empty( $args['email_account'] ) ) {
+		if ( is_numeric( $args['email_account'] ) ) {
 			update_post_meta( $thread_id, 'email_account', $args['email_account'] );
 		}
 

From 5e9ca076b8a779f97ef359ee884893e7747669b7 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 1 Jul 2014 20:39:34 +0530
Subject: [PATCH 158/485] Using unique ID instead of message number to move
 E-Mails

There is some bug in imap_mail_move when you use message number. Sometime
it just copy it and don't delete the old one
---
 classes/class-supportflow-email-replies.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 49b014e..91f27c9 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -70,6 +70,9 @@ public function download_and_process_email_replies( $connection_details ) {
 			return false;
 		}
 
+		$emails        = imap_search( $imap_connection, 'ALL', SE_UID );
+		$archive_mails = array();
+
 		// Process each new email and put it in the archive mailbox when done
 		$success = 0;
 		for ( $i = 1; $i <= $email_count; $i ++ ) {
@@ -86,11 +89,17 @@ public function download_and_process_email_replies( $connection_details ) {
 			$ret = $this->process_email( $imap_connection, $email, $i, $connection_details['username'], $connection_details['account_id'] );
 			// If it was successful, move the email to the archive
 			if ( $ret ) {
-				imap_mail_move( $imap_connection, $i, $connection_details['archive'] );
-				$success ++;
+				$archive_mails[] = $i;
 			}
 		}
 
+		foreach ( $archive_mails as $msg_number ) {
+			imap_mail_move( $imap_connection, $emails[$msg_number - 1], $connection_details['archive'], CP_UID );
+			$success ++;
+		}
+
+		imap_close( $imap_connection, CL_EXPUNGE );
+
 		return sprintf( __( 'Processed %d emails', 'supportflow' ), $success );
 	}
 

From 3b156731509461d155395060e9b54686d5fe195c Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 2 Jul 2014 18:44:02 +0530
Subject: [PATCH 159/485] Showing time (in ago) when reply was posted

---
 classes/class-supportflow-admin.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 029141f..936ffda 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -637,7 +637,9 @@ public function display_thread_replies() {
 				echo '</div>';
 				$reply_author    = get_post_meta( $reply->ID, 'reply_author', true );
 				$reply_timestamp = sprintf( __( 'Noted by %1$s on %2$s at %3$s', 'supportflow' ), $reply_author, get_the_date(), get_the_time() );
-				echo '<div class="thread-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . '</span></div>';
+				$modified_gmt  = get_post_modified_time( 'U', true, get_the_ID() );
+				$last_activity = sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
+				echo '<div class="thread-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . ' (' . $last_activity . ')' . '</span></div>';
 				echo '</li>';
 			}
 			echo '</ul>';
@@ -672,8 +674,9 @@ public function display_thread_replies() {
 				}
 				echo '</div>';
 				$reply_timestamp = sprintf( __( '%s at %s', 'supportflow' ), get_the_date(), get_the_time() );
-				echo '<div class="thread-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . '</span></div>';
-				echo '</li>';
+				$modified_gmt  = get_post_modified_time( 'U', true, get_the_ID() );
+				$last_activity = sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
+				echo '<div class="thread-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . ' (' . $last_activity . ')' . '</span></div>';				echo '</li>';
 			}
 			echo '</ul>';
 		}

From d5602a66dee2529af4613cca0402802ff35c7a2d Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 2 Jul 2014 23:07:23 +0530
Subject: [PATCH 160/485] Sending attachments literally rather than just
 sending its link in E-Mail

Currently it was sending a link to attachment hosted in our site. This was
a problem esp. for sites that are not publiciy accessible
---
 classes/class-supportflow-emails.php | 31 ++++++++++++++--------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 047060c..b76ce73 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -56,7 +56,7 @@ public function notify_agents_thread_replies( $reply_id ) {
 
 		// Don't email the person adding the reply, unless that's desired behavior
 		if ( ! apply_filters( 'supportflow_emails_notify_creator', false, 'reply' ) ) {
-			$key = array_search( get_post_meta( $reply->ID, 'reply_author_email' , true ), $agent_emails );
+			$key = array_search( get_post_meta( $reply->ID, 'reply_author_email', true ), $agent_emails );
 			if ( false !== $key ) {
 				unset( $agent_emails[$key] );
 			}
@@ -65,13 +65,14 @@ public function notify_agents_thread_replies( $reply_id ) {
 		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $thread->ID );
 		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $thread->ID, 'agent' );
 
-		$message = stripslashes( $reply->post_content );
-		if ( $attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply->ID ) ) ) {
-			$message .= "\n";
-			foreach ( $attachments as $attachment ) {
-				$message .= "\n" . wp_get_attachment_url( $attachment->ID );
+		$attachments = array();
+		if ( $thread_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply->ID ) ) ) {
+			foreach ( $thread_attachments as $attachment ) {
+				$attachments[] = get_attached_file( $attachment->ID );
 			}
 		}
+
+		$message = stripslashes( $reply->post_content );
 		// Ticket details that are relevant to the agent
 		$message .= "\n\n-------";
 		// Thread status
@@ -83,7 +84,7 @@ public function notify_agents_thread_replies( $reply_id ) {
 
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $thread->ID, 'agent' );
 
-		self::mail( $agent_emails, $subject, $message, '', $smtp_account );
+		self::mail( $agent_emails, $subject, $message, '', $attachments, $smtp_account );
 	}
 
 	/**
@@ -115,14 +116,14 @@ public function notify_respondents_thread_replies( $reply_id, $cc = array(), $bc
 		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $thread->ID );
 		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $thread->ID, 'respondent' );
 
-		$message = stripslashes( $reply->post_content );
-		if ( $attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply->ID ) ) ) {
-			$message .= "\n";
-			foreach ( $attachments as $attachment ) {
-				$message .= "\n" . wp_get_attachment_url( $attachment->ID );
+		$attachments = array();
+		if ( $thread_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply->ID ) ) ) {
+			foreach ( $thread_attachments as $attachment ) {
+				$attachments[] = get_attached_file( $attachment->ID );
 			}
 		}
 
+		$message = stripslashes( $reply->post_content );
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $thread->ID, 'respondent' );
 
 		$headers = '';
@@ -139,20 +140,20 @@ public function notify_respondents_thread_replies( $reply_id, $cc = array(), $bc
 			$headers .= "Bcc: $bcc\r\n";
 		}
 
-		self::mail( $respondents, $subject, $message, $headers, $smtp_account );
+		self::mail( $respondents, $subject, $message, $headers, $attachments, $smtp_account );
 	}
 
 	/**
 	 * Send an email from SupportFlow
 	 */
-	public function mail( $to, $subject, $message, $headers = '', $smtp_account = null ) {
+	public function mail( $to, $subject, $message, $headers = '', $attachments = array(), $smtp_account = null ) {
 
 		if ( ! empty( $smtp_account ) ) {
 			$this->smtp_account = $smtp_account;
 			add_action( 'phpmailer_init', array( $this, 'action_set_smtp_settings' ) );
 		}
 
-		wp_mail( $to, $subject, $message, $headers );
+		wp_mail( $to, $subject, $message, $headers, $attachments );
 
 		if ( ! empty( $smtp_account ) ) {
 			$this->smtp_account = null;

From ca85afac3e9a998fbdeedad5ccb16238501aba1f Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 1 Jul 2014 16:59:13 +0530
Subject: [PATCH 161/485] Redesign details meta box

This new one looks much similar to WP post meta box
---
 classes/class-supportflow-admin.php | 233 +++++++++++++++++++---------
 css/admin.css                       |  12 +-
 js/threads.js                       |  17 +-
 3 files changed, 189 insertions(+), 73 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 490b040..ff29c13 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -393,112 +393,203 @@ public function action_add_meta_boxes() {
 	public function meta_box_details() {
 		global $pagenow;
 
-		// Display Meta Data for Post
-		echo '<div id="misc-publishing-actions">';
-
-		// Date Created and Last Activity for Existing Posts
+		// Get post creation and last update time
 		if ( 'post.php' == $pagenow ) {
-
+			$opened        = get_the_date() . ' ' . get_the_time();
 			$modified_gmt  = get_post_modified_time( 'U', true, get_the_ID() );
 			$last_activity = sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
-
-			echo '<div class="misc-pub-section created-on">';
-			echo '<label for="created_on">' . __( 'Opened', 'supportflow' ) . ':</label>';
-			echo '<span class="the-date"> ' . get_the_date() . ' ' . get_the_time() . '</span>';
-			echo '<div clas="last-activity" title="' . get_the_modified_date( 'l, M j, Y ' ) . get_the_modified_time() . '">' . __( 'Last Activity', 'SupportFlow' ) . ': <strong>' . $last_activity . '</strong></div>';
-			echo '</div>';
 		}
 
-		// Post status dropdown
-		$current_status = get_post_status( get_the_ID() );
-		echo '<div class="misc-pub-section">';
-		echo '<label for="post_status">' . __( 'Status', 'supportflow' ) . ':</label>';
-		echo '<select id="post_status" name="post_status">';
-		foreach ( SupportFlow()->post_statuses as $slug => $post_status ) {
-			echo '<option value="' . esc_attr( $slug ) . '" ' . selected( $current_status, $slug ) . '>' . esc_html( $post_status['label'] ) . '</option>';
-		}
-		echo '</select>';
-		echo '</div>';
 
-		// Post E-Mail account drop down
-		if ( 'post-new.php' == $pagenow ) {
-			$email_accounts = get_option( 'sf_email_accounts' );
-			echo '<div class="misc-pub-section">';
-			echo '<label for="post_email_account">' . __( 'Account', 'supportflow' ) . ':</label>';
-			echo '<select id="post_email_account" name="post_email_account">';
-			$user_permissions = get_user_meta( get_current_user_id(), 'sf_permissions', true );
-			$user_permissions = $user_permissions['email_accounts'];
-			foreach ( $email_accounts as $id => $email_account ) {
-				if ( empty( $email_account ) || ( ! current_user_can( 'manage_options' ) && ! in_array( $id, $user_permissions ) ) ) {
-					continue;
-				}
-				echo '<option value="' . esc_attr( $id ) . '" ' . '>' . esc_html( $email_account['username'] ) . '</option>';
-			}
-			echo '</select>';
-			echo '</div>';
+		// Get post status
+		$post_statuses     = SupportFlow()->post_statuses;
+		$current_status_id = get_post_status( get_the_ID() );
+
+		if ( ! isset( $post_statuses[$current_status_id] ) ) {
+			$post_statuses_key = array_keys( $post_statuses );
+			$current_status_id = $post_statuses_key[0];
 		}
 
-		// Agent assignment dropdown
-		$post_author = get_post( get_the_ID() )->post_author;
-		echo '<div class="misc-pub-section">';
-		echo '<label for="post_author">' . __( 'Owner', 'supportflow' ) . ':</label>';
-		$args = array(
+		$current_status_label = $post_statuses[$current_status_id]['label'];
+
+
+		// Get post authors
+		$post_author_id    = get_post( get_the_ID() )->post_author;
+		$post_author_label = get_userdata( $post_author_id )->data->user_nicename;
+
+		$args                  = array(
 			'show_option_none' => __( '-- Unassigned --', 'supportflow' ),
-			'selected'         => $post_author,
-			'id'               => 'post_author',
-			'name'             => 'post_author',
+			'selected'         => $post_author_id,
+			'id'               => '',
+			'name'             => '',
 			'who'              => 'author',
+			'class'            => 'meta-item-dropdown',
+			'echo'             => false
 		);
-		wp_dropdown_users( $args );
-		echo '</div>';
+		$post_authors_dropdown = wp_dropdown_users( $args );
 
-		// E-Mail notifications override
-		echo '<div class="misc-pub-section">';
-		echo '<label for="post_email_notifications_override">' . __( 'E-Mail Notification', 'supportflow' ) . ':</label>';
-		echo '<select name="post_email_notifications_override" id="post_email_notifications_override" class="">';
 
-		if ( 'post-new.php' == $pagenow ) {
-			echo '<option value="default">' . __( 'Default', 'supportflow' ) . '</option>';
-			echo '<option value="enable">' . __( 'Enabled', 'supportflow' ) . '</option>';
-			echo '<option value="disable">' . __( 'Disabled', 'supportflow' ) . '</option>';
+		// Get post E-Mail account
+		$email_accounts = get_option( 'sf_email_accounts' );
+		if ( empty( $email_accounts ) ) {
+			$email_accounts = array();
+		}
 
+		$user_permissions = get_user_meta( get_current_user_id(), 'sf_permissions', true );
+		if ( ! is_array( $user_permissions ) ) {
+			$user_permissions = array( 'tags' => array(), 'email_accounts' => array() );
+		}
+		$user_permissions = $user_permissions['email_accounts'];
+
+		$email_account_dropdown = '<select class="meta-item-dropdown">';
+		foreach ( $email_accounts as $id => $email_accoun_id ) {
+			if ( empty( $email_accoun_id ) || ( ! current_user_can( 'manage_options' ) && ! in_array( $id, $user_permissions ) ) ) {
+				continue;
+			}
+			$email_account_dropdown .= '<option value="' . esc_attr( $id ) . '" ' . '>' . esc_html( $email_accoun_id['username'] ) . '</option>';
+		}
+		$email_account_dropdown .= '</select>';
+
+		$email_account_keys  = array_keys( $email_accounts );
+		$email_account_id     = $email_account_keys[0];
+		$email_account_label = $email_accounts[ $email_account_id ]['username'];
+
+		// Get E-Mail notification settings
+		$notification_id       = 0;
+		$notification_label    = 'Default';
+		$notification_dropdown = '';
+		$notification_dropdown .= '<select class="meta-item-dropdown">';
+
+		if ( 'post-new.php' == $pagenow ) {
+			$notification_dropdown .= '<option value="default">' . __( 'Default', 'supportflow' ) . '</option>';
+			$notification_dropdown .= '<option value="enable">' . __( 'Enabled', 'supportflow' ) . '</option>';
+			$notification_dropdown .= '<option value="disable">' . __( 'Disabled', 'supportflow' ) . '</option>';
 		} elseif ( 'post.php' == $pagenow ) {
 			$email_notifications_override = get_post_meta( get_the_ID(), 'email_notifications_override', true );
 			$current_user_id              = get_current_user_id();
-			$selected                     = 0;
 
 			if ( isset( $email_notifications_override[$current_user_id] ) ) {
 				$override_status = $email_notifications_override[$current_user_id];
 				if ( 'enable' == $override_status ) {
-					$selected = 1;
+					$notification_label = 'Enabled';
+					$notification_id    = 1;
 				} elseif ( 'disable' == $override_status ) {
-					$selected = 2;
+					$notification_label = 'Disabled';
+					$notification_id    = 2;
 				}
 			}
 
-			echo '<option value="default"' . selected( $selected, 0 ) . '>' . __( 'Default', 'supportflow' ) . '</option>';
-			echo '<option value="enable"' . selected( $selected, 1 ) . '>' . __( 'Enabled', 'supportflow' ) . '</option>';
-			echo '<option value="disable"' . selected( $selected, 2 ) . '>' . __( 'Disabled', 'supportflow' ) . '</option>';
+			$notification_dropdown .= '<option value="default"' . selected( $notification_id, 0, false ) . '>' . __( 'Default', 'supportflow' ) . '</option>';
+			$notification_dropdown .= '<option value="enable"' . selected( $notification_id, 1, false ) . '>' . __( 'Enabled', 'supportflow' ) . '</option>';
+			$notification_dropdown .= '<option value="disable"' . selected( $notification_id, 2, false ) . '>' . __( 'Disabled', 'supportflow' ) . '</option>';
 		}
-		echo '</select>';
-		echo '</div>';
 
-		echo '</div>'; // end div#misc-publishing-actions
+		$notification_dropdown .= '</select>';
 
 
-		// Start/Update Thread (submit)
+		// Get submit button label
 		if ( 'post-new.php' == $pagenow ) {
 			$submit_text = __( 'Start Thread', 'supportflow' );
 		} else {
 			$submit_text = __( 'Update Thread', 'supportflow' );
 		}
-		echo '<div id="major-publishing-actions">';
-		echo '<div id="publishing-action">';
-		submit_button( $submit_text, 'primary', 'save', false );
-		echo '</div>';
-		echo '<div class="clear"></div>';
-		echo '</div>';
+		?>
 
+		<div id="minor-publishing">
+			<div id="misc-publishing-actions">
+
+				<!--Thread opening date/time-->
+				<?php if ( 'post.php' == $pagenow ) : ?>
+					<div class="misc-pub-section meta-item">
+						<label><?php _e( 'Opened', 'supportflow' ) ?>:</label>
+						<span class="meta-item-label"><?php esc_html_e( $opened ) ?></span>
+					</div>
+
+					<!--Last thread update time-->
+					<div class="misc-pub-section meta-item">
+						<label><?php _e( 'Last Activity', 'supportflow' ) ?>:</label>
+						<span class="meta-item-label"><?php esc_html_e( $last_activity ) ?></span>
+					</div>
+				<?php endif; ?>
+
+				<!--Thread status box-->
+				<div class="misc-pub-section meta-item">
+					<label class="meta-item-toggle-button"><?php _e( 'Status', 'supportflow' ) ?>:</label>
+					<span class="meta-item-label"><?php esc_html_e( $current_status_label, 'supportflow' ) ?></span>
+					<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
+						<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
+					</a>
+					<input name="post_status" class="meta-item-name" value="<?php esc_attr_e( $current_status_id ) ?>" type="hidden" />
+
+					<div class="meta-item-toggle-content hide-if-js">
+						<select class="meta-item-dropdown">
+							<?php foreach ( $post_statuses as $slug => $post_status ) : ?>
+								<option value="<?php esc_attr_e( $slug ) ?>"<?php selected( $current_status_id, $slug ) ?>><?php esc_html_e( $post_status['label'] ) ?></option>;
+							<?php endforeach; ?>
+						</select>
+						<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php _e( 'OK' ) ?></a>
+						<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php _e( 'Cancel' ) ?></a>
+					</div>
+				</div>
+
+				<div class="misc-pub-section meta-item">
+					<label class="meta-item-toggle-button"><?php _e( 'Owner', 'supportflow' ) ?>:</label>
+					<span class="meta-item-label"><?php _e( $post_author_label, 'supportflow' ) ?></span>
+					<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
+						<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
+					</a>
+					<input name="post_author" class="meta-item-name" value="<?php esc_attr_e( $post_author_id ) ?>" type="hidden" />
+
+					<div class="meta-item-toggle-content hide-if-js">
+						<?php echo $post_authors_dropdown ?>
+						<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php _e( 'OK' ) ?></a>
+						<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php _e( 'Cancel' ) ?></a>
+					</div>
+				</div>
+
+				<?php if ( 'post-new.php' == $pagenow ) : ?>
+					<div class="misc-pub-section meta-item">
+						<label class="meta-item-toggle-button"><?php _e( 'Account', 'supportflow' ) ?>:</label>
+						<span class="meta-item-label"><?php _e( $email_account_label, 'supportflow' ) ?></span>
+						<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
+							<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
+						</a>
+						<input name="post_email_account" class="meta-item-name" value="<?php echo $email_account_id ?>" type="hidden" />
+
+						<div class="meta-item-toggle-content hide-if-js">
+							<?php echo $email_account_dropdown ?>
+							<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php _e( 'OK' ) ?></a>
+							<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php _e( 'Cancel' ) ?></a>
+						</div>
+					</div>
+				<?php endif; ?>
+
+				<div class="misc-pub-section meta-item">
+					<label class="meta-item-toggle-button"><?php _e( 'Notifications', 'supportflow' ) ?>:</label>
+					<span class="meta-item-label"><?php esc_html_e( $notification_label, 'supportflow' ) ?></span>
+					<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
+						<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
+					</a>
+					<input name="post_email_notifications_override" class="meta-item-name" value="<?php $notification_id ?>" type="hidden" />
+
+					<div class="meta-item-toggle-content hide-if-js">
+						<?php echo $notification_dropdown ?>
+						<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php _e( 'OK' ) ?></a>
+						<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php _e( 'Cancel' ) ?></a>
+					</div>
+				</div>
+
+			</div>
+			<div class="clear"></div>
+		</div>
+
+		<div id="major-publishing-actions">
+			<div id="publishing-action">
+				<?php submit_button( $submit_text, 'primary', 'save', false ); ?>
+			</div>
+			<div class="clear"></div>
+		</div>
+	<?php
 	}
 
 	/**
diff --git a/css/admin.css b/css/admin.css
index 8d2ae89..7072bf4 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -20,6 +20,16 @@
 	margin-top: 34px;
 }
 
+#change_user_label {
+    display:     inline;
+    font-weight: bold;
+    font-size:   16px;
+}
+
+#supportflow-details .meta-item-label {
+	font-weight: 600;
+}
+
 #supportflow-subject.postbox,
 #supportflow-respondents.postbox {
 	border:     none;
@@ -219,4 +229,4 @@ textarea::-webkit-input-placeholder {
 
 textarea:-moz-placeholder {
 	color: #BBB;
-}
\ No newline at end of file
+}
diff --git a/js/threads.js b/js/threads.js
index 23db0c9..bdf1daa 100644
--- a/js/threads.js
+++ b/js/threads.js
@@ -1,4 +1,19 @@
 jQuery(document).ready(function () {
+	jQuery('#supportflow-details .meta-item-ok-button').click(function (event) {
+		dropdown = jQuery(this).siblings('.meta-item-dropdown').children('option:selected');
+		meta_item = jQuery(this).closest('.meta-item');
+		form_input = meta_item.children('.meta-item-name');
+		label = meta_item.children('.meta-item-label');
+
+		form_input.val(dropdown.val());
+		label.text(dropdown.text());
+
+		event.preventDefault();
+	});
+
+	jQuery('#supportflow-details .meta-item-toggle-button').click(function (event) {
+		jQuery(this).closest('.meta-item').children('.meta-item-toggle-content').toggle(250);
+		event.preventDefault();
 
 	// Require title and atleast respondent before saving a thread
 	jQuery('#save').click(function (event) {
@@ -13,4 +28,4 @@ jQuery(document).ready(function () {
 			return;
 		}
 	});
-});
\ No newline at end of file
+});

From 062324ccf9d163d86e6a7c09b0d9db2e2b2379fa Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 2 Jul 2014 01:24:52 +0530
Subject: [PATCH 162/485] Moved E-Mail account dropdown to top

---
 classes/class-supportflow-admin.php | 34 ++++++++++++++---------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index ff29c13..8d66878 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -498,6 +498,23 @@ public function meta_box_details() {
 		<div id="minor-publishing">
 			<div id="misc-publishing-actions">
 
+				<?php if ( 'post-new.php' == $pagenow ) : ?>
+					<div class="misc-pub-section meta-item">
+						<label class="meta-item-toggle-button"><?php _e( 'Account', 'supportflow' ) ?>:</label>
+						<span class="meta-item-label"><?php _e( $email_account_label, 'supportflow' ) ?></span>
+						<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
+							<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
+						</a>
+						<input name="post_email_account" class="meta-item-name" value="<?php echo $email_account_id ?>" type="hidden" />
+
+						<div class="meta-item-toggle-content hide-if-js">
+							<?php echo $email_account_dropdown ?>
+							<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php _e( 'OK' ) ?></a>
+							<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php _e( 'Cancel' ) ?></a>
+						</div>
+					</div>
+				<?php endif; ?>
+
 				<!--Thread opening date/time-->
 				<?php if ( 'post.php' == $pagenow ) : ?>
 					<div class="misc-pub-section meta-item">
@@ -547,23 +564,6 @@ public function meta_box_details() {
 					</div>
 				</div>
 
-				<?php if ( 'post-new.php' == $pagenow ) : ?>
-					<div class="misc-pub-section meta-item">
-						<label class="meta-item-toggle-button"><?php _e( 'Account', 'supportflow' ) ?>:</label>
-						<span class="meta-item-label"><?php _e( $email_account_label, 'supportflow' ) ?></span>
-						<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
-							<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
-						</a>
-						<input name="post_email_account" class="meta-item-name" value="<?php echo $email_account_id ?>" type="hidden" />
-
-						<div class="meta-item-toggle-content hide-if-js">
-							<?php echo $email_account_dropdown ?>
-							<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php _e( 'OK' ) ?></a>
-							<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php _e( 'Cancel' ) ?></a>
-						</div>
-					</div>
-				<?php endif; ?>
-
 				<div class="misc-pub-section meta-item">
 					<label class="meta-item-toggle-button"><?php _e( 'Notifications', 'supportflow' ) ?>:</label>
 					<span class="meta-item-label"><?php esc_html_e( $notification_label, 'supportflow' ) ?></span>

From 627fa1b5b40a782c8431a19f6d0c969771366357 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 3 Jul 2014 16:02:23 +0530
Subject: [PATCH 163/485] Declaring variables in local scope

Currently variables are declared in global scope rather than local scope.
They are not required globally.
---
 js/threads.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/threads.js b/js/threads.js
index bdf1daa..c962db0 100644
--- a/js/threads.js
+++ b/js/threads.js
@@ -1,9 +1,9 @@
 jQuery(document).ready(function () {
 	jQuery('#supportflow-details .meta-item-ok-button').click(function (event) {
-		dropdown = jQuery(this).siblings('.meta-item-dropdown').children('option:selected');
-		meta_item = jQuery(this).closest('.meta-item');
-		form_input = meta_item.children('.meta-item-name');
-		label = meta_item.children('.meta-item-label');
+		var dropdown = jQuery(this).siblings('.meta-item-dropdown').children('option:selected');
+		var meta_item = jQuery(this).closest('.meta-item');
+		var form_input = meta_item.children('.meta-item-name');
+		var label = meta_item.children('.meta-item-label');
 
 		form_input.val(dropdown.val());
 		label.text(dropdown.text());

From caef7839409a2ad5be85c516e10c5cb05ffcf826 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 2 Jul 2014 01:53:29 +0530
Subject: [PATCH 164/485] Using a class rather than ID to get save button

---
 classes/class-supportflow-admin.php | 2 +-
 css/admin.css                       | 6 +++---
 js/threads.js                       | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 8d66878..abd717d 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -695,7 +695,7 @@ public function meta_box_replies() {
 		} else {
 			$submit_text = __( 'Send Message', 'supportflow' );
 		}
-		submit_button( $submit_text, 'primary', 'save', false );
+		submit_button( $submit_text, 'primary save-button', 'save', false );
 		echo '</div>';
 		echo '</div>';
 
diff --git a/css/admin.css b/css/admin.css
index 7072bf4..c61f209 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -21,9 +21,9 @@
 }
 
 #change_user_label {
-    display:     inline;
-    font-weight: bold;
-    font-size:   16px;
+	display:     inline;
+	font-weight: bold;
+	font-size:   16px;
 }
 
 #supportflow-details .meta-item-label {
diff --git a/js/threads.js b/js/threads.js
index c962db0..453bc07 100644
--- a/js/threads.js
+++ b/js/threads.js
@@ -14,9 +14,10 @@ jQuery(document).ready(function () {
 	jQuery('#supportflow-details .meta-item-toggle-button').click(function (event) {
 		jQuery(this).closest('.meta-item').children('.meta-item-toggle-content').toggle(250);
 		event.preventDefault();
-
+	});
+	    
 	// Require title and atleast respondent before saving a thread
-	jQuery('#save').click(function (event) {
+	jQuery('.save-button').click(function (event) {
 		if ('' == jQuery('#subject').val()) {
 			alert(SFThreads.no_title_msg);
 			event.preventDefault();

From 8c5f144d580c06fcca620ad08f9078287cb10148 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 27 Jun 2014 23:28:33 +0530
Subject: [PATCH 165/485] Showing permissions filter using tables

---
 classes/class-supportflow-permissions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 373680d..64c865b 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -597,4 +597,4 @@ public function get_cap( $cap ) {
 	}
 }
 
-SupportFlow()->extend->permissions = new SupportFlow_Permissions();
\ No newline at end of file
+SupportFlow()->extend->permissions = new SupportFlow_Permissions();

From db08df40359d0c65afb897a638281c6a09f7aba0 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 1 Jul 2014 21:10:52 +0530
Subject: [PATCH 166/485] Renamed SupportFlow_Email_Accounts class reference

---
 classes/class-supportflow-email-accounts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index ae802ac..bffb546 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -406,4 +406,4 @@ function email_account_exists( $imap_host, $smtp_host, $username ) {
 	}
 }
 
-SupportFlow()->extend->settings = new SupportFlow_Email_Accounts();
\ No newline at end of file
+SupportFlow()->extend->email_accounts = new SupportFlow_Email_Accounts();
\ No newline at end of file

From a8717807ffac1b7970a63b8d02addec0fedbf0d9 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 1 Jul 2014 21:12:17 +0530
Subject: [PATCH 167/485] Create get_email_accounts() to get E-Mail accounts
 array

---
 classes/class-supportflow-email-accounts.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index bffb546..2a28ea0 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -105,6 +105,13 @@ function action_admin_menu() {
 
 	}
 
+	/*
+	 * Return an array containing E-Mail accounts
+	 */
+	function get_email_accounts() {
+		return $this->email_accounts;
+	}
+
 	/*
 	 * Loads the setting page to add/remove E-Mail accounts
 	 */

From c98fceb2f3a7f19c064b21dedf0e8ec6ee982d01 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 1 Jul 2014 21:18:21 +0530
Subject: [PATCH 168/485] Using
 SupportFlow_Email_Accounts::get_email_accounts() to get array of E-Mail
 accounts

Currently it is accessing them directly from database
---
 classes/class-supportflow-admin.php               | 6 +-----
 classes/class-supportflow-email-accounts.php      | 5 +----
 classes/class-supportflow-email-notifications.php | 2 +-
 classes/class-supportflow-email-replies.php       | 2 +-
 classes/class-supportflow-emails.php              | 4 ++--
 classes/class-supportflow-permissions.php         | 2 +-
 6 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index abd717d..a809cc0 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -172,7 +172,6 @@ public function action_restrict_manage_posts() {
 
 
 		// Filter to specify E-Mail account
-		$email_accounts = get_option( 'sf_email_accounts' );
 
 		echo "<select name='email_account' id='email_account' class='postform'>";
 		echo "<option value=''>" . __( 'Show All Accounts', 'supportflow' ) . "</option>";
@@ -430,10 +429,7 @@ public function meta_box_details() {
 
 
 		// Get post E-Mail account
-		$email_accounts = get_option( 'sf_email_accounts' );
-		if ( empty( $email_accounts ) ) {
-			$email_accounts = array();
-		}
+		$email_accounts = SupportFlow()->extend->email_accounts->get_email_accounts();
 
 		$user_permissions = get_user_meta( get_current_user_id(), 'sf_permissions', true );
 		if ( ! is_array( $user_permissions ) ) {
diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 2a28ea0..529b7fe 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -84,10 +84,7 @@ function __construct() {
 
 		// Get existing E-Mail accounts from database
 		$email_accounts = & $this->email_accounts;
-		$email_accounts = get_option( 'sf_email_accounts' );
-		if ( ! is_array( $email_accounts ) ) {
-			$email_accounts = array();
-		}
+		$email_accounts = get_option( 'sf_email_accounts', array() );
 	}
 
 	function action_admin_menu() {
diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index c28f460..cc955af 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -160,7 +160,7 @@ public function get_notifications_settings( $user_id = null, $allowed_only = fal
 
 		// Load all tags and E-Mail accounts
 		$tags                  = get_terms( 'sf_tags', 'hide_empty=0' );
-		$email_accounts        = get_option( 'sf_email_accounts' );
+		$email_accounts        = SupportFlow()->extend->email_accounts->get_email_accounts();
 		$notification_settings = array();
 
 		// User is admin (has complete access to all tags, E-Mail account)
diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 91f27c9..6201b81 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -26,7 +26,7 @@ public function filter_reply_notify_subject( $subject, $reply_id, $thread_id ) {
 
 
 	function retrieve_email_replies() {
-		$email_accounts = get_option( 'sf_email_accounts' );
+		$email_accounts = SupportFlow()->extend->email_accounts->get_email_accounts();
 		foreach ( $email_accounts as $id => $email_account ) {
 			if ( empty( $email_account ) ) {
 				continue;
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 8526d3d..0dded00 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -39,7 +39,7 @@ public function notify_agents_thread_replies( $reply_id ) {
 		$agent_ids = SupportFlow()->extend->email_notifications->get_notified_user( $thread->ID );
 		$agent_ids = apply_filters( 'supportflow_emails_notify_agent_ids', $agent_ids, $thread, 'reply' );
 
-		$email_accounts   = get_option( 'sf_email_accounts' );
+		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts();
 		$email_account_id = get_post_meta( $thread->ID, 'email_account', true );
 		$smtp_account     = $email_accounts[$email_account_id];
 
@@ -100,7 +100,7 @@ public function notify_respondents_thread_replies( $reply_id, $cc = array(), $bc
 		$thread      = SupportFlow()->get_thread( $reply->post_parent );
 		$respondents = SupportFlow()->get_thread_respondents( $thread->ID, array( 'fields' => 'emails' ) );
 
-		$email_accounts   = get_option( 'sf_email_accounts' );
+		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts();
 		$email_account_id = get_post_meta( $thread->ID, 'email_account', true );
 		$smtp_account     = $email_accounts[$email_account_id];
 
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 64c865b..cac9e0e 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -258,7 +258,7 @@ public function action_wp_ajax_get_user_permissions() {
 
 	public function get_user_permissions( $user_id, $return_allowed = true, $return_disallowed = true ) {
 		$tags             = get_terms( 'sf_tags', 'hide_empty=0' );
-		$email_accounts   = get_option( 'sf_email_accounts' );
+		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts();
 		$permissions      = array();
 		$user_permissions = array();
 

From cceff7a576db4d07f33c7f12e66d7547caa08d5a Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 1 Jul 2014 21:24:55 +0530
Subject: [PATCH 169/485] Creted
 SupportFlow_Permissions::get_user_permisssions() to get array of user allowed
 tag/E-Mail account

---
 classes/class-supportflow-permissions.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index cac9e0e..f43ad56 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -112,6 +112,18 @@ public function action_admin_init() {
 		add_filter( 'user_has_cap', array( $this, 'limit_user_permissions' ), 10, 3 );
 	}
 
+	/*
+	 * Return an array containing all the tags and E-Mail accounts user have access to
+	 */
+	public function get_user_permissions_data( $user_id ) {
+		$user_permissions = get_user_meta( $user_id, 'sf_permissions', true );
+		if ( ! is_array( $user_permissions ) ) {
+			$user_permissions = array( 'tags' => array(), 'email_accounts' => array() );
+		}
+
+		return $user_permissions;
+	}
+
 	public function permissions_page() {
 		?>
 		<div class="wrap">

From f61448cc220164d07b0f66d9221ae9d8af5b3212 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 1 Jul 2014 23:16:37 +0530
Subject: [PATCH 170/485] Using
 SupportFlow_Permissions::get_user_permissions_data() to get permissions for a
 user

Earlier code was directly querying it from database
---
 classes/class-supportflow-admin.php              |  5 +----
 .../class-supportflow-email-notifications.php    |  5 +----
 classes/class-supportflow-permissions.php        | 16 ++++------------
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index a809cc0..4a2ba0a 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -431,10 +431,7 @@ public function meta_box_details() {
 		// Get post E-Mail account
 		$email_accounts = SupportFlow()->extend->email_accounts->get_email_accounts();
 
-		$user_permissions = get_user_meta( get_current_user_id(), 'sf_permissions', true );
-		if ( ! is_array( $user_permissions ) ) {
-			$user_permissions = array( 'tags' => array(), 'email_accounts' => array() );
-		}
+		$user_permissions = SupportFlow()->extend->permissions->get_user_permissions_data( get_current_user_id() );
 		$user_permissions = $user_permissions['email_accounts'];
 
 		$email_account_dropdown = '<select class="meta-item-dropdown">';
diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index cc955af..2d055c1 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -180,10 +180,7 @@ public function get_notifications_settings( $user_id = null, $allowed_only = fal
 
 				// Allow user to show notifications settings of only tags/E-Mail account he is permitted
 			} else {
-				$user_permissions = get_user_meta( $user->ID, 'sf_permissions', true );
-				if ( ! is_array( $user_permissions ) || empty( $user_permissions ) || ! is_array( $user_permissions['tags'] ) || ! is_array( $user_permissions['email_accounts'] ) ) {
-					$user_permissions = array( 'tags' => array(), 'email_accounts' => array() );
-				}
+				$user_permissions = SupportFlow()->extend->permissions->get_user_permissions_data( $user->ID );
 
 				foreach ( $user_permissions['tags'] as $id => $tag ) {
 					if ( ! in_array( $tag, $tags ) ) {
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index f43ad56..bc695ef 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -282,11 +282,7 @@ public function get_user_permissions( $user_id, $return_allowed = true, $return_
 
 		foreach ( $users as $user ) {
 			if ( ! $user->has_cap( 'manage_options' ) ) {
-				$permission = get_user_meta( $user->ID, 'sf_permissions', true );
-				if ( ! is_array( $permission ) || empty( $permission ) || ! is_array( $permission['tags'] ) || ! is_array( $permission['email_accounts'] ) ) {
-					$permission = array( 'tags' => array(), 'email_accounts' => array() );
-				}
-
+				$permission = $this->get_user_permissions_data( $user->ID );
 				$permissions[$user->ID] = $permission;
 			}
 		}
@@ -355,11 +351,7 @@ public function action_wp_ajax_set_user_permission() {
 
 
 	public function set_user_permission( $user_id, $privilege_type, $privilege_id, $allowed ) {
-		$permission = get_user_meta( $user_id, 'sf_permissions', true );
-
-		if ( ! is_array( $permission ) || ! isset( $permission['tags'] ) || ! isset( $permission['email_accounts'] ) ) {
-			$permission = array( 'tags' => array(), 'email_accounts' => array() );
-		}
+		$permission = $this->get_user_permissions_data( $user_id );
 
 		if ( true == $allowed ) {
 			if ( ! in_array( $privilege_id, $permission[$privilege_type] ) ) {
@@ -400,7 +392,7 @@ function limit_user_permissions( $allcaps, $cap, $args ) {
 		}
 
 		// Get all supportflow permissions granted to the current user
-		$user_permissions = get_user_meta( $args[1], 'sf_permissions', true );
+		$user_permissions = $this->get_user_permissions_data( $args[1] );
 
 		// This capability is requested if user is viewing/modifying existing ticket
 		if ( 'edit_post' == $args[0] ) {
@@ -458,7 +450,7 @@ function limit_user_permissions( $allcaps, $cap, $args ) {
 	 * Check if user has access to a particular post
 	 */
 	public function is_user_allowed_post( $user_id, $post_id ) {
-		$user_permissions   = get_user_meta( $user_id, 'sf_permissions', true );
+		$user_permissions   = $this->get_user_permissions_data( $user_id );
 		$post_email_account = get_post_meta( $post_id, 'email_account', true );
 		$post_tags          = wp_get_post_terms( $post_id, 'sf_tags' );
 

From 2fda4d2f98af25e51d01b6e20640ef35fe6917a7 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 1 Jul 2014 23:38:14 +0530
Subject: [PATCH 171/485] Created
 SupportFlow_Email_Notifications::get_email_notifications() to get tag/E-Mail
 account user opted to receive E-Mail notifications

---
 classes/class-supportflow-email-notifications.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 2d055c1..98b1776 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -77,6 +77,18 @@ public function action_admin_menu() {
 
 	}
 
+	/**
+	 * Return an array containing tag/E-Mail account user opted to receive E-Mail notifications.
+	 */
+	public function get_email_notifications( $user_id ) {
+		$email_notifications = get_user_meta( $user_id, 'sf_email_notifications', true );
+		if ( ! is_array( $email_notifications ) || empty( $email_notifications ) || ! is_array( $email_notifications['tags'] ) || ! is_array( $email_notifications['email_accounts'] ) ) {
+			$email_notifications = array( 'tags' => array(), 'email_accounts' => array() );
+		}
+
+		return $email_notifications;
+	}
+
 	/**
 	 * Loads the page to change E-Mail notfication settings
 	 */

From d11a72bad381194ed5be2fe4b27ccb23fb9f880d Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 1 Jul 2014 23:41:08 +0530
Subject: [PATCH 172/485] Using get_email_notifications() to get E-Mail
 notifications rather querying database directly

---
 classes/class-supportflow-email-notifications.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 98b1776..126802f 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -208,11 +208,7 @@ public function get_notifications_settings( $user_id = null, $allowed_only = fal
 
 
 			// Get tag/E-Mail account for which user already receive notifications
-			$email_notifications = get_user_meta( $user->ID, 'sf_email_notifications', true );
-			if ( ! is_array( $email_notifications ) || empty( $email_notifications ) || ! is_array( $email_notifications['tags'] ) || ! is_array( $email_notifications['email_accounts'] ) ) {
-				$email_notifications = array( 'tags' => array(), 'email_accounts' => array() );
-			}
-
+			$email_notifications = $this->get_email_notifications( $user->ID );
 
 			// Return exiting notifications settings of user
 			foreach ( $user_permissions['email_accounts'] as $id ) {
@@ -289,10 +285,7 @@ public function set_notfication_settings( $privilege_type, $privilege_id, $allow
 		}
 
 		// Get tag/E-Mail account for which user already receive notifications
-		$email_notifications = get_user_meta( $user_id, 'sf_email_notifications', true );
-		if ( ! is_array( $email_notifications ) || empty( $email_notifications ) || ! is_array( $email_notifications['tags'] ) || ! is_array( $email_notifications['email_accounts'] ) ) {
-			$email_notifications = array( 'tags' => array(), 'email_accounts' => array() );
-		}
+		$email_notifications = $this->get_email_notifications( $user_id );
 
 		if ( true == $allowed ) {
 			if ( ! in_array( $privilege_id, $email_notifications[$privilege_type] ) ) {

From 7bf899f34f624fc937fb25b61c9324a8eef32c59 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 2 Jul 2014 00:41:34 +0530
Subject: [PATCH 173/485] Add option to retrieve only existing E-Mail accounts

---
 classes/class-supportflow-admin.php             |  2 +-
 classes/class-supportflow-email-accounts.php    | 17 +++++++++++++++--
 .../class-supportflow-email-notifications.php   |  2 +-
 classes/class-supportflow-email-replies.php     |  5 +----
 classes/class-supportflow-emails.php            |  4 ++--
 classes/class-supportflow-permissions.php       |  5 +----
 6 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 4a2ba0a..db5201c 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -429,7 +429,7 @@ public function meta_box_details() {
 
 
 		// Get post E-Mail account
-		$email_accounts = SupportFlow()->extend->email_accounts->get_email_accounts();
+		$email_accounts = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 
 		$user_permissions = SupportFlow()->extend->permissions->get_user_permissions_data( get_current_user_id() );
 		$user_permissions = $user_permissions['email_accounts'];
diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 529b7fe..5b117b7 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -69,6 +69,7 @@ function prepare_items() {
  */
 class SupportFlow_Email_Accounts extends SupportFlow {
 	var $email_accounts;
+	var $existing_email_accounts;
 
 	const SUCCESS                  = 0;
 	const ACCOUNT_EXISTS           = 1;
@@ -85,6 +86,14 @@ function __construct() {
 		// Get existing E-Mail accounts from database
 		$email_accounts = & $this->email_accounts;
 		$email_accounts = get_option( 'sf_email_accounts', array() );
+
+		$existing_email_accounts = & $this->existing_email_accounts;
+		$existing_email_accounts = array();
+		foreach ($email_accounts as $uid => $email_account) {
+			if ( ! empty( $email_account ) ) {
+				$existing_email_accounts[ $uid ] = $email_account;
+			}
+		}
 	}
 
 	function action_admin_menu() {
@@ -105,8 +114,12 @@ function action_admin_menu() {
 	/*
 	 * Return an array containing E-Mail accounts
 	 */
-	function get_email_accounts() {
-		return $this->email_accounts;
+	function get_email_accounts( $existing_only = false ) {
+		if ( $existing_only ) {
+			return $this->existing_email_accounts;
+		} else {
+			return $this->email_accounts;
+		}
 	}
 
 	/*
diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 126802f..3122f2b 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -172,7 +172,7 @@ public function get_notifications_settings( $user_id = null, $allowed_only = fal
 
 		// Load all tags and E-Mail accounts
 		$tags                  = get_terms( 'sf_tags', 'hide_empty=0' );
-		$email_accounts        = SupportFlow()->extend->email_accounts->get_email_accounts();
+		$email_accounts        = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 		$notification_settings = array();
 
 		// User is admin (has complete access to all tags, E-Mail account)
diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 6201b81..f84c460 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -26,11 +26,8 @@ public function filter_reply_notify_subject( $subject, $reply_id, $thread_id ) {
 
 
 	function retrieve_email_replies() {
-		$email_accounts = SupportFlow()->extend->email_accounts->get_email_accounts();
+		$email_accounts = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 		foreach ( $email_accounts as $id => $email_account ) {
-			if ( empty( $email_account ) ) {
-				continue;
-			}
 			$imap_account = array_merge( $email_account, array(
 				'inbox'      => 'INBOX',
 				'archive'    => 'ARCHIVE',
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 0dded00..820fc57 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -39,7 +39,7 @@ public function notify_agents_thread_replies( $reply_id ) {
 		$agent_ids = SupportFlow()->extend->email_notifications->get_notified_user( $thread->ID );
 		$agent_ids = apply_filters( 'supportflow_emails_notify_agent_ids', $agent_ids, $thread, 'reply' );
 
-		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts();
+		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 		$email_account_id = get_post_meta( $thread->ID, 'email_account', true );
 		$smtp_account     = $email_accounts[$email_account_id];
 
@@ -100,7 +100,7 @@ public function notify_respondents_thread_replies( $reply_id, $cc = array(), $bc
 		$thread      = SupportFlow()->get_thread( $reply->post_parent );
 		$respondents = SupportFlow()->get_thread_respondents( $thread->ID, array( 'fields' => 'emails' ) );
 
-		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts();
+		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 		$email_account_id = get_post_meta( $thread->ID, 'email_account', true );
 		$smtp_account     = $email_accounts[$email_account_id];
 
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index bc695ef..d1828c0 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -270,7 +270,7 @@ public function action_wp_ajax_get_user_permissions() {
 
 	public function get_user_permissions( $user_id, $return_allowed = true, $return_disallowed = true ) {
 		$tags             = get_terms( 'sf_tags', 'hide_empty=0' );
-		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts();
+		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts( true);
 		$permissions      = array();
 		$user_permissions = array();
 
@@ -291,9 +291,6 @@ public function get_user_permissions( $user_id, $return_allowed = true, $return_
 			$user_data = get_userdata( $user_id );
 
 			foreach ( $email_accounts as $id => $email_account ) {
-				if ( empty( $email_account ) ) {
-					continue;
-				}
 				$allowed = in_array( $id, $permission['email_accounts'] );
 				if ( ( $allowed && ! $return_allowed ) || ( ! $allowed && ! $return_disallowed ) ) {
 					continue;

From dfb364466f98f8b66216b9b97e6186cc12e9d0ca Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 2 Jul 2014 01:46:19 +0530
Subject: [PATCH 174/485] Check if atleast one E-Mail account exists before
 showing thread creation page

---
 classes/class-supportflow-permissions.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index d1828c0..c03acb8 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -375,6 +375,20 @@ public function set_user_permission( $user_id, $privilege_type, $privilege_id, $
 	function limit_user_permissions( $allcaps, $cap, $args ) {
 		global $pagenow, $post_type;
 
+		// Check if atleast one E-Mail account exists before showing thread creation page
+		if (
+			'post-new.php' == $pagenow &&
+			SupportFlow()->post_type == $post_type
+		) {
+			$email_accounts = SupportFlow()->extend->email_accounts->get_email_accounts( true );
+			if ( empty( $email_accounts ) ) {
+				$link = "edit.php?post_type=$post_type&page=sf_accounts";
+				$msg  = 'Please add atleast one E-Mail account before creating a thread.';
+
+				wp_die( "<a href='$link'>" . __( $msg, 'supportflow' ) . "</a>" );
+			}
+		}
+
 		if (
 			// Return if required capability is not one of them
 			! in_array( $args[0], array( 'edit_post', 'edit_posts', 'delete_post' ) ) ||

From 9e69379ea3f8a05775368b46858a5f21ce4f3bbf Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 2 Jul 2014 02:19:41 +0530
Subject: [PATCH 175/485] Using post owner label as 'Unassigned'  when there is
 no owner

---
 classes/class-supportflow-admin.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index db5201c..cd31b8c 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -414,8 +414,11 @@ public function meta_box_details() {
 
 		// Get post authors
 		$post_author_id    = get_post( get_the_ID() )->post_author;
-		$post_author_label = get_userdata( $post_author_id )->data->user_nicename;
-
+		if ( 0 > $post_author_id ) {
+			$post_author_label = get_userdata( $post_author_id )->data->user_nicename;
+		} else {
+			$post_author_label = __( '-- Unassigned --', 'supportflow' );
+		}
 		$args                  = array(
 			'show_option_none' => __( '-- Unassigned --', 'supportflow' ),
 			'selected'         => $post_author_id,

From 554c8411bc4756ece9d0a61a2dfdb84173d4cd88 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 2 Jul 2014 01:53:29 +0530
Subject: [PATCH 176/485] Using a class rather than ID to get save button

---
 js/threads.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/threads.js b/js/threads.js
index 453bc07..912c47e 100644
--- a/js/threads.js
+++ b/js/threads.js
@@ -15,7 +15,7 @@ jQuery(document).ready(function () {
 		jQuery(this).closest('.meta-item').children('.meta-item-toggle-content').toggle(250);
 		event.preventDefault();
 	});
-	    
+
 	// Require title and atleast respondent before saving a thread
 	jQuery('.save-button').click(function (event) {
 		if ('' == jQuery('#subject').val()) {

From 0f885d8b4fcceb811323fcebfed26363fa73ed79 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 2 Jul 2014 22:00:45 +0530
Subject: [PATCH 177/485] Some E-Mail accounts were not displayed publicly due
 to a bug

Earlier the code was not implemented correctly causing several E-Mail
accounts to show up
---
 classes/class-supportflow-email-notifications.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 3122f2b..3d94db7 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -193,15 +193,14 @@ public function get_notifications_settings( $user_id = null, $allowed_only = fal
 				// Allow user to show notifications settings of only tags/E-Mail account he is permitted
 			} else {
 				$user_permissions = SupportFlow()->extend->permissions->get_user_permissions_data( $user->ID );
-
 				foreach ( $user_permissions['tags'] as $id => $tag ) {
 					if ( ! in_array( $tag, $tags ) ) {
 						unset ( $user_permissions['tags'][ $id ] );
 					}
 				}
-				foreach ( $user_permissions['email_accounts'] as $id => $email_account ) {
-					if ( ! in_array( $email_account, $email_accounts ) ) {
-						unset ( $user_permissions['email_accounts'][ $id ] );
+				foreach ( $user_permissions['email_accounts'] as $index => $email_account_id ) {
+					if ( ! isset( $email_accounts[ $email_account_id ] ) ) {
+						unset ( $user_permissions['email_accounts'][ $index ] );
 					}
 				}
 			}

From 6d89e29a98e3aeeb3ea1d46d9a3386ff81d2feb0 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 4 Jul 2014 22:14:57 +0530
Subject: [PATCH 178/485] Added content to empty readme file

---
 readme.txt | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/readme.txt b/readme.txt
index e69de29..3c31a87 100644
--- a/readme.txt
+++ b/readme.txt
@@ -0,0 +1,14 @@
+=== SupportFlow ===
+Contributors: VarunAgw, danielbachhuber, Viper007Bond, andrewspittle
+Tags: Ticket, Support
+Tested up to: 3.9.1
+Stable tag: 0.1
+License: GPLv2 or later
+License URI: http://www.gnu.org/licenses/gpl-2.0.html
+
+SupportFlow is a web based help desk support software. It allows agents to reply or create new tickets using web interference.
+
+== Changelog ==
+
+= 0.1 =
+* Initial release.

From 40b4da6a98e78af0e90039704dace9c0fe52a14a Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 5 Jul 2014 15:01:44 +0530
Subject: [PATCH 179/485] Created a button to remove attachment from thread

Earlier there was no button/link to remove an attachment. So if you
inserted an attachment you have to refresh the page to remove it

Fixes #36
---
 classes/class-supportflow-admin.php |  4 +++-
 js/thread_attachments.js            | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index cd31b8c..7a8d2ae 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -73,6 +73,8 @@ public function action_admin_enqueue_scripts() {
 			wp_localize_script( 'supportflow-thread-attachments', 'SFThreadAttachments', array(
 				'frame_title'  => __( 'Attach files', 'supportflow' ),
 				'button_title' => __( 'Insert as attachment', 'supportflow' ),
+				'remove_attachment' => __( 'Remove', 'supportflow' ),
+				'sure_remove'       => __( 'Are you sure want to remove this attachment?', 'supportflow' ),
 			) );
 			wp_localize_script( 'supportflow-threads', 'SFThreads', array(
 			    'no_title_msg'      => __( 'You must need to specify the subject of the thread', 'supportpress' ),
@@ -681,7 +683,7 @@ public function meta_box_replies() {
 		echo '</div>';
 		echo '<ul id="replies-attachments-list">';
 		echo '</ul>';
-		echo '<input type="hidden" id="reply-attachments" name="reply-attachments" />';
+		echo '<input type="hidden" id="reply-attachments" name="reply-attachments" value="," />';
 		echo '</div>';
 		echo '<div id="submit-action">';
 		echo '<input type="checkbox" id="mark-private" name="mark-private" />';
diff --git a/js/thread_attachments.js b/js/thread_attachments.js
index eae615d..df5fa2b 100644
--- a/js/thread_attachments.js
+++ b/js/thread_attachments.js
@@ -4,6 +4,7 @@ jQuery(document).ready(function ($) {
 		// Initialization
 		init    : function () {
 			$(document).on('click', '#reply-attachment-browse-button', {}, attachment_uploader.uploader);
+			$(document).on('click', '.reply-attachment-remove', attachment_uploader.remove);
 		},
 
 		// Call this from the upload button to initiate the upload frame.
@@ -18,7 +19,9 @@ jQuery(document).ready(function ($) {
 			frame.on('close', function () {
 				var attachments = frame.state().get('selection').toJSON();
 				jQuery.each(attachments, function () {
-					jQuery('#replies-attachments-list').append('<li>' + '<a target="_blank" href="' + this.url + '">' + this.filename + '</a></li>');
+					var attachment_download_link = '<a class="reply-attachment-link" target="_blank" href="' + this.url + '">' + this.filename + '</a>';
+					var attachment_remove_link   = '<a class="reply-attachment-remove" href="#" data-attachment-id=' + this.id + ' >' + SFThreadAttachments.remove_attachment + '</a>';
+					jQuery('#replies-attachments-list').append('<li class="reply-attachment">' +  attachment_download_link + '&nbsp;' + attachment_remove_link + '</li>');
 					jQuery('#reply-attachments').val(jQuery('#reply-attachments').val() + this.id + ',');
 				});
 			});
@@ -27,6 +30,20 @@ jQuery(document).ready(function ($) {
 			return false;
 		},
 
+		remove: function (event) {
+			if (confirm(SFThreadAttachments.sure_remove)) {
+				var attachment_id = $(this).data('attachment-id');
+				var reply_attachments = $('#reply-attachments').val();
+				reply_attachments = reply_attachments.replace(',' + attachment_id + ',', ',');
+
+				// Remove attachment ID from hidden input box
+				$('#reply-attachments').val(reply_attachments)
+				
+				// Remove attachment from attachment list
+				$(this).closest('.reply-attachment').remove();
+			}
+			event.preventDefault();
+		},
 
 	};
 

From 30029e15302c578bd29b55f79d53a0954b1cc710 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 5 Jul 2014 15:30:48 +0530
Subject: [PATCH 180/485] Preventing reply author name to leave its box

Currently in view thread page if reply author box name is long it override
on reply content rather breaking into a new line
---
 css/admin.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/css/admin.css b/css/admin.css
index c61f209..9232f8a 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -180,6 +180,8 @@
 
 #supportflow-replies.postbox ul.thread-replies li .reply-avatar {
 	float: left;
+	width: 100px;	
+        word-wrap: break-word;
 }
 
 #supportflow-replies.postbox ul.thread-replies li .reply-author {

From 78ca72ea0df95210ace1d59bbc1e8e3beceb7799 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 3 Jul 2014 00:19:16 +0530
Subject: [PATCH 181/485] Created a class to generate SupportFlow thread
 statistics

---
 classes/class-supportflow-statistics.php | 20 ++++++++++++++++++++
 supportflow.php                          |  1 +
 2 files changed, 21 insertions(+)
 create mode 100644 classes/class-supportflow-statistics.php

diff --git a/classes/class-supportflow-statistics.php b/classes/class-supportflow-statistics.php
new file mode 100644
index 0000000..b05f074
--- /dev/null
+++ b/classes/class-supportflow-statistics.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Show SupportFlow thread statistics
+ *
+ * @since    0.1
+ */
+
+class SupportFlow_Statistics extends SupportFlow {
+
+	public function __construct() {
+		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
+	}
+
+	public function setup_actions() {
+
+	}
+
+}
+
+SupportFlow()->extend->statistics = new SupportFlow_Statistics();
diff --git a/supportflow.php b/supportflow.php
index 2e3595b..8794d9a 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -224,6 +224,7 @@ private function includes() {
 
 		require_once( $this->plugin_dir . 'classes/class-supportflow-ui-submissionform.php' );
 		require_once( $this->plugin_dir . 'classes/class-supportflow-ui-widget.php' );
+		require_once( $this->plugin_dir . 'classes/class-supportflow-statistics.php' );
 
 		/** Tools *************************************************************/
 		if ( defined( 'WP_CLI' ) && WP_CLI ) {

From 9a029c07a9cb0891578d57bd9fb626be8b888425 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 5 Jul 2014 16:33:54 +0530
Subject: [PATCH 182/485] Showing all thread replies by default instead of 5

Also providing an argument numberposts to change the limit of replies

Fixes #129
---
 supportflow.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/supportflow.php b/supportflow.php
index 2e3595b..41e95dc 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -606,6 +606,7 @@ public function get_replies( $args ) {
 			'post_id' => '',
 			'search'  => '',
 			'order'   => 'DESC', // 'DESC', 'ASC',
+			'numberposts' => -1,
 		);
 
 		$args      = array_merge( $default_args, $args );
@@ -615,6 +616,7 @@ public function get_replies( $args ) {
 			'post_status' => $args['status'],
 			'post_type'   => $this->reply_type,
 			'order'       => $args['order'],
+			'numberposts' => $args['numberposts'],
 			'suppress_filters' => false,
 		);
 		add_filter( 'posts_clauses', array( $this, 'filter_reply_clauses' ), 10, 2 );

From f744a0736be5738869239ae8eabca020a301b95f Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 5 Jul 2014 16:39:55 +0530
Subject: [PATCH 183/485] Using core comment-grey-bubble class to show reply
 count icon

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index cd31b8c..a2435cc 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -792,7 +792,7 @@ public function filter_manage_post_columns( $columns ) {
 			'respondents' => __( 'Respondents', 'supportflow' ),
 			'status'      => __( 'Status', 'supportflow' ),
 			'author'      => __( 'Agent', 'supportflow' ),
-			'sf_replies'  => '<span class="vers"><img alt="' . esc_attr__( 'Replies', 'supportflow' ) . '" src="' . esc_url( admin_url( 'images/comment-grey-bubble.png' ) ) . '" /></span>',
+			'sf_replies'  => '<span title="' . __( 'Reply count', 'supportflow' ) . '" class="comment-grey-bubble"></span>',
 			'created'     => __( 'Created', 'support' ),
 		);
 

From 4b9e1901328364a667ed2bf87df736209cb01634 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 5 Jul 2014 15:06:22 +0530
Subject: [PATCH 184/485] Corrected WP coding standard

---
 classes/class-supportflow-admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 7a8d2ae..9316a38 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -71,8 +71,8 @@ public function action_admin_enqueue_scripts() {
 
 			wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
 			wp_localize_script( 'supportflow-thread-attachments', 'SFThreadAttachments', array(
-				'frame_title'  => __( 'Attach files', 'supportflow' ),
-				'button_title' => __( 'Insert as attachment', 'supportflow' ),
+				'frame_title'       => __( 'Attach files', 'supportflow' ),
+				'button_title'      => __( 'Insert as attachment', 'supportflow' ),
 				'remove_attachment' => __( 'Remove', 'supportflow' ),
 				'sure_remove'       => __( 'Are you sure want to remove this attachment?', 'supportflow' ),
 			) );

From e46311176675ef479518833b6f2f4b867a1523c5 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 5 Jul 2014 16:43:31 +0530
Subject: [PATCH 185/485] Corrected WP coding standard

---
 supportflow.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index 41e95dc..34ae202 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -602,10 +602,10 @@ public function get_thread_replies( $thread_id, $args = array() ) {
 	public function get_replies( $args ) {
 
 		$default_args = array(
-			'status'  => 'public', // 'public', 'private', 'all'
-			'post_id' => '',
-			'search'  => '',
-			'order'   => 'DESC', // 'DESC', 'ASC',
+			'status'      => 'public', // 'public', 'private', 'all'
+			'post_id'     => '',
+			'search'      => '',
+			'order'       => 'DESC', // 'DESC', 'ASC',
 			'numberposts' => -1,
 		);
 

From db80bc2f039394f9111f662a3c4150a900db8b70 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 5 Jul 2014 17:34:03 +0530
Subject: [PATCH 186/485] Reduce subject box extra height

Earlier it had extra height and was looking ugly
---
 css/admin.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/css/admin.css b/css/admin.css
index 9232f8a..b1a2a15 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -92,6 +92,8 @@
 	padding-right:  8px;
 	padding-top:    12px;
 	padding-bottom: 10px;
+	line-height: 100%;
+	height: 1.7em;
 }
 
 #supportflow-respondents.postbox input {

From 21b23ade4e72184ccaff93e02edd37dc803672f1 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 6 Jul 2014 00:27:22 +0530
Subject: [PATCH 187/485] Corrected typo in readme

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 3c31a87..389a972 100644
--- a/readme.txt
+++ b/readme.txt
@@ -6,7 +6,7 @@ Stable tag: 0.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
-SupportFlow is a web based help desk support software. It allows agents to reply or create new tickets using web interference.
+SupportFlow is a web based help desk support software. It allows agents to reply or create new tickets using web interface.
 
 == Changelog ==
 

From c54c824a044a0e1df36b36a19b360d5aec9299a2 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 6 Jul 2014 00:29:07 +0530
Subject: [PATCH 188/485] Added few more tags to supportflow

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 389a972..6d3e9e1 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,6 @@
 === SupportFlow ===
 Contributors: VarunAgw, danielbachhuber, Viper007Bond, andrewspittle
-Tags: Ticket, Support
+Tags: Ticket, support, admin, customer, customer support, help desk, helpdesk, IT, support, ticket
 Tested up to: 3.9.1
 Stable tag: 0.1
 License: GPLv2 or later

From a5ae71b103c87a98b1034b6778a6b234e9a74791 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 7 Jul 2014 00:35:03 +0530
Subject: [PATCH 189/485] Created a page to statistics

Currently it shows new/open/closed tickets stats for different time period
as well as different tags
Clicking the number of matching tickets will show them in `All threads`
page
---
 classes/class-supportflow-statistics.php | 341 +++++++++++++++++++++++
 1 file changed, 341 insertions(+)

diff --git a/classes/class-supportflow-statistics.php b/classes/class-supportflow-statistics.php
index b05f074..b4f592c 100644
--- a/classes/class-supportflow-statistics.php
+++ b/classes/class-supportflow-statistics.php
@@ -12,9 +12,350 @@ public function __construct() {
 	}
 
 	public function setup_actions() {
+		add_action( 'admin_menu', array( $this, 'action_admin_menu' ) );
+	}
+
+	public function action_admin_menu() {
+		$this->slug = 'sf_statistics';
+
+		add_submenu_page(
+			'edit.php?post_type=' . SupportFlow()->post_type,
+			__( 'Statistics', 'supportflow' ),
+			__( 'Statistics', 'supportflow' ),
+			'manage_options',
+			$this->slug,
+			array( $this, 'statistics_page' )
+		);
+	}
+
+	public function statistics_page() {
+		$this->insert_css_code();
+		$this->insert_js_code()
+		?>
+		<div class="wrap">
+			<h2><?php _e( 'Statistics', 'supportflow' ) ?></h2>
+			<br />
+
+			<div class="stat-box">
+				<a class="toggle-link" href="#">
+					<h3><?php _e( 'Overall statistics', 'supportflow' ) ?></h3>
+				</a>
+
+				<div class="toggle-content">
+					<?php $this->show_overall_stats() ?>
+				</div>
+			</div>
+
+			<div class="stat-box">
+				<a class="toggle-link" href="#">
+					<h3><?php _e( 'Tickets distribution by tag', 'supportflow' ) ?></h3>
+				</a>
+
+				<div class="toggle-content">
+					<?php $this->show_tag_stats() ?>
+				</div>
+			</div>
+
+			<div class="stat-box">
+				<a class="toggle-link" href="#">
+					<h3><?php _e( 'Daily statistics for last 30 days', 'supportflow' ) ?></h3>
+				</a>
+
+				<div class="toggle-content">
+					<?php $this->show_30_days_stats() ?>
+				</div>
+			</div>
+
+			<div class="stat-box">
+				<a class="toggle-link" href="#">
+					<h3><?php _e( 'Month statistics for last 12 months', 'supportflow' ) ?></h3>
+				</a>
+
+				<div class="toggle-content">
+					<?php $this->show_12_month_stats() ?>
+				</div>
+			</div>
+
+			<div class="stat-box">
+				<a class="toggle-link" href="#">
+					<h3><?php _e( 'Yearly statistics for last 5 years', 'supportflow' ) ?></h3>
+				</a>
+
+				<div class="toggle-content">
+					<?php $this->show_5_year_stats() ?>
+				</div>
+			</div>
+
+		</div>
+	<?php
+	}
+
+	function insert_css_code() {
+		?>
+		<style>
+			.stat-box .toggle-content {
+				display: none;
+			}
+		</style>
+	<?php
+	}
+
+	function insert_js_code() {
+		?>
+		<script type="text/javascript">
+			jQuery(document).ready(function () {
+				jQuery('.toggle-link').click(function (event) {
+					var current = jQuery(this).siblings('.toggle-content').css('display');
+					jQuery('.toggle-content').hide(500);
+					jQuery('.toggle-link').prop('title', 'Expand');
+					if ('none' == current) {
+						jQuery(this).siblings('.toggle-content').show(500);
+						jQuery(this).prop('title', 'Collapse');
+					}
+					event.preventDefault();
+				});
+
+				jQuery(jQuery('.toggle-content')).each(function () {
+					if ('none' == jQuery(this).css('display')) {
+						jQuery(this).siblings('.toggle-link').prop('title', 'Expand');
+					} else {
+						jQuery(this).siblings('.toggle-link').prop('title', 'Collapse');
+					}
+					jQuery('.toggle-content').first().show(500);
+				});
+			});
+		</script>
+	<?php
+	}
+
+	public function show_overall_stats() {
+		$statistics_table = new SupportFlow_Statistics_Table();
+
+		$statistics_table->set_columns( array(
+			'table_date'   => __( 'Date', 'supportflow' ),
+			'table_new'    => __( 'New threads', 'supportflow' ),
+			'table_open'   => __( 'Open threads', 'supportflow' ),
+			'table_closed' => __( 'Closed threads', 'supportflow' ),
+		) );
+
+		$labels = array( 'Today', 'Yesterday' );
+		for ( $i = 0; $i < 2; $i ++ ) {
+			$date_time = strtotime( '-' . $i . ' days' );
+
+			$link_date  = date( "Ymd", $date_time );
+			$link_value = date( "j-M-Y", $date_time );
+			$post_date  = array(
+				'year'  => (int) date( "Y", $date_time ),
+				'month' => (int) date( "m", $date_time ),
+				'day'   => (int) date( "j", $date_time ),
+			);
+
+			$items[] = $this->get_post_data_by_date( $post_date, $link_date, __( $labels[$i], 'supportflow' ) );
+		}
+
+		$items[] = $this->get_post_data_by_date( null, null, __( 'Total tickets', 'supportflow' ) );
+
+		$statistics_table->set_data( $items );
+		$statistics_table->display();
+	}
+
+
+	public function show_tag_stats() {
+		$statistics_table = new SupportFlow_Statistics_Table();
+
+		$statistics_table->set_columns( array(
+			'table_tag'    => __( 'Tag', 'supportflow' ),
+			'table_new'    => __( 'New threads', 'supportflow' ),
+			'table_open'   => __( 'Open threads', 'supportflow' ),
+			'table_closed' => __( 'Closed threads', 'supportflow' ),
+		) );
+
+		foreach ( get_terms(SupportFlow()->tags_tax, 'hide_empty=0' ) as $tag ) {
+			$items[] = $this->get_post_data_by_tag( $tag->slug, $tag->slug, $tag->name );
+		}
+
+		$statistics_table->set_data( $items );
+		$statistics_table->display();
+	}
+
+
+	public function show_30_days_stats() {
+		$statistics_table = new SupportFlow_Statistics_Table();
+
+		$statistics_table->set_columns( array(
+			'table_date'   => __( 'Date', 'supportflow' ),
+			'table_new'    => __( 'New threads', 'supportflow' ),
+			'table_open'   => __( 'Open threads', 'supportflow' ),
+			'table_closed' => __( 'Closed threads', 'supportflow' ),
+		) );
+
+		for ( $i = 0; $i < 30; $i ++ ) {
+			$date_time  = strtotime( '-' . $i . ' days' );
+			$post_date  = array(
+				'year'  => (int) date( "Y", $date_time ),
+				'month' => (int) date( "m", $date_time ),
+				'day'   => (int) date( "j", $date_time ),
+			);
+			$link_date  = date( "Ymd", $date_time );
+			$link_value = date( "j-M-Y", $date_time );
+			$items[]    = $this->get_post_data_by_date( $post_date, $link_date, $link_value );
+		}
+
+		$statistics_table->set_data( $items );
+		$statistics_table->display();
+	}
+
+	public function show_12_month_stats() {
+		$statistics_table = new SupportFlow_Statistics_Table();
+
+		$statistics_table->set_columns( array(
+			'table_date'   => __( 'Date', 'supportflow' ),
+			'table_new'    => __( 'New threads', 'supportflow' ),
+			'table_open'   => __( 'Open threads', 'supportflow' ),
+			'table_closed' => __( 'Closed threads', 'supportflow' ),
+		) );
+
+		for ( $i = 0; $i < 12; $i ++ ) {
+			$date_time  = strtotime( '-' . $i . 'month' );
+			$post_date  = array(
+				'year'  => (int) date( "Y", $date_time ),
+				'month' => (int) date( "m", $date_time ),
+			);
+			$link_date  = date( "Ym", $date_time );
+			$link_value = date( "M-Y", $date_time );
+			$items[]    = $this->get_post_data_by_date( $post_date, $link_date, $link_value );
+		}
 
+		$statistics_table->set_data( $items );
+		$statistics_table->display();
 	}
 
+
+	public function show_5_year_stats() {
+		$statistics_table = new SupportFlow_Statistics_Table();
+
+		$statistics_table->set_columns( array(
+			'table_date'   => __( 'Date', 'supportflow' ),
+			'table_new'    => __( 'New threads', 'supportflow' ),
+			'table_open'   => __( 'Open threads', 'supportflow' ),
+			'table_closed' => __( 'Closed threads', 'supportflow' ),
+		) );
+
+		for ( $i = 0; $i < 5; $i ++ ) {
+			$date_time  = strtotime( '-' . $i . 'year' );
+			$post_date  = array(
+				'year' => (int) date( "Y", $date_time ),
+			);
+			$link_date  = date( "Y", $date_time );
+			$link_value = date( "Y", $date_time );
+			$items[]    = $this->get_post_data_by_date( $post_date, $link_date, $link_value );
+		}
+
+		$statistics_table->set_data( $items );
+		$statistics_table->display();
+	}
+
+	function get_post_data_by_date( $post_date = null, $link_date = null, $link_value = null ) {
+
+		return array(
+			'table_date'   => $link_value,
+			'table_new'    => $this->get_post_link_by_date( $link_date, 'sf_new', $this->get_posts_count_by_date( 'sf_new', $post_date ) ),
+			'table_open'   => $this->get_post_link_by_date( $link_date, 'sf_open', $this->get_posts_count_by_date( 'sf_open', $post_date ) ),
+			'table_closed' => $this->get_post_link_by_date( $link_date, 'sf_closed', $this->get_posts_count_by_date( 'sf_closed', $post_date ) ),
+		);
+	}
+
+	function get_post_data_by_tag( $post_tag = null, $link_tag = null, $link_value = null ) {
+
+		return array(
+			'table_tag'    => $link_value,
+			'table_new'    => $this->get_post_link_by_tag( $link_tag, 'sf_new', $this->get_posts_count_by_tag( 'sf_new', $post_tag ) ),
+			'table_open'   => $this->get_post_link_by_tag( $link_tag, 'sf_open', $this->get_posts_count_by_tag( 'sf_open', $post_tag ) ),
+			'table_closed' => $this->get_post_link_by_tag( $link_tag, 'sf_closed', $this->get_posts_count_by_tag( 'sf_closed', $post_tag ) ),
+		);
+	}
+
+	public function get_posts_count_by_date( $post_status = '*', $date = null ) {
+		$args = array(
+			'post_type'      => SupportFlow()->post_type,
+			'posts_per_page' => 1,
+			'post_parent'    => 0,
+			'post_status'    => $post_status,
+		);
+
+		if ( ! is_null( $date ) ) {
+			$args['date_query'] = $date;
+		}
+
+		$wp_query = new WP_Query( $args );
+
+		return (int) $wp_query->found_posts;
+	}
+
+	public function get_posts_count_by_tag( $post_status = '*', $tag = null ) {
+		$args = array(
+			'post_type'      => SupportFlow()->post_type,
+			'posts_per_page' => 1,
+			'post_parent'    => 0,
+			'post_status'    => $post_status,
+			'taxonomy'       => SupportFlow()->tags_tax,
+		);
+
+		if ( ! is_null( $tag ) ) {
+			$args['term'] = $tag;
+		}
+
+		$wp_query = new WP_Query( $args );
+
+		return (int) $wp_query->found_posts;
+	}
+
+
+	function get_post_link_by_date( $link_date = null, $post_status = null, $link_value = null ) {
+		$link = '<a href="edit.php?%s%s%s">%s</a>';
+
+		$post_type   = 'post_type=' . SupportFlow()->post_type;
+		$post_status = is_null( $post_status ) ? '' : "&post_status=$post_status";
+		$date        = is_null( $link_date ) ? '' : "&m=$link_date";
+		$value       = is_null( $link_value ) ? '' : "$link_value";
+
+		return sprintf( $link, $post_type, $post_status, $date, $value );
+	}
+
+	function get_post_link_by_tag( $link_tag = null, $post_status = null, $link_value = null ) {
+		$link = '<a href="edit.php?%s%s%s">%s</a>';
+
+		$post_type   = 'post_type=' . SupportFlow()->post_type;
+		$post_status = is_null( $post_status ) ? '' : "&post_status=$post_status";
+		$date        = is_null( $link_tag ) ? '' : '&' . SupportFlow()->tags_tax . "=$link_tag";
+		$value       = is_null( $link_value ) ? '' : "$link_value";
+
+		return sprintf( $link, $post_type, $post_status, $date, $value );
+	}
+
+}
+
+
+/**
+ * Table to show statistics
+ */
+class SupportFlow_Statistics_Table extends WP_List_Table {
+
+	function __construct() {
+		parent::__construct( array( 'screen' => 'sf_statistics_table' ) );
+	}
+
+	protected function column_default( $item, $column_name ) {
+		return $item[$column_name];
+	}
+
+	function set_columns( $columns ) {
+		$this->_column_headers = array( $columns, array(), array() );
+	}
+
+	function set_data( $data ) {
+		$this->items = $data;
+	}
 }
 
 SupportFlow()->extend->statistics = new SupportFlow_Statistics();

From 933ae3c99f7eb994d692d47321a9d7d43d62fea7 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 7 Jul 2014 01:19:56 +0530
Subject: [PATCH 190/485] Showing correct owner in details meta box label

There was a bug (caused by incorrect arithmetic operator) due to which all
posts with owner were shown as "Unassigned"
---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index cd31b8c..3297b89 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -414,7 +414,7 @@ public function meta_box_details() {
 
 		// Get post authors
 		$post_author_id    = get_post( get_the_ID() )->post_author;
-		if ( 0 > $post_author_id ) {
+		if ( $post_author_id > 0) {
 			$post_author_label = get_userdata( $post_author_id )->data->user_nicename;
 		} else {
 			$post_author_label = __( '-- Unassigned --', 'supportflow' );

From 697c02655831084071bec314f888b69c6adb0382 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 7 Jul 2014 02:11:02 +0530
Subject: [PATCH 191/485] Prevent thread reply content from leaving outside of
 div

---
 css/admin.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/css/admin.css b/css/admin.css
index b1a2a15..e40058c 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -202,6 +202,7 @@
 	-webkit-border-radius: 3px;
 	-moz-border-radius:    3px;
 	border-radius:         3px;
+	word-wrap:             break-word;
 }
 
 #supportflow-replies.postbox ul.thread-replies li .thread-meta {

From 7792c9d410d477773bd01d8f25a7a27bdb01cacc Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 7 Jul 2014 02:23:48 +0530
Subject: [PATCH 192/485] E-Mail accounts were not shown in filter menu in all
 threads page

This bug was caused by accidental removal of a line most probably in
refactor branch
---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index a2435cc..1891f63 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -172,7 +172,7 @@ public function action_restrict_manage_posts() {
 
 
 		// Filter to specify E-Mail account
-
+		$email_accounts = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 		echo "<select name='email_account' id='email_account' class='postform'>";
 		echo "<option value=''>" . __( 'Show All Accounts', 'supportflow' ) . "</option>";
 		foreach ( $email_accounts as $id => $email_account ) {

From d0a2d5795c1edee3f3c7466b19f9d4aa0f9586a0 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 8 Jul 2014 17:36:18 +0530
Subject: [PATCH 193/485] Arranging if condition parameters in yoda notation

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 3297b89..40a1d5e 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -414,7 +414,7 @@ public function meta_box_details() {
 
 		// Get post authors
 		$post_author_id    = get_post( get_the_ID() )->post_author;
-		if ( $post_author_id > 0) {
+		if ( 0 < $post_author_id ) {
 			$post_author_label = get_userdata( $post_author_id )->data->user_nicename;
 		} else {
 			$post_author_label = __( '-- Unassigned --', 'supportflow' );

From d7b81a73e483fd5d6f6501d5717017b7d517e1ea Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 5 Jul 2014 16:16:57 +0530
Subject: [PATCH 194/485] Submit post if user pressed Ctrl+Enter in reply
 content box

---
 js/threads.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/js/threads.js b/js/threads.js
index 912c47e..93b6b08 100644
--- a/js/threads.js
+++ b/js/threads.js
@@ -29,4 +29,11 @@ jQuery(document).ready(function () {
 			return;
 		}
 	});
+	
+	// Submit post if user pressed Ctrl+Enter in reply content box
+	jQuery('#reply').keypress(function (event) {
+	    if (event.ctrlKey && event.keyCode == 10 && $(this).val() != '') {
+		$('#post').submit();
+	    }
+	});
 });

From 5e72ed1cfed7e94c38399d7af918f54f89572c3f Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 5 Jul 2014 16:48:52 +0530
Subject: [PATCH 195/485] Using subscribed/unsubscribed for E-Mail
 notifications status

Earlier it was allowed/not allowed. It is just to help user understand
functionality easily
---
 classes/class-supportflow-admin.php               | 12 ++++++------
 classes/class-supportflow-email-notifications.php |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 18ede3a..f031178 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -458,8 +458,8 @@ public function meta_box_details() {
 
 		if ( 'post-new.php' == $pagenow ) {
 			$notification_dropdown .= '<option value="default">' . __( 'Default', 'supportflow' ) . '</option>';
-			$notification_dropdown .= '<option value="enable">' . __( 'Enabled', 'supportflow' ) . '</option>';
-			$notification_dropdown .= '<option value="disable">' . __( 'Disabled', 'supportflow' ) . '</option>';
+			$notification_dropdown .= '<option value="enable">' . __( 'Subscribed', 'supportflow' ) . '</option>';
+			$notification_dropdown .= '<option value="disable">' . __( 'Unsubscribed', 'supportflow' ) . '</option>';
 		} elseif ( 'post.php' == $pagenow ) {
 			$email_notifications_override = get_post_meta( get_the_ID(), 'email_notifications_override', true );
 			$current_user_id              = get_current_user_id();
@@ -467,17 +467,17 @@ public function meta_box_details() {
 			if ( isset( $email_notifications_override[$current_user_id] ) ) {
 				$override_status = $email_notifications_override[$current_user_id];
 				if ( 'enable' == $override_status ) {
-					$notification_label = 'Enabled';
+					$notification_label = 'Subscribed';
 					$notification_id    = 1;
 				} elseif ( 'disable' == $override_status ) {
-					$notification_label = 'Disabled';
+					$notification_label = 'Unsubscribed';
 					$notification_id    = 2;
 				}
 			}
 
 			$notification_dropdown .= '<option value="default"' . selected( $notification_id, 0, false ) . '>' . __( 'Default', 'supportflow' ) . '</option>';
-			$notification_dropdown .= '<option value="enable"' . selected( $notification_id, 1, false ) . '>' . __( 'Enabled', 'supportflow' ) . '</option>';
-			$notification_dropdown .= '<option value="disable"' . selected( $notification_id, 2, false ) . '>' . __( 'Disabled', 'supportflow' ) . '</option>';
+			$notification_dropdown .= '<option value="enable"' . selected( $notification_id, 1, false ) . '>' . __( 'Subscribed', 'supportflow' ) . '</option>';
+			$notification_dropdown .= '<option value="disable"' . selected( $notification_id, 2, false ) . '>' . __( 'Unsubscribed', 'supportflow' ) . '</option>';
 		}
 
 		$notification_dropdown .= '</select>';
diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 3d94db7..868eb53 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -25,7 +25,7 @@ function __construct( $notification_settings ) {
 				'privilege_id'   => $notification_setting['privilege_id'],
 			) );
 			$status    = "<input type='checkbox' id='permission_$id' class='toggle_privilege' data-email-notfication-identifier='" . $identfier . "' " . checked( $notification_setting['allowed'], true, false ) . '>';
-			$status .= " <label for='permission_$id' class='privilege_status'> " . __( $notification_setting['allowed'] ? 'Allowed' : 'Not allowed', 'supportflow' ) . "</label>";
+			$status .= " <label for='permission_$id' class='privilege_status'> " . __( $notification_setting['allowed'] ? 'Subscribed' : 'Unsubscribed', 'supportflow' ) . "</label>";
 			$this->_data[] = array(
 				'status'    => $status,
 				'privilege' => esc_html( $notification_setting['privilege'] ),
@@ -142,9 +142,9 @@ public function notification_setting_page() {
 						complete: function () {
 							var allowed = checkbox.prop('checked');
 							if (true == allowed) {
-								checkbox_label.html('<?php _e( 'Allowed', 'supportflow' ) ?>');
+								checkbox_label.html('<?php _e( 'Subscribed', 'supportflow' ) ?>');
 							} else {
-								checkbox_label.html('<?php _e( 'Not Allowed', 'supportflow' ) ?>');
+								checkbox_label.html('<?php _e( 'Unsubscribed', 'supportflow' ) ?>');
 							}
 							checkbox.prop('disabled', false);
 						},

From dcb1fab396816473eea2732faea25b1f32565633 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 5 Jul 2014 16:53:35 +0530
Subject: [PATCH 196/485] Renamed `Notifications` to `E-Mail notifications` for
 better understanding

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index f031178..57846ae 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -561,7 +561,7 @@ public function meta_box_details() {
 				</div>
 
 				<div class="misc-pub-section meta-item">
-					<label class="meta-item-toggle-button"><?php _e( 'Notifications', 'supportflow' ) ?>:</label>
+					<label class="meta-item-toggle-button"><?php _e( 'E-Mail Notifications', 'supportflow' ) ?>:</label>
 					<span class="meta-item-label"><?php esc_html_e( $notification_label, 'supportflow' ) ?></span>
 					<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
 						<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>

From 555e8353697eaccf383441f45882c26d4ab82181 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 5 Jul 2014 16:58:09 +0530
Subject: [PATCH 197/485] Add explainatory title to E-Mail notification label
 in details meta box

---
 classes/class-supportflow-admin.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 57846ae..945605a 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -453,6 +453,7 @@ public function meta_box_details() {
 		// Get E-Mail notification settings
 		$notification_id       = 0;
 		$notification_label    = 'Default';
+		$notification_label_title = 'Choose default if you want to receive E-Mail notifications based on what you set in `E-Mail notification` page. Choose Enable/Disable if you want to override those settings';
 		$notification_dropdown = '';
 		$notification_dropdown .= '<select class="meta-item-dropdown">';
 
@@ -561,7 +562,7 @@ public function meta_box_details() {
 				</div>
 
 				<div class="misc-pub-section meta-item">
-					<label class="meta-item-toggle-button"><?php _e( 'E-Mail Notifications', 'supportflow' ) ?>:</label>
+					<label class="meta-item-toggle-button" title="<?php _e( $notification_label_title, 'supportflow' ) ?>"><?php _e( 'E-Mail Notifications', 'supportflow' ) ?>:</label>
 					<span class="meta-item-label"><?php esc_html_e( $notification_label, 'supportflow' ) ?></span>
 					<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
 						<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>

From a1f66b026e04aaf000537ddda7685aa7b6ba944a Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 5 Jul 2014 17:00:10 +0530
Subject: [PATCH 198/485] Corrected WP coding standards

---
 classes/class-supportflow-admin.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 945605a..30fef7a 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -451,11 +451,11 @@ public function meta_box_details() {
 		$email_account_label = $email_accounts[ $email_account_id ]['username'];
 
 		// Get E-Mail notification settings
-		$notification_id       = 0;
-		$notification_label    = 'Default';
+		$notification_id          = 0;
+		$notification_label       = 'Default';
 		$notification_label_title = 'Choose default if you want to receive E-Mail notifications based on what you set in `E-Mail notification` page. Choose Enable/Disable if you want to override those settings';
-		$notification_dropdown = '';
-		$notification_dropdown .= '<select class="meta-item-dropdown">';
+		$notification_dropdown    = '';
+		$notification_dropdown   .= '<select class="meta-item-dropdown">';
 
 		if ( 'post-new.php' == $pagenow ) {
 			$notification_dropdown .= '<option value="default">' . __( 'Default', 'supportflow' ) . '</option>';

From acedec8edab209d7128936b66081e83b3f809da8 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 5 Jul 2014 17:57:53 +0530
Subject: [PATCH 199/485] Order post by last updated with recently updated at
 top

Fixes #116
---
 classes/class-supportflow-admin.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 30fef7a..c9d17ec 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -273,14 +273,8 @@ function action_pre_get_posts( $query ) {
 
 		// Order posts by post_modified if there's no orderby set
 		if ( ! $query->get( 'orderby' ) ) {
-			$sort_order          = array(
-				'orderby' => 'modified',
-			);
-			$sort_order['order'] = ( in_array( $query->get( 'post_status' ), array( 'trash', $last_status ) ) ) ? 'desc' : 'asc';
-			foreach ( $sort_order as $key => $value ) {
-				$query->set( $key, $value );
-				$_GET[$key] = $value;
-			}
+			$query->set( 'orderby', 'modified' );
+			$query->set( 'order', 'DESC' );
 		}
 
 		// Do our own custom search handling so we can search against reply text

From df322bbc691af26820ccf87ce363023906c672fc Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 7 Jul 2014 01:03:31 +0530
Subject: [PATCH 200/485] Echo dash sign if there is no respondent

---
 classes/class-supportflow-admin.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index c9d17ec..de00bec 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -831,6 +831,7 @@ function action_manage_posts_custom_column( $column_name, $thread_id ) {
 			case 'respondents':
 				$respondents = SupportFlow()->get_thread_respondents( $thread_id, array( 'fields' => 'emails' ) );
 				if ( empty( $respondents ) ) {
+					echo '—';
 					break;
 				}
 				foreach ( $respondents as $key => $respondent_email ) {

From 0f9aa3e04b0b7c08d3f2f51a154f92b9a435eabd Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 7 Jul 2014 01:36:27 +0530
Subject: [PATCH 201/485] Showing E-Mail acount of thread in "All threads" page

---
 classes/class-supportflow-admin.php | 47 ++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index de00bec..bf0821b 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -65,7 +65,7 @@ public function action_admin_enqueue_scripts() {
 
 			wp_enqueue_script( 'supportflow-thread-attachments', SupportFlow()->plugin_url . 'js/thread_attachments.js', array( 'jquery' ) );
 			wp_enqueue_script( 'supportflow-respondents-autocomplete', SupportFlow()->plugin_url . 'js/respondents-autocomplete.js', array( 'jquery', 'jquery-ui-autocomplete' ) );
-			wp_enqueue_script( 'supportflow-threads', SupportFlow()->plugin_url . 'js/threads.js', array( 'jquery') );
+			wp_enqueue_script( 'supportflow-threads', SupportFlow()->plugin_url . 'js/threads.js', array( 'jquery' ) );
 
 			$ajaxurl = add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) );
 
@@ -75,8 +75,8 @@ public function action_admin_enqueue_scripts() {
 				'button_title' => __( 'Insert as attachment', 'supportflow' ),
 			) );
 			wp_localize_script( 'supportflow-threads', 'SFThreads', array(
-			    'no_title_msg'      => __( 'You must need to specify the subject of the thread', 'supportpress' ),
-			    'no_respondent_msg' => __( 'You must need to add atleast one thread respondent', 'supportpress' ),
+				'no_title_msg'      => __( 'You must need to specify the subject of the thread', 'supportpress' ),
+				'no_respondent_msg' => __( 'You must need to add atleast one thread respondent', 'supportpress' ),
 			) );
 		}
 	}
@@ -165,7 +165,7 @@ public function action_restrict_manage_posts() {
 		echo "<select name='" . esc_attr( $tax_slug ) . "' id='" . esc_attr( $tax_slug ) . "' class='postform'>";
 		echo "<option value=''>" . __( 'Show All tags', 'supportflow' ) . "</option>";
 		foreach ( $terms as $term ) {
-			$selected = selected( isset( $_REQUEST[ $tax_slug ] ) && ( $_REQUEST[ $tax_slug ] == $term->slug ), true, false );
+			$selected = selected( isset( $_REQUEST[$tax_slug] ) && ( $_REQUEST[$tax_slug] == $term->slug ), true, false );
 			echo "<option value='" . esc_attr( $term->slug ) . "' $selected>" . esc_html( $term->name ) . '</option>';
 		}
 		echo "</select>";
@@ -407,7 +407,7 @@ public function meta_box_details() {
 
 
 		// Get post authors
-		$post_author_id    = get_post( get_the_ID() )->post_author;
+		$post_author_id = get_post( get_the_ID() )->post_author;
 		if ( 0 < $post_author_id ) {
 			$post_author_label = get_userdata( $post_author_id )->data->user_nicename;
 		} else {
@@ -441,8 +441,8 @@ public function meta_box_details() {
 		$email_account_dropdown .= '</select>';
 
 		$email_account_keys  = array_keys( $email_accounts );
-		$email_account_id     = $email_account_keys[0];
-		$email_account_label = $email_accounts[ $email_account_id ]['username'];
+		$email_account_id    = $email_account_keys[0];
+		$email_account_label = $email_accounts[$email_account_id]['username'];
 
 		// Get E-Mail notification settings
 		$notification_id          = 0;
@@ -636,10 +636,10 @@ public function meta_box_replies() {
 			$content = $predefined_reply->post_content;
 
 			if ( ! empty( $predefined_reply->post_title ) ) {
- 				$title = $predefined_reply->post_title;
- 			} else {
- 				$title = $predefined_reply->post_content;
- 			}
+				$title = $predefined_reply->post_title;
+			} else {
+				$title = $predefined_reply->post_content;
+			}
 
 			// Limit size to 75 characters
 			if ( strlen( $title ) > 75 ) {
@@ -725,8 +725,8 @@ public function display_thread_replies() {
 				echo '</div>';
 				$reply_author    = get_post_meta( $reply->ID, 'reply_author', true );
 				$reply_timestamp = sprintf( __( 'Noted by %1$s on %2$s at %3$s', 'supportflow' ), $reply_author, get_the_date(), get_the_time() );
-				$modified_gmt  = get_post_modified_time( 'U', true, get_the_ID() );
-				$last_activity = sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
+				$modified_gmt    = get_post_modified_time( 'U', true, get_the_ID() );
+				$last_activity   = sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
 				echo '<div class="thread-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . ' (' . $last_activity . ')' . '</span></div>';
 				echo '</li>';
 			}
@@ -762,9 +762,10 @@ public function display_thread_replies() {
 				}
 				echo '</div>';
 				$reply_timestamp = sprintf( __( '%s at %s', 'supportflow' ), get_the_date(), get_the_time() );
-				$modified_gmt  = get_post_modified_time( 'U', true, get_the_ID() );
-				$last_activity = sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
-				echo '<div class="thread-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . ' (' . $last_activity . ')' . '</span></div>';				echo '</li>';
+				$modified_gmt    = get_post_modified_time( 'U', true, get_the_ID() );
+				$last_activity   = sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
+				echo '<div class="thread-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . ' (' . $last_activity . ')' . '</span></div>';
+				echo '</li>';
 			}
 			echo '</ul>';
 		}
@@ -788,6 +789,7 @@ public function filter_manage_post_columns( $columns ) {
 			'status'      => __( 'Status', 'supportflow' ),
 			'author'      => __( 'Agent', 'supportflow' ),
 			'sf_replies'  => '<span title="' . __( 'Reply count', 'supportflow' ) . '" class="comment-grey-bubble"></span>',
+			'email'       => __( 'E-Mail account', 'supportflow' ),
 			'created'     => __( 'Created', 'support' ),
 		);
 
@@ -854,6 +856,17 @@ function action_manage_posts_custom_column( $column_name, $thread_id ) {
 				$filter_link = add_query_arg( $args, admin_url( 'edit.php' ) );
 				echo '<a href="' . esc_url( $filter_link ) . '">' . esc_html( $status_name ) . '</a>';
 				break;
+			case 'email':
+				$email_account_id       = get_post_meta( $thread_id, 'email_account', true );
+				$email_accounts         = SupportFlow()->extend->email_accounts->get_email_accounts();
+				$args                   = array(
+					'post_type'     => SupportFlow()->post_type,
+					'email_account' => $email_account_id,
+				);
+				$email_account_username = $email_accounts[$email_account_id]['username'];
+				$filter_link            = add_query_arg( $args, admin_url( 'edit.php' ) );
+				echo '<a href="' . esc_url( $filter_link ) . '">' . esc_html( $email_account_username ) . '</a>';
+				break;
 			case 'sf_replies':
 				$replies = SupportFlow()->get_thread_replies_count( $thread_id );
 				echo '<div class="post-com-count-wrapper">';
@@ -903,7 +916,7 @@ public function action_save_post( $thread_id ) {
 			SupportFlow()->update_thread_respondents( $thread_id, $respondents );
 		}
 
-		if ( isset( $_POST['post_email_account'] ) && is_numeric( $_POST['post_email_account']  ) ) {
+		if ( isset( $_POST['post_email_account'] ) && is_numeric( $_POST['post_email_account'] ) ) {
 			$email_account = (int) $_POST['post_email_account'];
 			update_post_meta( $thread_id, 'email_account', $email_account );
 		}

From d3d43907e1ead8a89db33e8f05bbfd863af38ef8 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 7 Jul 2014 01:47:06 +0530
Subject: [PATCH 202/485] Reduced width of reply count column in all threads
 page

---
 css/admin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/admin.css b/css/admin.css
index e40058c..1959b27 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -1,6 +1,6 @@
 .wp-list-table.fixed .column-sf_replies {
 	text-align: left;
-	width:      4em;
+	width:      1em;
 }
 
 .wp-list-table.fixed .column-updated,

From 83db6eb02ca5d95571e48bd42cf7f443cc49ea63 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 7 Jul 2014 01:49:50 +0530
Subject: [PATCH 203/485] Reduced width of status column in all threads page

---
 css/admin.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/css/admin.css b/css/admin.css
index 1959b27..3108198 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -3,6 +3,11 @@
 	width:      1em;
 }
 
+.wp-list-table.fixed .column-status {
+	text-align: left;
+	width:      6em;
+}
+
 .wp-list-table.fixed .column-updated,
 .wp-list-table.fixed .column-created {
 	width: 10%;

From 34bc9d2f05b4a4994c7c64026e22d9dfd39e0374 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 7 Jul 2014 02:06:39 +0530
Subject: [PATCH 204/485] Showing excerpt of first reply in all thread page

---
 classes/class-supportflow-admin.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index bf0821b..ef80e1e 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -785,6 +785,7 @@ public function filter_manage_post_columns( $columns ) {
 			'cb'          => $columns['cb'],
 			'updated'     => __( 'Updated', 'supportflow' ),
 			'title'       => __( 'Subject', 'supportflow' ),
+			'sf_excerpt'  => __( 'Excerpt', 'supportflow' ),
 			'respondents' => __( 'Respondents', 'supportflow' ),
 			'status'      => __( 'Status', 'supportflow' ),
 			'author'      => __( 'Agent', 'supportflow' ),
@@ -830,6 +831,17 @@ function action_manage_posts_custom_column( $column_name, $thread_id ) {
 				$modified_gmt = get_post_modified_time( 'U', true, $thread_id );
 				echo sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
 				break;
+			case 'sf_excerpt':
+				$replies = SupportFlow()->get_thread_replies( $thread_id, array( 'numberposts' => 1, 'order' => 'ASC' ) );
+				if ( ! isset( $replies[0] ) ) {
+					break;
+				}
+				$first_reply = $replies[0]->post_content;
+				if ( strlen( $first_reply ) > 50 ) {
+					$first_reply = substr( $first_reply, 0, 50 );
+				}
+				echo $first_reply;
+				break;
 			case 'respondents':
 				$respondents = SupportFlow()->get_thread_respondents( $thread_id, array( 'fields' => 'emails' ) );
 				if ( empty( $respondents ) ) {

From 30d6a91b14762471b64a8147eecff243218fef8c Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 9 Jul 2014 02:54:52 +0530
Subject: [PATCH 205/485] Returning wp_mail result after sending E-Mail

---
 classes/class-supportflow-emails.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 820fc57..705814a 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -153,12 +153,14 @@ public function mail( $to, $subject, $message, $headers = '', $attachments = arr
 			add_action( 'phpmailer_init', array( $this, 'action_set_smtp_settings' ) );
 		}
 
-		wp_mail( $to, $subject, $message, $headers, $attachments );
+		$result = wp_mail( $to, $subject, $message, $headers, $attachments );
 
 		if ( ! empty( $smtp_account ) ) {
 			$this->smtp_account = null;
 			remove_action( 'phpmailer_init', array( $this, 'action_set_smtp_settings' ) );
 		}
+
+		return $result;
 	}
 
 	public function action_set_smtp_settings( $phpmailer ) {

From ab0ef7995d2595df330598a2e85190aa3bd31bb4 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 9 Jul 2014 03:24:34 +0530
Subject: [PATCH 206/485] Return invalid E-Mail ID's in extract_email_ids()
 method too

Earlier it accept an array of E-Mail ID's and return only valid E-Mail
ID's from them. Now onwards it can also return invalid E-Mail ID's as
argument
---
 supportflow.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index 34ae202..62a8f1c 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -770,11 +770,16 @@ public function get_cap( $cap ) {
 	 * Convert multiple comma seperated E-Mail ID's into a array
 	 * @return array
 	 */
-	public function extract_email_ids( $string ) {
+	public function extract_email_ids( $string, & $invalid_email_ids = array() ) {
 		$emails = str_replace( ' ', '', $string );
 		$emails = explode( ',', $emails );
-		$emails = array_filter( $emails, function ( $email ) {
-			return sanitize_email( $email ) == $email && '' != $email;
+		$emails = array_filter( $emails, function ( $email ) use ( & $invalid_email_ids ) {
+			$is_valid_email_id = sanitize_email( $email ) == $email && '' != $email;
+			if ( ! $is_valid_email_id && '' != $email ) {
+				$invalid_email_ids[] = $email;
+			}
+
+			return $is_valid_email_id;
 		} );
 
 		return $emails;

From e39581f1a737b994b8889d969f1843110f739b99 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 9 Jul 2014 03:34:43 +0530
Subject: [PATCH 207/485] Allow forwarding a thread to an E-Mail ID

It covers:
* A meta box in view thread page which allowes entering E-Mail ID to send E-Mails
* Sending thread replies along with its details to these E-Mail ID's
* Checking if user has permission and CSRF check
* Validating E-Mail ID's before sending
---
 classes/class-supportflow-admin.php  | 56 ++++++++++++++++++++++++++++
 classes/class-supportflow-emails.php | 44 ++++++++++++++++++++++
 js/email_conversation.js             | 33 ++++++++++++++++
 3 files changed, 133 insertions(+)
 create mode 100644 js/email_conversation.js

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index ef80e1e..59dc46a 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -6,6 +6,7 @@
 class SupportFlow_Admin extends SupportFlow {
 
 	function __construct() {
+		add_action( 'wp_ajax_sf_forward_conversation', array( $this, 'action_wp_ajax_sf_email_conversation' ) );
 		add_action( 'wp_ajax_thread_attachment_upload', array( $this, 'action_wp_ajax_thread_attachment_upload' ) );
 		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
 	}
@@ -79,6 +80,45 @@ public function action_admin_enqueue_scripts() {
 				'no_respondent_msg' => __( 'You must need to add atleast one thread respondent', 'supportpress' ),
 			) );
 		}
+
+		if ( 'post.php' == $pagenow ) {
+			wp_enqueue_script( 'supportflow-email-conversation', SupportFlow()->plugin_url . 'js/email_conversation.js', array( 'jquery' ) );
+			wp_localize_script( 'supportflow-email-conversation', 'SFEmailConversation', array(
+				'post_id'                   => get_the_ID(),
+				'sending_emails'            => __( 'Please wait while sending E-Mail(s)', 'supportpress' ),
+				'failed_sending'            => __( 'Failed sending E-Mails', 'supportpress' ),
+				'_email_conversation_nonce' => wp_create_nonce(),
+			) );
+		}
+	}
+
+	/**
+	 *
+	 */
+	public function action_wp_ajax_sf_email_conversation() {
+		check_ajax_referer( - 1, '_email_conversation_nonce' );
+
+		if ( ! isset( $_REQUEST['email_ids'] ) || ! isset( $_REQUEST['post_id'] ) ) {
+			die;
+		}
+
+		$email_ids = SupportFlow()->extract_email_ids( $_REQUEST['email_ids'] );
+		$thread_id = (int) $_REQUEST['post_id'];
+
+		if ( ! current_user_can( 'edit_post', $thread_id ) ) {
+			_e( 'You are not allowed to edit this item.' );
+			die;
+		}
+
+		if ( empty( $email_ids ) ) {
+			_e( 'No valid E-Mail ID found', 'supportflow' );
+			die;
+		}
+
+		SupportFlow()->extend->emails->email_conversation( $thread_id, $email_ids );
+
+		_e( 'Successfully sented E-Mails', 'supportflow' );
+		exit;
 	}
 
 	/**
@@ -364,6 +404,8 @@ function handle_action_change_status() {
 	 *
 	 */
 	public function action_add_meta_boxes() {
+		global $pagenow;
+
 		if ( ! $this->is_edit_screen() ) {
 			return;
 		}
@@ -378,6 +420,20 @@ public function action_add_meta_boxes() {
 		add_meta_box( 'supportflow-respondents', __( 'Respondents', 'supportflow' ), array( $this, 'meta_box_respondents' ), SupportFlow()->post_type, 'normal' );
 		add_meta_box( 'supportflow-cc-bcc', __( 'CC and BCC', 'supportflow' ), array( $this, 'meta_box_cc_bcc' ), SupportFlow()->post_type, 'normal' );
 		add_meta_box( 'supportflow-replies', __( 'Replies', 'supportflow' ), array( $this, 'meta_box_replies' ), SupportFlow()->post_type, 'normal' );
+
+		if ( 'post.php' == $pagenow ) {
+			add_meta_box( 'supportflow-forward_conversation', __( 'Forward this conversation', 'supportflow' ), array( $this, 'meta_box_email_conversation' ), SupportFlow()->post_type, 'side' );
+		}
+	}
+
+	public function meta_box_email_conversation() {
+		?>
+		<p class="description"><?php _e( "Please enter E-Mail address seperated by comma to whom you want to send this conversation.", 'supportflow' ) ?></p>
+		<br />
+		<input type="text" id="email_conversation_to" />
+		<?php submit_button( __( 'Send', 'supportflow' ), '', 'email_conversation_submit', false ); ?>
+		<p id="email_conversation_status"></p>
+	<?php
 	}
 
 	/**
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 705814a..7b0e15f 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -143,6 +143,50 @@ public function notify_respondents_thread_replies( $reply_id, $cc = array(), $bc
 		self::mail( $respondents, $subject, $message, $headers, $attachments, $smtp_account );
 	}
 
+	/**
+	 * E-Mail a supportflow conversation to users
+	 *
+	 * @param integer      $thread_id
+	 * @param array|string $to
+	 */
+	public function email_conversation( $thread_id, $to ) {
+
+		$thread         = SupportFlow()->get_thread( $thread_id );
+		$thread_replies = SupportFlow()->get_thread_replies( $thread_id );
+		$thread_owner   = $thread->post_author > 0 ? get_user_by( 'id', $thread->post_author )->data->user_nicename : __( 'Unassigned', 'supportflow' );
+
+		$attachments = array();
+		$msg         = '';
+		$subject     = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $thread->ID ) . ' ' . __( 'Conversation summery', 'supportflow' );
+
+		$msg .= '<b>' . __( 'Title', 'supportflow' ) . ':</b> ' . esc_html( $thread->post_title ) . '<br>';
+		$msg .= '<b>' . __( 'Status', 'supportflow' ) . ':</b> ' . SupportFlow()->post_statuses[$thread->post_status]['label'] . '<br>';
+		$msg .= '<b>' . __( 'Owner', 'supportflow' ) . ':</b> ' . esc_html( $thread_owner ) . '<br>';
+		$msg .= '<b>' . __( 'Created on', 'supportflow' ) . ':</b> ' . $thread->post_date_gmt . ' GMT<br>';
+		$msg .= '<b>' . __( 'Last Updated on', 'supportflow' ) . ':</b> ' . $thread->post_modified_gmt . ' GMT<br>';
+		$msg .= '<br><br>';
+
+		foreach ( array_reverse( $thread_replies ) as $thread_reply ) {
+			$date_time    = $thread_reply->post_date_gmt . ' GMT';
+			$reply_author = get_post_meta( $thread_reply->ID, 'reply_author', true );
+			if ( empty( $reply_author ) ) {
+				$reply_author = get_post_meta( $thread_reply->ID, 'reply_author_email', true );
+			}
+
+			$msg .= '<b>' . sprintf( __( 'On %s, %s wrote:', 'supportflow' ), $date_time, esc_html( $reply_author ) ) . '</b>';
+			$msg .= '<br>';
+			$msg .= esc_html( $thread_reply->post_content );
+			$msg .= '<br><br>';
+
+			if ( $thread_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $thread_reply->ID ) ) ) {
+				foreach ( $thread_attachments as $attachment ) {
+					$attachments[] = get_attached_file( $attachment->ID );
+				}
+			}
+		}
+		self::mail( $to, $subject, $msg, 'Content-Type: text/html', $attachments );
+	}
+
 	/**
 	 * Send an email from SupportFlow
 	 */
diff --git a/js/email_conversation.js b/js/email_conversation.js
new file mode 100644
index 0000000..b833032
--- /dev/null
+++ b/js/email_conversation.js
@@ -0,0 +1,33 @@
+jQuery(document).ready(function () {
+	// Send conversation to E-Mail ID's
+	jQuery('#email_conversation_submit').click(function (event) {
+		event.preventDefault();
+		var email_ids = jQuery('#email_conversation_to').val();
+
+		jQuery.ajax(ajaxurl, {
+			type      : 'post',
+			data      : {
+				action                   : 'sf_forward_conversation',
+				email_ids                : email_ids,
+				post_id                  : SFEmailConversation.post_id,
+				_email_conversation_nonce: SFEmailConversation._email_conversation_nonce,
+			},
+			beforeSend: function () {
+				jQuery('#email_conversation_to').prop('disabled', true);
+				jQuery('#email_conversation_submit').prop('disabled', true);
+				jQuery('#email_conversation_status').text(SFEmailConversation.sending_emails);
+			},
+			success   : function (content) {
+				jQuery('#email_conversation_status').html(content);
+			},
+			error     : function () {
+				jQuery('#email_conversation_status').text(SFEmailConversation.failed_sending);
+			},
+			complete  : function () {
+				jQuery('#email_conversation_to').prop('disabled', false);
+				jQuery('#email_conversation_submit').prop('disabled', false);
+			},
+		});
+
+	});
+});
\ No newline at end of file

From acd8189e370188494e43e67575d28eb7ff1a47e2 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 10 Jul 2014 20:52:16 +0530
Subject: [PATCH 208/485] Escaping attachment URL and filename

---
 js/thread_attachments.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/thread_attachments.js b/js/thread_attachments.js
index df5fa2b..9bb31cd 100644
--- a/js/thread_attachments.js
+++ b/js/thread_attachments.js
@@ -19,7 +19,7 @@ jQuery(document).ready(function ($) {
 			frame.on('close', function () {
 				var attachments = frame.state().get('selection').toJSON();
 				jQuery.each(attachments, function () {
-					var attachment_download_link = '<a class="reply-attachment-link" target="_blank" href="' + this.url + '">' + this.filename + '</a>';
+					var attachment_download_link = '<a class="reply-attachment-link" target="_blank" href="' + _.escape(this.url) + '">' +  _.escape(this.filename) + '</a>';
 					var attachment_remove_link   = '<a class="reply-attachment-remove" href="#" data-attachment-id=' + this.id + ' >' + SFThreadAttachments.remove_attachment + '</a>';
 					jQuery('#replies-attachments-list').append('<li class="reply-attachment">' +  attachment_download_link + '&nbsp;' + attachment_remove_link + '</li>');
 					jQuery('#reply-attachments').val(jQuery('#reply-attachments').val() + this.id + ',');

From ac0bdfbb18975b0bfa740797d8adb5d86fa1b14c Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 10 Jul 2014 20:55:01 +0530
Subject: [PATCH 209/485] Added type to style tag to maintain backward
 compatibiliy with old browsers

---
 classes/class-supportflow-statistics.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-statistics.php b/classes/class-supportflow-statistics.php
index b4f592c..c24c348 100644
--- a/classes/class-supportflow-statistics.php
+++ b/classes/class-supportflow-statistics.php
@@ -92,7 +92,7 @@ public function statistics_page() {
 
 	function insert_css_code() {
 		?>
-		<style>
+		<style type="text/css">
 			.stat-box .toggle-content {
 				display: none;
 			}

From 0b145125212684cc406bcbaea0a73bb1e19a55ae Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 10 Jul 2014 21:20:36 +0530
Subject: [PATCH 210/485] Add comments to code in statistics page

---
 classes/class-supportflow-statistics.php | 84 ++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/classes/class-supportflow-statistics.php b/classes/class-supportflow-statistics.php
index c24c348..ce58860 100644
--- a/classes/class-supportflow-statistics.php
+++ b/classes/class-supportflow-statistics.php
@@ -18,6 +18,7 @@ public function setup_actions() {
 	public function action_admin_menu() {
 		$this->slug = 'sf_statistics';
 
+		// Creates a submenu in SupportFlow menu
 		add_submenu_page(
 			'edit.php?post_type=' . SupportFlow()->post_type,
 			__( 'Statistics', 'supportflow' ),
@@ -28,7 +29,11 @@ public function action_admin_menu() {
 		);
 	}
 
+	/**
+	 * Display whole statistics page
+	 */
 	public function statistics_page() {
+		// Add JS and CSS code required by page
 		$this->insert_css_code();
 		$this->insert_js_code()
 		?>
@@ -90,6 +95,9 @@ public function statistics_page() {
 	<?php
 	}
 
+	/*
+	 * Add CSS code required by statistics page
+	 */
 	function insert_css_code() {
 		?>
 		<style type="text/css">
@@ -100,10 +108,14 @@ function insert_css_code() {
 	<?php
 	}
 
+	/*
+	 * Add JS code required by statistics page
+	 */
 	function insert_js_code() {
 		?>
 		<script type="text/javascript">
 			jQuery(document).ready(function () {
+				// Close all the different stat tables and toggle the status of clicked stat table
 				jQuery('.toggle-link').click(function (event) {
 					var current = jQuery(this).siblings('.toggle-content').css('display');
 					jQuery('.toggle-content').hide(500);
@@ -115,12 +127,14 @@ function insert_js_code() {
 					event.preventDefault();
 				});
 
+				// Set different type of statistics link title at page load
 				jQuery(jQuery('.toggle-content')).each(function () {
 					if ('none' == jQuery(this).css('display')) {
 						jQuery(this).siblings('.toggle-link').prop('title', 'Expand');
 					} else {
 						jQuery(this).siblings('.toggle-link').prop('title', 'Collapse');
 					}
+
 					jQuery('.toggle-content').first().show(500);
 				});
 			});
@@ -128,6 +142,10 @@ function insert_js_code() {
 	<?php
 	}
 
+	/*
+	 * Show overall stats table.
+	 * Currently shows today, yesterday and overall (whole life) ticket stats
+	 */
 	public function show_overall_stats() {
 		$statistics_table = new SupportFlow_Statistics_Table();
 
@@ -160,6 +178,9 @@ public function show_overall_stats() {
 	}
 
 
+	/*
+	 * Show tickets status per tag
+	 */
 	public function show_tag_stats() {
 		$statistics_table = new SupportFlow_Statistics_Table();
 
@@ -179,6 +200,9 @@ public function show_tag_stats() {
 	}
 
 
+	/*
+	 * Shows stats of ticket created in last 30 days
+	 */
 	public function show_30_days_stats() {
 		$statistics_table = new SupportFlow_Statistics_Table();
 
@@ -205,6 +229,10 @@ public function show_30_days_stats() {
 		$statistics_table->display();
 	}
 
+
+	/*
+	 * Shows stats of ticket created in last 12 months
+	 */
 	public function show_12_month_stats() {
 		$statistics_table = new SupportFlow_Statistics_Table();
 
@@ -231,6 +259,9 @@ public function show_12_month_stats() {
 	}
 
 
+	/*
+	 * Shows stats of ticket created in last 5 years
+	 */
 	public function show_5_year_stats() {
 		$statistics_table = new SupportFlow_Statistics_Table();
 
@@ -255,6 +286,14 @@ public function show_5_year_stats() {
 		$statistics_table->display();
 	}
 
+
+	/**
+	 * Stats of post created on a particular date
+	 * @param array $post_date Date in format like array('year'=>1994, 'month'=>12, 'day'=>5)
+	 * @param integer $link_date Date in format used in filtering by WP in all threads page. e.g. 19941205
+	 * @param string $link_value Value to show user of link in table
+	 * @return array Tickets stats created on a particular date. This array is directly usable in table
+	 */
 	function get_post_data_by_date( $post_date = null, $link_date = null, $link_value = null ) {
 
 		return array(
@@ -265,6 +304,14 @@ function get_post_data_by_date( $post_date = null, $link_date = null, $link_valu
 		);
 	}
 
+
+	/**
+	 * Stats of post created of a particular tag
+	 * @param string $post_tag Slug of tag for which you want to get stats for
+	 * @param integer $link_tag Tag in format used in filtering by WP in all threads page.
+	 * @param string $link_value Value to show user of link in table
+	 * @return array Tickets stats created for a particular tag. This array is directly usable in table
+	 */
 	function get_post_data_by_tag( $post_tag = null, $link_tag = null, $link_value = null ) {
 
 		return array(
@@ -275,6 +322,13 @@ function get_post_data_by_tag( $post_tag = null, $link_tag = null, $link_value =
 		);
 	}
 
+
+	/**
+	 * Get count of post created on a particular date with particular post status.
+	 * @param string $post_status Post status you want to get count. Using `*` to get count of all post statuses
+	 * @param type $date Date in format like array('year'=>1994, 'month'=>12, 'day'=>5)
+	 * @return integer Count of posts
+	 */
 	public function get_posts_count_by_date( $post_status = '*', $date = null ) {
 		$args = array(
 			'post_type'      => SupportFlow()->post_type,
@@ -292,6 +346,13 @@ public function get_posts_count_by_date( $post_status = '*', $date = null ) {
 		return (int) $wp_query->found_posts;
 	}
 
+
+	/**
+	 * Get count of post created of a particular tag with particular post status.
+	 * @param string $post_status Post status you want to get count. Using `*` to get count of all post statuses
+	 * @param type $tag Slug of tag you want to get count of
+	 * @return integer Count of posts
+	 */
 	public function get_posts_count_by_tag( $post_status = '*', $tag = null ) {
 		$args = array(
 			'post_type'      => SupportFlow()->post_type,
@@ -311,6 +372,13 @@ public function get_posts_count_by_tag( $post_status = '*', $tag = null ) {
 	}
 
 
+	/**
+	 * Generate a link that shows matching tickets in all thread page
+	 * @param integer $link_date Date in format used in filtering by WP in all threads page. e.g. 19941205
+	 * @param string $post_status Post statuses that should be shown in all threads page
+	 * @param string $link_value Value of hyperlink that should be shown to user
+	 * @return string A hyperlink
+	 */
 	function get_post_link_by_date( $link_date = null, $post_status = null, $link_value = null ) {
 		$link = '<a href="edit.php?%s%s%s">%s</a>';
 
@@ -322,6 +390,14 @@ function get_post_link_by_date( $link_date = null, $post_status = null, $link_va
 		return sprintf( $link, $post_type, $post_status, $date, $value );
 	}
 
+
+	/**
+	 * Generate a link that shows matching tickets in all thread page
+	 * @param string $link_tag Slug of tag
+	 * @param string $post_status Post statuses that should be shown in all threads page
+	 * @param string $link_value Value of hyperlink that should be shown to user
+	 * @return string A hyperlink
+	 */
 	function get_post_link_by_tag( $link_tag = null, $post_status = null, $link_value = null ) {
 		$link = '<a href="edit.php?%s%s%s">%s</a>';
 
@@ -349,10 +425,18 @@ protected function column_default( $item, $column_name ) {
 		return $item[$column_name];
 	}
 
+	/**
+	 * Set columns that should be displayed in table
+	 * @param array $columns
+	 */
 	function set_columns( $columns ) {
 		$this->_column_headers = array( $columns, array(), array() );
 	}
 
+	/**
+	 * Set data that should be displayed in table
+	 * @param array $data
+	 */
 	function set_data( $data ) {
 		$this->items = $data;
 	}

From b5d18f2707ef20b50faec8cbde99c12616562a6a Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 11 Jul 2014 22:37:49 +0530
Subject: [PATCH 211/485] Making attachement remove link red in color

---
 js/thread_attachments.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/thread_attachments.js b/js/thread_attachments.js
index 9bb31cd..d61d8f8 100644
--- a/js/thread_attachments.js
+++ b/js/thread_attachments.js
@@ -20,8 +20,8 @@ jQuery(document).ready(function ($) {
 				var attachments = frame.state().get('selection').toJSON();
 				jQuery.each(attachments, function () {
 					var attachment_download_link = '<a class="reply-attachment-link" target="_blank" href="' + _.escape(this.url) + '">' +  _.escape(this.filename) + '</a>';
-					var attachment_remove_link   = '<a class="reply-attachment-remove" href="#" data-attachment-id=' + this.id + ' >' + SFThreadAttachments.remove_attachment + '</a>';
-					jQuery('#replies-attachments-list').append('<li class="reply-attachment">' +  attachment_download_link + '&nbsp;' + attachment_remove_link + '</li>');
+					var attachment_remove_link   = '<a class="reply-attachment-remove delete" href="#" data-attachment-id=' + this.id + ' >' + SFThreadAttachments.remove_attachment + '</a>';
+					jQuery('#replies-attachments-list').append('<li id="media-items" class="reply-attachment">' +  attachment_download_link + '&nbsp;' + attachment_remove_link + '</li>');
 					jQuery('#reply-attachments').val(jQuery('#reply-attachments').val() + this.id + ',');
 				});
 			});

From b9662ed2b2b9c64b6bd55c9b73ec316deff2dd47 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 11 Jul 2014 22:52:26 +0530
Subject: [PATCH 212/485] Add explainatory messages for user to failed ajax
 requests

---
 classes/class-supportflow-admin.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 59dc46a..c5822be 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -96,9 +96,13 @@ public function action_admin_enqueue_scripts() {
 	 *
 	 */
 	public function action_wp_ajax_sf_email_conversation() {
-		check_ajax_referer( - 1, '_email_conversation_nonce' );
+		if ( false === check_ajax_referer( - 1, '_email_conversation_nonce', false ) ) {
+			_e( 'Invalid request. Please try refreshing the page.', 'supportflow' );
+			die;
+		}
 
 		if ( ! isset( $_REQUEST['email_ids'] ) || ! isset( $_REQUEST['post_id'] ) ) {
+			_e( 'Invalid request. Please try refreshing the page.', 'supportflow' );
 			die;
 		}
 

From e935a84d8634e3f55c6556f5aa901fa112ca085e Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 11 Jul 2014 22:55:35 +0530
Subject: [PATCH 213/485] Escaping attachment ID before insertion in DOM

---
 js/thread_attachments.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/thread_attachments.js b/js/thread_attachments.js
index d61d8f8..6630399 100644
--- a/js/thread_attachments.js
+++ b/js/thread_attachments.js
@@ -20,9 +20,9 @@ jQuery(document).ready(function ($) {
 				var attachments = frame.state().get('selection').toJSON();
 				jQuery.each(attachments, function () {
 					var attachment_download_link = '<a class="reply-attachment-link" target="_blank" href="' + _.escape(this.url) + '">' +  _.escape(this.filename) + '</a>';
-					var attachment_remove_link   = '<a class="reply-attachment-remove delete" href="#" data-attachment-id=' + this.id + ' >' + SFThreadAttachments.remove_attachment + '</a>';
+					var attachment_remove_link   = '<a class="reply-attachment-remove delete" href="#" data-attachment-id=' + _.escape(this.id) + ' >' + SFThreadAttachments.remove_attachment + '</a>';
 					jQuery('#replies-attachments-list').append('<li id="media-items" class="reply-attachment">' +  attachment_download_link + '&nbsp;' + attachment_remove_link + '</li>');
-					jQuery('#reply-attachments').val(jQuery('#reply-attachments').val() + this.id + ',');
+					jQuery('#reply-attachments').val(jQuery('#reply-attachments').val() + _.escape(this.id) + ',');
 				});
 			});
 

From af990e3c3120fedf1c2b558f907a21eef735a5be Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 11 Jul 2014 23:04:22 +0530
Subject: [PATCH 214/485] Added action to wp_create_nonce()

---
 classes/class-supportflow-admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index c5822be..e103efe 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -87,7 +87,7 @@ public function action_admin_enqueue_scripts() {
 				'post_id'                   => get_the_ID(),
 				'sending_emails'            => __( 'Please wait while sending E-Mail(s)', 'supportpress' ),
 				'failed_sending'            => __( 'Failed sending E-Mails', 'supportpress' ),
-				'_email_conversation_nonce' => wp_create_nonce(),
+				'_email_conversation_nonce' => wp_create_nonce( 'sf_email_conversation' ),
 			) );
 		}
 	}
@@ -96,7 +96,7 @@ public function action_admin_enqueue_scripts() {
 	 *
 	 */
 	public function action_wp_ajax_sf_email_conversation() {
-		if ( false === check_ajax_referer( - 1, '_email_conversation_nonce', false ) ) {
+		if ( false === check_ajax_referer( 'sf_email_conversation', '_email_conversation_nonce', false ) ) {
 			_e( 'Invalid request. Please try refreshing the page.', 'supportflow' );
 			die;
 		}

From c68b72744cabc3f18c5b0bddfd942f68cb42b69c Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 12 Jul 2014 16:46:20 +0530
Subject: [PATCH 215/485] Disable public display of thread page in front end

Currently you are able to open ticket page through /?post_type=sf_thread&p=2
---
 supportflow.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/supportflow.php b/supportflow.php
index d9251b0..c13821d 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -281,6 +281,7 @@ public function action_init_register_post_type() {
 				),
 				'public'        => true,
 				'menu_position' => 3,
+				'publicly_queryable' => false,
 				'supports'      => false,
 			)
 		);

From 5a97632db8dd0f7f2166701616f4529770f47dea Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 12 Jul 2014 16:49:05 +0530
Subject: [PATCH 216/485] Corrected coding standards

---
 classes/class-supportflow-statistics.php |  2 +-
 supportflow.php                          | 23 ++++++++++++-----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/classes/class-supportflow-statistics.php b/classes/class-supportflow-statistics.php
index ce58860..34e1cd3 100644
--- a/classes/class-supportflow-statistics.php
+++ b/classes/class-supportflow-statistics.php
@@ -35,7 +35,7 @@ public function action_admin_menu() {
 	public function statistics_page() {
 		// Add JS and CSS code required by page
 		$this->insert_css_code();
-		$this->insert_js_code()
+		$this->insert_js_code();
 		?>
 		<div class="wrap">
 			<h2><?php _e( 'Statistics', 'supportflow' ) ?></h2>
diff --git a/supportflow.php b/supportflow.php
index c13821d..ba1833e 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -265,7 +265,7 @@ private function setup_actions() {
 	public function action_init_register_post_type() {
 		register_post_type(
 			$this->post_type, array(
-				'labels'        => array(
+				'labels'             => array(
 					'menu_name'          => __( 'SupportFlow', 'supportflow' ),
 					'name'               => __( 'Threads', 'supportflow' ),
 					'singular_name'      => __( 'Thread', 'supportflow' ),
@@ -279,10 +279,10 @@ public function action_init_register_post_type() {
 					'not_found'          => __( 'No threads found', 'supportflow' ),
 					'not_found_in_trash' => __( 'No threads found in trash', 'supportflow' ),
 				),
-				'public'        => true,
-				'menu_position' => 3,
+				'public'             => true,
+				'menu_position'      => 3,
 				'publicly_queryable' => false,
-				'supports'      => false,
+				'supports'           => false,
 			)
 		);
 	}
@@ -608,17 +608,17 @@ public function get_replies( $args ) {
 			'post_id'     => '',
 			'search'      => '',
 			'order'       => 'DESC', // 'DESC', 'ASC',
-			'numberposts' => -1,
+			'numberposts' => - 1,
 		);
 
 		$args      = array_merge( $default_args, $args );
 		$post_args = array(
-			'search'      => $args['search'],
-			'post_parent' => $args['post_id'],
-			'post_status' => $args['status'],
-			'post_type'   => $this->reply_type,
-			'order'       => $args['order'],
-			'numberposts' => $args['numberposts'],
+			'search'           => $args['search'],
+			'post_parent'      => $args['post_id'],
+			'post_status'      => $args['status'],
+			'post_type'        => $this->reply_type,
+			'order'            => $args['order'],
+			'numberposts'      => $args['numberposts'],
 			'suppress_filters' => false,
 		);
 		add_filter( 'posts_clauses', array( $this, 'filter_reply_clauses' ), 10, 2 );
@@ -663,6 +663,7 @@ public function get_thread_replies_count( $thread_id, $args = array() ) {
 
 		$query = new WP_Query( $args );
 		$count = $query->found_posts;
+
 		return (int) $count;
 	}
 

From 9e42e193f088a5c89814314e7e28019ee27f22ac Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 12 Jul 2014 16:55:29 +0530
Subject: [PATCH 217/485] Initialize $items by empty array

This is to prevent undefined variable error because $items which is
supposed to be an array is passed to other functions
---
 classes/class-supportflow-statistics.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/classes/class-supportflow-statistics.php b/classes/class-supportflow-statistics.php
index 34e1cd3..ee14e75 100644
--- a/classes/class-supportflow-statistics.php
+++ b/classes/class-supportflow-statistics.php
@@ -148,6 +148,7 @@ function insert_js_code() {
 	 */
 	public function show_overall_stats() {
 		$statistics_table = new SupportFlow_Statistics_Table();
+		$items = array();
 
 		$statistics_table->set_columns( array(
 			'table_date'   => __( 'Date', 'supportflow' ),
@@ -183,6 +184,7 @@ public function show_overall_stats() {
 	 */
 	public function show_tag_stats() {
 		$statistics_table = new SupportFlow_Statistics_Table();
+		$items = array();
 
 		$statistics_table->set_columns( array(
 			'table_tag'    => __( 'Tag', 'supportflow' ),
@@ -205,6 +207,7 @@ public function show_tag_stats() {
 	 */
 	public function show_30_days_stats() {
 		$statistics_table = new SupportFlow_Statistics_Table();
+		$items = array();
 
 		$statistics_table->set_columns( array(
 			'table_date'   => __( 'Date', 'supportflow' ),
@@ -235,6 +238,7 @@ public function show_30_days_stats() {
 	 */
 	public function show_12_month_stats() {
 		$statistics_table = new SupportFlow_Statistics_Table();
+		$items = array();
 
 		$statistics_table->set_columns( array(
 			'table_date'   => __( 'Date', 'supportflow' ),
@@ -264,6 +268,7 @@ public function show_12_month_stats() {
 	 */
 	public function show_5_year_stats() {
 		$statistics_table = new SupportFlow_Statistics_Table();
+		$items = array();
 
 		$statistics_table->set_columns( array(
 			'table_date'   => __( 'Date', 'supportflow' ),

From 85ebc39f1d8fcaca2d73efe0a61fe699f3c62779 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 12 Jul 2014 23:59:42 +0530
Subject: [PATCH 218/485] Escaping data before echoing

---
 classes/class-supportflow-email-accounts.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 5b117b7..e136124 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -25,14 +25,14 @@ function __construct( $accounts ) {
 			}
 
 			$this->_data[] = array(
-				'table_username'  => $account['username'],
-				'table_imap_host' => $account['imap_host'],
-				'table_imap_port' => $account['imap_port'],
-				'table_imap_ssl'  => $account['imap_ssl'] ? 'True' : 'False',
-				'table_smtp_host' => $account['smtp_host'],
-				'table_smtp_port' => $account['smtp_port'],
-				'table_smtp_ssl'  => $account['smtp_ssl'] ? 'True' : 'False',
-				'table_action'    => "<a href='#' data-account-id='$account_id' class='delete_email_account'>Delete</a>",
+				'table_username'  => esc_html( $account['username'] ),
+				'table_imap_host' => esc_html( $account['imap_host'] ),
+				'table_imap_port' => esc_html( $account['imap_port'] ),
+				'table_imap_ssl'  => esc_html( $account['imap_ssl'] ? 'True' : 'False' ),
+				'table_smtp_host' => esc_html( $account['smtp_host'] ),
+				'table_smtp_port' => esc_html( $account['smtp_port'] ),
+				'table_smtp_ssl'  => esc_html( $account['smtp_ssl'] ? 'True' : 'False' ),
+				'table_action'    => "<a href='#' data-account-id='" . esc_attr( $account_id ) . "' class='delete_email_account'>Delete</a>",
 			);
 		}
 	}
@@ -221,7 +221,7 @@ public function insert_add_new_account_form() {
 		?>
 		<h3><?php _e( 'Add New Account', 'supportflow' ) ?></h3>
 		<?php _e( 'Please enter IMAP Server Settings', 'supportflow' ) ?><br />
-		<form method="POST" id="add_new_email_account" action="<?php echo $form_action ?>">
+		<form method="POST" id="add_new_email_account" action="<?php echo esc_attr( $form_action ) ?>">
 			<input type="hidden" name="action" value="add" />
 			<?php wp_nonce_field( 'add_email_account' ) ?>
 			<table class="form-table">

From 094dc1dbcce934a345d68f8fa398f4a12955395a Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 13 Jul 2014 00:00:57 +0530
Subject: [PATCH 219/485] Adding support for I18n

---
 classes/class-supportflow-email-accounts.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index e136124..bc4421c 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -32,7 +32,7 @@ function __construct( $accounts ) {
 				'table_smtp_host' => esc_html( $account['smtp_host'] ),
 				'table_smtp_port' => esc_html( $account['smtp_port'] ),
 				'table_smtp_ssl'  => esc_html( $account['smtp_ssl'] ? 'True' : 'False' ),
-				'table_action'    => "<a href='#' data-account-id='" . esc_attr( $account_id ) . "' class='delete_email_account'>Delete</a>",
+				'table_action'    => "<a href='#' data-account-id='" . esc_attr( $account_id ) . "' class='delete_email_account'>" . __( 'Delete', 'supportflow' ) . "</a>",
 			);
 		}
 	}

From 363aad8f8e08ebe8f741647d85dbe96fcf4d5c21 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 29 Jun 2014 18:10:27 +0530
Subject: [PATCH 220/485] Add show thread option to specify if the tag should
 be shown in all threads page

Conflicts:
	supportflow.php
---
 classes/class-supportflow-admin.php |  9 +++++++--
 supportflow.php                     | 20 ++++++++++++--------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index ef80e1e..b699d53 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -268,8 +268,13 @@ function action_pre_get_posts( $query ) {
 		}
 
 		$statuses     = SupportFlow()->post_statuses;
-		$status_slugs = array_keys( $statuses );
-		$last_status  = array_pop( $status_slugs );
+		$status_slugs = array();
+
+		foreach ( $statuses as $status => $status_data ) {
+			if ( true == $status_data['show_threads'] ) {
+				$status_slugs[] = $status;
+			}
+		}
 
 		// Order posts by post_modified if there's no orderby set
 		if ( ! $query->get( 'orderby' ) ) {
diff --git a/supportflow.php b/supportflow.php
index ba1833e..fcebb45 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -174,20 +174,24 @@ private function setup_globals() {
 		$this->post_statuses = apply_filters(
 			'supportflow_thread_post_statuses', array(
 				'sf_new'     => array(
-					'label'       => __( 'New', 'supportflow' ),
-					'label_count' => _n_noop( 'New <span class="count">(%s)</span>', 'New <span class="count">(%s)</span>', 'supportflow' ),
+					'show_threads' => true,
+					'label'        => __( 'New', 'supportflow' ),
+					'label_count'  => _n_noop( 'New <span class="count">(%s)</span>', 'New <span class="count">(%s)</span>', 'supportflow' ),
 				),
 				'sf_open'    => array(
-					'label'       => __( 'Open', 'supportflow' ),
-					'label_count' => _n_noop( 'Open <span class="count">(%s)</span>', 'Open <span class="count">(%s)</span>', 'supportflow' ),
+					'show_threads' => true,
+					'label'        => __( 'Open', 'supportflow' ),
+					'label_count'  => _n_noop( 'Open <span class="count">(%s)</span>', 'Open <span class="count">(%s)</span>', 'supportflow' ),
 				),
 				'sf_pending' => array(
-					'label'       => __( 'Pending', 'supportflow' ),
-					'label_count' => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>', 'supportflow' ),
+					'show_threads' => true,
+					'label'        => __( 'Pending', 'supportflow' ),
+					'label_count'  => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>', 'supportflow' ),
 				),
 				'sf_closed'  => array(
-					'label'       => __( 'Closed', 'supportflow' ),
-					'label_count' => _n_noop( 'Closed <span class="count">(%s)</span>', 'Closed <span class="count">(%s)</span>', 'supportflow' ),
+					'show_threads' => false,
+					'label'        => __( 'Closed', 'supportflow' ),
+					'label_count'  => _n_noop( 'Closed <span class="count">(%s)</span>', 'Closed <span class="count">(%s)</span>', 'supportflow' ),
 				),
 			)
 		);

From e399b97048b9c320fb7377e2f35dd7a0ba411e7e Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 13 Jul 2014 21:22:46 +0530
Subject: [PATCH 221/485] Using wp_query to get count of threads

Current approach cause it to include thread replies in the count too
---
 classes/class-supportflow-admin.php | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index b699d53..74beefc 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -111,14 +111,24 @@ public function filter_post_updated_messages( $messages ) {
 	public function filter_views( $views ) {
 		global $wpdb;
 
-		// The 'all' count shouldn't include closed posts
-		$post_type   = SupportFlow()->post_type;
-		$num_posts   = wp_count_posts( $post_type, 'readable' );
-		$total_posts = array_sum( (array) $num_posts );
-		foreach ( get_post_stati( array( 'show_in_admin_all_list' => false ) ) as $state ) {
-			$total_posts -= $num_posts->$state;
-		}
-		$total_posts -= $num_posts->sf_closed;
+		$post_type     = SupportFlow()->post_type;
+		$statuses     = SupportFlow()->post_statuses;
+		$status_slugs = array();
+
+		foreach ( $statuses as $status => $status_data ) {
+			if ( true == $status_data['show_threads'] ) {
+				$status_slugs[] = $status;
+			}
+		}
+
+		$wp_query    = new WP_Query( array(
+			'post_type'      => $post_type,
+			'post_parent'    => 0,
+			'posts_per_page' => 1,
+			'post_status'    => $status_slugs,
+		) );
+		$total_posts = $wp_query->found_posts;
+
 		$class    = empty( $class ) && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['show_sticky'] ) ? ' class="current"' : '';
 		$view_all = "<a href='edit.php?post_type=$post_type'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts, 'posts' ), number_format_i18n( $total_posts ) ) . '</a>';
 

From 2cdc0e3a70c32d4cd92a0a3e0a47f0824ec40b83 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 13 Jul 2014 21:24:23 +0530
Subject: [PATCH 222/485] Using wp_update_post() instead of using $wpdb to
 update post modified time

---
 supportflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index fcebb45..cb9be68 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -731,7 +731,7 @@ public function add_thread_reply( $thread_id, $reply_text, $details = array() )
 
 
 		// Adding a thread reply updates the post modified time for the thread
-		$query = $wpdb->update( $wpdb->posts, array( 'post_modified' => current_time( 'mysql' ) ), array( 'ID' => $thread_id ) );
+		wp_update_post( array( 'ID' => $thread_id, 'post_modified' => current_time( 'mysql' ) ) );
 		clean_post_cache( $thread_id );
 		do_action( 'supportflow_thread_reply_added', $reply_id, $details['cc'], $details['bcc'] );
 

From 8791be5bad52259e6473e651eee91a206e430471 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 13 Jul 2014 21:29:58 +0530
Subject: [PATCH 223/485] Remove private option from filter links

They are just private replies to thread and are actual threads
---
 classes/class-supportflow-admin.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 74beefc..3ebee88 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -150,6 +150,9 @@ public function filter_views( $views ) {
 		$views['all']  = $view_all;
 		$views         = array_reverse( $views );
 
+		// Remove private option from filter links as they are just private replies to thread
+		unset( $views['private'] );
+
 		return $views;
 	}
 

From 581ba88574c4944290aee20f848846dd787e3082 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 13 Jul 2014 21:52:47 +0530
Subject: [PATCH 224/485] Revert "Using wp_update_post() instead of using $wpdb
 to update post modified time"

This reverts commit 2cdc0e3a70c32d4cd92a0a3e0a47f0824ec40b83.
It was causing some bugs because it raise action_save_post() method
---
 supportflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index cb9be68..fcebb45 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -731,7 +731,7 @@ public function add_thread_reply( $thread_id, $reply_text, $details = array() )
 
 
 		// Adding a thread reply updates the post modified time for the thread
-		wp_update_post( array( 'ID' => $thread_id, 'post_modified' => current_time( 'mysql' ) ) );
+		$query = $wpdb->update( $wpdb->posts, array( 'post_modified' => current_time( 'mysql' ) ), array( 'ID' => $thread_id ) );
 		clean_post_cache( $thread_id );
 		do_action( 'supportflow_thread_reply_added', $reply_id, $details['cc'], $details['bcc'] );
 

From 88497b1c39ee1598c0a9ec0417683334f7ff90f8 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 13 Jul 2014 22:43:53 +0530
Subject: [PATCH 225/485] Updated plugin URL and authors in plugin file header

---
 supportflow.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index fcebb45..5257506 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -2,9 +2,9 @@
 
 /**
  * Plugin Name: SupportFlow
- * Plugin URI:
+ * Plugin URI: https://wordpress.org/plugins/supportflow/
  * Description: Reinventing how you support your customers.
- * Author:      Daniel Bachhuber, Alex Mills, Andrew Spittle
+ * Author:      Daniel Bachhuber, Varun Agrawal, Alex Mills, Andrew Spittle
  * Author URI:
  * Version:     0.1
  *

From 2d167a61635bbc26db213b4ecb449ed45c759c6c Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 13 Jul 2014 22:47:48 +0530
Subject: [PATCH 226/485] Preventing direct access to plugin by typing its URL

Currently anyone can execute plugin PHP code directly by typing
/wp-content/plugins/supportflow/*.php

Now it will die if anyone try to directly execute it
---
 classes/class-supportflow-admin.php               | 2 ++
 classes/class-supportflow-attachments.php         | 3 +++
 classes/class-supportflow-email-accounts.php      | 2 ++
 classes/class-supportflow-email-notifications.php | 2 ++
 classes/class-supportflow-email-replies.php       | 3 +++
 classes/class-supportflow-emails.php              | 2 ++
 classes/class-supportflow-json-api.php            | 2 ++
 classes/class-supportflow-permissions.php         | 2 ++
 classes/class-supportflow-predefined-replies.php  | 2 ++
 classes/class-supportflow-statistics.php          | 2 ++
 classes/class-supportflow-ui-submissionform.php   | 2 ++
 classes/class-supportflow-ui-widget.php           | 2 ++
 classes/class-supportflow-wp-cli.php              | 2 ++
 supportflow-user-widget.php                       | 2 ++
 supportflow.php                                   | 2 ++
 15 files changed, 32 insertions(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 3ebee88..0441310 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -3,6 +3,8 @@
  *
  */
 
+defined('ABSPATH') or die( "Cheatin' uh?" );
+
 class SupportFlow_Admin extends SupportFlow {
 
 	function __construct() {
diff --git a/classes/class-supportflow-attachments.php b/classes/class-supportflow-attachments.php
index 4c25848..40ee8dc 100644
--- a/classes/class-supportflow-attachments.php
+++ b/classes/class-supportflow-attachments.php
@@ -2,6 +2,9 @@
 /**
  * Allow attachments to be securely stored and served
  */
+
+defined('ABSPATH') or die( "Cheatin' uh?" );
+
 class SupportFlow_Attachments extends SupportFlow {
 
 	var $file_hash = '';
diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index bc4421c..a9e1f2c 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -3,6 +3,8 @@
  * Setting page to add/remove new E-Mail accounts to get replies
  */
 
+defined('ABSPATH') or die( "Cheatin' uh?" );
+
 if ( ! class_exists( 'WP_List_Table' ) ) {
 	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
 }
diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 868eb53..70fa44f 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -5,6 +5,8 @@
  * @since    0.1
  */
 
+defined('ABSPATH') or die( "Cheatin' uh?" );
+
 if ( ! class_exists( 'WP_List_Table' ) ) {
 	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
 }
diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index f84c460..7e6d51f 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -2,6 +2,9 @@
 /**
  * Primary class for ingesting emails from an IMAP email box, parsing, and adding to appropriate threads
  */
+
+defined('ABSPATH') or die( "Cheatin' uh?" );
+
 class SupportFlow_Email_Replies extends SupportFlow {
 
 	const email_id_key = 'orig_email_id';
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 820fc57..c9a0bf5 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -3,6 +3,8 @@
  * Primary class for determining which emails are sent and what goes in the email
  */
 
+defined('ABSPATH') or die( "Cheatin' uh?" );
+
 class SupportFlow_Emails extends SupportFlow {
 
 	function __construct() {
diff --git a/classes/class-supportflow-json-api.php b/classes/class-supportflow-json-api.php
index 7a2aa54..fa16c03 100644
--- a/classes/class-supportflow-json-api.php
+++ b/classes/class-supportflow-json-api.php
@@ -1,5 +1,7 @@
 <?php
 
+defined('ABSPATH') or die( "Cheatin' uh?" );
+
 class SupportFlow_JSON_API extends SupportFlow {
 
 	public $action = 'supportflow_json';
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index c03acb8..2a2be87 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -5,6 +5,8 @@
  * @since    0.1
  */
 
+defined('ABSPATH') or die( "Cheatin' uh?" );
+
 if ( ! class_exists( 'WP_List_Table' ) ) {
 	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
 }
diff --git a/classes/class-supportflow-predefined-replies.php b/classes/class-supportflow-predefined-replies.php
index c124134..354356b 100644
--- a/classes/class-supportflow-predefined-replies.php
+++ b/classes/class-supportflow-predefined-replies.php
@@ -3,6 +3,8 @@
  * Class to create/insert predefined replies into the threads
  */
 
+defined('ABSPATH') or die( "Cheatin' uh?" );
+
 class SupportFlow_Predefined_Replies extends SupportFlow {
 
 	function __construct() {
diff --git a/classes/class-supportflow-statistics.php b/classes/class-supportflow-statistics.php
index ee14e75..58a42be 100644
--- a/classes/class-supportflow-statistics.php
+++ b/classes/class-supportflow-statistics.php
@@ -5,6 +5,8 @@
  * @since    0.1
  */
 
+defined('ABSPATH') or die( "Cheatin' uh?" );
+
 class SupportFlow_Statistics extends SupportFlow {
 
 	public function __construct() {
diff --git a/classes/class-supportflow-ui-submissionform.php b/classes/class-supportflow-ui-submissionform.php
index 8b53e16..4755e1b 100644
--- a/classes/class-supportflow-ui-submissionform.php
+++ b/classes/class-supportflow-ui-submissionform.php
@@ -1,5 +1,7 @@
 <?php
 
+defined('ABSPATH') or die( "Cheatin' uh?" );
+
 class SupportFlow_UI_SubmissionForm extends SupportFlow {
 
 	public $messages = array();
diff --git a/classes/class-supportflow-ui-widget.php b/classes/class-supportflow-ui-widget.php
index 126fa06..61b7ce8 100644
--- a/classes/class-supportflow-ui-widget.php
+++ b/classes/class-supportflow-ui-widget.php
@@ -1,5 +1,7 @@
 <?php
 
+defined('ABSPATH') or die( "Cheatin' uh?" );
+
 class SupportFlow_UI_Widget extends SupportFlow {
 
 	public $script_slug = 'supportflow-user-widget';
diff --git a/classes/class-supportflow-wp-cli.php b/classes/class-supportflow-wp-cli.php
index f83acb3..29b5e62 100644
--- a/classes/class-supportflow-wp-cli.php
+++ b/classes/class-supportflow-wp-cli.php
@@ -3,6 +3,8 @@
  * WP-CLI commands for SupportFlow
  */
 
+defined('ABSPATH') or die( "Cheatin' uh?" );
+
 WP_CLI::add_command( 'supportflow', 'SupportFlow_WPCLI' );
 
 class SupportFlow_WPCLI extends WP_CLI_Command {
diff --git a/supportflow-user-widget.php b/supportflow-user-widget.php
index 96ae3c5..88774d2 100644
--- a/supportflow-user-widget.php
+++ b/supportflow-user-widget.php
@@ -1,5 +1,7 @@
 <?php
 
+defined('ABSPATH') or die( "Cheatin' uh?" );
+
 add_action( 'wp_enqueue_scripts', 'sf_user_widget_enqueue_scripts' );
 add_action( 'admin_enqueue_scripts', 'sf_user_widget_enqueue_scripts' );
 function sf_user_widget_enqueue_scripts() {
diff --git a/supportflow.php b/supportflow.php
index 5257506..c530869 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -1,5 +1,7 @@
 <?php
 
+defined('ABSPATH') or die( "Cheatin' uh?" );
+
 /**
  * Plugin Name: SupportFlow
  * Plugin URI: https://wordpress.org/plugins/supportflow/

From 4f89bf36c472f57f3b6420ee107704ef9971d7da Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 14 Jul 2014 21:38:11 +0530
Subject: [PATCH 227/485] Remove wp_ajax_thread_attachment_upload action hook
 as callback function was already removed earlier

---
 classes/class-supportflow-admin.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 0441310..db2a119 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -8,7 +8,6 @@
 class SupportFlow_Admin extends SupportFlow {
 
 	function __construct() {
-		add_action( 'wp_ajax_thread_attachment_upload', array( $this, 'action_wp_ajax_thread_attachment_upload' ) );
 		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
 	}
 

From d0df4e44e56e42940263841defbbf083adf18578 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 14 Jul 2014 22:08:30 +0530
Subject: [PATCH 228/485] Added a missing `>` to a HTML close tag

---
 classes/class-supportflow-permissions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 2a2be87..200b941 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -28,7 +28,7 @@ function __construct( $user_permissions ) {
 				'privilege_id'   => $user_permission['privilege_id'],
 			) );
 			$status    = "<input type='checkbox' id='permission_$id' class='toggle_privilege' data-permission-identifier='" . $identfier . "' " . checked( $user_permission['allowed'], true, false ) . '>';
-			$status .= " <label for='permission_$id' class='privilege_status'> " . __( $user_permission['allowed'] ? 'Allowed' : 'Not allowed', 'supportflow' ) . "</label";
+			$status .= " <label for='permission_$id' class='privilege_status'>" . __( $user_permission['allowed'] ? 'Allowed' : 'Not allowed', 'supportflow' ) . "</label>";
 			$this->_data[] = array(
 				'status'    => $status,
 				'privilege' => esc_html( $user_permission['privilege'] ),

From e2e30715227f39a4cb7057c831cf85a8cfcf6ec9 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 14 Jul 2014 22:13:31 +0530
Subject: [PATCH 229/485] Corrected coding standards

---
 classes/class-supportflow-admin.php               | 2 +-
 classes/class-supportflow-attachments.php         | 2 +-
 classes/class-supportflow-email-accounts.php      | 2 +-
 classes/class-supportflow-email-notifications.php | 2 +-
 classes/class-supportflow-email-replies.php       | 2 +-
 classes/class-supportflow-emails.php              | 2 +-
 classes/class-supportflow-json-api.php            | 2 +-
 classes/class-supportflow-permissions.php         | 2 +-
 classes/class-supportflow-predefined-replies.php  | 2 +-
 classes/class-supportflow-statistics.php          | 2 +-
 classes/class-supportflow-ui-submissionform.php   | 2 +-
 classes/class-supportflow-ui-widget.php           | 2 +-
 classes/class-supportflow-wp-cli.php              | 2 +-
 supportflow-user-widget.php                       | 2 +-
 supportflow.php                                   | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index db2a119..a71c1dc 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -3,7 +3,7 @@
  *
  */
 
-defined('ABSPATH') or die( "Cheatin' uh?" );
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
 class SupportFlow_Admin extends SupportFlow {
 
diff --git a/classes/class-supportflow-attachments.php b/classes/class-supportflow-attachments.php
index 40ee8dc..b6313a9 100644
--- a/classes/class-supportflow-attachments.php
+++ b/classes/class-supportflow-attachments.php
@@ -3,7 +3,7 @@
  * Allow attachments to be securely stored and served
  */
 
-defined('ABSPATH') or die( "Cheatin' uh?" );
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
 class SupportFlow_Attachments extends SupportFlow {
 
diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index a9e1f2c..4682a0f 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -3,7 +3,7 @@
  * Setting page to add/remove new E-Mail accounts to get replies
  */
 
-defined('ABSPATH') or die( "Cheatin' uh?" );
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
 if ( ! class_exists( 'WP_List_Table' ) ) {
 	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 70fa44f..7320776 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -5,7 +5,7 @@
  * @since    0.1
  */
 
-defined('ABSPATH') or die( "Cheatin' uh?" );
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
 if ( ! class_exists( 'WP_List_Table' ) ) {
 	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 7e6d51f..ff8fb1a 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -3,7 +3,7 @@
  * Primary class for ingesting emails from an IMAP email box, parsing, and adding to appropriate threads
  */
 
-defined('ABSPATH') or die( "Cheatin' uh?" );
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
 class SupportFlow_Email_Replies extends SupportFlow {
 
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index c9a0bf5..a20fe53 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -3,7 +3,7 @@
  * Primary class for determining which emails are sent and what goes in the email
  */
 
-defined('ABSPATH') or die( "Cheatin' uh?" );
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
 class SupportFlow_Emails extends SupportFlow {
 
diff --git a/classes/class-supportflow-json-api.php b/classes/class-supportflow-json-api.php
index fa16c03..976b540 100644
--- a/classes/class-supportflow-json-api.php
+++ b/classes/class-supportflow-json-api.php
@@ -1,6 +1,6 @@
 <?php
 
-defined('ABSPATH') or die( "Cheatin' uh?" );
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
 class SupportFlow_JSON_API extends SupportFlow {
 
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 200b941..641351c 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -5,7 +5,7 @@
  * @since    0.1
  */
 
-defined('ABSPATH') or die( "Cheatin' uh?" );
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
 if ( ! class_exists( 'WP_List_Table' ) ) {
 	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
diff --git a/classes/class-supportflow-predefined-replies.php b/classes/class-supportflow-predefined-replies.php
index 354356b..4e29a11 100644
--- a/classes/class-supportflow-predefined-replies.php
+++ b/classes/class-supportflow-predefined-replies.php
@@ -3,7 +3,7 @@
  * Class to create/insert predefined replies into the threads
  */
 
-defined('ABSPATH') or die( "Cheatin' uh?" );
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
 class SupportFlow_Predefined_Replies extends SupportFlow {
 
diff --git a/classes/class-supportflow-statistics.php b/classes/class-supportflow-statistics.php
index 58a42be..4ba6095 100644
--- a/classes/class-supportflow-statistics.php
+++ b/classes/class-supportflow-statistics.php
@@ -5,7 +5,7 @@
  * @since    0.1
  */
 
-defined('ABSPATH') or die( "Cheatin' uh?" );
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
 class SupportFlow_Statistics extends SupportFlow {
 
diff --git a/classes/class-supportflow-ui-submissionform.php b/classes/class-supportflow-ui-submissionform.php
index 4755e1b..70077bb 100644
--- a/classes/class-supportflow-ui-submissionform.php
+++ b/classes/class-supportflow-ui-submissionform.php
@@ -1,6 +1,6 @@
 <?php
 
-defined('ABSPATH') or die( "Cheatin' uh?" );
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
 class SupportFlow_UI_SubmissionForm extends SupportFlow {
 
diff --git a/classes/class-supportflow-ui-widget.php b/classes/class-supportflow-ui-widget.php
index 61b7ce8..bba34e9 100644
--- a/classes/class-supportflow-ui-widget.php
+++ b/classes/class-supportflow-ui-widget.php
@@ -1,6 +1,6 @@
 <?php
 
-defined('ABSPATH') or die( "Cheatin' uh?" );
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
 class SupportFlow_UI_Widget extends SupportFlow {
 
diff --git a/classes/class-supportflow-wp-cli.php b/classes/class-supportflow-wp-cli.php
index 29b5e62..9abbbdb 100644
--- a/classes/class-supportflow-wp-cli.php
+++ b/classes/class-supportflow-wp-cli.php
@@ -3,7 +3,7 @@
  * WP-CLI commands for SupportFlow
  */
 
-defined('ABSPATH') or die( "Cheatin' uh?" );
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
 WP_CLI::add_command( 'supportflow', 'SupportFlow_WPCLI' );
 
diff --git a/supportflow-user-widget.php b/supportflow-user-widget.php
index 88774d2..32197b2 100644
--- a/supportflow-user-widget.php
+++ b/supportflow-user-widget.php
@@ -1,6 +1,6 @@
 <?php
 
-defined('ABSPATH') or die( "Cheatin' uh?" );
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
 add_action( 'wp_enqueue_scripts', 'sf_user_widget_enqueue_scripts' );
 add_action( 'admin_enqueue_scripts', 'sf_user_widget_enqueue_scripts' );
diff --git a/supportflow.php b/supportflow.php
index c530869..6044792 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -1,6 +1,6 @@
 <?php
 
-defined('ABSPATH') or die( "Cheatin' uh?" );
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
 /**
  * Plugin Name: SupportFlow

From 15edc68cc21986a65a22ae7b4a381f36874a2f15 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 14 Jul 2014 22:55:19 +0530
Subject: [PATCH 230/485] Add actions to WP security nonce

---
 classes/class-supportflow-email-notifications.php | 4 ++--
 classes/class-supportflow-permissions.php         | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 7320776..3d817d1 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -129,7 +129,7 @@ public function notification_setting_page() {
 							privilege_type              : privilege_type,
 							privilege_id                : privilege_id,
 							allowed                     : allowed,
-							_set_email_notfication_nonce: '<?php echo wp_create_nonce() ?>',
+							_set_email_notfication_nonce: '<?php echo wp_create_nonce( 'set_email_notfication' ) ?>',
 						},
 						success : function (content) {
 							if (1 != content) {
@@ -253,7 +253,7 @@ public function get_notifications_settings( $user_id = null, $allowed_only = fal
 	 * AJAX request to change user E-Mail notification settings
 	 */
 	public function action_wp_ajax_set_email_notfication() {
-		check_ajax_referer( - 1, '_set_email_notfication_nonce' );
+		check_ajax_referer( 'set_email_notfication', '_set_email_notfication_nonce' );
 
 		if ( ! isset( $_POST['privilege_type'] )
 			|| ! isset( $_POST['privilege_id'] )
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 641351c..1a08583 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -180,7 +180,7 @@ public function permissions_page() {
 							action                     : 'get_user_permissions',
 							user_id                    : user_id,
 							status                     : status,
-							_get_user_permissions_nonce: '<?php echo wp_create_nonce() ?>',
+							_get_user_permissions_nonce: '<?php echo wp_create_nonce( 'get_user_permissions' ) ?>',
 						},
 						success: function (content) {
 							jQuery('#user_permissions_table').html(content);
@@ -209,7 +209,7 @@ public function permissions_page() {
 							privilege_type            : privilege_type,
 							privilege_id              : privilege_id,
 							allowed                   : allowed,
-							_set_user_permission_nonce: '<?php echo wp_create_nonce() ?>',
+							_set_user_permission_nonce: '<?php echo wp_create_nonce( 'set_user_permission' ) ?>',
 						},
 						success : function (content) {
 							if (1 != content) {
@@ -239,7 +239,7 @@ public function permissions_page() {
 	}
 
 	public function action_wp_ajax_get_user_permissions() {
-		check_ajax_referer( - 1, '_get_user_permissions_nonce' );
+		check_ajax_referer( 'get_user_permissions', '_get_user_permissions_nonce' );
 
 		if (
 			! isset( $_POST['user_id'], $_POST['status'] ) ||
@@ -328,7 +328,7 @@ public function get_user_permissions( $user_id, $return_allowed = true, $return_
 	}
 
 	public function action_wp_ajax_set_user_permission() {
-		check_ajax_referer( - 1, '_set_user_permission_nonce' );
+		check_ajax_referer( 'set_user_permission', '_set_user_permission_nonce' );
 
 		if ( ! isset( $_POST['user_id'] )
 			|| ! isset( $_POST['privilege_type'] )

From 1bb2936bd6f83a0964062ec4a752ecbfb9a4a4db Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Mon, 14 Jul 2014 16:16:06 -0700
Subject: [PATCH 231/485] Bump version to 0.2.

---
 readme.txt      | 9 ++++++++-
 supportflow.php | 5 ++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/readme.txt b/readme.txt
index 6d3e9e1..d21d87b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: VarunAgw, danielbachhuber, Viper007Bond, andrewspittle
 Tags: Ticket, support, admin, customer, customer support, help desk, helpdesk, IT, support, ticket
 Tested up to: 3.9.1
-Stable tag: 0.1
+Stable tag: 0.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -10,5 +10,12 @@ SupportFlow is a web based help desk support software. It allows agents to reply
 
 == Changelog ==
 
+= 0.2 =
+* Fix nonce and escaping bugs.
+* Add ability to forward a thread to someone outside of SupportFlow.
+* Add a statistics page.
+* Various minor bug fixes.
+* Various UI and UX tweaks.
+
 = 0.1 =
 * Initial release.
diff --git a/supportflow.php b/supportflow.php
index 12f4f18..44c8382 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -4,11 +4,10 @@
 
 /**
  * Plugin Name: SupportFlow
- * Plugin URI: https://wordpress.org/plugins/supportflow/
+ * Plugin URI:  https://wordpress.org/plugins/supportflow/
  * Description: Reinventing how you support your customers.
  * Author:      Daniel Bachhuber, Varun Agrawal, Alex Mills, Andrew Spittle
- * Author URI:
- * Version:     0.1
+ * Version:     0.2
  *
  * Text Domain: supportflow
  * Domain Path: /languages/

From 5106d8b1921106df9e8a77d4c183ae16ddd735bf Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 15 Jul 2014 15:07:58 +0530
Subject: [PATCH 232/485] Checking if post exists before accessing its
 properities

Currently if you view an non-existing thread e.g.
/wp-admin/post.php?post=25456&action=edit `$the_post` returns null causing
an error

So this commits check if it is null before continuing
---
 classes/class-supportflow-admin.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 0980caf..774837f 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -984,8 +984,7 @@ public function is_edit_screen() {
 			return $pagenow;
 		} elseif ( 'post.php' == $pagenow && ! empty( $_GET['action'] ) && 'edit' == $_GET['action'] && ! empty( $_GET['post'] ) ) {
 			$the_post = get_post( $_GET['post'] );
-
-			return ( $the_post->post_type == SupportFlow()->post_type ) ? $pagenow : false;
+			return (  $the_post != null && $the_post->post_type == SupportFlow()->post_type ) ? $pagenow : false;
 		} else {
 			return false;
 		}

From cf8fba0e4b8e57e6d3feb63b2f48fe69809161f0 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 15 Jul 2014 15:40:53 +0530
Subject: [PATCH 233/485] Not returning wp_error on failed post creation

Returning `0` is good in case of failure in production use
---
 supportflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index 44c8382..a75639a 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -718,7 +718,7 @@ public function add_thread_reply( $thread_id, $reply_text, $details = array() )
 
 		$reply = apply_filters( 'supportflow_pre_insert_thread_reply', $reply );
 		remove_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
-		$reply_id = wp_insert_post( $reply, true );
+		$reply_id = wp_insert_post( $reply );
 		add_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
 		// If there are attachment IDs store them as meta
 		if ( is_array( $attachment_ids ) ) {

From 909db3e1ca9acb69db3fedfa4ecbdc358c98c645 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 15 Jul 2014 15:43:04 +0530
Subject: [PATCH 234/485] Using wp_update_post() instead of using $wpdb to
 update post modified time

---
 supportflow.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index a75639a..247fdcc 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -732,7 +732,9 @@ public function add_thread_reply( $thread_id, $reply_text, $details = array() )
 
 
 		// Adding a thread reply updates the post modified time for the thread
-		$query = $wpdb->update( $wpdb->posts, array( 'post_modified' => current_time( 'mysql' ) ), array( 'ID' => $thread_id ) );
+		remove_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
+		wp_update_post( array( 'ID' => $thread_id, 'post_modified' => current_time( 'mysql' ) ) );
+		add_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
 		clean_post_cache( $thread_id );
 		do_action( 'supportflow_thread_reply_added', $reply_id, $details['cc'], $details['bcc'] );
 

From 0309f38b2ffe7d3a08ce89fd5b20d841d58ca755 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 15 Jul 2014 17:54:03 +0530
Subject: [PATCH 235/485] Authenticate SMTP settings when adding an E-Mail
 account

Fixes #140
---
 classes/class-supportflow-email-accounts.php | 30 +++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 4682a0f..0b1f54f 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -80,7 +80,7 @@ class SupportFlow_Email_Accounts extends SupportFlow {
 	const IMAP_INVALID_CREDENTIALS = 4;
 	const IMAP_TIME_OUT            = 5;
 	const IMAP_CONNECTION_FAILED   = 6;
-
+	const SMTP_AUTHENTICATION_FAILED = 7;
 
 	function __construct() {
 		add_action( 'admin_menu', array( $this, 'action_admin_menu' ) );
@@ -177,6 +177,9 @@ function process_form_submission() {
 				case self::IMAP_CONNECTION_FAILED:
 					echo '<h3>' . __( 'Unknown error while connecting to the IMAP server. Please check your IMAP settings and try again.', 'supportflow' ) . '</h3>';
 					break;
+				case self::SMTP_AUTHENTICATION_FAILED:
+					echo '<h3>' . __( 'Unable to authenticate SMTP account. Please check your SMTP setting and try again.', 'supportflow' ) . '</h3>';
+					break;
 			}
 		}
 		// Delete existing account
@@ -332,6 +335,8 @@ public function insert_js_code() {
 	 * Add a new E-Mail account to database
 	 */
 	function add_email_account( $imap_host, $imap_port, $imap_ssl, $smtp_host, $smtp_port, $smtp_ssl, $username, $password, $test_login = true ) {
+		global $phpmailer;
+
 		$email_accounts = & $this->email_accounts;
 		$imap_host      = sanitize_text_field( $imap_host );
 		$imap_port      = intval( $imap_port );
@@ -365,6 +370,29 @@ function add_email_account( $imap_host, $imap_port, $imap_ssl, $smtp_host, $smtp
 					return self::IMAP_CONNECTION_FAILED;
 				}
 			}
+
+			// Initialize PHPMailer
+			wp_mail( '', '', '' );
+
+			// Set PHPMailer SMTP settings
+			$phpmailer->IsSMTP();
+			$phpmailer->Host       = $smtp_host;
+			$phpmailer->Port       = $smtp_port;
+			$phpmailer->SMTPSecure = $smtp_ssl ? 'ssl' : '';
+			$phpmailer->Username   = $username;
+			$phpmailer->Password   = $password;
+			$phpmailer->SMTPAuth   = true;
+
+			// $phpmail raise fatal error on SMTP connect failure
+			try {
+				$smtp_authentication = $phpmailer->smtpConnect();
+			} catch ( Exception $e ) {
+
+			}
+
+			if ( ! isset( $smtp_authentication ) || ! $smtp_authentication ) {
+				return self::SMTP_AUTHENTICATION_FAILED;
+			}
 		}
 
 		$email_accounts[] = array(

From c5a8d6ccf4b1a76baed2c24d749e52d0db67e7fc Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 15 Jul 2014 17:55:29 +0530
Subject: [PATCH 236/485] Corrected coding standards

---
 classes/class-supportflow-email-accounts.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 0b1f54f..83389d7 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -73,13 +73,13 @@ class SupportFlow_Email_Accounts extends SupportFlow {
 	var $email_accounts;
 	var $existing_email_accounts;
 
-	const SUCCESS                  = 0;
-	const ACCOUNT_EXISTS           = 1;
-	const NO_ACCOUNT_EXISTS        = 2;
-	const IMAP_HOST_NOT_FOUND      = 3;
-	const IMAP_INVALID_CREDENTIALS = 4;
-	const IMAP_TIME_OUT            = 5;
-	const IMAP_CONNECTION_FAILED   = 6;
+	const SUCCESS                    = 0;
+	const ACCOUNT_EXISTS             = 1;
+	const NO_ACCOUNT_EXISTS          = 2;
+	const IMAP_HOST_NOT_FOUND        = 3;
+	const IMAP_INVALID_CREDENTIALS   = 4;
+	const IMAP_TIME_OUT              = 5;
+	const IMAP_CONNECTION_FAILED     = 6;
 	const SMTP_AUTHENTICATION_FAILED = 7;
 
 	function __construct() {

From 1c8ec4ac494e5959d4f438ce8199da2898fdfa5f Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 15 Jul 2014 23:40:48 +0530
Subject: [PATCH 237/485] Sanitizing $_GET request parameter before using

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 774837f..cfdca20 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -983,7 +983,7 @@ public function is_edit_screen() {
 		if ( in_array( $pagenow, array( 'edit.php', 'post-new.php' ) ) && ! empty( $_GET['post_type'] ) && $_GET['post_type'] == SupportFlow()->post_type ) {
 			return $pagenow;
 		} elseif ( 'post.php' == $pagenow && ! empty( $_GET['action'] ) && 'edit' == $_GET['action'] && ! empty( $_GET['post'] ) ) {
-			$the_post = get_post( $_GET['post'] );
+			$the_post = get_post( absint( $_GET['post'] ) );
 			return (  $the_post != null && $the_post->post_type == SupportFlow()->post_type ) ? $pagenow : false;
 		} else {
 			return false;

From 4932f80945c2e1dedc1f98bc3c7d9d96ac10d143 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 15 Jul 2014 23:42:58 +0530
Subject: [PATCH 238/485] Checking object class rather than its existence
 before accessing its properties

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index cfdca20..c7720e3 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -984,7 +984,7 @@ public function is_edit_screen() {
 			return $pagenow;
 		} elseif ( 'post.php' == $pagenow && ! empty( $_GET['action'] ) && 'edit' == $_GET['action'] && ! empty( $_GET['post'] ) ) {
 			$the_post = get_post( absint( $_GET['post'] ) );
-			return (  $the_post != null && $the_post->post_type == SupportFlow()->post_type ) ? $pagenow : false;
+			return (  is_a( $the_post, 'WP_Post' ) && $the_post->post_type == SupportFlow()->post_type ) ? $pagenow : false;
 		} else {
 			return false;
 		}

From fd1f6eb6a8bc8337646d6a04ada3854a57bfe358 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 15 Jul 2014 23:49:42 +0530
Subject: [PATCH 239/485] Removed check for empty E-Mail account

We are only retrieving existing E-Mail accounts in get_email_accounts()
method so they is need to check for their existence again
---
 classes/class-supportflow-admin.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index c7720e3..bd150f3 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -234,9 +234,6 @@ public function action_restrict_manage_posts() {
 		echo "<select name='email_account' id='email_account' class='postform'>";
 		echo "<option value=''>" . __( 'Show All Accounts', 'supportflow' ) . "</option>";
 		foreach ( $email_accounts as $id => $email_account ) {
-			if ( empty( $email_account ) ) {
-				continue;
-			}
 			$selected = selected( isset( $_REQUEST['email_account'] ) && ( $_REQUEST['email_account'] == $id ), true, false );
 			echo "<option value='" . esc_attr( $id ) . "'$selected>" . esc_html( $email_account['username'] . ' (' . $email_account['imap_host'] . ')' ) . '</option>';
 		}

From d2844523f781e5fefc87f916cc342059bda37006 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 15 Jul 2014 23:54:27 +0530
Subject: [PATCH 240/485] Showing only E-Mail account username

Two different E-Mail accounts can't have same username so it is useless to
show IMAP host name along with it
---
 classes/class-supportflow-admin.php               | 2 +-
 classes/class-supportflow-email-notifications.php | 2 +-
 classes/class-supportflow-permissions.php         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index bd150f3..e821635 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -235,7 +235,7 @@ public function action_restrict_manage_posts() {
 		echo "<option value=''>" . __( 'Show All Accounts', 'supportflow' ) . "</option>";
 		foreach ( $email_accounts as $id => $email_account ) {
 			$selected = selected( isset( $_REQUEST['email_account'] ) && ( $_REQUEST['email_account'] == $id ), true, false );
-			echo "<option value='" . esc_attr( $id ) . "'$selected>" . esc_html( $email_account['username'] . ' (' . $email_account['imap_host'] . ')' ) . '</option>';
+			echo "<option value='" . esc_attr( $id ) . "'$selected>" . esc_html( $email_account['username'] ) . '</option>';
 		}
 		echo "</select>";
 
diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 3d817d1..40111a4 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -225,7 +225,7 @@ public function get_notifications_settings( $user_id = null, $allowed_only = fal
 					'privilege_type' => 'email_accounts',
 					'type'           => 'E-Mail Account',
 					'privilege_id'   => $id,
-					'privilege'      => $email_account['username'] . ' (' . $email_account['imap_host'] . ')',
+					'privilege'      => $email_account['username'],
 					'allowed'        => in_array( $id, $email_notifications['email_accounts'] ),
 				);
 			}
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 1a08583..2b22eef 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -303,7 +303,7 @@ public function get_user_permissions( $user_id, $return_allowed = true, $return_
 					'privilege_type' => 'email_accounts',
 					'type'           => 'E-Mail Account',
 					'privilege_id'   => $id,
-					'privilege'      => $email_account['username'] . ' (' . $email_account['imap_host'] . ')',
+					'privilege'      => $email_account['username'],
 					'allowed'        => $allowed,
 				);
 			}

From 25baafe8aca22b5ea95fb927c83a0153f86759e5 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 16 Jul 2014 00:49:35 +0530
Subject: [PATCH 241/485] Remove manual override of table columns width

There are causing table to take fix width even if there is lot of extra
space
For example in wp-admin/edit.php?post_type=sf_thread&page=sf_permissions,
status columns takes very small width even insufficient to shows it
content properly
---
 css/admin.css | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/css/admin.css b/css/admin.css
index 3108198..09b2e9f 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -1,18 +1,3 @@
-.wp-list-table.fixed .column-sf_replies {
-	text-align: left;
-	width:      1em;
-}
-
-.wp-list-table.fixed .column-status {
-	text-align: left;
-	width:      6em;
-}
-
-.wp-list-table.fixed .column-updated,
-.wp-list-table.fixed .column-created {
-	width: 10%;
-}
-
 .subsubsub li.trash a {
 	color: #BC0B0B;
 }

From e47777f1d7f7a314dfa0c91e2a22f292e38bb634 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 16 Jul 2014 00:56:31 +0530
Subject: [PATCH 242/485] Refactored code to make more readable

---
 classes/class-supportflow-admin.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index e821635..4511741 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -929,8 +929,9 @@ function action_manage_posts_custom_column( $column_name, $thread_id ) {
 						SupportFlow()->respondents_tax => SupportFlow()->get_email_hash( $respondent_email ),
 						'post_type'                    => SupportFlow()->post_type,
 					);
+					$respondent_photo  = get_avatar( $respondent_email, 16 );
 					$respondent_link   = '<a href="' . esc_url( add_query_arg( $args, admin_url( 'edit.php' ) ) ) . '">' . $respondent_email . '</a>';
-					$respondents[$key] = get_avatar( $respondent_email, 16 ) . '&nbsp;&nbsp;' . $respondent_link;
+					$respondents[$key] = $respondent_photo . '&nbsp;' . $respondent_link;
 				}
 				echo implode( '<br />', $respondents );
 				break;

From d01b1ecb824d530de4d367fd81cd3c237cf537d8 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 16 Jul 2014 00:58:41 +0530
Subject: [PATCH 243/485] Making respondent E-Mail ID starts in same line as
 its photo in all threads page

Currently if respondents E-Mail ID is long enough to not fit in line with
respondent photo it leaves the whole line empty moving to next line
completely
---
 classes/class-supportflow-admin.php | 2 +-
 css/admin.css                       | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 4511741..09f77ea 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -930,7 +930,7 @@ function action_manage_posts_custom_column( $column_name, $thread_id ) {
 						'post_type'                    => SupportFlow()->post_type,
 					);
 					$respondent_photo  = get_avatar( $respondent_email, 16 );
-					$respondent_link   = '<a href="' . esc_url( add_query_arg( $args, admin_url( 'edit.php' ) ) ) . '">' . $respondent_email . '</a>';
+					$respondent_link   = '<a class="respondent_link" href="' . esc_url( add_query_arg( $args, admin_url( 'edit.php' ) ) ) . '">' . $respondent_email . '</a>';
 					$respondents[$key] = $respondent_photo . '&nbsp;' . $respondent_link;
 				}
 				echo implode( '<br />', $respondents );
diff --git a/css/admin.css b/css/admin.css
index 09b2e9f..3b7c4cb 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -2,6 +2,11 @@
 	color: #BC0B0B;
 }
 
+.respondent_link {
+	white-space: pre;
+	vertical-align: top;
+}
+
 #poststuff {
 	padding-top: 0;
 }

From 383dc5f5e696eeff4b58220c090efeebff50751b Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 16 Jul 2014 14:33:44 +0530
Subject: [PATCH 244/485] Show a dash sign if thread has no excerpt (i.e. no
 replies) in all thread page

---
 classes/class-supportflow-admin.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 09f77ea..a7387d5 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -910,6 +910,7 @@ function action_manage_posts_custom_column( $column_name, $thread_id ) {
 			case 'sf_excerpt':
 				$replies = SupportFlow()->get_thread_replies( $thread_id, array( 'numberposts' => 1, 'order' => 'ASC' ) );
 				if ( ! isset( $replies[0] ) ) {
+					echo '—';
 					break;
 				}
 				$first_reply = $replies[0]->post_content;

From 17df98e65bc8a8e95302bacad25e1b8d50b7358f Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 16 Jul 2014 16:52:16 +0530
Subject: [PATCH 245/485] Showing meaningfull message when there are no items
 in table

Tables cover:
- E-Mail accounts table
- User permissions
- E-Mail notification settings
---
 classes/class-supportflow-email-accounts.php      | 4 ++++
 classes/class-supportflow-email-notifications.php | 4 ++++
 classes/class-supportflow-permissions.php         | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 83389d7..c2ca5f3 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -43,6 +43,10 @@ function column_default( $item, $column_name ) {
 		return $item[ $column_name ];
 	}
 
+	function no_items() {
+		_e( 'No E-Mail accounts found. Please add them in the form.', 'supportflow' );
+	}
+
 	function get_columns() {
 		return array(
 			'table_username'  => __( 'Username', 'supportflow' ),
diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 40111a4..63e331c 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -40,6 +40,10 @@ function column_default( $item, $column_name ) {
 		return $item[$column_name];
 	}
 
+	function no_items() {
+		_e( 'You don\'t have permission to any tag/e-mail account or maybe no tag/e-mail account exists yet.', 'supportflow' );
+	}
+
 	function get_columns() {
 		return array(
 			'status'    => __( 'Status', 'supportflow' ),
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 2b22eef..b683147 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -42,6 +42,10 @@ function column_default( $item, $column_name ) {
 		return $item[$column_name];
 	}
 
+	function no_items() {
+		_e( 'No tag/e-mail accounts found. Please add them before setting user permissions. Note: You can only set permissions for non-admin users.', 'supportflow' );
+	}
+
 	function get_columns() {
 		return array(
 			'status'    => __( 'Status', 'supportflow' ),

From 946e40dca9aa7ad1c401c2e0804434edaf23eb9c Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 2 Jul 2014 01:53:29 +0530
Subject: [PATCH 246/485] Using a class rather than ID to get save button

Conflicts:
	classes/class-supportflow-admin.php
---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index a7387d5..dde3dc4 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -652,7 +652,7 @@ public function meta_box_details() {
 
 		<div id="major-publishing-actions">
 			<div id="publishing-action">
-				<?php submit_button( $submit_text, 'primary', 'save', false ); ?>
+				<?php submit_button( $submit_text, 'save-button primary', 'save', false ); ?>
 			</div>
 			<div class="clear"></div>
 		</div>

From dae524e5c57c7770f2b96caee8c81023ea2a06e3 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 17 Jul 2014 23:18:36 +0530
Subject: [PATCH 247/485] Improved messages shown when there are no items in
 table

This is update up to commit 17df98e65bc8a8e95302bacad25e1b8d50b7358f
---
 classes/class-supportflow-email-accounts.php      | 2 +-
 classes/class-supportflow-email-notifications.php | 2 +-
 classes/class-supportflow-permissions.php         | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index c2ca5f3..e5c68b0 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -44,7 +44,7 @@ function column_default( $item, $column_name ) {
 	}
 
 	function no_items() {
-		_e( 'No E-Mail accounts found. Please add them in the form.', 'supportflow' );
+		_e( 'No E-Mail accounts found. Please <b>add them</b> in the form below.', 'supportflow' );
 	}
 
 	function get_columns() {
diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 63e331c..b37b5dc 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -41,7 +41,7 @@ function column_default( $item, $column_name ) {
 	}
 
 	function no_items() {
-		_e( 'You don\'t have permission to any tag/e-mail account or maybe no tag/e-mail account exists yet.', 'supportflow' );
+		_e( "You don't have <b>permission</b> to any tag/e-mail account, or maybe no tag/e-mail account exists yet. Please ask your administrator to give you permission to an e-mail account or tag.", 'supportflow' );
 	}
 
 	function get_columns() {
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index b683147..29892a1 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -43,7 +43,9 @@ function column_default( $item, $column_name ) {
 	}
 
 	function no_items() {
-		_e( 'No tag/e-mail accounts found. Please add them before setting user permissions. Note: You can only set permissions for non-admin users.', 'supportflow' );
+		$message = __('No tag/e-mail accounts found. <b>%s</b> before setting user permissions.<br><b>Note: </b>Administrator accounts automatically have full access in SupportFlow.', 'supportflow');
+		$link = '<a href="">' . __('Please add them', 'supportflow') . '</a>';
+		printf($message, $link);
 	}
 
 	function get_columns() {

From 6996f3da50d4791ddcd19efeb491a5f21c3d2126 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 16 Jul 2014 02:49:21 +0530
Subject: [PATCH 248/485] Splitted E-Mail notification class into E-Mail
 notification and preference

Apart from this code has been modularized, fixed coding standards as well
as menu item name has been replaced as "Preferences"
---
 .../class-supportflow-email-notifications.php | 173 +-----------------
 classes/class-supportflow-preferences.php     | 154 ++++++++++++++++
 js/preferences.js                             |  47 +++++
 supportflow.php                               |   1 +
 4 files changed, 211 insertions(+), 164 deletions(-)
 create mode 100644 classes/class-supportflow-preferences.php
 create mode 100644 js/preferences.js

diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index b37b5dc..e26c682 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -11,78 +11,8 @@
 	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
 }
 
-/**
- * Table to show existing preference with a option to change them
- */
-class SupportFlow_Email_Notifications_Table extends WP_List_Table {
-	protected $_data;
-
-	function __construct( $notification_settings ) {
-		parent::__construct( array( 'screen' => 'sf_user_email_notifications_table' ) );
-
-		$this->_data = array();
-		foreach ( $notification_settings as $id => $notification_setting ) {
-			$identfier = json_encode( array(
-				'privilege_type' => $notification_setting['privilege_type'],
-				'privilege_id'   => $notification_setting['privilege_id'],
-			) );
-			$status    = "<input type='checkbox' id='permission_$id' class='toggle_privilege' data-email-notfication-identifier='" . $identfier . "' " . checked( $notification_setting['allowed'], true, false ) . '>';
-			$status .= " <label for='permission_$id' class='privilege_status'> " . __( $notification_setting['allowed'] ? 'Subscribed' : 'Unsubscribed', 'supportflow' ) . "</label>";
-			$this->_data[] = array(
-				'status'    => $status,
-				'privilege' => esc_html( $notification_setting['privilege'] ),
-				'type'      => $notification_setting['type'],
-			);
-		}
-	}
-
-	function column_default( $item, $column_name ) {
-		return $item[$column_name];
-	}
-
-	function no_items() {
-		_e( "You don't have <b>permission</b> to any tag/e-mail account, or maybe no tag/e-mail account exists yet. Please ask your administrator to give you permission to an e-mail account or tag.", 'supportflow' );
-	}
-
-	function get_columns() {
-		return array(
-			'status'    => __( 'Status', 'supportflow' ),
-			'privilege' => __( 'Privilege', 'supportflow' ),
-			'type'      => __( 'Type', 'supportflow' ),
-		);
-	}
-
-	function prepare_items() {
-		$columns               = $this->get_columns();
-		$data                  = $this->_data;
-		$hidden                = array();
-		$sortable              = array();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-		$this->items           = $data;
-	}
-}
-
 class SupportFlow_Email_Notifications extends SupportFlow {
 
-	public function __construct() {
-		add_action( 'admin_menu', array( $this, 'action_admin_menu' ) );
-		add_action( 'wp_ajax_set_email_notfication', array( $this, 'action_wp_ajax_set_email_notfication' ) );
-	}
-
-	public function action_admin_menu() {
-		$this->slug = 'sf_email_notifications';
-
-		add_submenu_page(
-			'edit.php?post_type=' . SupportFlow()->post_type,
-			__( 'E-Mail Notifications', 'supportflow' ),
-			__( 'E-Mail Notifications', 'supportflow' ),
-			'read',
-			$this->slug,
-			array( $this, 'notification_setting_page' )
-		);
-
-	}
-
 	/**
 	 * Return an array containing tag/E-Mail account user opted to receive E-Mail notifications.
 	 */
@@ -95,77 +25,12 @@ public function get_email_notifications( $user_id ) {
 		return $email_notifications;
 	}
 
-	/**
-	 * Loads the page to change E-Mail notfication settings
-	 */
-	public function notification_setting_page() {
-		?>
-		<div class="wrap">
-		<h2><?php _e( 'E-Mail Notifications', 'supportflow' ) ?></h2>
-		<p><?php _e( 'Please check the tags/E-Mail accounts for which you want to receive E-Mail notifications of replies. You will be able to override E-Mail notifications settings for individual threads.', 'supportflow' ) ?></p>
-
-		<div id="email_notification_table">
-			<?php
-			$email_notifications_table = new SupportFlow_Email_Notifications_Table( $this->get_notifications_settings( get_current_user_id() ) );
-			$email_notifications_table->prepare_items();
-			$email_notifications_table->display();
-			?>
-		</div>
-		<script type="text/javascript">
-			jQuery(document).ready(function () {
-
-				jQuery(document).on('change', '.toggle_privilege', function () {
-					var checkbox = jQuery(this);
-					var checkbox_label = checkbox.siblings('.privilege_status');
-					var email_notfication_identifier = checkbox.data('email-notfication-identifier');
-
-					var allowed = checkbox.prop('checked');
-					var privilege_type = email_notfication_identifier.privilege_type;
-					var privilege_id = email_notfication_identifier.privilege_id;
-
-					checkbox_label.html('<?php _e( 'Changing status, please wait.', 'supportflow' ) ?>');
-					checkbox.prop('disabled', true);
-
-					jQuery.ajax(ajaxurl, {
-						type    : 'post',
-						data    : {
-							action                      : 'set_email_notfication',
-							privilege_type              : privilege_type,
-							privilege_id                : privilege_id,
-							allowed                     : allowed,
-							_set_email_notfication_nonce: '<?php echo wp_create_nonce( 'set_email_notfication' ) ?>',
-						},
-						success : function (content) {
-							if (1 != content) {
-								checkbox.prop('checked', !checkbox.prop('checked'));
-								alert('<?php _e( 'Failed changing state. Old state is reverted', 'supportflow' ) ?>');
-							}
-						},
-						error   : function () {
-							checkbox.prop('checked', !checkbox.prop('checked'));
-							alert('<?php _e( 'Failed changing state. Old state is reverted', 'supportflow' ) ?>');
-						},
-						complete: function () {
-							var allowed = checkbox.prop('checked');
-							if (true == allowed) {
-								checkbox_label.html('<?php _e( 'Subscribed', 'supportflow' ) ?>');
-							} else {
-								checkbox_label.html('<?php _e( 'Unsubscribed', 'supportflow' ) ?>');
-							}
-							checkbox.prop('disabled', false);
-						},
-					});
-				});
-			});
-		</script>
-	<?php
-
-	}
-
 	/**
 	 * Get E-Mail notification setting of a user(s) in an array
+	 *
 	 * @param integer $user_id
 	 * @param boolean $allowed_only
+	 *
 	 * @return array
 	 */
 	public function get_notifications_settings( $user_id = null, $allowed_only = false ) {
@@ -196,7 +61,7 @@ public function get_notifications_settings( $user_id = null, $allowed_only = fal
 				$user_permissions = array( 'tags' => $permitted_tags, 'email_accounts' => $permitted_email_accounts );
 				unset( $permitted_tags, $permitted_email_accounts );
 
-				// Allow user to show notifications settings of only tags/E-Mail account he is permitted
+			// Allow user to show notifications settings of only tags/E-Mail account he is permitted
 			} else {
 				$user_permissions = SupportFlow()->extend->permissions->get_user_permissions_data( $user->ID );
 				foreach ( $user_permissions['tags'] as $id => $tag ) {
@@ -211,7 +76,6 @@ public function get_notifications_settings( $user_id = null, $allowed_only = fal
 				}
 			}
 
-
 			// Get tag/E-Mail account for which user already receive notifications
 			$email_notifications = $this->get_email_notifications( $user->ID );
 
@@ -253,34 +117,15 @@ public function get_notifications_settings( $user_id = null, $allowed_only = fal
 		return $notification_settings;
 	}
 
-	/**
-	 * AJAX request to change user E-Mail notification settings
-	 */
-	public function action_wp_ajax_set_email_notfication() {
-		check_ajax_referer( 'set_email_notfication', '_set_email_notfication_nonce' );
-
-		if ( ! isset( $_POST['privilege_type'] )
-			|| ! isset( $_POST['privilege_id'] )
-			|| ! isset( $_POST['allowed'] )
-			|| ! in_array( $_POST['privilege_type'], array( 'email_accounts', 'tags' ) )
-		) {
-			exit;
-		}
-
-		$privilege_type = $_POST['privilege_type'];
-		$privilege_id   = $_POST['privilege_id'];
-		$allowed        = 'true' == $_POST['allowed'] ? true : false;
-
-		echo $this->set_notfication_settings( $privilege_type, $privilege_id, $allowed );
-		exit;
-	}
 
 	/**
 	 * Change E-Mail notification of a user for particular tag/E-Mail account
-	 * @param string $privilege_type
-	 * @param int $privilege_id
+	 *
+	 * @param string  $privilege_type
+	 * @param int     $privilege_id
 	 * @param boolean $allowed
-	 * @param int $user_id
+	 * @param int     $user_id
+	 *
 	 * @return boolean
 	 */
 	public function set_notfication_settings( $privilege_type, $privilege_id, $allowed, $user_id = null ) {
@@ -289,7 +134,7 @@ public function set_notfication_settings( $privilege_type, $privilege_id, $allow
 			$user_id = get_current_user_id();
 		}
 
-		// Get tag/E-Mail account for which user already receive notifications
+// Get tag/E-Mail account for which user already receive notifications
 		$email_notifications = $this->get_email_notifications( $user_id );
 
 		if ( true == $allowed ) {
diff --git a/classes/class-supportflow-preferences.php b/classes/class-supportflow-preferences.php
new file mode 100644
index 0000000..cecb93c
--- /dev/null
+++ b/classes/class-supportflow-preferences.php
@@ -0,0 +1,154 @@
+<?php
+/**
+ *
+ * @since    0.1
+ */
+
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
+
+class SupportFlow_Preferences extends SupportFlow {
+
+	public function __construct() {
+		add_action( 'admin_menu', array( $this, 'action_admin_menu' ) );
+		add_action( 'wp_ajax_set_email_notfication', array( $this, 'action_wp_ajax_set_email_notfication' ) );
+	}
+
+	public function action_admin_menu() {
+		$this->slug = 'sf_email_notifications';
+
+		add_submenu_page(
+			'edit.php?post_type=' . SupportFlow()->post_type,
+			__( 'Preferences', 'supportflow' ),
+			__( 'Preferences', 'supportflow' ),
+			'read',
+			$this->slug,
+			array( $this, 'preferences_page' )
+		);
+
+
+	}
+
+	public function enqueue_scripts() {
+		wp_enqueue_script('supportflow-preferences', SupportFlow()->plugin_url . 'js/preferences.js', array( 'jquery' ) );
+		wp_localize_script('supportflow-preferences', 'SFPreferences', array (
+		    'changing_state' => __( 'Changing status, please wait.', 'supportflow' ),
+		    'set_email_notfication_nonce' => wp_create_nonce( 'set_email_notfication' ),
+		    'failed_changing_state' => __( 'Failed changing state. Old state is reverted', 'supportflow' ),
+		    'subscribed' => __( 'Subscribed', 'supportflow' ),
+		    'unsubscribed' => __( 'Unsubscribed', 'supportflow' ),
+		));
+	}
+
+	public function preferences_page() {
+		$this->enqueue_scripts();
+		?>
+
+		<div class="wrap">
+			<?php $this->notification_setting_page() ?>
+		</div>
+
+		<?php
+	}
+
+	/**
+	 * Loads the page to change E-Mail notfication settings
+	 */
+	public function notification_setting_page() {
+		?>
+		<h2><?php _e( 'E-Mail Notifications', 'supportflow' ) ?></h2>
+		<p><?php _e( 'Please check the tags/E-Mail accounts for which you want to receive E-Mail notifications of replies. You will be able to override E-Mail notifications settings for individual threads.', 'supportflow' ) ?></p>
+
+		<div id="email_notification_table">
+			<?php
+			$email_notifications_table = new SupportFlow_Email_Notifications_Table( SupportFlow()->extend->email_notifications->get_notifications_settings( get_current_user_id() ) );
+			$email_notifications_table->prepare_items();
+			$email_notifications_table->display();
+			?>
+		</div>
+	<?php
+
+	}
+
+
+	/**
+	 * AJAX request to change user E-Mail notification settings
+	 */
+	public function action_wp_ajax_set_email_notfication() {
+		check_ajax_referer( 'set_email_notfication', '_set_email_notfication_nonce' );
+
+		if ( ! isset( $_POST['privilege_type'] )
+			|| ! isset( $_POST['privilege_id'] )
+			|| ! isset( $_POST['allowed'] )
+			|| ! in_array( $_POST['privilege_type'], array( 'email_accounts', 'tags' ) )
+		) {
+			exit;
+		}
+
+		$privilege_type = $_POST['privilege_type'];
+		$privilege_id   = $_POST['privilege_id'];
+		$allowed        = 'true' == $_POST['allowed'] ? true : false;
+
+		echo SupportFlow()->extend->email_notifications->set_notfication_settings( $privilege_type, $privilege_id, $allowed );
+		exit;
+	}
+
+
+}
+
+SupportFlow()->extend->preferences = new SupportFlow_Preferences();
+
+
+if ( ! class_exists( 'WP_List_Table' ) ) {
+	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+}
+
+/**
+ * Table to show existing preference with a option to change them
+ */
+class SupportFlow_Email_Notifications_Table extends WP_List_Table {
+	protected $_data;
+
+	function __construct( $notification_settings ) {
+		parent::__construct( array( 'screen' => 'sf_user_email_notifications_table' ) );
+
+		$this->_data = array();
+		foreach ( $notification_settings as $id => $notification_setting ) {
+			$identfier = json_encode( array(
+				'privilege_type' => $notification_setting['privilege_type'],
+				'privilege_id'   => $notification_setting['privilege_id'],
+			) );
+			$status    = "<input type='checkbox' id='permission_$id' class='toggle_privilege' data-email-notfication-identifier='" . $identfier . "' " . checked( $notification_setting['allowed'], true, false ) . '>';
+			$status .= " <label for='permission_$id' class='privilege_status'> " . __( $notification_setting['allowed'] ? 'Subscribed' : 'Unsubscribed', 'supportflow' ) . "</label>";
+			$this->_data[] = array(
+				'status'    => $status,
+				'privilege' => esc_html( $notification_setting['privilege'] ),
+				'type'      => $notification_setting['type'],
+			);
+		}
+	}
+
+	function column_default( $item, $column_name ) {
+		return $item[$column_name];
+	}
+
+	function no_items() {
+		_e( "You don't have <b>permission</b> to any tag/e-mail account, or maybe no tag/e-mail account exists yet. Please ask your administrator to give you permission to an e-mail account or tag.", 'supportflow' );
+	}
+
+	function get_columns() {
+		return array(
+			'status'    => __( 'Status', 'supportflow' ),
+			'privilege' => __( 'Privilege', 'supportflow' ),
+			'type'      => __( 'Type', 'supportflow' ),
+		);
+	}
+
+	function prepare_items() {
+		$columns               = $this->get_columns();
+		$data                  = $this->_data;
+		$hidden                = array();
+		$sortable              = array();
+		$this->_column_headers = array( $columns, $hidden, $sortable );
+		$this->items           = $data;
+	}
+}
\ No newline at end of file
diff --git a/js/preferences.js b/js/preferences.js
new file mode 100644
index 0000000..e5c22ec
--- /dev/null
+++ b/js/preferences.js
@@ -0,0 +1,47 @@
+jQuery(document).ready(function () {
+
+	// Update E-Mail notification settings on checkbox toggle
+	jQuery(document).on('change', '.toggle_privilege', function () {
+		var checkbox = jQuery(this);
+		var checkbox_label = checkbox.siblings('.privilege_status');
+		var email_notfication_identifier = checkbox.data('email-notfication-identifier');
+
+		var allowed = checkbox.prop('checked');
+		var privilege_type = email_notfication_identifier.privilege_type;
+		var privilege_id = email_notfication_identifier.privilege_id;
+
+		checkbox_label.html(SFPreferences.changing_state);
+		checkbox.prop('disabled', true);
+
+		jQuery.ajax(ajaxurl, {
+			type    : 'post',
+			data    : {
+				action                      : 'set_email_notfication',
+				privilege_type              : privilege_type,
+				privilege_id                : privilege_id,
+				allowed                     : allowed,
+				_set_email_notfication_nonce: SFPreferences.set_email_notfication_nonce,
+			},
+			success : function (content) {
+				if (1 != content) {
+					checkbox.prop('checked', !checkbox.prop('checked'));
+					alert(SFPreferences.failed_changing_state);
+				}
+			},
+			error   : function () {
+				checkbox.prop('checked', !checkbox.prop('checked'));
+				alert(SFPreferences.failed_changing_state);
+			},
+			complete: function () {
+				var allowed = checkbox.prop('checked');
+				if (true == allowed) {
+					checkbox_label.html(SFPreferences.subscribed);
+				} else {
+					checkbox_label.html(SFPreferences.unsubscribed);
+				}
+				checkbox.prop('disabled', false);
+			},
+		});
+	});
+
+});
\ No newline at end of file
diff --git a/supportflow.php b/supportflow.php
index 247fdcc..c753795 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -224,6 +224,7 @@ private function includes() {
 		require_once( $this->plugin_dir . 'classes/class-supportflow-email-accounts.php' );
 		require_once( $this->plugin_dir . 'classes/class-supportflow-predefined-replies.php' );
 		require_once( $this->plugin_dir . 'classes/class-supportflow-email-notifications.php' );
+		require_once( $this->plugin_dir . 'classes/class-supportflow-preferences.php' );
 
 		/** Extensions ********************************************************/
 

From ddfb6a3d97ce4efc4bd8f2ecf9a68c5533d789fc Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 16 Jul 2014 03:58:58 +0530
Subject: [PATCH 249/485] Allow users to insert their signature in the threads

- User can specify their signature in Preferences submenu of SupportFlow
  menu
- There is also a checkbox in reply box which allow to prevent insertion of
  signature in a particular reply. This box is checked by default
- Signature will be added to reply in this format
  "$reply\n\n-----\n$agent_signature"
---
 classes/class-supportflow-admin.php       | 15 +++++++++++-
 classes/class-supportflow-preferences.php | 30 +++++++++++++++++++++++
 css/admin.css                             |  4 +++
 3 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index c2f810f..4dc3677 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -757,6 +757,9 @@ public function meta_box_replies() {
 		echo '<input type="hidden" id="reply-attachments" name="reply-attachments" value="," />';
 		echo '</div>';
 		echo '<div id="submit-action">';
+		$signature_label_title = __( 'Append your signature at the bottom of the reply. Signature can be removed or changed in preferences page', 'supportflow' );
+		echo '<input type="checkbox" checked="checked" id="insert-signature" name="insert-signature" />';
+		echo "<label for='insert-signature' title='$signature_label_title'>" . __( 'Insert signature', 'supportflow' ) . '</label>';
 		echo '<input type="checkbox" id="mark-private" name="mark-private" />';
 		echo '<label for="mark-private">' . __( 'Mark private', 'supportflow' ) . '</label>';
 		if ( 'post-new.php' == $pagenow ) {
@@ -1019,7 +1022,17 @@ public function action_save_post( $thread_id ) {
 		}
 
 		if ( isset( $_POST['reply'] ) && ! empty( $_POST['reply'] ) ) {
-			$reply      = wp_filter_nohtml_kses( $_POST['reply'] );
+			$reply = $_POST['reply'];
+
+			if ( isset( $_POST['insert-signature'] ) && 'on' == $_POST['insert-signature'] ) {
+				$agent_signature = get_user_meta( get_current_user_id(), 'sf_user_signature', true );
+				if ( ! empty( $agent_signature ) ) {
+					$reply .= "\n\n-----\n$agent_signature";
+				}
+			}
+
+			$reply = wp_filter_nohtml_kses( $reply );
+
 			$visibility = ( ! empty( $_POST['mark-private'] ) ) ? 'private' : 'public';
 			if ( ! empty( $_POST['reply-attachments'] ) ) {
 				$attachment_ids = array_map( 'intval', explode( ',', trim( $_POST['reply-attachments'], ',' ) ) );
diff --git a/classes/class-supportflow-preferences.php b/classes/class-supportflow-preferences.php
index cecb93c..43526b4 100644
--- a/classes/class-supportflow-preferences.php
+++ b/classes/class-supportflow-preferences.php
@@ -44,12 +44,42 @@ public function preferences_page() {
 		?>
 
 		<div class="wrap">
+			<?php $this->user_thread_signature_page() ?>
+			<br />
 			<?php $this->notification_setting_page() ?>
 		</div>
 
 		<?php
 	}
 
+	public function user_thread_signature_page() {
+		if (
+			isset( $_POST['action'], $_POST['_wpnonce'], $_POST['update_signature_value'] ) &&
+			'update_signature' == $_POST['action'] &&
+			wp_verify_nonce( $_POST['_wpnonce'], 'update_signature' )
+		) {
+			$signature         = sanitize_text_field( $_POST['update_signature_value'] );
+			$sign_updated = true;
+			update_user_meta( get_current_user_id(), 'sf_user_signature', $signature );
+		} else {
+			$signature = get_user_meta( get_current_user_id(), 'sf_user_signature', true );
+		}
+
+		?>
+		<h2><?php _e( 'My signature', 'supportflow' ) ?></h2>
+		<p><?php _e( 'Please enter your signature you wish to add to your thread reply. To remove signature clear the text box and then update it. Note: It will be automatically appended at the end of your thread replies', 'supportflow' ) ?></p>
+		<?php if ( isset( $sign_updated ) && $sign_updated ) {
+			echo '<h3>' . __( 'Signature updated successfully.', 'supportflow' ) . '</h3>';
+		} ?>
+		<form id="update_signature" method="POST">
+			<?php wp_nonce_field( 'update_signature' ) ?>
+			<input type="hidden" name="action" value="update_signature" />
+			<textarea id="update_signature" name="update_signature_value" rows="7"><?php esc_html_e( $signature ) ?></textarea>
+			<?php submit_button( __( 'Update my signature', 'supportflow' ) ); ?>
+		</form>
+	<?php
+	}
+
 	/**
 	 * Loads the page to change E-Mail notfication settings
 	 */
diff --git a/css/admin.css b/css/admin.css
index 3b7c4cb..6eadb11 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -21,6 +21,10 @@
 	font-size:   16px;
 }
 
+#update_signature {
+	width: 30em;
+}
+
 #supportflow-details .meta-item-label {
 	font-weight: 600;
 }

From 539722d29147650c3ae3db179311da03ab4be440 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 17 Jul 2014 23:34:51 +0530
Subject: [PATCH 250/485] Using wp_kses() to sanitize agent signature

---
 classes/class-supportflow-preferences.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-preferences.php b/classes/class-supportflow-preferences.php
index 43526b4..5d13bd5 100644
--- a/classes/class-supportflow-preferences.php
+++ b/classes/class-supportflow-preferences.php
@@ -58,7 +58,7 @@ public function user_thread_signature_page() {
 			'update_signature' == $_POST['action'] &&
 			wp_verify_nonce( $_POST['_wpnonce'], 'update_signature' )
 		) {
-			$signature         = sanitize_text_field( $_POST['update_signature_value'] );
+			$signature         = wp_kses( $_POST['update_signature_value'], array() );
 			$sign_updated = true;
 			update_user_meta( get_current_user_id(), 'sf_user_signature', $signature );
 		} else {

From 99d6208871cb744422113a6d411e5863676396f5 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 18 Jul 2014 04:30:00 +0530
Subject: [PATCH 251/485] Show a dash sign if E-Mail account associated with
 ticket is deleted in all thread page

---
 classes/class-supportflow-admin.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 4dc3677..5c2e626 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -958,6 +958,10 @@ function action_manage_posts_custom_column( $column_name, $thread_id ) {
 					'post_type'     => SupportFlow()->post_type,
 					'email_account' => $email_account_id,
 				);
+				if ( ! isset( $email_accounts[$email_account_id] ) ) {
+					echo '—';
+					break;
+				}
 				$email_account_username = $email_accounts[$email_account_id]['username'];
 				$filter_link            = add_query_arg( $args, admin_url( 'edit.php' ) );
 				echo '<a href="' . esc_url( $filter_link ) . '">' . esc_html( $email_account_username ) . '</a>';

From 0aa8fe886cc136020fe2d31d02ed77d330f58f80 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 18 Jul 2014 04:34:00 +0530
Subject: [PATCH 252/485] Corrected variable spelling

$email_accoun_id => $email_account_id
---
 classes/class-supportflow-admin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 5c2e626..e90e238 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -510,11 +510,11 @@ public function meta_box_details() {
 		$user_permissions = $user_permissions['email_accounts'];
 
 		$email_account_dropdown = '<select class="meta-item-dropdown">';
-		foreach ( $email_accounts as $id => $email_accoun_id ) {
-			if ( empty( $email_accoun_id ) || ( ! current_user_can( 'manage_options' ) && ! in_array( $id, $user_permissions ) ) ) {
+		foreach ( $email_accounts as $id => $email_account_id ) {
+			if ( empty( $email_account_id ) || ( ! current_user_can( 'manage_options' ) && ! in_array( $id, $user_permissions ) ) ) {
 				continue;
 			}
-			$email_account_dropdown .= '<option value="' . esc_attr( $id ) . '" ' . '>' . esc_html( $email_accoun_id['username'] ) . '</option>';
+			$email_account_dropdown .= '<option value="' . esc_attr( $id ) . '" ' . '>' . esc_html( $email_account_id['username'] ) . '</option>';
 		}
 		$email_account_dropdown .= '</select>';
 

From 523de2b3272b310e3d0a9dc6103debff9f7d57c5 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 18 Jul 2014 04:36:31 +0530
Subject: [PATCH 253/485] Load E-Mail account data only in new thread page

In "Details" meta box
E-Mail account dropdown is only shown in new thread page so these settings
should be load only in that case
---
 classes/class-supportflow-admin.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index e90e238..b96f634 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -509,18 +509,20 @@ public function meta_box_details() {
 		$user_permissions = SupportFlow()->extend->permissions->get_user_permissions_data( get_current_user_id() );
 		$user_permissions = $user_permissions['email_accounts'];
 
-		$email_account_dropdown = '<select class="meta-item-dropdown">';
-		foreach ( $email_accounts as $id => $email_account_id ) {
-			if ( empty( $email_account_id ) || ( ! current_user_can( 'manage_options' ) && ! in_array( $id, $user_permissions ) ) ) {
-				continue;
+		if ( 'post-new.php' == $pagenow ) {
+			$email_account_dropdown = '<select class="meta-item-dropdown">';
+			foreach ( $email_accounts as $id => $email_account_id ) {
+				if ( empty( $email_account_id ) || ( ! current_user_can( 'manage_options' ) && ! in_array( $id, $user_permissions ) ) ) {
+					continue;
+				}
+				$email_account_dropdown .= '<option value="' . esc_attr( $id ) . '" ' . '>' . esc_html( $email_account_id['username'] ) . '</option>';
 			}
-			$email_account_dropdown .= '<option value="' . esc_attr( $id ) . '" ' . '>' . esc_html( $email_account_id['username'] ) . '</option>';
-		}
-		$email_account_dropdown .= '</select>';
+			$email_account_dropdown .= '</select>';
 
-		$email_account_keys  = array_keys( $email_accounts );
-		$email_account_id    = $email_account_keys[0];
-		$email_account_label = $email_accounts[$email_account_id]['username'];
+			$email_account_keys  = array_keys( $email_accounts );
+			$email_account_id    = $email_account_keys[0];
+			$email_account_label = $email_accounts[$email_account_id]['username'];
+		}
 
 		// Get E-Mail notification settings
 		$notification_id          = 0;

From 9ec8cb93c04915f130402813e614972379ea0635 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 18 Jul 2014 04:55:48 +0530
Subject: [PATCH 254/485] Created
 SupportFlow_Email_Accounts->get_email_account($id) method

Return a single E-Mail account
---
 classes/class-supportflow-admin.php          |  6 +++++-
 classes/class-supportflow-email-accounts.php | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index b96f634..ac10cf4 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -737,6 +737,9 @@ public function meta_box_replies() {
 		);
 
 		$rand = array_rand( $placeholders );
+
+		
+
 		echo '<div class="alignleft"><h4>' . __( 'Conversation', 'supportflow' ) . '</h4></div>';
 		echo '<div class="alignright">';
 		echo '<select id="predefs"  class="predefined_replies_dropdown">';
@@ -746,7 +749,8 @@ public function meta_box_replies() {
 		echo '</select></div>';
 
 		echo '<div id="thread-reply-box">';
-		echo "<textarea id='reply' name='reply' class='thread-reply' rows='4' placeholder='" . esc_attr( $placeholders[$rand] ) . "'>";
+		echo "<textarea id='reply' name='reply' disabled class='thread-reply' rows='4' placeholder='" . esc_attr( $placeholders[$rand] ) . "'>";
+		echo 'das';
 		echo "</textarea>";
 
 		echo '<div id="message-tools">';
diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index e5c68b0..96c4f20 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -128,6 +128,20 @@ function get_email_accounts( $existing_only = false ) {
 		}
 	}
 
+	/**
+	 * Return a single E-Mail account
+	 * @param integer $id ID of E-Mail account
+	 * @return null|array array containing E-Mail account on success else null
+	 */
+	function get_email_account( $id ) {
+		$email_accounts = & $this->email_accounts;
+		if ( isset( $email_accounts[$id] ) && ! empty( $email_accounts[$id] ) ) {
+			return $email_accounts[$id];
+		} else {
+			return null;
+		}
+	}
+
 	/*
 	 * Loads the setting page to add/remove E-Mail accounts
 	 */

From c4ae447b88184c7630105a4883ef2978b7677f7f Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 18 Jul 2014 05:46:41 +0530
Subject: [PATCH 255/485] Test if E-Mail account already exists for thread

This is a server side check. It prevent updating of post E-Mail account if it is already set
---
 classes/class-supportflow-admin.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index ac10cf4..bbbab60 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -1010,6 +1010,7 @@ public function is_edit_screen() {
 	 * and new reply data
 	 */
 	public function action_save_post( $thread_id ) {
+		$email_account_id = get_post_meta($thread_id, 'email_account', true);
 
 		if ( SupportFlow()->post_type != get_post_type( $thread_id ) ) {
 			return;
@@ -1020,7 +1021,7 @@ public function action_save_post( $thread_id ) {
 			SupportFlow()->update_thread_respondents( $thread_id, $respondents );
 		}
 
-		if ( isset( $_POST['post_email_account'] ) && is_numeric( $_POST['post_email_account'] ) ) {
+		if ( isset( $_POST['post_email_account'] ) && is_numeric( $_POST['post_email_account'] ) && '' == $email_account_id ) {
 			$email_account = (int) $_POST['post_email_account'];
 			update_post_meta( $thread_id, 'email_account', $email_account );
 		}

From df1e450ac437e4b33b325c8d4525e6db8aa25779 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 18 Jul 2014 06:02:07 +0530
Subject: [PATCH 256/485] Prevent adding new replies to thread with associated
 E-Mail account deleted

Current approach will disable reply box, pre-defined replies combo, attach
file button,..It will still allow to change other settings There is also a
server side check for it when saving posts
---
 classes/class-supportflow-admin.php | 38 ++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index bbbab60..d754082 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -731,32 +731,40 @@ public function meta_box_replies() {
 			}
 		}
 
-		$placeholders = array(
-			__( "What's burning?", 'supportflow' ),
-			__( 'What do you need to get off your chest?', 'supportflow' ),
-		);
+		$email_account_id = get_post_meta( get_the_ID(), 'email_account', true );
+		$email_account    = SupportFlow()->extend->email_accounts->get_email_account( $email_account_id );
 
-		$rand = array_rand( $placeholders );
+		$thread_lock       = ( null == $email_account );
+		$disabled_attr     = $thread_lock ? 'disabled' : '';
+		$submit_attr_array = $thread_lock ? array( 'disabled' => 'true' ) : array();
 
-		
+		if ( $thread_lock ) {
+			$placeholder = __( "Thread is locked permanently because E-Mail account associated with it is deleted. Please create a new thread now. You can't now reply to it.", 'supportflow' );
+		} else {
+			$placeholders = array(
+				__( "What's burning?", 'supportflow' ),
+				__( 'What do you need to get off your chest?', 'supportflow' ),
+			);
+			$rand        = array_rand( $placeholders );
+			$placeholder = $placeholders[$rand];
+		}
 
 		echo '<div class="alignleft"><h4>' . __( 'Conversation', 'supportflow' ) . '</h4></div>';
 		echo '<div class="alignright">';
-		echo '<select id="predefs"  class="predefined_replies_dropdown">';
+		echo '<select id="predefs" ' . $disabled_attr . ' class="predefined_replies_dropdown">';
 		foreach ( $pre_defs as $pre_def ) {
 			echo '<option class="predef" data-content="' . esc_attr( $pre_def['content'] ) . '">' . esc_html( $pre_def['title'] ) . "</option>\n";
 		}
 		echo '</select></div>';
 
 		echo '<div id="thread-reply-box">';
-		echo "<textarea id='reply' name='reply' disabled class='thread-reply' rows='4' placeholder='" . esc_attr( $placeholders[$rand] ) . "'>";
-		echo 'das';
+		echo "<textarea id='reply' name='reply' $disabled_attr class='thread-reply' rows='4' placeholder='" . esc_attr( $placeholder ) . "'>";
 		echo "</textarea>";
 
 		echo '<div id="message-tools">';
 		echo '<div id="replies-attachments-wrap">';
 		echo '<div class="drag-drop-buttons">';
-		echo '<input id="reply-attachment-browse-button" type="button" value="' . esc_attr( __( 'Attach files', 'supportflow' ) ) . '" class="button" />';
+		echo '<input id="reply-attachment-browse-button" ' . $disabled_attr . ' type="button" value="' . esc_attr( __( 'Attach files', 'supportflow' ) ) . '" class="button" />';
 		echo '</div>';
 		echo '<ul id="replies-attachments-list">';
 		echo '</ul>';
@@ -764,16 +772,16 @@ public function meta_box_replies() {
 		echo '</div>';
 		echo '<div id="submit-action">';
 		$signature_label_title = __( 'Append your signature at the bottom of the reply. Signature can be removed or changed in preferences page', 'supportflow' );
-		echo '<input type="checkbox" checked="checked" id="insert-signature" name="insert-signature" />';
+		echo '<input type="checkbox" ' . $disabled_attr . '	checked="checked" id="insert-signature" name="insert-signature" />';
 		echo "<label for='insert-signature' title='$signature_label_title'>" . __( 'Insert signature', 'supportflow' ) . '</label>';
-		echo '<input type="checkbox" id="mark-private" name="mark-private" />';
+		echo '<input type="checkbox" ' . $disabled_attr . ' id="mark-private" name="mark-private" />';
 		echo '<label for="mark-private">' . __( 'Mark private', 'supportflow' ) . '</label>';
 		if ( 'post-new.php' == $pagenow ) {
 			$submit_text = __( 'Start Thread', 'supportflow' );
 		} else {
 			$submit_text = __( 'Send Message', 'supportflow' );
 		}
-		submit_button( $submit_text, 'primary save-button', 'save', false );
+		submit_button( $submit_text, 'primary save-button', 'save', false, $submit_attr_array );
 		echo '</div>';
 		echo '</div>';
 
@@ -1011,6 +1019,8 @@ public function is_edit_screen() {
 	 */
 	public function action_save_post( $thread_id ) {
 		$email_account_id = get_post_meta($thread_id, 'email_account', true);
+		$email_account = SupportFlow()->extend->email_accounts->get_email_account( $email_account_id );
+		$thread_lock   = ( null == $email_account );
 
 		if ( SupportFlow()->post_type != get_post_type( $thread_id ) ) {
 			return;
@@ -1032,7 +1042,7 @@ public function action_save_post( $thread_id ) {
 			update_post_meta( $thread_id, 'email_notifications_override', $email_notifications_override );
 		}
 
-		if ( isset( $_POST['reply'] ) && ! empty( $_POST['reply'] ) ) {
+		if ( isset( $_POST['reply'] ) && ! empty( $_POST['reply'] ) && ! $thread_lock ) {
 			$reply = $_POST['reply'];
 
 			if ( isset( $_POST['insert-signature'] ) && 'on' == $_POST['insert-signature'] ) {

From b815d0cee98d92adf70811c8120d91c66fd31daa Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 18 Jul 2014 06:14:43 +0530
Subject: [PATCH 257/485] Embed "Forward this conversation" input box in a form
 tag

Currently after entering E-Mail ID's in forward conversation input box if
you hit enter thread get updated rather than sending of E-Mail. So this
empty form tag is just to redirect enter to this send E-Mail button
---
 classes/class-supportflow-admin.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 4dc3677..c80a4e7 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -452,8 +452,10 @@ public function meta_box_email_conversation() {
 		?>
 		<p class="description"><?php _e( "Please enter E-Mail address seperated by comma to whom you want to send this conversation.", 'supportflow' ) ?></p>
 		<br />
-		<input type="text" id="email_conversation_to" />
-		<?php submit_button( __( 'Send', 'supportflow' ), '', 'email_conversation_submit', false ); ?>
+		<form name="email_conversation">
+			<input type="text" id="email_conversation_to" />
+			<?php submit_button( __( 'Send', 'supportflow' ), '', 'email_conversation_submit', false ); ?>
+		</form>
 		<p id="email_conversation_status"></p>
 	<?php
 	}

From b12faedffeed302fdc2ab96e16a983d4366d2b70 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 19 Jul 2014 02:56:09 +0530
Subject: [PATCH 258/485] Revert "Embed "Forward this conversation" input box
 in a form tag"

Nested <form> tags are against HTML specs so they shouldn't be used
This reverts commit b815d0cee98d92adf70811c8120d91c66fd31daa.
---
 classes/class-supportflow-admin.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index c80a4e7..4dc3677 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -452,10 +452,8 @@ public function meta_box_email_conversation() {
 		?>
 		<p class="description"><?php _e( "Please enter E-Mail address seperated by comma to whom you want to send this conversation.", 'supportflow' ) ?></p>
 		<br />
-		<form name="email_conversation">
-			<input type="text" id="email_conversation_to" />
-			<?php submit_button( __( 'Send', 'supportflow' ), '', 'email_conversation_submit', false ); ?>
-		</form>
+		<input type="text" id="email_conversation_to" />
+		<?php submit_button( __( 'Send', 'supportflow' ), '', 'email_conversation_submit', false ); ?>
 		<p id="email_conversation_status"></p>
 	<?php
 	}

From 789d4e7ec93d2da90cfca954e0a0d77309c02881 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 19 Jul 2014 03:05:52 +0530
Subject: [PATCH 259/485] E-Mail coversation too if enter is pressed on input
 box

---
 js/email_conversation.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/js/email_conversation.js b/js/email_conversation.js
index b833032..0295568 100644
--- a/js/email_conversation.js
+++ b/js/email_conversation.js
@@ -1,6 +1,7 @@
 jQuery(document).ready(function () {
 	// Send conversation to E-Mail ID's
-	jQuery('#email_conversation_submit').click(function (event) {
+	
+	var email_conversion = function (event) {
 		event.preventDefault();
 		var email_ids = jQuery('#email_conversation_to').val();
 
@@ -29,5 +30,13 @@ jQuery(document).ready(function () {
 			},
 		});
 
+	}
+	
+	jQuery('#email_conversation_submit').click(email_conversion);
+	jQuery('#email_conversation_to').keyup(function () {
+		if (event.keyCode == 10) {
+			email_conversion();
+		}
 	});
+	
 });
\ No newline at end of file

From 7ce279954ea203a42ca65e02a2d22f79b691a1ac Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 18 Jul 2014 04:14:22 +0530
Subject: [PATCH 260/485] Case sensitive replace of instances of thread to
 ticket

---
 classes/class-supportflow-admin.php           | 158 ++++++++---------
 classes/class-supportflow-attachments.php     |  14 +-
 .../class-supportflow-email-notifications.php |  12 +-
 classes/class-supportflow-email-replies.php   |  30 ++--
 classes/class-supportflow-emails.php          |  90 +++++-----
 classes/class-supportflow-permissions.php     |  44 ++---
 .../class-supportflow-predefined-replies.php  |   2 +-
 classes/class-supportflow-preferences.php     |   8 +-
 classes/class-supportflow-statistics.php      |  46 ++---
 .../class-supportflow-ui-submissionform.php   |   8 +-
 classes/class-supportflow-ui-widget.php       |  82 ++++-----
 classes/class-supportflow-wp-cli.php          |  52 +++---
 css/admin.css                                 |  18 +-
 css/widget.css                                |  66 +++----
 js/supportflow-user-widget.js                 | 126 ++++++-------
 ...d_attachments.js => ticket_attachments.js} |   8 +-
 js/{threads.js => tickets.js}                 |   6 +-
 readme.txt                                    |   2 +-
 supportflow.php                               | 166 +++++++++---------
 19 files changed, 469 insertions(+), 469 deletions(-)
 rename js/{thread_attachments.js => ticket_attachments.js} (89%)
 rename js/{threads.js => tickets.js} (89%)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index d754082..5daf5ae 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -14,7 +14,7 @@ function __construct() {
 
 	public function setup_actions() {
 
-		// Creating or updating a thread
+		// Creating or updating a ticket
 		add_action( 'add_meta_boxes', array( $this, 'action_add_meta_boxes' ) );
 		add_action( 'save_post', array( $this, 'action_save_post' ) );
 
@@ -27,7 +27,7 @@ public function setup_actions() {
 		add_filter( 'post_updated_messages', array( $this, 'filter_post_updated_messages' ) );
 		add_action( 'admin_init', array( $this, 'action_admin_init' ) );
 
-		// Manage threads view
+		// Manage tickets view
 		add_filter( 'manage_' . SupportFlow()->post_type . '_posts_columns', array( $this, 'filter_manage_post_columns' ) );
 		add_filter( 'manage_edit-' . SupportFlow()->post_type . '_sortable_columns', array( $this, 'manage_sortable_columns' ) );
 		add_action( 'manage_posts_custom_column', array( $this, 'action_manage_posts_custom_column' ), 10, 2 );
@@ -65,22 +65,22 @@ public function action_admin_enqueue_scripts() {
 		if ( 'post.php' == $pagenow || 'post-new.php' == $pagenow ) {
 			wp_enqueue_media();
 
-			wp_enqueue_script( 'supportflow-thread-attachments', SupportFlow()->plugin_url . 'js/thread_attachments.js', array( 'jquery' ) );
+			wp_enqueue_script( 'supportflow-ticket-attachments', SupportFlow()->plugin_url . 'js/ticket_attachments.js', array( 'jquery' ) );
 			wp_enqueue_script( 'supportflow-respondents-autocomplete', SupportFlow()->plugin_url . 'js/respondents-autocomplete.js', array( 'jquery', 'jquery-ui-autocomplete' ) );
-			wp_enqueue_script( 'supportflow-threads', SupportFlow()->plugin_url . 'js/threads.js', array( 'jquery' ) );
+			wp_enqueue_script( 'supportflow-tickets', SupportFlow()->plugin_url . 'js/tickets.js', array( 'jquery' ) );
 
 			$ajaxurl = add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) );
 
 			wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
-			wp_localize_script( 'supportflow-thread-attachments', 'SFThreadAttachments', array(
+			wp_localize_script( 'supportflow-ticket-attachments', 'SFTicketAttachments', array(
 				'frame_title'       => __( 'Attach files', 'supportflow' ),
 				'button_title'      => __( 'Insert as attachment', 'supportflow' ),
 				'remove_attachment' => __( 'Remove', 'supportflow' ),
 				'sure_remove'       => __( 'Are you sure want to remove this attachment?', 'supportflow' ),
 			) );
-			wp_localize_script( 'supportflow-threads', 'SFThreads', array(
-				'no_title_msg'      => __( 'You must need to specify the subject of the thread', 'supportpress' ),
-				'no_respondent_msg' => __( 'You must need to add atleast one thread respondent', 'supportpress' ),
+			wp_localize_script( 'supportflow-tickets', 'SFTickets', array(
+				'no_title_msg'      => __( 'You must need to specify the subject of the ticket', 'supportpress' ),
+				'no_respondent_msg' => __( 'You must need to add atleast one ticket respondent', 'supportpress' ),
 			) );
 		}
 
@@ -110,9 +110,9 @@ public function action_wp_ajax_sf_email_conversation() {
 		}
 
 		$email_ids = SupportFlow()->extract_email_ids( $_REQUEST['email_ids'] );
-		$thread_id = (int) $_REQUEST['post_id'];
+		$ticket_id = (int) $_REQUEST['post_id'];
 
-		if ( ! current_user_can( 'edit_post', $thread_id ) ) {
+		if ( ! current_user_can( 'edit_post', $ticket_id ) ) {
 			_e( 'You are not allowed to edit this item.' );
 			die;
 		}
@@ -122,31 +122,31 @@ public function action_wp_ajax_sf_email_conversation() {
 			die;
 		}
 
-		SupportFlow()->extend->emails->email_conversation( $thread_id, $email_ids );
+		SupportFlow()->extend->emails->email_conversation( $ticket_id, $email_ids );
 
 		_e( 'Successfully sented E-Mails', 'supportflow' );
 		exit;
 	}
 
 	/**
-	 * Filter the messages that appear to the user after they perform an action on a thread
+	 * Filter the messages that appear to the user after they perform an action on a ticket
 	 */
 	public function filter_post_updated_messages( $messages ) {
 		global $post;
 
 		$messages[SupportFlow()->post_type] = array(
 			0  => '', // Unused. Messages start at index 1.
-			1  => __( 'Thread updated.', 'supportflow' ),
+			1  => __( 'Ticket updated.', 'supportflow' ),
 			2  => __( 'Custom field updated.', 'supportflow' ),
 			3  => __( 'Custom field deleted.', 'supportflow' ),
-			4  => __( 'Thread updated.', 'supportflow' ),
+			4  => __( 'Ticket updated.', 'supportflow' ),
 			/* translators: %s: date and time of the revision */
-			5  => isset( $_GET['revision'] ) ? sprintf( __( 'Thread restored to revision from %s', 'supportflow' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
-			6  => __( 'Thread updated.', 'supportflow' ),
-			7  => __( 'Thread updated.', 'supportflow' ),
-			8  => __( 'Thread updated.', 'supportflow' ),
-			9  => __( 'Thread updated.', 'supportflow' ),
-			10 => __( 'Thread updated.', 'supportflow' ),
+			5  => isset( $_GET['revision'] ) ? sprintf( __( 'Ticket restored to revision from %s', 'supportflow' ), wp_post_revision_title( (int) $_GET['revision'], false ) ) : false,
+			6  => __( 'Ticket updated.', 'supportflow' ),
+			7  => __( 'Ticket updated.', 'supportflow' ),
+			8  => __( 'Ticket updated.', 'supportflow' ),
+			9  => __( 'Ticket updated.', 'supportflow' ),
+			10 => __( 'Ticket updated.', 'supportflow' ),
 		);
 
 		return $messages;
@@ -163,7 +163,7 @@ public function filter_views( $views ) {
 		$status_slugs = array();
 
 		foreach ( $statuses as $status => $status_data ) {
-			if ( true == $status_data['show_threads'] ) {
+			if ( true == $status_data['show_tickets'] ) {
 				$status_slugs[] = $status;
 			}
 		}
@@ -197,14 +197,14 @@ public function filter_views( $views ) {
 		$views['all']  = $view_all;
 		$views         = array_reverse( $views );
 
-		// Remove private option from filter links as they are just private replies to thread
+		// Remove private option from filter links as they are just private replies to ticket
 		unset( $views['private'] );
 
 		return $views;
 	}
 
 	/**
-	 * Add custom filters for the Manage Threads view
+	 * Add custom filters for the Manage Tickets view
 	 */
 	public function action_restrict_manage_posts() {
 
@@ -250,7 +250,7 @@ function filter_post_row_actions( $row_actions, $post ) {
 
 		// Rename these actions
 		if ( isset( $row_actions['edit'] ) ) {
-			$row_actions['edit'] = str_replace( __( 'Edit' ), __( 'View', 'supportflow' ), str_replace( __( 'Edit this item' ), __( 'View Thread', 'supportflow' ), $row_actions['edit'] ) );
+			$row_actions['edit'] = str_replace( __( 'Edit' ), __( 'View', 'supportflow' ), str_replace( __( 'Edit this item' ), __( 'View Ticket', 'supportflow' ), $row_actions['edit'] ) );
 		}
 
 		// Save the trash action for the end
@@ -277,15 +277,15 @@ function filter_post_row_actions( $row_actions, $post ) {
 				'action'      => 'change_status',
 				'sf_nonce'    => wp_create_nonce( 'sf-change-status' ),
 				'post_status' => $change_to,
-				'thread_id'   => $post->ID,
+				'ticket_id'   => $post->ID,
 				'post_type'   => SupportFlow()->post_type,
 			);
 			$action_link = add_query_arg( $args, admin_url( 'edit.php' ) );
 			if ( $last_status == $change_to ) {
-				$title_attr  = esc_attr__( 'Close Thread', 'supportflow' );
+				$title_attr  = esc_attr__( 'Close Ticket', 'supportflow' );
 				$action_text = esc_html__( 'Close', 'supportflow' );
 			} else {
-				$title_attr  = esc_attr__( 'Reopen Thread', 'supportflow' );
+				$title_attr  = esc_attr__( 'Reopen Ticket', 'supportflow' );
 				$action_text = esc_html__( 'Reopen', 'supportflow' );
 			}
 
@@ -315,7 +315,7 @@ public function filter_bulk_actions( $actions ) {
 	}
 
 	/**
-	 * Handle which threads are show on the Manage Threads view when
+	 * Handle which tickets are show on the Manage Tickets view when
 	 */
 	function action_pre_get_posts( $query ) {
 		global $pagenow;
@@ -328,7 +328,7 @@ function action_pre_get_posts( $query ) {
 		$status_slugs = array();
 
 		foreach ( $statuses as $status => $status_data ) {
-			if ( true == $status_data['show_threads'] ) {
+			if ( true == $status_data['show_tickets'] ) {
 				$status_slugs[] = $status;
 			}
 		}
@@ -368,7 +368,7 @@ function action_pre_get_posts( $query ) {
 			add_filter( 'posts_search', array( $this, 'filter_posts_search' ) );
 		}
 
-		// Only show threads with the last status if the last status is set
+		// Only show tickets with the last status if the last status is set
 		$post_status = $query->get( 'post_status' );
 		if ( ! $query->get( 's' ) && empty( $post_status ) ) {
 			$query->set( 'post_status', $status_slugs );
@@ -393,7 +393,7 @@ public function filter_posts_search( $posts_search ) {
 	 */
 	function handle_action_change_status() {
 
-		if ( ! isset( $_GET['action'], $_GET['sf_nonce'], $_GET['post_status'], $_GET['thread_id'] ) ) {
+		if ( ! isset( $_GET['action'], $_GET['sf_nonce'], $_GET['post_status'], $_GET['ticket_id'] ) ) {
 			return;
 		}
 
@@ -401,18 +401,18 @@ function handle_action_change_status() {
 			wp_die( __( "Doin' something phishy, huh?", 'supportflow' ) );
 		}
 
-		$thread_id = (int) $_GET['thread_id'];
+		$ticket_id = (int) $_GET['ticket_id'];
 
-		if ( ! current_user_can( 'edit_post', $thread_id ) ) {
+		if ( ! current_user_can( 'edit_post', $ticket_id ) ) {
 			wp_die( __( 'You are not allowed to edit this item.' ) );
 		}
 
 		$post_status = sanitize_key( $_GET['post_status'] );
-		$new_thread  = array(
-			'ID'          => $thread_id,
+		$new_ticket  = array(
+			'ID'          => $ticket_id,
 			'post_status' => $post_status,
 		);
-		wp_update_post( $new_thread );
+		wp_update_post( $new_ticket );
 		wp_safe_redirect( wp_get_referer() );
 		exit;
 	}
@@ -420,9 +420,9 @@ function handle_action_change_status() {
 	/**
 	 * Manipulate the meta boxes appearing on the edit post view
 	 *
-	 * When creating a new thread, you should be able to:
+	 * When creating a new ticket, you should be able to:
 	 *
-	 * When updating an existing thread, you should be able to:
+	 * When updating an existing ticket, you should be able to:
 	 *
 	 */
 	public function action_add_meta_boxes() {
@@ -459,7 +459,7 @@ public function meta_box_email_conversation() {
 	}
 
 	/**
-	 * Show details about the thread, and allow the post status and agent to be changed
+	 * Show details about the ticket, and allow the post status and agent to be changed
 	 */
 	public function meta_box_details() {
 		global $pagenow;
@@ -560,9 +560,9 @@ public function meta_box_details() {
 
 		// Get submit button label
 		if ( 'post-new.php' == $pagenow ) {
-			$submit_text = __( 'Start Thread', 'supportflow' );
+			$submit_text = __( 'Start Ticket', 'supportflow' );
 		} else {
-			$submit_text = __( 'Update Thread', 'supportflow' );
+			$submit_text = __( 'Update Ticket', 'supportflow' );
 		}
 		?>
 
@@ -586,21 +586,21 @@ public function meta_box_details() {
 					</div>
 				<?php endif; ?>
 
-				<!--Thread opening date/time-->
+				<!--Ticket opening date/time-->
 				<?php if ( 'post.php' == $pagenow ) : ?>
 					<div class="misc-pub-section meta-item">
 						<label><?php _e( 'Opened', 'supportflow' ) ?>:</label>
 						<span class="meta-item-label"><?php esc_html_e( $opened ) ?></span>
 					</div>
 
-					<!--Last thread update time-->
+					<!--Last ticket update time-->
 					<div class="misc-pub-section meta-item">
 						<label><?php _e( 'Last Activity', 'supportflow' ) ?>:</label>
 						<span class="meta-item-label"><?php esc_html_e( $last_activity ) ?></span>
 					</div>
 				<?php endif; ?>
 
-				<!--Thread status box-->
+				<!--Ticket status box-->
 				<div class="misc-pub-section meta-item">
 					<label class="meta-item-toggle-button"><?php _e( 'Status', 'supportflow' ) ?>:</label>
 					<span class="meta-item-label"><?php esc_html_e( $current_status_label, 'supportflow' ) ?></span>
@@ -671,7 +671,7 @@ public function meta_box_subject() {
 		$placeholder = __( 'What is your conversation about?', 'supportflow' );
 		echo '<h4>' . __( 'Subject', 'supportflow' ) . '</h4>';
 		echo '<input type="text" id="subject" name="post_title" placeholder="' . $placeholder . '" value="' . get_the_title() . '" autocomplete="off" />';
-		echo '<p class="description">' . __( 'Please describe what this thread is about in several words', 'supportflow' ) . '</p>';
+		echo '<p class="description">' . __( 'Please describe what this ticket is about in several words', 'supportflow' ) . '</p>';
 
 	}
 
@@ -680,7 +680,7 @@ public function meta_box_subject() {
 	 */
 	public function meta_box_respondents() {
 
-		$respondents        = SupportFlow()->get_thread_respondents( get_the_ID(), array( 'fields' => 'emails' ) );
+		$respondents        = SupportFlow()->get_ticket_respondents( get_the_ID(), array( 'fields' => 'emails' ) );
 		$respondents_string = implode( ', ', $respondents );
 		$respondents_string .= empty( $respondents_string ) ? '' : ', ';
 		$placeholder = __( 'Who are you starting a conversation with?', 'supportflow' );
@@ -777,7 +777,7 @@ public function meta_box_replies() {
 		echo '<input type="checkbox" ' . $disabled_attr . ' id="mark-private" name="mark-private" />';
 		echo '<label for="mark-private">' . __( 'Mark private', 'supportflow' ) . '</label>';
 		if ( 'post-new.php' == $pagenow ) {
-			$submit_text = __( 'Start Thread', 'supportflow' );
+			$submit_text = __( 'Start Ticket', 'supportflow' );
 		} else {
 			$submit_text = __( 'Send Message', 'supportflow' );
 		}
@@ -789,18 +789,18 @@ public function meta_box_replies() {
 
 		echo '<div class="clear"></div>';
 
-		$this->display_thread_replies();
+		$this->display_ticket_replies();
 	}
 
-	public function display_thread_replies() {
+	public function display_ticket_replies() {
 
-		$private_replies = SupportFlow()->get_thread_replies( get_the_ID(), array( 'status' => 'private' ) );
+		$private_replies = SupportFlow()->get_ticket_replies( get_the_ID(), array( 'status' => 'private' ) );
 
 		if ( ! empty( $private_replies ) ) {
 			echo '<ul class="private-replies">';
 			foreach ( $private_replies as $reply ) {
 				echo '<li>';
-				echo '<div class="thread-reply">';
+				echo '<div class="ticket-reply">';
 				$post_content = wpautop( stripslashes( $reply->post_content ) );
 				// Make link clickable
 				$post_content = make_clickable( $post_content );
@@ -810,7 +810,7 @@ public function display_thread_replies() {
 					'post_type'   => 'attachment'
 				);
 				if ( $attachments = get_posts( $attachment_args ) ) {
-					echo '<ul class="thread-reply-attachments">';
+					echo '<ul class="ticket-reply-attachments">';
 					foreach ( $attachments as $attachment ) {
 						$attachment_link = wp_get_attachment_url( $attachment->ID );
 						echo '<li><a target="_blank" href="' . esc_url( $attachment_link ) . '">' . esc_html( $attachment->post_title ) . '</a></li>';
@@ -822,15 +822,15 @@ public function display_thread_replies() {
 				$reply_timestamp = sprintf( __( 'Noted by %1$s on %2$s at %3$s', 'supportflow' ), $reply_author, get_the_date(), get_the_time() );
 				$modified_gmt    = get_post_modified_time( 'U', true, get_the_ID() );
 				$last_activity   = sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
-				echo '<div class="thread-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . ' (' . $last_activity . ')' . '</span></div>';
+				echo '<div class="ticket-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . ' (' . $last_activity . ')' . '</span></div>';
 				echo '</li>';
 			}
 			echo '</ul>';
 		}
 
-		$replies = SupportFlow()->get_thread_replies( get_the_ID(), array( 'status' => 'public' ) );
+		$replies = SupportFlow()->get_ticket_replies( get_the_ID(), array( 'status' => 'public' ) );
 		if ( ! empty( $replies ) ) {
-			echo '<ul class="thread-replies">';
+			echo '<ul class="ticket-replies">';
 			foreach ( $replies as $reply ) {
 				$reply_author       = get_post_meta( $reply->ID, 'reply_author', true );
 				$reply_author_email = get_post_meta( $reply->ID, 'reply_author_email', true );
@@ -838,7 +838,7 @@ public function display_thread_replies() {
 				echo '<div class="reply-avatar">' . get_avatar( $reply_author_email, 72 );
 				echo '<p class="reply-author">' . esc_html( $reply_author ) . '</p>';
 				echo '</div>';
-				echo '<div class="thread-reply">';
+				echo '<div class="ticket-reply">';
 				$post_content = wpautop( stripslashes( $reply->post_content ) );
 				// Make link clickable
 				$post_content = make_clickable( $post_content );
@@ -848,7 +848,7 @@ public function display_thread_replies() {
 					'post_type'   => 'attachment'
 				);
 				if ( $attachments = get_posts( $attachment_args ) ) {
-					echo '<ul class="thread-reply-attachments">';
+					echo '<ul class="ticket-reply-attachments">';
 					foreach ( $attachments as $attachment ) {
 						$attachment_link = wp_get_attachment_url( $attachment->ID );
 						echo '<li><a target="_blank" href="' . esc_url( $attachment_link ) . '">' . esc_html( $attachment->post_title ) . '</a></li>';
@@ -859,7 +859,7 @@ public function display_thread_replies() {
 				$reply_timestamp = sprintf( __( '%s at %s', 'supportflow' ), get_the_date(), get_the_time() );
 				$modified_gmt    = get_post_modified_time( 'U', true, get_the_ID() );
 				$last_activity   = sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
-				echo '<div class="thread-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . ' (' . $last_activity . ')' . '</span></div>';
+				echo '<div class="ticket-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . ' (' . $last_activity . ')' . '</span></div>';
 				echo '</li>';
 			}
 			echo '</ul>';
@@ -870,7 +870,7 @@ public function display_thread_replies() {
 	}
 
 	/**
-	 * Modifications to the columns appearing in the All Threads view
+	 * Modifications to the columns appearing in the All Tickets view
 	 *
 	 * @todo maybe add 'Created' column
 	 */
@@ -904,10 +904,10 @@ public function manage_sortable_columns( $columns ) {
 
 	/**
 	 * Use the most recent public reply as the post excerpt
-	 * on the Manage Threads view so mode=excerpt works well
+	 * on the Manage Tickets view so mode=excerpt works well
 	 */
 	public function filter_get_the_excerpt( $orig ) {
-		if ( $reply = array_pop( SupportFlow()->get_thread_replies( get_the_ID() ) ) ) {
+		if ( $reply = array_pop( SupportFlow()->get_ticket_replies( get_the_ID() ) ) ) {
 			$reply_author = get_post_meta( $reply->ID, 'reply_author' );
 
 			return $reply_author . ': "' . wp_trim_excerpt( $reply->post_content ) . '"';
@@ -919,15 +919,15 @@ public function filter_get_the_excerpt( $orig ) {
 	/**
 	 * Produce the column values for the custom columns we created
 	 */
-	function action_manage_posts_custom_column( $column_name, $thread_id ) {
+	function action_manage_posts_custom_column( $column_name, $ticket_id ) {
 
 		switch ( $column_name ) {
 			case 'updated':
-				$modified_gmt = get_post_modified_time( 'U', true, $thread_id );
+				$modified_gmt = get_post_modified_time( 'U', true, $ticket_id );
 				echo sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
 				break;
 			case 'sf_excerpt':
-				$replies = SupportFlow()->get_thread_replies( $thread_id, array( 'numberposts' => 1, 'order' => 'ASC' ) );
+				$replies = SupportFlow()->get_ticket_replies( $ticket_id, array( 'numberposts' => 1, 'order' => 'ASC' ) );
 				if ( ! isset( $replies[0] ) ) {
 					echo '—';
 					break;
@@ -939,7 +939,7 @@ function action_manage_posts_custom_column( $column_name, $thread_id ) {
 				echo $first_reply;
 				break;
 			case 'respondents':
-				$respondents = SupportFlow()->get_thread_respondents( $thread_id, array( 'fields' => 'emails' ) );
+				$respondents = SupportFlow()->get_ticket_respondents( $ticket_id, array( 'fields' => 'emails' ) );
 				if ( empty( $respondents ) ) {
 					echo '—';
 					break;
@@ -956,7 +956,7 @@ function action_manage_posts_custom_column( $column_name, $thread_id ) {
 				echo implode( '<br />', $respondents );
 				break;
 			case 'status':
-				$post_status = get_post_status( $thread_id );
+				$post_status = get_post_status( $ticket_id );
 				$args        = array(
 					'post_type'   => SupportFlow()->post_type,
 					'post_status' => $post_status,
@@ -966,7 +966,7 @@ function action_manage_posts_custom_column( $column_name, $thread_id ) {
 				echo '<a href="' . esc_url( $filter_link ) . '">' . esc_html( $status_name ) . '</a>';
 				break;
 			case 'email':
-				$email_account_id       = get_post_meta( $thread_id, 'email_account', true );
+				$email_account_id       = get_post_meta( $ticket_id, 'email_account', true );
 				$email_accounts         = SupportFlow()->extend->email_accounts->get_email_accounts();
 				$args                   = array(
 					'post_type'     => SupportFlow()->post_type,
@@ -981,21 +981,21 @@ function action_manage_posts_custom_column( $column_name, $thread_id ) {
 				echo '<a href="' . esc_url( $filter_link ) . '">' . esc_html( $email_account_username ) . '</a>';
 				break;
 			case 'sf_replies':
-				$replies = SupportFlow()->get_thread_replies_count( $thread_id );
+				$replies = SupportFlow()->get_ticket_replies_count( $ticket_id );
 				echo '<div class="post-com-count-wrapper">';
 				echo "<span class='replies-count'>{$replies}</span>";
 				echo '</div>';
 				break;
 			case 'created':
-				$created_time = get_the_time( get_option( 'time_format' ) . ' T', $thread_id );
-				$created_date = get_the_time( get_option( 'date_format' ), $thread_id );
+				$created_time = get_the_time( get_option( 'time_format' ) . ' T', $ticket_id );
+				$created_date = get_the_time( get_option( 'date_format' ), $ticket_id );
 				echo sprintf( __( '%s<br />%s', 'supportflow' ), $created_time, $created_date );
 				break;
 		}
 	}
 
 	/**
-	 * Whether or not we're on a view for creating or updating a thread
+	 * Whether or not we're on a view for creating or updating a ticket
 	 *
 	 * @return string $pagenow Return the context for the screen we're in
 	 */
@@ -1014,32 +1014,32 @@ public function is_edit_screen() {
 	}
 
 	/**
-	 * When a thread is saved or updated, make sure we save the respondent
+	 * When a ticket is saved or updated, make sure we save the respondent
 	 * and new reply data
 	 */
-	public function action_save_post( $thread_id ) {
+	public function action_save_post( $ticket_id ) {
 		$email_account_id = get_post_meta($thread_id, 'email_account', true);
 		$email_account = SupportFlow()->extend->email_accounts->get_email_account( $email_account_id );
 		$thread_lock   = ( null == $email_account );
 
-		if ( SupportFlow()->post_type != get_post_type( $thread_id ) ) {
+		if ( SupportFlow()->post_type != get_post_type( $ticket_id ) ) {
 			return;
 		}
 
 		if ( isset( $_POST['respondents'] ) ) {
 			$respondents = array_map( 'sanitize_email', explode( ',', $_POST['respondents'] ) );
-			SupportFlow()->update_thread_respondents( $thread_id, $respondents );
+			SupportFlow()->update_ticket_respondents( $ticket_id, $respondents );
 		}
 
 		if ( isset( $_POST['post_email_account'] ) && is_numeric( $_POST['post_email_account'] ) && '' == $email_account_id ) {
 			$email_account = (int) $_POST['post_email_account'];
-			update_post_meta( $thread_id, 'email_account', $email_account );
+			update_post_meta( $ticket_id, 'email_account', $email_account );
 		}
 
 		if ( isset( $_POST['post_email_notifications_override'] ) && in_array( $_POST['post_email_notifications_override'], array( 'default', 'enable', 'disable' ) ) ) {
-			$email_notifications_override                        = get_post_meta( $thread_id, 'email_notifications_override', true );
+			$email_notifications_override                        = get_post_meta( $ticket_id, 'email_notifications_override', true );
 			$email_notifications_override[get_current_user_id()] = $_POST['post_email_notifications_override'];
-			update_post_meta( $thread_id, 'email_notifications_override', $email_notifications_override );
+			update_post_meta( $ticket_id, 'email_notifications_override', $email_notifications_override );
 		}
 
 		if ( isset( $_POST['reply'] ) && ! empty( $_POST['reply'] ) && ! $thread_lock ) {
@@ -1069,7 +1069,7 @@ public function action_save_post( $thread_id ) {
 				'cc'             => $cc,
 				'bcc'            => $bcc,
 			);
-			SupportFlow()->add_thread_reply( $thread_id, $reply, $reply_args );
+			SupportFlow()->add_ticket_reply( $ticket_id, $reply, $reply_args );
 		}
 
 	}
diff --git a/classes/class-supportflow-attachments.php b/classes/class-supportflow-attachments.php
index b6313a9..739a8b2 100644
--- a/classes/class-supportflow-attachments.php
+++ b/classes/class-supportflow-attachments.php
@@ -32,8 +32,8 @@ public function setup_actions() {
 			update_option( self::secret_key_option, $this->secret_key );
 		}
 
-		// Only apply to files that are uploaded to a thread
-		if ( isset( $_REQUEST['post_id'] ) && SupportFlow()->is_thread( (int) $_REQUEST['post_id'] ) ) {
+		// Only apply to files that are uploaded to a ticket
+		if ( isset( $_REQUEST['post_id'] ) && SupportFlow()->is_ticket( (int) $_REQUEST['post_id'] ) ) {
 			add_filter( 'wp_handle_upload_prefilter', array( $this, 'wp_handle_upload_prefilter' ) );
 			add_filter( 'wp_handle_upload', array( $this, 'wp_handle_upload' ) );
 		}
@@ -45,7 +45,7 @@ public function setup_actions() {
 	public function filter_wp_get_attachment_url( $url, $attachment_id ) {
 
 		if ( $attachment = get_post( $attachment_id ) ) {
-			if ( SupportFlow()->is_thread( $attachment->post_parent ) ) {
+			if ( SupportFlow()->is_ticket( $attachment->post_parent ) ) {
 				return $attachment->guid;
 			}
 
@@ -84,7 +84,7 @@ public function handle_file_delivery( $template ) {
 			return get_404_template();
 		}
 
-		// Check to see whether the user has permission to view the thread
+		// Check to see whether the user has permission to view the ticket
 		if ( $this->attachments_require_permission && ! $this->can_view_attachment( $post->ID ) ) {
 			wp_die( __( 'Sorry, you do not have permission to view this attachment.', 'supportflow' ) );
 		}
@@ -176,15 +176,15 @@ public function can_view_attachment( $attachment_id, $email_or_login = false ) {
 			}
 		}
 
-		$thread_id   = get_post( $attachment_id )->post_parent;
-		$respondents = SupportFlow()->get_thread_respondents( $thread_id, array( 'fields' => 'emails' ) );
+		$ticket_id   = get_post( $attachment_id )->post_parent;
+		$respondents = SupportFlow()->get_ticket_respondents( $ticket_id, array( 'fields' => 'emails' ) );
 
 		// If the email address is a respondent, they can view
 		if ( in_array( $email_or_login, $respondents ) ) {
 			return true;
 		}
 
-		// @todo permissions check on whether the user is logged in as some who can view threads
+		// @todo permissions check on whether the user is logged in as some who can view tickets
 
 		return false;
 	}
diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index e26c682..12b228a 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -157,16 +157,16 @@ public function set_notfication_settings( $privilege_type, $privilege_id, $allow
 	}
 
 	/**
-	 * Get user id of all the users that will receive e-mail notifications for a thread reply
+	 * Get user id of all the users that will receive e-mail notifications for a ticket reply
 	 *
-	 * @param type $thread_id
+	 * @param type $ticket_id
 	 *
 	 * @return type array
 	 */
-	public function get_notified_user( $thread_id ) {
-		$tags                         = wp_get_post_terms( $thread_id, 'sf_tags', array( 'fields' => 'slugs' ) );
-		$email_account                = get_post_meta( $thread_id, 'email_account', true );
-		$email_notifications_override = get_post_meta( $thread_id, 'email_notifications_override', true );
+	public function get_notified_user( $ticket_id ) {
+		$tags                         = wp_get_post_terms( $ticket_id, 'sf_tags', array( 'fields' => 'slugs' ) );
+		$email_account                = get_post_meta( $ticket_id, 'email_account', true );
+		$email_notifications_override = get_post_meta( $ticket_id, 'email_notifications_override', true );
 
 		if ( ! is_array( $email_notifications_override ) ) {
 			$email_notifications_override = array();
diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index ff8fb1a..a25cf3e 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Primary class for ingesting emails from an IMAP email box, parsing, and adding to appropriate threads
+ * Primary class for ingesting emails from an IMAP email box, parsing, and adding to appropriate tickets
  */
 
 defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
@@ -20,9 +20,9 @@ public function setup_actions() {
 
 	}
 
-	public function filter_reply_notify_subject( $subject, $reply_id, $thread_id ) {
+	public function filter_reply_notify_subject( $subject, $reply_id, $ticket_id ) {
 
-		$subject = rtrim( $subject ) . ' [' . SupportFlow()->get_secret_for_thread( $thread_id ) . ']';
+		$subject = rtrim( $subject ) . ' [' . SupportFlow()->get_secret_for_ticket( $ticket_id ) . ']';
 
 		return $subject;
 	}
@@ -155,7 +155,7 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 		if ( ! empty( $email->headers->subject ) ) {
 			$subject = $email->headers->subject;
 		} else {
-			$subject = sprintf( __( 'New thread from %s', 'supportflow' ), $email->headers->fromaddress );
+			$subject = sprintf( __( 'New ticket from %s', 'supportflow' ), $email->headers->fromaddress );
 		}
 
 		$reply_author       = isset( $email->headers->from[0]->personal ) ? $email->headers->from[0]->personal : '';
@@ -182,10 +182,10 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 			}
 		}
 
-		// Check to see if this message was in response to an existing thread
-		$thread_id = false;
+		// Check to see if this message was in response to an existing ticket
+		$ticket_id = false;
 		if ( preg_match( '#\[([a-zA-Z0-9]{8})\]$#', $subject, $matches ) ) {
-			$thread_id = SupportFlow()->get_thread_from_secret( $matches[1] );
+			$ticket_id = SupportFlow()->get_ticket_from_secret( $matches[1] );
 		}
 
 		// Add anyone else that was in the 'to' or 'cc' fields as respondents
@@ -203,17 +203,17 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 		}
 		$respondents[] = $reply_author_email;
 
-		if ( $thread_id ) {
+		if ( $ticket_id ) {
 			$reply_args = array(
 				'reply_author'       => $reply_author,
 				'reply_author_email' => $reply_author_email,
 			);
-			SupportFlow()->update_thread_respondents( $thread_id, $respondents, true );
-			SupportFlow()->add_thread_reply( $thread_id, $message, $reply_args );
+			SupportFlow()->update_ticket_respondents( $ticket_id, $respondents, true );
+			SupportFlow()->add_ticket_reply( $ticket_id, $message, $reply_args );
 
 		} else {
-			// If this wasn't in reply to an existing message, create a new thread
-			$new_thread_args = array(
+			// If this wasn't in reply to an existing message, create a new ticket
+			$new_ticket_args = array(
 				'subject'            => $subject,
 				'reply_author'       => $reply_author,
 				'reply_author_email' => $reply_author_email,
@@ -222,14 +222,14 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 				'email_account'      => $email_account_id,
 			);
 
-			$thread_id = SupportFlow()->create_thread( $new_thread_args );
+			$ticket_id = SupportFlow()->create_ticket( $new_ticket_args );
 		}
 
-		$all_replies = SupportFlow()->get_thread_replies( $thread_id );
+		$all_replies = SupportFlow()->get_ticket_replies( $ticket_id );
 		$new_reply   = $all_replies[count( $all_replies ) - 1];
 
 		foreach ( $new_attachment_ids as $new_attachment_id ) {
-			// Associate the thread ID as the parent to our new attachment
+			// Associate the ticket ID as the parent to our new attachment
 			wp_update_post( array( 'ID' => $new_attachment_id, 'post_parent' => $new_reply->ID, 'post_status' => 'inherit' ) );
 		}
 
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 5738224..88459fe 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -21,28 +21,28 @@ public function setup_actions() {
 			return;
 		}
 
-		// When a new reply is added to a thread, notify the respondents and the agents
-		add_action( 'supportflow_thread_reply_added', array( $this, 'notify_agents_thread_replies' ) );
-		add_action( 'supportflow_thread_reply_added', array( $this, 'notify_respondents_thread_replies' ), 10, 3 );
+		// When a new reply is added to a ticket, notify the respondents and the agents
+		add_action( 'supportflow_ticket_reply_added', array( $this, 'notify_agents_ticket_replies' ) );
+		add_action( 'supportflow_ticket_reply_added', array( $this, 'notify_respondents_ticket_replies' ), 10, 3 );
 	}
 
 	/**
-	 * When a new reply is added to the thread, notify the agent on the thread if there is one
+	 * When a new reply is added to the ticket, notify the agent on the ticket if there is one
 	 */
-	public function notify_agents_thread_replies( $reply_id ) {
+	public function notify_agents_ticket_replies( $reply_id ) {
 
 		$reply = get_post( $reply_id );
 		if ( ! $reply ) {
 			return;
 		}
 
-		$thread = SupportFlow()->get_thread( $reply->post_parent );
+		$ticket = SupportFlow()->get_ticket( $reply->post_parent );
 		// One agent by default, but easily allow notifications to a triage team
-		$agent_ids = SupportFlow()->extend->email_notifications->get_notified_user( $thread->ID );
-		$agent_ids = apply_filters( 'supportflow_emails_notify_agent_ids', $agent_ids, $thread, 'reply' );
+		$agent_ids = SupportFlow()->extend->email_notifications->get_notified_user( $ticket->ID );
+		$agent_ids = apply_filters( 'supportflow_emails_notify_agent_ids', $agent_ids, $ticket, 'reply' );
 
 		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts( true );
-		$email_account_id = get_post_meta( $thread->ID, 'email_account', true );
+		$email_account_id = get_post_meta( $ticket->ID, 'email_account', true );
 		$smtp_account     = $email_accounts[$email_account_id];
 
 		if ( empty( $agent_ids ) ) {
@@ -64,12 +64,12 @@ public function notify_agents_thread_replies( $reply_id ) {
 			}
 		}
 
-		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $thread->ID );
-		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $thread->ID, 'agent' );
+		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $ticket->ID );
+		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $ticket->ID, 'agent' );
 
 		$attachments = array();
-		if ( $thread_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply->ID ) ) ) {
-			foreach ( $thread_attachments as $attachment ) {
+		if ( $ticket_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply->ID ) ) ) {
+			foreach ( $ticket_attachments as $attachment ) {
 				$attachments[] = get_attached_file( $attachment->ID );
 			}
 		}
@@ -77,33 +77,33 @@ public function notify_agents_thread_replies( $reply_id ) {
 		$message = stripslashes( $reply->post_content );
 		// Ticket details that are relevant to the agent
 		$message .= "\n\n-------";
-		// Thread status
-		$post_status = SupportFlow()->post_statuses[$thread->post_status]['label'];
+		// Ticket status
+		$post_status = SupportFlow()->post_statuses[$ticket->post_status]['label'];
 		$message .= "\n" . sprintf( __( "Status: %s", 'supportflow' ), $post_status );
 		// Assigned agent
-		$assigned_agent = ( $thread->post_author ) ? get_user_by( 'id', $thread->post_author )->display_name : __( 'None assigned', 'supportflow' );
+		$assigned_agent = ( $ticket->post_author ) ? get_user_by( 'id', $ticket->post_author )->display_name : __( 'None assigned', 'supportflow' );
 		$message .= "\n" . sprintf( __( "Agent: %s", 'supportflow' ), $assigned_agent );
 
-		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $thread->ID, 'agent' );
+		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $ticket->ID, 'agent' );
 
 		self::mail( $agent_emails, $subject, $message, '', $attachments, $smtp_account );
 	}
 
 	/**
-	 * When a new reply is added to the thread, notify all of the respondents on the thread
+	 * When a new reply is added to the ticket, notify all of the respondents on the ticket
 	 */
-	public function notify_respondents_thread_replies( $reply_id, $cc = array(), $bcc = array() ) {
+	public function notify_respondents_ticket_replies( $reply_id, $cc = array(), $bcc = array() ) {
 		// Respondents shouldn't receive private replies
 		$reply = get_post( $reply_id );
 		if ( ! $reply || 'private' == $reply->post_status ) {
 			return;
 		}
 
-		$thread      = SupportFlow()->get_thread( $reply->post_parent );
-		$respondents = SupportFlow()->get_thread_respondents( $thread->ID, array( 'fields' => 'emails' ) );
+		$ticket      = SupportFlow()->get_ticket( $reply->post_parent );
+		$respondents = SupportFlow()->get_ticket_respondents( $ticket->ID, array( 'fields' => 'emails' ) );
 
 		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts( true );
-		$email_account_id = get_post_meta( $thread->ID, 'email_account', true );
+		$email_account_id = get_post_meta( $ticket->ID, 'email_account', true );
 		$smtp_account     = $email_accounts[$email_account_id];
 
 		// Don't email the person creating the reply, unless that's desired behavior
@@ -115,18 +115,18 @@ public function notify_respondents_thread_replies( $reply_id, $cc = array(), $bc
 			}
 		}
 
-		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $thread->ID );
-		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $thread->ID, 'respondent' );
+		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $ticket->ID );
+		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $ticket->ID, 'respondent' );
 
 		$attachments = array();
-		if ( $thread_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply->ID ) ) ) {
-			foreach ( $thread_attachments as $attachment ) {
+		if ( $ticket_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply->ID ) ) ) {
+			foreach ( $ticket_attachments as $attachment ) {
 				$attachments[] = get_attached_file( $attachment->ID );
 			}
 		}
 
 		$message = stripslashes( $reply->post_content );
-		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $thread->ID, 'respondent' );
+		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $ticket->ID, 'respondent' );
 
 		$headers = '';
 
@@ -148,40 +148,40 @@ public function notify_respondents_thread_replies( $reply_id, $cc = array(), $bc
 	/**
 	 * E-Mail a supportflow conversation to users
 	 *
-	 * @param integer      $thread_id
+	 * @param integer      $ticket_id
 	 * @param array|string $to
 	 */
-	public function email_conversation( $thread_id, $to ) {
+	public function email_conversation( $ticket_id, $to ) {
 
-		$thread         = SupportFlow()->get_thread( $thread_id );
-		$thread_replies = SupportFlow()->get_thread_replies( $thread_id );
-		$thread_owner   = $thread->post_author > 0 ? get_user_by( 'id', $thread->post_author )->data->user_nicename : __( 'Unassigned', 'supportflow' );
+		$ticket         = SupportFlow()->get_ticket( $ticket_id );
+		$ticket_replies = SupportFlow()->get_ticket_replies( $ticket_id );
+		$ticket_owner   = $ticket->post_author > 0 ? get_user_by( 'id', $ticket->post_author )->data->user_nicename : __( 'Unassigned', 'supportflow' );
 
 		$attachments = array();
 		$msg         = '';
-		$subject     = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $thread->ID ) . ' ' . __( 'Conversation summery', 'supportflow' );
+		$subject     = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $ticket->ID ) . ' ' . __( 'Conversation summery', 'supportflow' );
 
-		$msg .= '<b>' . __( 'Title', 'supportflow' ) . ':</b> ' . esc_html( $thread->post_title ) . '<br>';
-		$msg .= '<b>' . __( 'Status', 'supportflow' ) . ':</b> ' . SupportFlow()->post_statuses[$thread->post_status]['label'] . '<br>';
-		$msg .= '<b>' . __( 'Owner', 'supportflow' ) . ':</b> ' . esc_html( $thread_owner ) . '<br>';
-		$msg .= '<b>' . __( 'Created on', 'supportflow' ) . ':</b> ' . $thread->post_date_gmt . ' GMT<br>';
-		$msg .= '<b>' . __( 'Last Updated on', 'supportflow' ) . ':</b> ' . $thread->post_modified_gmt . ' GMT<br>';
+		$msg .= '<b>' . __( 'Title', 'supportflow' ) . ':</b> ' . esc_html( $ticket->post_title ) . '<br>';
+		$msg .= '<b>' . __( 'Status', 'supportflow' ) . ':</b> ' . SupportFlow()->post_statuses[$ticket->post_status]['label'] . '<br>';
+		$msg .= '<b>' . __( 'Owner', 'supportflow' ) . ':</b> ' . esc_html( $ticket_owner ) . '<br>';
+		$msg .= '<b>' . __( 'Created on', 'supportflow' ) . ':</b> ' . $ticket->post_date_gmt . ' GMT<br>';
+		$msg .= '<b>' . __( 'Last Updated on', 'supportflow' ) . ':</b> ' . $ticket->post_modified_gmt . ' GMT<br>';
 		$msg .= '<br><br>';
 
-		foreach ( array_reverse( $thread_replies ) as $thread_reply ) {
-			$date_time    = $thread_reply->post_date_gmt . ' GMT';
-			$reply_author = get_post_meta( $thread_reply->ID, 'reply_author', true );
+		foreach ( array_reverse( $ticket_replies ) as $ticket_reply ) {
+			$date_time    = $ticket_reply->post_date_gmt . ' GMT';
+			$reply_author = get_post_meta( $ticket_reply->ID, 'reply_author', true );
 			if ( empty( $reply_author ) ) {
-				$reply_author = get_post_meta( $thread_reply->ID, 'reply_author_email', true );
+				$reply_author = get_post_meta( $ticket_reply->ID, 'reply_author_email', true );
 			}
 
 			$msg .= '<b>' . sprintf( __( 'On %s, %s wrote:', 'supportflow' ), $date_time, esc_html( $reply_author ) ) . '</b>';
 			$msg .= '<br>';
-			$msg .= esc_html( $thread_reply->post_content );
+			$msg .= esc_html( $ticket_reply->post_content );
 			$msg .= '<br><br>';
 
-			if ( $thread_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $thread_reply->ID ) ) ) {
-				foreach ( $thread_attachments as $attachment ) {
+			if ( $ticket_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $ticket_reply->ID ) ) ) {
+				foreach ( $ticket_attachments as $attachment ) {
 					$attachments[] = get_attached_file( $attachment->ID );
 				}
 			}
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 29892a1..b69592b 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -383,7 +383,7 @@ public function set_user_permission( $user_id, $privilege_type, $privilege_id, $
 	function limit_user_permissions( $allcaps, $cap, $args ) {
 		global $pagenow, $post_type;
 
-		// Check if atleast one E-Mail account exists before showing thread creation page
+		// Check if atleast one E-Mail account exists before showing ticket creation page
 		if (
 			'post-new.php' == $pagenow &&
 			SupportFlow()->post_type == $post_type
@@ -391,7 +391,7 @@ function limit_user_permissions( $allcaps, $cap, $args ) {
 			$email_accounts = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 			if ( empty( $email_accounts ) ) {
 				$link = "edit.php?post_type=$post_type&page=sf_accounts";
-				$msg  = 'Please add atleast one E-Mail account before creating a thread.';
+				$msg  = 'Please add atleast one E-Mail account before creating a ticket.';
 
 				wp_die( "<a href='$link'>" . __( $msg, 'supportflow' ) . "</a>" );
 			}
@@ -404,7 +404,7 @@ function limit_user_permissions( $allcaps, $cap, $args ) {
 			// Return if user is admin
 			( ! empty( $allcaps['manage_options'] ) && true == $allcaps['manage_options'] ) ||
 
-			// Return if posts are not supportflow threads
+			// Return if posts are not supportflow tickets
 			SupportFlow()->post_type != $post_type
 		) {
 			return $allcaps;
@@ -416,12 +416,12 @@ function limit_user_permissions( $allcaps, $cap, $args ) {
 		// This capability is requested if user is viewing/modifying existing ticket
 		if ( 'edit_post' == $args[0] ) {
 
-			// Allow if user have access to the tag/E-Mail account used by the thread
+			// Allow if user have access to the tag/E-Mail account used by the ticket
 			if ( $this->is_user_allowed_post( $args[1], $args[2] ) ) {
 				$allcaps["edit_others_posts"] = true;
 				$allcaps["edit_posts"]        = true;
 
-			// Allow if user is creating new thread with permitted E-Mail account
+			// Allow if user is creating new ticket with permitted E-Mail account
 			} elseif (
 				'post.php' == $pagenow &&
 				isset ( $_REQUEST['action'], $_REQUEST['post_email_account'] ) &&
@@ -431,28 +431,28 @@ function limit_user_permissions( $allcaps, $cap, $args ) {
 				$allcaps["edit_others_posts"] = true;
 				$allcaps["edit_posts"]        = true;
 
-			// Disallow user access to thread in other cases
+			// Disallow user access to ticket in other cases
 			} else {
 				$allcaps["edit_others_posts"] = false;
 				$allcaps["edit_posts"]        = false;
 			}
 		}
 
-		// Allow deleting thread if user have access to the tag/E-Mail account used by the thread
+		// Allow deleting ticket if user have access to the tag/E-Mail account used by the ticket
 		if ( 'delete_post' == $args[0] && $this->is_user_allowed_post( $args[1], $args[2] ) ) {
 			$allcaps["delete_others_posts"] = true;
 		} else {
 			$allcaps["delete_others_posts"] = false;
 		}
 
-		// This capability is requested if user is creating new thread or listing all threads
+		// This capability is requested if user is creating new ticket or listing all tickets
 		if ( 'edit_posts' == $args[0] ) {
 
-			// List All threads if user have access to atleast one E-Mail account or tag
+			// List All tickets if user have access to atleast one E-Mail account or tag
 			if ( 'post-new.php' != $pagenow && ( ! empty( $user_permissions['email_accounts'] ) || ! empty( $user_permissions['tags'] ) ) ) {
 				$allcaps["edit_posts"] = true;
 
-			// Allow creating new thread if user have access to atleast one E-Mail account
+			// Allow creating new ticket if user have access to atleast one E-Mail account
 			} elseif ( 'post-new.php' == $pagenow && ! empty( $user_permissions['email_accounts'] ) ) {
 				$allcaps["edit_posts"] = true;
 
@@ -514,14 +514,14 @@ private function _setup_caps() {
 		// Setup the default caps for SupportFlow
 		$this->_caps = apply_filters(
 			'supportflow_caps', array(
-				'close_others_threads'    => 'sf_close_others_threads',
-				'open_others_threads'     => 'sf_open_others_threads',
-				'reopen_others_threads'   => 'sf_reopen_others_threads',
-				'reply_on_others_threads' => 'sf_reply_on_others_threads',
-				'close_threads'           => 'sf_close_threads',
-				'open_threads'            => 'sf_open_threads',
-				'reopen_threads'          => 'sf_reopen_threads',
-				'reply_on_threads'        => 'sf_reply_on_threads',
+				'close_others_tickets'    => 'sf_close_others_tickets',
+				'open_others_tickets'     => 'sf_open_others_tickets',
+				'reopen_others_tickets'   => 'sf_reopen_others_tickets',
+				'reply_on_others_tickets' => 'sf_reply_on_others_tickets',
+				'close_tickets'           => 'sf_close_tickets',
+				'open_tickets'            => 'sf_open_tickets',
+				'reopen_tickets'          => 'sf_reopen_tickets',
+				'reply_on_tickets'        => 'sf_reply_on_tickets',
 			)
 		);
 
@@ -531,12 +531,12 @@ private function _setup_caps() {
 				'administrator' => $this->get_caps(), // Apply all caps
 				'editor'        => $this->get_caps(), // Apply all caps
 				'author'        => array(
-					'close_threads'    => $this->get_cap( 'close_threads' ),
-					'open_threads'     => $this->get_cap( 'open_threads' ),
-					'reply_on_threads' => $this->get_cap( 'reply_on_threads' ),
+					'close_tickets'    => $this->get_cap( 'close_tickets' ),
+					'open_tickets'     => $this->get_cap( 'open_tickets' ),
+					'reply_on_tickets' => $this->get_cap( 'reply_on_tickets' ),
 				),
 				'contributor'   => array(
-					'reply_on_threads' => $this->get_cap( 'reply_on_threads' ),
+					'reply_on_tickets' => $this->get_cap( 'reply_on_tickets' ),
 				),
 			)
 		);
diff --git a/classes/class-supportflow-predefined-replies.php b/classes/class-supportflow-predefined-replies.php
index 4e29a11..8dbd310 100644
--- a/classes/class-supportflow-predefined-replies.php
+++ b/classes/class-supportflow-predefined-replies.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Class to create/insert predefined replies into the threads
+ * Class to create/insert predefined replies into the tickets
  */
 
 defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
diff --git a/classes/class-supportflow-preferences.php b/classes/class-supportflow-preferences.php
index 5d13bd5..2382a6b 100644
--- a/classes/class-supportflow-preferences.php
+++ b/classes/class-supportflow-preferences.php
@@ -44,7 +44,7 @@ public function preferences_page() {
 		?>
 
 		<div class="wrap">
-			<?php $this->user_thread_signature_page() ?>
+			<?php $this->user_ticket_signature_page() ?>
 			<br />
 			<?php $this->notification_setting_page() ?>
 		</div>
@@ -52,7 +52,7 @@ public function preferences_page() {
 		<?php
 	}
 
-	public function user_thread_signature_page() {
+	public function user_ticket_signature_page() {
 		if (
 			isset( $_POST['action'], $_POST['_wpnonce'], $_POST['update_signature_value'] ) &&
 			'update_signature' == $_POST['action'] &&
@@ -67,7 +67,7 @@ public function user_thread_signature_page() {
 
 		?>
 		<h2><?php _e( 'My signature', 'supportflow' ) ?></h2>
-		<p><?php _e( 'Please enter your signature you wish to add to your thread reply. To remove signature clear the text box and then update it. Note: It will be automatically appended at the end of your thread replies', 'supportflow' ) ?></p>
+		<p><?php _e( 'Please enter your signature you wish to add to your ticket reply. To remove signature clear the text box and then update it. Note: It will be automatically appended at the end of your ticket replies', 'supportflow' ) ?></p>
 		<?php if ( isset( $sign_updated ) && $sign_updated ) {
 			echo '<h3>' . __( 'Signature updated successfully.', 'supportflow' ) . '</h3>';
 		} ?>
@@ -86,7 +86,7 @@ public function user_thread_signature_page() {
 	public function notification_setting_page() {
 		?>
 		<h2><?php _e( 'E-Mail Notifications', 'supportflow' ) ?></h2>
-		<p><?php _e( 'Please check the tags/E-Mail accounts for which you want to receive E-Mail notifications of replies. You will be able to override E-Mail notifications settings for individual threads.', 'supportflow' ) ?></p>
+		<p><?php _e( 'Please check the tags/E-Mail accounts for which you want to receive E-Mail notifications of replies. You will be able to override E-Mail notifications settings for individual tickets.', 'supportflow' ) ?></p>
 
 		<div id="email_notification_table">
 			<?php
diff --git a/classes/class-supportflow-statistics.php b/classes/class-supportflow-statistics.php
index 4ba6095..ac9df5f 100644
--- a/classes/class-supportflow-statistics.php
+++ b/classes/class-supportflow-statistics.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Show SupportFlow thread statistics
+ * Show SupportFlow ticket statistics
  *
  * @since    0.1
  */
@@ -154,9 +154,9 @@ public function show_overall_stats() {
 
 		$statistics_table->set_columns( array(
 			'table_date'   => __( 'Date', 'supportflow' ),
-			'table_new'    => __( 'New threads', 'supportflow' ),
-			'table_open'   => __( 'Open threads', 'supportflow' ),
-			'table_closed' => __( 'Closed threads', 'supportflow' ),
+			'table_new'    => __( 'New tickets', 'supportflow' ),
+			'table_open'   => __( 'Open tickets', 'supportflow' ),
+			'table_closed' => __( 'Closed tickets', 'supportflow' ),
 		) );
 
 		$labels = array( 'Today', 'Yesterday' );
@@ -190,9 +190,9 @@ public function show_tag_stats() {
 
 		$statistics_table->set_columns( array(
 			'table_tag'    => __( 'Tag', 'supportflow' ),
-			'table_new'    => __( 'New threads', 'supportflow' ),
-			'table_open'   => __( 'Open threads', 'supportflow' ),
-			'table_closed' => __( 'Closed threads', 'supportflow' ),
+			'table_new'    => __( 'New tickets', 'supportflow' ),
+			'table_open'   => __( 'Open tickets', 'supportflow' ),
+			'table_closed' => __( 'Closed tickets', 'supportflow' ),
 		) );
 
 		foreach ( get_terms(SupportFlow()->tags_tax, 'hide_empty=0' ) as $tag ) {
@@ -213,9 +213,9 @@ public function show_30_days_stats() {
 
 		$statistics_table->set_columns( array(
 			'table_date'   => __( 'Date', 'supportflow' ),
-			'table_new'    => __( 'New threads', 'supportflow' ),
-			'table_open'   => __( 'Open threads', 'supportflow' ),
-			'table_closed' => __( 'Closed threads', 'supportflow' ),
+			'table_new'    => __( 'New tickets', 'supportflow' ),
+			'table_open'   => __( 'Open tickets', 'supportflow' ),
+			'table_closed' => __( 'Closed tickets', 'supportflow' ),
 		) );
 
 		for ( $i = 0; $i < 30; $i ++ ) {
@@ -244,9 +244,9 @@ public function show_12_month_stats() {
 
 		$statistics_table->set_columns( array(
 			'table_date'   => __( 'Date', 'supportflow' ),
-			'table_new'    => __( 'New threads', 'supportflow' ),
-			'table_open'   => __( 'Open threads', 'supportflow' ),
-			'table_closed' => __( 'Closed threads', 'supportflow' ),
+			'table_new'    => __( 'New tickets', 'supportflow' ),
+			'table_open'   => __( 'Open tickets', 'supportflow' ),
+			'table_closed' => __( 'Closed tickets', 'supportflow' ),
 		) );
 
 		for ( $i = 0; $i < 12; $i ++ ) {
@@ -274,9 +274,9 @@ public function show_5_year_stats() {
 
 		$statistics_table->set_columns( array(
 			'table_date'   => __( 'Date', 'supportflow' ),
-			'table_new'    => __( 'New threads', 'supportflow' ),
-			'table_open'   => __( 'Open threads', 'supportflow' ),
-			'table_closed' => __( 'Closed threads', 'supportflow' ),
+			'table_new'    => __( 'New tickets', 'supportflow' ),
+			'table_open'   => __( 'Open tickets', 'supportflow' ),
+			'table_closed' => __( 'Closed tickets', 'supportflow' ),
 		) );
 
 		for ( $i = 0; $i < 5; $i ++ ) {
@@ -297,7 +297,7 @@ public function show_5_year_stats() {
 	/**
 	 * Stats of post created on a particular date
 	 * @param array $post_date Date in format like array('year'=>1994, 'month'=>12, 'day'=>5)
-	 * @param integer $link_date Date in format used in filtering by WP in all threads page. e.g. 19941205
+	 * @param integer $link_date Date in format used in filtering by WP in all tickets page. e.g. 19941205
 	 * @param string $link_value Value to show user of link in table
 	 * @return array Tickets stats created on a particular date. This array is directly usable in table
 	 */
@@ -315,7 +315,7 @@ function get_post_data_by_date( $post_date = null, $link_date = null, $link_valu
 	/**
 	 * Stats of post created of a particular tag
 	 * @param string $post_tag Slug of tag for which you want to get stats for
-	 * @param integer $link_tag Tag in format used in filtering by WP in all threads page.
+	 * @param integer $link_tag Tag in format used in filtering by WP in all tickets page.
 	 * @param string $link_value Value to show user of link in table
 	 * @return array Tickets stats created for a particular tag. This array is directly usable in table
 	 */
@@ -380,9 +380,9 @@ public function get_posts_count_by_tag( $post_status = '*', $tag = null ) {
 
 
 	/**
-	 * Generate a link that shows matching tickets in all thread page
-	 * @param integer $link_date Date in format used in filtering by WP in all threads page. e.g. 19941205
-	 * @param string $post_status Post statuses that should be shown in all threads page
+	 * Generate a link that shows matching tickets in all ticket page
+	 * @param integer $link_date Date in format used in filtering by WP in all tickets page. e.g. 19941205
+	 * @param string $post_status Post statuses that should be shown in all tickets page
 	 * @param string $link_value Value of hyperlink that should be shown to user
 	 * @return string A hyperlink
 	 */
@@ -399,9 +399,9 @@ function get_post_link_by_date( $link_date = null, $post_status = null, $link_va
 
 
 	/**
-	 * Generate a link that shows matching tickets in all thread page
+	 * Generate a link that shows matching tickets in all ticket page
 	 * @param string $link_tag Slug of tag
-	 * @param string $post_status Post statuses that should be shown in all threads page
+	 * @param string $post_status Post statuses that should be shown in all tickets page
 	 * @param string $link_value Value of hyperlink that should be shown to user
 	 * @return string A hyperlink
 	 */
diff --git a/classes/class-supportflow-ui-submissionform.php b/classes/class-supportflow-ui-submissionform.php
index 70077bb..9ac2892 100644
--- a/classes/class-supportflow-ui-submissionform.php
+++ b/classes/class-supportflow-ui-submissionform.php
@@ -71,7 +71,7 @@ public function action_init_handle_form_submission() {
 			return;
 		}
 
-		$thread_id = SupportFlow()->create_thread(
+		$ticket_id = SupportFlow()->create_ticket(
 			array(
 				'subject'         => $_POST['supportflow']['subject'],
 				'message'         => $_POST['supportflow']['message'],
@@ -80,13 +80,13 @@ public function action_init_handle_form_submission() {
 			)
 		);
 
-		if ( is_wp_error( $thread_id ) ) {
-			$this->messages[] = 'There was an error creating the thread: ' . $thread_id->get_error_message();
+		if ( is_wp_error( $ticket_id ) ) {
+			$this->messages[] = 'There was an error creating the ticket: ' . $ticket_id->get_error_message();
 
 			return;
 		}
 
-		$this->messages[] = 'Thread (ticket) number ' . $thread_id . ' created.';
+		$this->messages[] = 'Ticket (ticket) number ' . $ticket_id . ' created.';
 	}
 }
 
diff --git a/classes/class-supportflow-ui-widget.php b/classes/class-supportflow-ui-widget.php
index bba34e9..79a8f52 100644
--- a/classes/class-supportflow-ui-widget.php
+++ b/classes/class-supportflow-ui-widget.php
@@ -28,12 +28,12 @@ public function filter_json_api_response( $response ) {
 		}
 
 		switch ( $response['api-action'] ) {
-			case 'create-thread':
-			case 'get-thread':
-				$response['widget_title'] = get_the_title( (int) $response['thread_id'] );
-				$response['html']         = $this->render_single_thread_replies_html( (int) $response['thread_id'] );
+			case 'create-ticket':
+			case 'get-ticket':
+				$response['widget_title'] = get_the_title( (int) $response['ticket_id'] );
+				$response['html']         = $this->render_single_ticket_replies_html( (int) $response['ticket_id'] );
 				break;
-			case 'add-thread-reply':
+			case 'add-ticket-reply':
 				$reply            = get_post( $response['comment_id'] );
 				$response['html'] = '<li>' . $this->render_single_reply_html( $reply ) . '</li>';
 				break;
@@ -42,11 +42,11 @@ public function filter_json_api_response( $response ) {
 		return $response;
 	}
 
-	public function render_single_thread_replies_html( $thread_id ) {
+	public function render_single_ticket_replies_html( $ticket_id ) {
 
-		$replies = SupportFlow()->get_thread_replies( $thread_id, array( 'status' => 'public', 'order' => 'ASC' ) );
+		$replies = SupportFlow()->get_ticket_replies( $ticket_id, array( 'status' => 'public', 'order' => 'ASC' ) );
 
-		$output = '<ul class="thread-replies">';
+		$output = '<ul class="ticket-replies">';
 		foreach ( $replies as $reply ) {
 			$output .= '<li>' . $this->render_single_reply_html( $reply ) . '</li>';
 		}
@@ -58,31 +58,31 @@ public function render_single_thread_replies_html( $thread_id ) {
 	public function render_single_reply_html( $reply ) {
 		$reply_timestamp = mysql2date( 'M. n', $reply->post_date_gmt );
 		$reply_author    = get_post_meta( $reply->ID, 'reply_author' );
-		$output          = '<div class="thread-reply-body">'
+		$output          = '<div class="ticket-reply-body">'
 			. wpautop( stripslashes( $reply->post_content ) )
 			. '</div>'
-			. '<div class="thread-reply-meta">'
-			. '<span class="thread-reply-author">' . esc_html( $reply_author ) . '</span>'
-			. '<span class="thread-reply-timestamp">' . esc_html( $reply_timestamp ) . '</span>'
+			. '<div class="ticket-reply-meta">'
+			. '<span class="ticket-reply-author">' . esc_html( $reply_author ) . '</span>'
+			. '<span class="ticket-reply-timestamp">' . esc_html( $reply_timestamp ) . '</span>'
 			. '</div>';
 
 		return $output;
 	}
 
-	public function render_all_threads_html() {
+	public function render_all_tickets_html() {
 		$user = wp_get_current_user();
 
-		$threads = SupportFlow()->get_threads( array( 'respondent_email' => $user->user_email ) );
+		$tickets = SupportFlow()->get_tickets( array( 'respondent_email' => $user->user_email ) );
 
-		if ( empty( $threads ) ) {
-			$output = '<div class="thread nothreads">' . __( 'No open threads.', 'supportflow' ) . '</div>';
+		if ( empty( $tickets ) ) {
+			$output = '<div class="ticket notickets">' . __( 'No open tickets.', 'supportflow' ) . '</div>';
 		} else {
-			$output = '<ul id="respondent-threads">';
-			foreach ( $threads as $thread ) {
-				$output .= '<li id="thread-' . $thread->ID . '">';
-				$output .= '<h4 class="thread-title">' . get_the_title( $thread->ID ) . '</h4>';
-				$output .= '<div class="thread-replies">';
-				$replies    = SupportFlow()->get_thread_replies( $thread->ID, array( 'status' => 'public' ) );
+			$output = '<ul id="respondent-tickets">';
+			foreach ( $tickets as $ticket ) {
+				$output .= '<li id="ticket-' . $ticket->ID . '">';
+				$output .= '<h4 class="ticket-title">' . get_the_title( $ticket->ID ) . '</h4>';
+				$output .= '<div class="ticket-replies">';
+				$replies    = SupportFlow()->get_ticket_replies( $ticket->ID, array( 'status' => 'public' ) );
 				$last_reply = array_shift( $replies );
 				$output .= $this->render_single_reply_html( $last_reply );
 				$output .= '</div>';
@@ -110,8 +110,8 @@ public function action_template_redirect() {
 
 		$widget_title = __( 'Support', 'supportflow' );
 
-		$start_thread_text    = __( 'Start thread', 'supportflow' );
-		$starting_thread_text = __( 'Starting thread...', 'supportflow' );
+		$start_ticket_text    = __( 'Start ticket', 'supportflow' );
+		$starting_ticket_text = __( 'Starting ticket...', 'supportflow' );
 		$send_reply_text      = __( 'Send reply', 'supportflow' );
 		$sending_reply_text   = __( 'Sending reply...', 'supportflow' );
 		wp_localize_script(
@@ -120,8 +120,8 @@ public function action_template_redirect() {
 			array(
 				'ajaxurl'              => $ajaxurl,
 				'widget_title'         => $widget_title,
-				'start_thread_text'    => $start_thread_text,
-				'starting_thread_text' => $starting_thread_text,
+				'start_ticket_text'    => $start_ticket_text,
+				'starting_ticket_text' => $starting_ticket_text,
 				'send_reply_text'      => $send_reply_text,
 				'sending_reply_text'   => $sending_reply_text,
 			)
@@ -142,29 +142,29 @@ public function action_template_redirect() {
 		<body>
 
 		<div id="supportflow-widget">
-			<button id="supportflow-back"><?php _e( 'All Threads', 'supportflow' ); ?></button>
+			<button id="supportflow-back"><?php _e( 'All Tickets', 'supportflow' ); ?></button>
 			<h1 id="widget-title"><?php echo $widget_title; ?></h1>
 
-			<div id="supportflow-newthread-box">
-				<button id="supportflow-newthread"><?php _e( 'Start a new thread', 'supportflow' ); ?></button>
-				<form id="supportflow-newthread-form">
-					<input type="text" id="new-thread-subject" name="new-thread-subject" class="thread-subject" placeholder="<?php esc_attr_e( 'What can we help with?', 'supportflow' ); ?>" autocomplete="off" />
-					<textarea id="new-thread-message" name="new-thread-message" class="thread-message" cols="25" rows="6" placeholder="<?php esc_attr_e( 'Tell us a bit more...', 'supportflow' ); ?>" autocomplete="off"></textarea>
-					<input id="new-thread-submit" type="submit" name="new-thread-submit" class="submit-button" value="<?php echo esc_attr( $start_thread_text ); ?>" />
+			<div id="supportflow-newticket-box">
+				<button id="supportflow-newticket"><?php _e( 'Start a new ticket', 'supportflow' ); ?></button>
+				<form id="supportflow-newticket-form">
+					<input type="text" id="new-ticket-subject" name="new-ticket-subject" class="ticket-subject" placeholder="<?php esc_attr_e( 'What can we help with?', 'supportflow' ); ?>" autocomplete="off" />
+					<textarea id="new-ticket-message" name="new-ticket-message" class="ticket-message" cols="25" rows="6" placeholder="<?php esc_attr_e( 'Tell us a bit more...', 'supportflow' ); ?>" autocomplete="off"></textarea>
+					<input id="new-ticket-submit" type="submit" name="new-ticket-submit" class="submit-button" value="<?php echo esc_attr( $start_ticket_text ); ?>" />
 				</form>
 			</div>
 
-			<div id="supportflow-all-threads">
-				<?php echo $this->render_all_threads_html(); ?>
+			<div id="supportflow-all-tickets">
+				<?php echo $this->render_all_tickets_html(); ?>
 			</div>
 
-			<div id="supportflow-single-thread">
-				<div id="supportflow-thread-body">
+			<div id="supportflow-single-ticket">
+				<div id="supportflow-ticket-body">
 				</div>
-				<form id="supportflow-existing-thread-form">
-					<textarea id="existing-thread-message" name="existing-thread-message" class="thread-message" cols="25" rows="6" autocomplete="off"></textarea>
-					<input id="existing-thread-submit" type="submit" name="existing-thread-submit" class="submit-button" value="<?php echo esc_attr( $send_reply_text ); ?>" />
-					<input id="existing-thread-id" name="thread-id" type="hidden" />
+				<form id="supportflow-existing-ticket-form">
+					<textarea id="existing-ticket-message" name="existing-ticket-message" class="ticket-message" cols="25" rows="6" autocomplete="off"></textarea>
+					<input id="existing-ticket-submit" type="submit" name="existing-ticket-submit" class="submit-button" value="<?php echo esc_attr( $send_reply_text ); ?>" />
+					<input id="existing-ticket-id" name="ticket-id" type="hidden" />
 				</form>
 			</div>
 		</div>
diff --git a/classes/class-supportflow-wp-cli.php b/classes/class-supportflow-wp-cli.php
index 9abbbdb..4a079c7 100644
--- a/classes/class-supportflow-wp-cli.php
+++ b/classes/class-supportflow-wp-cli.php
@@ -85,8 +85,8 @@ public function import_remote( $args, $assoc_args ) {
 			'messages',
 			'predefined_messages',
 			'tags',
-			'threadmeta',
-			'threads',
+			'ticketmeta',
+			'tickets',
 			'usermeta',
 			'users',
 		);
@@ -99,36 +99,36 @@ public function import_remote( $args, $assoc_args ) {
 		}
 
 		/**
-		 * Import threads and their messages
+		 * Import tickets and their messages
 		 *
 		 * @todo Support for importing priorities. This seems to exist in the schema for old SP, but not in the interface
 		 */
-		$old_threads           = $spdb->get_results( "SELECT * FROM $spdb->threads" );
-		$count_threads_created = 0;
-		foreach ( $old_threads as $old_thread ) {
+		$old_tickets           = $spdb->get_results( "SELECT * FROM $spdb->tickets" );
+		$count_tickets_created = 0;
+		foreach ( $old_tickets as $old_ticket ) {
 
-			// Don't import a thread that's already been imported
-			if ( $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE '_imported_id'=%d", $old_thread->thread_id ) ) ) {
-				WP_CLI::line( "Skipping: #{$old_thread->thread_id} '{$old_thread->subject}' already exists" );
+			// Don't import a ticket that's already been imported
+			if ( $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE '_imported_id'=%d", $old_ticket->ticket_id ) ) ) {
+				WP_CLI::line( "Skipping: #{$old_ticket->ticket_id} '{$old_ticket->subject}' already exists" );
 				continue;
 			}
 
-			// Create the new thread
-			$thread_args = array(
-				'subject' => $old_thread->subject,
-				'date'    => $old_thread->dt,
-				'status'  => 'sf_' . $old_thread->state,
+			// Create the new ticket
+			$ticket_args = array(
+				'subject' => $old_ticket->subject,
+				'date'    => $old_ticket->dt,
+				'status'  => 'sf_' . $old_ticket->state,
 			);
-			$thread_id   = SupportFlow()->create_thread( $thread_args );
-			if ( is_wp_error( $thread_id ) ) {
+			$ticket_id   = SupportFlow()->create_ticket( $ticket_args );
+			if ( is_wp_error( $ticket_id ) ) {
 				continue;
 			}
 
-			// Add the respondent to the thread
-			SupportFlow()->update_thread_respondents( $thread_id, $old_thread->email );
+			// Add the respondent to the ticket
+			SupportFlow()->update_ticket_respondents( $ticket_id, $old_ticket->email );
 
-			// Get the thread's messages and import those too
-			$old_messages  = (array) $spdb->get_results( $spdb->prepare( "SELECT * FROM $spdb->messages WHERE thread_id=%d", $old_thread->thread_id ) );
+			// Get the ticket's messages and import those too
+			$old_messages  = (array) $spdb->get_results( $spdb->prepare( "SELECT * FROM $spdb->messages WHERE ticket_id=%d", $old_ticket->ticket_id ) );
 			$count_replies = 0;
 			foreach ( $old_messages as $old_message ) {
 				$message_args = array(
@@ -140,16 +140,16 @@ public function import_remote( $args, $assoc_args ) {
 				if ( function_exists( 'What_The_Email' ) ) {
 					$old_message->content = What_The_Email()->get_message( $old_message->content );
 				}
-				$reply_id = SupportFlow()->add_thread_reply( $thread_id, $old_message->content, $message_args );
+				$reply_id = SupportFlow()->add_ticket_reply( $ticket_id, $old_message->content, $message_args );
 				add_post_meta( $reply_id, '_imported_id', $old_message->message_id );
 				$count_replies ++;
 			}
 
-			// One the thread is created, log the old thread ID
-			update_post_meta( $thread_id, '_imported_id', $old_thread->thread_id );
+			// One the ticket is created, log the old ticket ID
+			update_post_meta( $ticket_id, '_imported_id', $old_ticket->ticket_id );
 
-			WP_CLI::line( "Created: #{$old_thread->thread_id} '{$old_thread->subject}' with {$count_replies} replies" );
-			$count_threads_created ++;
+			WP_CLI::line( "Created: #{$old_ticket->ticket_id} '{$old_ticket->subject}' with {$count_replies} replies" );
+			$count_tickets_created ++;
 		}
 
 		/**
@@ -158,7 +158,7 @@ public function import_remote( $args, $assoc_args ) {
 		 * @todo once we support predefined messages
 		 */
 
-		WP_CLI::success( "All done! Imported {$count_threads_created} threads." );
+		WP_CLI::success( "All done! Imported {$count_tickets_created} tickets." );
 
 	}
 
diff --git a/css/admin.css b/css/admin.css
index 6eadb11..0f3bc66 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -106,7 +106,7 @@
 	font-size: 1.2em;
 }
 
-#supportflow-replies.postbox #thread-reply-box {
+#supportflow-replies.postbox #ticket-reply-box {
 	width: 100%;
 }
 
@@ -160,38 +160,38 @@
 	margin-top: 0;
 }
 
-#supportflow-replies.postbox ul.private-replies li .thread-meta {
+#supportflow-replies.postbox ul.private-replies li .ticket-meta {
 	color:      #BBB;
 	font-size:  0.9em;
 	text-align: right;
 }
 
-#supportflow-replies.postbox ul.thread-replies li {
+#supportflow-replies.postbox ul.ticket-replies li {
 	clear:         left;
 	margin-top:    20px;
 	margin-bottom: 20px;
 }
 
-#supportflow-replies.postbox ul.thread-replies li .thread-reply-attachments li,
-#supportflow-replies.postbox ul.private-replies li .thread-reply-attachments li {
+#supportflow-replies.postbox ul.ticket-replies li .ticket-reply-attachments li,
+#supportflow-replies.postbox ul.private-replies li .ticket-reply-attachments li {
 	margin-top:    3px;
 	margin-bottom: 3px;
 	font-size:     0.9em;
 }
 
-#supportflow-replies.postbox ul.thread-replies li .reply-avatar {
+#supportflow-replies.postbox ul.ticket-replies li .reply-avatar {
 	float: left;
 	width: 100px;	
         word-wrap: break-word;
 }
 
-#supportflow-replies.postbox ul.thread-replies li .reply-author {
+#supportflow-replies.postbox ul.ticket-replies li .reply-author {
 	margin:    0;
 	font-size: 0.9em;
 	color:     #666666;
 }
 
-#supportflow-replies.postbox ul.thread-replies li .thread-reply {
+#supportflow-replies.postbox ul.ticket-replies li .ticket-reply {
 	background-color:      #FFFFFF;
 	margin-left:           105px;
 	min-height:            80px;
@@ -204,7 +204,7 @@
 	word-wrap:             break-word;
 }
 
-#supportflow-replies.postbox ul.thread-replies li .thread-meta {
+#supportflow-replies.postbox ul.ticket-replies li .ticket-meta {
 	margin-left: 105px;
 	font-size:   0.9em;
 	color:       #666666;
diff --git a/css/widget.css b/css/widget.css
index c39b2b8..297bc32 100644
--- a/css/widget.css
+++ b/css/widget.css
@@ -34,12 +34,12 @@ body {
 	content: "\25C0 \a0";
 }
 
-#supportflow-newthread-box {
+#supportflow-newticket-box {
 	padding: 10px 0;
 }
 
-#supportflow-newthread,
-#new-thread-submit {
+#supportflow-newticket,
+#new-ticket-submit {
 	background-color:      #fff;
 	border:                1px solid #bbb;
 	font-family:           sans-serif;
@@ -51,16 +51,16 @@ body {
 	-webkit-border-radius: 15px;
 }
 
-#new-thread-submit {
+#new-ticket-submit {
 	margin-top: 10px;
 }
 
-#supportflow-existing-thread-form input[type='text'] {
+#supportflow-existing-ticket-form input[type='text'] {
 	width: 100%;
 }
 
-#supportflow-newthread-form textarea,
-#supportflow-existing-thread-form textarea {
+#supportflow-newticket-form textarea,
+#supportflow-existing-ticket-form textarea {
 	width:                 100%;
 	font-size:             16px;
 	font-weight:           200;
@@ -72,8 +72,8 @@ body {
 	padding:               3px 8px;
 }
 
-#supportflow-newthread-form input[type='submit'],
-#supportflow-existing-thread-form input[type='submit'] {
+#supportflow-newticket-form input[type='submit'],
+#supportflow-existing-ticket-form input[type='submit'] {
 	width:                 100%;
 	font-size:             16px;
 	padding-top:           5px;
@@ -89,27 +89,27 @@ body {
 	border:                1px solid #BBB;
 }
 
-#supportflow-newthread-form input[type='submit']:hover,
-#supportflow-existing-thread-form input[type='submit']:hover {
+#supportflow-newticket-form input[type='submit']:hover,
+#supportflow-existing-ticket-form input[type='submit']:hover {
 	cursor:       pointer;
 	border-color: #888;
 	color:        #111;
 }
 
-#supportflow-newthread:hover,
-#supportflow-newthread:active,
-#new-thread-submit:hover,
-#new-thread-submit:active,
+#supportflow-newticket:hover,
+#supportflow-newticket:active,
+#new-ticket-submit:hover,
+#new-ticket-submit:active,
 #supportflow-back:hover,
 #supportflow-back:active {
 	border-color: #666;
 }
 
-#supportflow-all-threads .thread .time {
+#supportflow-all-tickets .ticket .time {
 	color: gray;
 }
 
-#supportflow-all-threads .nothreads {
+#supportflow-all-tickets .notickets {
 	border-bottom: 1px solid #989898;
 	border-top:    1px solid #989898;
 	color:         #333;
@@ -118,21 +118,21 @@ body {
 	text-align:    center;
 }
 
-#supportflow-newthread-form {
+#supportflow-newticket-form {
 	display: none;
 	margin:  0;
 }
 
-#supportflow-newthread-form input[name="subject"] {
+#supportflow-newticket-form input[name="subject"] {
 	margin-bottom: 6px;
 }
 
-#supportflow-newthread-form input[type="text"] {
+#supportflow-newticket-form input[type="text"] {
 	font-size:   14px;
 	line-height: 150%;
 }
 
-#supportflow-newthread-form input[type="text"] {
+#supportflow-newticket-form input[type="text"] {
 	border:                1px solid #ccc;
 	-webkit-border-radius: 3px;
 	border-radius:         3px;
@@ -146,52 +146,52 @@ body {
 	background-color: #13455b;
 }
 
-#supportflow-single-thread {
+#supportflow-single-ticket {
 	display: none;
 }
 
-#supportflow-single-thread ul,
-#supportflow-all-threads ul {
+#supportflow-single-ticket ul,
+#supportflow-all-tickets ul {
 	list-style-type: none;
 	margin:          0;
 	padding:         0;
 }
 
-#supportflow-single-thread ul li,
-#supportflow-all-threads ul li {
+#supportflow-single-ticket ul li,
+#supportflow-all-tickets ul li {
 	border-bottom: 1px solid #ECECEC;
 	padding:       5px 5px 10px 5px;
 }
 
-#supportflow-all-threads ul li:first-child {
+#supportflow-all-tickets ul li:first-child {
 	border-top:  1px solid #ECECEC;
 	padding-top: 0;
 }
 
-#supportflow-all-threads ul li:hover {
+#supportflow-all-tickets ul li:hover {
 	background-color: #fff;
 	cursor:           pointer;
 }
 
-#supportflow-all-threads ul li h4 {
+#supportflow-all-tickets ul li h4 {
 	font:   bold 14px/18px "Helvetica Neue", sans-serif;
 	margin: 10px 0 0 0;
 }
 
-.thread-replies .thread-reply-body p {
+.ticket-replies .ticket-reply-body p {
 	font:   13px/18px "Helvetica Neue", sans-serif;
 	margin: 5px 0;
 }
 
-.thread-replies .thread-reply-meta {
+.ticket-replies .ticket-reply-meta {
 	font-size: 12px;
 	color:     #888;
 }
 
-.thread-replies .thread-reply-meta .thread-reply-author {
+.ticket-replies .ticket-reply-meta .ticket-reply-author {
 	font-weight: bold;
 }
 
-.thread-replies .thread-reply-meta .thread-reply-timestamp {
+.ticket-replies .ticket-reply-meta .ticket-reply-timestamp {
 	float: right;
 }
\ No newline at end of file
diff --git a/js/supportflow-user-widget.js b/js/supportflow-user-widget.js
index 9ce1446..07bc0f6 100644
--- a/js/supportflow-user-widget.js
+++ b/js/supportflow-user-widget.js
@@ -10,31 +10,31 @@ var supportflow = {};
 		supportflow.widget_title = $('h1#widget-title');
 		supportflow.original_widget_title = supportflow.widget_title.html();
 		supportflow.back_button = $('#supportflow-back');
-		supportflow.back_button.click(supportflow.hide_single_thread_view);
+		supportflow.back_button.click(supportflow.hide_single_ticket_view);
 
-		// Creating a new thread
-		supportflow.new_thread_button = $('#supportflow-newthread');
-		supportflow.new_thread_form = $('#supportflow-newthread-form');
-		supportflow.new_thread_subject = supportflow.new_thread_form.find('#new-thread-subject');
-		supportflow.new_thread_message = supportflow.new_thread_form.find('#new-thread-message');
-		supportflow.new_thread_submit = supportflow.new_thread_form.find('#new-thread-submit');
+		// Creating a new ticket
+		supportflow.new_ticket_button = $('#supportflow-newticket');
+		supportflow.new_ticket_form = $('#supportflow-newticket-form');
+		supportflow.new_ticket_subject = supportflow.new_ticket_form.find('#new-ticket-subject');
+		supportflow.new_ticket_message = supportflow.new_ticket_form.find('#new-ticket-message');
+		supportflow.new_ticket_submit = supportflow.new_ticket_form.find('#new-ticket-submit');
 
-		supportflow.new_thread_button.click(supportflow.show_new_thread_form);
-		supportflow.new_thread_form.submit(supportflow.submit_new_thread_form);
+		supportflow.new_ticket_button.click(supportflow.show_new_ticket_form);
+		supportflow.new_ticket_form.submit(supportflow.submit_new_ticket_form);
 
-		// Viewing all threads
-		supportflow.all_threads_view = $('#supportflow-all-threads');
-		supportflow.all_threads_view.find('li').click(supportflow.show_single_thread_view);
+		// Viewing all tickets
+		supportflow.all_tickets_view = $('#supportflow-all-tickets');
+		supportflow.all_tickets_view.find('li').click(supportflow.show_single_ticket_view);
 
-		// Viewing an existing thread
-		supportflow.single_thread_view = $('#supportflow-single-thread');
-		supportflow.single_thread_body = supportflow.single_thread_view.find('#supportflow-thread-body');
-		supportflow.single_thread_form = supportflow.single_thread_view.find('#supportflow-existing-thread-form');
-		supportflow.single_thread_id = supportflow.single_thread_form.find('#existing-thread-id');
-		supportflow.single_thread_message = supportflow.single_thread_view.find('#existing-thread-message');
-		supportflow.single_thread_submit = supportflow.single_thread_form.find('#existing-thread-submit');
+		// Viewing an existing ticket
+		supportflow.single_ticket_view = $('#supportflow-single-ticket');
+		supportflow.single_ticket_body = supportflow.single_ticket_view.find('#supportflow-ticket-body');
+		supportflow.single_ticket_form = supportflow.single_ticket_view.find('#supportflow-existing-ticket-form');
+		supportflow.single_ticket_id = supportflow.single_ticket_form.find('#existing-ticket-id');
+		supportflow.single_ticket_message = supportflow.single_ticket_view.find('#existing-ticket-message');
+		supportflow.single_ticket_submit = supportflow.single_ticket_form.find('#existing-ticket-submit');
 
-		supportflow.single_thread_form.submit(supportflow.submit_new_message_form);
+		supportflow.single_ticket_form.submit(supportflow.submit_new_message_form);
 
 	};
 
@@ -42,100 +42,100 @@ var supportflow = {};
 		return SupportFlowUserWidgetVars.ajaxurl + '&api-action=' + action;
 	};
 
-	supportflow.show_new_thread_form = function () {
+	supportflow.show_new_ticket_form = function () {
 		$(this).hide();
-		$('#supportflow-newthread-form').slideDown();
+		$('#supportflow-newticket-form').slideDown();
 	};
 
-	supportflow.hide_new_thread_form = function () {
+	supportflow.hide_new_ticket_form = function () {
 
 	}
 
-	supportflow.hide_single_thread_view = function () {
-		supportflow.single_thread_view.hide();
+	supportflow.hide_single_ticket_view = function () {
+		supportflow.single_ticket_view.hide();
 		supportflow.widget_title.html(supportflow.original_widget_title);
-		supportflow.all_threads_view.attr('opacity', '1').show();
-		supportflow.new_thread_button.show();
+		supportflow.all_tickets_view.attr('opacity', '1').show();
+		supportflow.new_ticket_button.show();
 		supportflow.back_button.hide();
 	}
 
-	supportflow.show_single_thread_view = function (e) {
+	supportflow.show_single_ticket_view = function (e) {
 		e.preventDefault();
 
 		supportflow.back_button.show();
 
-		supportflow.new_thread_button.hide();
-		supportflow.all_threads_view.attr('opacity', '0.5');
-		supportflow.widget_title.html($(this).find('.thread-title').html());
-		var thread_id = $(this).attr('id').replace('thread-', '');
+		supportflow.new_ticket_button.hide();
+		supportflow.all_tickets_view.attr('opacity', '0.5');
+		supportflow.widget_title.html($(this).find('.ticket-title').html());
+		var ticket_id = $(this).attr('id').replace('ticket-', '');
 		var data = {
-			thread_id         : thread_id,
+			ticket_id         : ticket_id,
 			supportflow_widget: true,
 		}
-		$.get(supportflow.get_ajax_url('get-thread'), data, supportflow.handle_new_thread_response);
+		$.get(supportflow.get_ajax_url('get-ticket'), data, supportflow.handle_new_ticket_response);
 
 	}
 
-	supportflow.submit_new_thread_form = function (e) {
+	supportflow.submit_new_ticket_form = function (e) {
 		e.preventDefault();
 
-		supportflow.disable_thread_form(supportflow.new_thread_form, SupportFlowUserWidgetVars.starting_thread_text);
+		supportflow.disable_ticket_form(supportflow.new_ticket_form, SupportFlowUserWidgetVars.starting_ticket_text);
 
 		var data = {
-			subject           : supportflow.new_thread_subject.val(),
-			message           : supportflow.new_thread_message.val(),
+			subject           : supportflow.new_ticket_subject.val(),
+			message           : supportflow.new_ticket_message.val(),
 			supportflow_widget: true,
 		}
-		$.post(supportflow.get_ajax_url('create-thread'), data, supportflow.handle_new_thread_response);
+		$.post(supportflow.get_ajax_url('create-ticket'), data, supportflow.handle_new_ticket_response);
 	}
 
 	supportflow.submit_new_message_form = function (e) {
 		e.preventDefault();
 
-		supportflow.disable_thread_form(supportflow.single_thread_form, SupportFlowUserWidgetVars.sending_reply_text);
+		supportflow.disable_ticket_form(supportflow.single_ticket_form, SupportFlowUserWidgetVars.sending_reply_text);
 
 		var data = {
-			thread_id         : supportflow.single_thread_id.val(),
-			message           : supportflow.single_thread_message.val(),
+			ticket_id         : supportflow.single_ticket_id.val(),
+			message           : supportflow.single_ticket_message.val(),
 			supportflow_widget: true,
 		}
-		$.post(supportflow.get_ajax_url('add-thread-reply'), data, supportflow.handle_new_message_response);
+		$.post(supportflow.get_ajax_url('add-ticket-reply'), data, supportflow.handle_new_message_response);
 	}
 
-	supportflow.enable_thread_form = function (form, clear_form, submit_text) {
-		form.find('input.thread-subject').removeAttr('disabled');
-		form.find('textarea.thread-message').removeAttr('disabled');
+	supportflow.enable_ticket_form = function (form, clear_form, submit_text) {
+		form.find('input.ticket-subject').removeAttr('disabled');
+		form.find('textarea.ticket-message').removeAttr('disabled');
 		form.find('input.submit-button').removeAttr('disabled').val(submit_text).removeClass('disabled');
 		if (clear_form) {
-			form.find('input.thread-subject').val('');
-			form.find('textarea.thread-message').val('');
+			form.find('input.ticket-subject').val('');
+			form.find('textarea.ticket-message').val('');
 		}
 	}
 
-	supportflow.disable_thread_form = function (form, submit_text) {
-		form.find('input.thread-subject').attr('disabled', 'disabled');
-		form.find('textarea.thread-message').attr('disabled', 'disabled');
+	supportflow.disable_ticket_form = function (form, submit_text) {
+		form.find('input.ticket-subject').attr('disabled', 'disabled');
+		form.find('textarea.ticket-message').attr('disabled', 'disabled');
 		form.find('input.submit-form').attr('disabled', 'disabled').val(submit_text).addClass('disabled');
 	}
 
-	supportflow.handle_new_thread_response = function (response) {
+	supportflow.handle_new_ticket_response = function (response) {
 
 		// If there was an error in the process, re-enable the form and show the error message
 		if ('error' == response.status) {
-			supportflow.enable_thread_form(supportflow.new_thread_form, false, SupportFlowUserWidgetVars.start_thread_text);
+			supportflow.enable_ticket_form(supportflow.new_ticket_form, false, SupportFlowUserWidgetVars.start_ticket_text);
 			return;
 		}
 
 		// Restore and hide the form
-		supportflow.enable_thread_form(supportflow.new_thread_form, true, SupportFlowUserWidgetVars.start_thread_text);
-		supportflow.new_thread_form.hide();
-		supportflow.all_threads_view.hide();
+		supportflow.enable_ticket_form(supportflow.new_ticket_form, true, SupportFlowUserWidgetVars.start_ticket_text);
+		supportflow.new_ticket_form.hide();
+		supportflow.all_tickets_view.hide();
 
-		// We're good to render the single thread
+		// We're good to render the single ticket
 		supportflow.widget_title.html(response.title);
-		supportflow.single_thread_body.html(response.html);
-		supportflow.single_thread_view.show();
-		supportflow.single_thread_id.val(response.thread_id);
+		supportflow.single_ticket_body.html(response.html);
+		supportflow.single_ticket_view.show();
+		supportflow.single_ticket_id.val(response.ticket_id);
 
 	}
 
@@ -144,13 +144,13 @@ var supportflow = {};
 		// If there was an error in the process, re-enable the form and show the error message
 		if ('error' == response.status) {
 			// @todo display the error message
-			supportflow.enable_thread_form(supportflow.single_thread_form, false, SupportFlowUserWidgetVars.send_reply_text);
+			supportflow.enable_ticket_form(supportflow.single_ticket_form, false, SupportFlowUserWidgetVars.send_reply_text);
 			return;
 		}
 
 		// Renable the form and append the response
-		supportflow.enable_thread_form(supportflow.single_thread_form, true, SupportFlowUserWidgetVars.send_reply_text);
-		supportflow.single_thread_body.find('ul').append(response.html);
+		supportflow.enable_ticket_form(supportflow.single_ticket_form, true, SupportFlowUserWidgetVars.send_reply_text);
+		supportflow.single_ticket_body.find('ul').append(response.html);
 
 	}
 
diff --git a/js/thread_attachments.js b/js/ticket_attachments.js
similarity index 89%
rename from js/thread_attachments.js
rename to js/ticket_attachments.js
index 6630399..42483ba 100644
--- a/js/thread_attachments.js
+++ b/js/ticket_attachments.js
@@ -10,9 +10,9 @@ jQuery(document).ready(function ($) {
 		// Call this from the upload button to initiate the upload frame.
 		uploader: function (event) {
 			var frame = wp.media({
-				title   : SFThreadAttachments.frame_title,
+				title   : SFTicketAttachments.frame_title,
 				multiple: true,
-				button  : { text: SFThreadAttachments.button_title },
+				button  : { text: SFTicketAttachments.button_title },
 			});
 
 			// Handle results from media manager.
@@ -20,7 +20,7 @@ jQuery(document).ready(function ($) {
 				var attachments = frame.state().get('selection').toJSON();
 				jQuery.each(attachments, function () {
 					var attachment_download_link = '<a class="reply-attachment-link" target="_blank" href="' + _.escape(this.url) + '">' +  _.escape(this.filename) + '</a>';
-					var attachment_remove_link   = '<a class="reply-attachment-remove delete" href="#" data-attachment-id=' + _.escape(this.id) + ' >' + SFThreadAttachments.remove_attachment + '</a>';
+					var attachment_remove_link   = '<a class="reply-attachment-remove delete" href="#" data-attachment-id=' + _.escape(this.id) + ' >' + SFTicketAttachments.remove_attachment + '</a>';
 					jQuery('#replies-attachments-list').append('<li id="media-items" class="reply-attachment">' +  attachment_download_link + '&nbsp;' + attachment_remove_link + '</li>');
 					jQuery('#reply-attachments').val(jQuery('#reply-attachments').val() + _.escape(this.id) + ',');
 				});
@@ -31,7 +31,7 @@ jQuery(document).ready(function ($) {
 		},
 
 		remove: function (event) {
-			if (confirm(SFThreadAttachments.sure_remove)) {
+			if (confirm(SFTicketAttachments.sure_remove)) {
 				var attachment_id = $(this).data('attachment-id');
 				var reply_attachments = $('#reply-attachments').val();
 				reply_attachments = reply_attachments.replace(',' + attachment_id + ',', ',');
diff --git a/js/threads.js b/js/tickets.js
similarity index 89%
rename from js/threads.js
rename to js/tickets.js
index 93b6b08..57c496f 100644
--- a/js/threads.js
+++ b/js/tickets.js
@@ -16,15 +16,15 @@ jQuery(document).ready(function () {
 		event.preventDefault();
 	});
 
-	// Require title and atleast respondent before saving a thread
+	// Require title and atleast respondent before saving a ticket
 	jQuery('.save-button').click(function (event) {
 		if ('' == jQuery('#subject').val()) {
-			alert(SFThreads.no_title_msg);
+			alert(SFTickets.no_title_msg);
 			event.preventDefault();
 			return;
 		}
 		if ('' == jQuery('#respondents').val()) {
-			alert(SFThreads.no_respondent_msg);
+			alert(SFTickets.no_respondent_msg);
 			event.preventDefault();
 			return;
 		}
diff --git a/readme.txt b/readme.txt
index d21d87b..e57b892 100644
--- a/readme.txt
+++ b/readme.txt
@@ -12,7 +12,7 @@ SupportFlow is a web based help desk support software. It allows agents to reply
 
 = 0.2 =
 * Fix nonce and escaping bugs.
-* Add ability to forward a thread to someone outside of SupportFlow.
+* Add ability to forward a ticket to someone outside of SupportFlow.
 * Add a statistics page.
 * Various minor bug fixes.
 * Various UI and UX tweaks.
diff --git a/supportflow.php b/supportflow.php
index c753795..6492249 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -161,36 +161,36 @@ private function setup_globals() {
 
 		/** Identifiers *******************************************************/
 
-		$this->post_type                = apply_filters( 'supportflow_thread_post_type', 'sf_thread' );
+		$this->post_type                = apply_filters( 'supportflow_ticket_post_type', 'sf_ticket' );
 		$this->predefinded_replies_type = apply_filters( 'supportflow_predefinded_replies_type', 'sf_predefs' );
 		$this->respondents_tax          = apply_filters( 'supportflow_respondents_taxonomy', 'sf_respondent' );
 		$this->tags_tax                 = apply_filters( 'supportflow_tags_taxonomy', 'sf_tags' );
-		$this->comment_type             = apply_filters( 'supportflow_thread_comment_type', 'sf_comment' );
-		$this->reply_type               = apply_filters( 'supportflow_thread_reply_type', 'sf_thread' );
+		$this->comment_type             = apply_filters( 'supportflow_ticket_comment_type', 'sf_comment' );
+		$this->reply_type               = apply_filters( 'supportflow_ticket_reply_type', 'sf_ticket' );
 
 		$this->email_term_prefix = 'sf-';
 
-		$this->thread_secret_key = 'thread_secret';
+		$this->ticket_secret_key = 'ticket_secret';
 
 		$this->post_statuses = apply_filters(
-			'supportflow_thread_post_statuses', array(
+			'supportflow_ticket_post_statuses', array(
 				'sf_new'     => array(
-					'show_threads' => true,
+					'show_tickets' => true,
 					'label'        => __( 'New', 'supportflow' ),
 					'label_count'  => _n_noop( 'New <span class="count">(%s)</span>', 'New <span class="count">(%s)</span>', 'supportflow' ),
 				),
 				'sf_open'    => array(
-					'show_threads' => true,
+					'show_tickets' => true,
 					'label'        => __( 'Open', 'supportflow' ),
 					'label_count'  => _n_noop( 'Open <span class="count">(%s)</span>', 'Open <span class="count">(%s)</span>', 'supportflow' ),
 				),
 				'sf_pending' => array(
-					'show_threads' => true,
+					'show_tickets' => true,
 					'label'        => __( 'Pending', 'supportflow' ),
 					'label_count'  => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>', 'supportflow' ),
 				),
 				'sf_closed'  => array(
-					'show_threads' => false,
+					'show_tickets' => false,
 					'label'        => __( 'Closed', 'supportflow' ),
 					'label_count'  => _n_noop( 'Closed <span class="count">(%s)</span>', 'Closed <span class="count">(%s)</span>', 'supportflow' ),
 				),
@@ -273,17 +273,17 @@ public function action_init_register_post_type() {
 			$this->post_type, array(
 				'labels'             => array(
 					'menu_name'          => __( 'SupportFlow', 'supportflow' ),
-					'name'               => __( 'Threads', 'supportflow' ),
-					'singular_name'      => __( 'Thread', 'supportflow' ),
-					'all_items'          => __( 'All Threads', 'supportflow' ),
-					'add_new'            => __( 'New Thread', 'supportflow' ),
-					'add_new_item'       => __( 'Start New Thread', 'supportflow' ),
+					'name'               => __( 'Tickets', 'supportflow' ),
+					'singular_name'      => __( 'Ticket', 'supportflow' ),
+					'all_items'          => __( 'All Tickets', 'supportflow' ),
+					'add_new'            => __( 'New Ticket', 'supportflow' ),
+					'add_new_item'       => __( 'Start New Ticket', 'supportflow' ),
 					'edit_item'          => __( 'Discussion', 'supportflow' ),
-					'new_item'           => __( 'New Thread', 'supportflow' ),
-					'view_item'          => __( 'View Thread', 'supportflow' ),
-					'search_items'       => __( 'Search Threads', 'supportflow' ),
-					'not_found'          => __( 'No threads found', 'supportflow' ),
-					'not_found_in_trash' => __( 'No threads found in trash', 'supportflow' ),
+					'new_item'           => __( 'New Ticket', 'supportflow' ),
+					'view_item'          => __( 'View Ticket', 'supportflow' ),
+					'search_items'       => __( 'Search Tickets', 'supportflow' ),
+					'not_found'          => __( 'No tickets found', 'supportflow' ),
+					'not_found_in_trash' => __( 'No tickets found in trash', 'supportflow' ),
 				),
 				'public'             => true,
 				'menu_position'      => 3,
@@ -338,7 +338,7 @@ public function action_init_register_taxonomies() {
 	}
 
 	/**
-	 * Register the custom post (thread) statuses
+	 * Register the custom post (ticket) statuses
 	 *
 	 * @since SupportFlow 0.1
 	 * @uses  register_post_status() To register the post statuses
@@ -390,19 +390,19 @@ public function get_email_hash( $email ) {
 		return $email;
 	}
 
-	/** Thread Functions ******************************************************/
+	/** Ticket Functions ******************************************************/
 
 	/**
-	 * Check whether a post_id is a thread
+	 * Check whether a post_id is a ticket
 	 */
-	public function is_thread( $post ) {
+	public function is_ticket( $post ) {
 		return (bool) ( $this->post_type == get_post_type( $post ) );
 	}
 
 	/**
-	 * Create a new thread
+	 * Create a new ticket
 	 */
-	public function create_thread( $args ) {
+	public function create_ticket( $args ) {
 		// The __get() magic doesn't allow key() usage so gotta copy it
 		$post_statuses = $this->post_statuses;
 
@@ -421,58 +421,58 @@ public function create_thread( $args ) {
 
 		$args = wp_parse_args( $args, $defaults );
 
-		$thread = array(
+		$ticket = array(
 			'post_type'   => $this->post_type,
 			'post_title'  => $args['subject'],
 			'post_author' => $args['assignee'],
 			'post_date'   => $args['date'],
 		);
 
-		// Validate the thread status
+		// Validate the ticket status
 		if ( ! get_post_status_object( $args['status'] ) ) {
 			$args['status'] = $defaults['status'];
 		}
-		$thread['post_status'] = $args['status'];
-		$thread_id             = wp_insert_post( $thread );
+		$ticket['post_status'] = $args['status'];
+		$ticket_id             = wp_insert_post( $ticket );
 
-		if ( is_wp_error( $thread_id ) ) {
-			return $thread_id;
+		if ( is_wp_error( $ticket_id ) ) {
+			return $ticket_id;
 		}
 
 		// Assign the respondent(s)
 		if ( ! empty( $args['respondent_email'] ) ) {
-			$this->update_thread_respondents( $thread_id, $args['respondent_email'] );
+			$this->update_ticket_respondents( $ticket_id, $args['respondent_email'] );
 		}
 
 		if ( is_numeric( $args['email_account'] ) ) {
-			update_post_meta( $thread_id, 'email_account', $args['email_account'] );
+			update_post_meta( $ticket_id, 'email_account', $args['email_account'] );
 		}
 
-		// If there was a message, add it to the thread
+		// If there was a message, add it to the ticket
 		if ( ! empty( $args['message'] ) && ! empty( $args['respondent_email'] ) ) {
 			$reply_details = array(
 				'reply_author'       => $args['reply_author'],
 				'reply_author_email' => $args['reply_author_email'],
 				'user_id'            => $args['respondent_id'],
 			);
-			$this->add_thread_reply( $thread_id, $args['message'], $reply_details );
+			$this->add_ticket_reply( $ticket_id, $args['message'], $reply_details );
 		}
 
-		return $thread_id;
+		return $ticket_id;
 	}
 
 	/**
-	 * @todo This should produce an object with thread details, respondents, and replies
+	 * @todo This should produce an object with ticket details, respondents, and replies
 	 */
-	public function get_thread( $thread_id ) {
+	public function get_ticket( $ticket_id ) {
 
-		return get_post( $thread_id );
+		return get_post( $ticket_id );
 	}
 
 	/**
-	 * @todo This should produce a series of thread objects with respondents, replies, etc.
+	 * @todo This should produce a series of ticket objects with respondents, replies, etc.
 	 */
-	public function get_threads( $args = array() ) {
+	public function get_tickets( $args = array() ) {
 
 		$defaults = array(
 			'respondent_email' => '',
@@ -481,13 +481,13 @@ public function get_threads( $args = array() ) {
 		);
 		$args     = array_merge( $defaults, $args );
 
-		$thread_args = array();
+		$ticket_args = array();
 		if ( empty( $args['post_status'] ) ) {
-			$thread_args['post_status'] = array_keys( $this->post_statuses );
+			$ticket_args['post_status'] = array_keys( $this->post_statuses );
 		}
 
 		if ( ! empty( $args['respondent_email'] ) ) {
-			$thread_args['tax_query'] = array(
+			$ticket_args['tax_query'] = array(
 				array(
 					'taxonomy' => $this->respondents_tax,
 					'field'    => 'slug',
@@ -496,15 +496,15 @@ public function get_threads( $args = array() ) {
 			);
 		}
 
-		$thread_args['post_type'] = $this->post_type;
-		$thread_args['orderby']   = $args['orderby'];
+		$ticket_args['post_type'] = $this->post_type;
+		$ticket_args['orderby']   = $args['orderby'];
 
-		$threads = new WP_Query( $thread_args );
-		if ( is_wp_error( $threads ) ) {
-			return $threads;
+		$tickets = new WP_Query( $ticket_args );
+		if ( is_wp_error( $tickets ) ) {
+			return $tickets;
 		}
 
-		return $threads->posts;
+		return $tickets->posts;
 	}
 
 	/**
@@ -537,18 +537,18 @@ public function get_respondents( $args = array() ) {
 	}
 
 	/**
-	 * Get a thread's respondents
+	 * Get a ticket's respondents
 	 *
 	 * @todo support retrieving more fields
 	 */
-	public function get_thread_respondents( $thread_id, $args = array() ) {
+	public function get_ticket_respondents( $ticket_id, $args = array() ) {
 
 		$default_args = array(
 			'fields' => 'all', // 'all', 'emails'
 		);
 		$args         = array_merge( $default_args, $args );
 
-		$raw_respondents = wp_get_object_terms( $thread_id, $this->respondents_tax );
+		$raw_respondents = wp_get_object_terms( $ticket_id, $this->respondents_tax );
 		if ( is_wp_error( $raw_respondents ) ) {
 			return array();
 		}
@@ -564,13 +564,13 @@ public function get_thread_respondents( $thread_id, $args = array() ) {
 	}
 
 	/**
-	 * Update a thread's respondents
+	 * Update a ticket's respondents
 	 *
-	 * @param int   $thread_id
+	 * @param int   $ticket_id
 	 * @param array $respondents An array of email addresses
 	 * @param bool  $append      Whether or not to append these email addresses to any existing addresses
 	 */
-	public function update_thread_respondents( $thread_id, $respondents, $append = false ) {
+	public function update_ticket_respondents( $ticket_id, $respondents, $append = false ) {
 
 		if ( is_string( $respondents ) ) {
 			$respondents = array( $respondents );
@@ -590,18 +590,18 @@ public function update_thread_respondents( $thread_id, $respondents, $append = f
 				$term_ids[] = $term['term_id'];
 			}
 		}
-		wp_set_object_terms( $thread_id, $term_ids, $this->respondents_tax, $append );
+		wp_set_object_terms( $ticket_id, $term_ids, $this->respondents_tax, $append );
 	}
 
 	/**
-	 * Get all of the replies associated with a thread
+	 * Get all of the replies associated with a ticket
 	 */
-	public function get_thread_replies( $thread_id, $args = array() ) {
+	public function get_ticket_replies( $ticket_id, $args = array() ) {
 
-		$args['post_id'] = $thread_id;
-		$thread_replies  = SupportFlow()->get_replies( $args );
+		$args['post_id'] = $ticket_id;
+		$ticket_replies  = SupportFlow()->get_replies( $args );
 
-		return $thread_replies;
+		return $ticket_replies;
 	}
 
 	/**
@@ -628,11 +628,11 @@ public function get_replies( $args ) {
 			'suppress_filters' => false,
 		);
 		add_filter( 'posts_clauses', array( $this, 'filter_reply_clauses' ), 10, 2 );
-		$thread_replies = get_posts( $post_args );
+		$ticket_replies = get_posts( $post_args );
 
 		remove_filter( 'posts_clauses', array( $this, 'filter_reply_clauses' ) );
 
-		return $thread_replies;
+		return $ticket_replies;
 	}
 
 	/**
@@ -655,16 +655,16 @@ public function filter_reply_clauses( $clauses, $query ) {
 	}
 
 	/**
-	 * Get the total number of replies associated with a thread
+	 * Get the total number of replies associated with a ticket
 	 *
 	 * @todo support filtering to specific types or replier
 	 */
-	public function get_thread_replies_count( $thread_id, $args = array() ) {
+	public function get_ticket_replies_count( $ticket_id, $args = array() ) {
 		$args = array(
 			'posts_per_page' => 1,
 			'post_type'      => $this->post_type,
 			'post_status'    => 'public',
-			'post_parent'    => $thread_id,
+			'post_parent'    => $ticket_id,
 		);
 
 		$query = new WP_Query( $args );
@@ -674,9 +674,9 @@ public function get_thread_replies_count( $thread_id, $args = array() ) {
 	}
 
 	/**
-	 * Add a reply to a given thread
+	 * Add a reply to a given ticket
 	 */
-	public function add_thread_reply( $thread_id, $reply_text, $details = array() ) {
+	public function add_ticket_reply( $ticket_id, $reply_text, $details = array() ) {
 		global $wpdb;
 
 		$default_details = array(
@@ -709,7 +709,7 @@ public function add_thread_reply( $thread_id, $reply_text, $details = array() )
 
 		$reply = array(
 			'post_content' => $reply_text,
-			'post_parent'  => (int) $thread_id,
+			'post_parent'  => (int) $ticket_id,
 			'post_date'    => $details['time'],
 			'post_status'  => $details['post_status'],
 			'post_type'    => $this->reply_type,
@@ -717,7 +717,7 @@ public function add_thread_reply( $thread_id, $reply_text, $details = array() )
 			'user_id'      => (int) $details['user_id'],
 		);
 
-		$reply = apply_filters( 'supportflow_pre_insert_thread_reply', $reply );
+		$reply = apply_filters( 'supportflow_pre_insert_ticket_reply', $reply );
 		remove_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
 		$reply_id = wp_insert_post( $reply );
 		add_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
@@ -732,42 +732,42 @@ public function add_thread_reply( $thread_id, $reply_text, $details = array() )
 		add_post_meta( $reply_id, 'reply_author_email', esc_sql( $details['reply_author_email'] ) );
 
 
-		// Adding a thread reply updates the post modified time for the thread
+		// Adding a ticket reply updates the post modified time for the ticket
 		remove_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
-		wp_update_post( array( 'ID' => $thread_id, 'post_modified' => current_time( 'mysql' ) ) );
+		wp_update_post( array( 'ID' => $ticket_id, 'post_modified' => current_time( 'mysql' ) ) );
 		add_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
-		clean_post_cache( $thread_id );
-		do_action( 'supportflow_thread_reply_added', $reply_id, $details['cc'], $details['bcc'] );
+		clean_post_cache( $ticket_id );
+		do_action( 'supportflow_ticket_reply_added', $reply_id, $details['cc'], $details['bcc'] );
 
 		return $reply_id;
 	}
 
 	/**
-	 * Generate the secure key for replying to this thread
+	 * Generate the secure key for replying to this ticket
 	 *
 	 * @todo Rather than storing this in the database, it should be generated on the fly
 	 * with an encryption algorithim
 	 */
-	public function get_secret_for_thread( $thread_id ) {
+	public function get_secret_for_ticket( $ticket_id ) {
 
-		if ( $secret = get_post_meta( $thread_id, $this->thread_secret_key, true ) ) {
+		if ( $secret = get_post_meta( $ticket_id, $this->ticket_secret_key, true ) ) {
 			return $secret;
 		}
 
 		$secret = wp_generate_password( 8, false );
-		update_post_meta( $thread_id, $this->thread_secret_key, $secret );
+		update_post_meta( $ticket_id, $this->ticket_secret_key, $secret );
 
 		return $secret;
 	}
 
 	/**
-	 * Get the thread ID from a secret
+	 * Get the ticket ID from a secret
 	 */
-	public function get_thread_from_secret( $secret ) {
+	public function get_ticket_from_secret( $secret ) {
 		global $wpdb;
-		$thread_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key=%s AND meta_value=%s", $this->thread_secret_key, $secret ) );
+		$ticket_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key=%s AND meta_value=%s", $this->ticket_secret_key, $secret ) );
 
-		return ( $thread_id ) ? (int) $thread_id : 0;
+		return ( $ticket_id ) ? (int) $ticket_id : 0;
 	}
 
 	/**

From 47be9ea7fb02254e5022893fdd65d6a341e493bf Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 19 Jul 2014 03:17:54 +0530
Subject: [PATCH 261/485] Retaining post type as `sf_thread` for backward
 compatibility with older versions

---
 supportflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index 6492249..aadf491 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -161,7 +161,7 @@ private function setup_globals() {
 
 		/** Identifiers *******************************************************/
 
-		$this->post_type                = apply_filters( 'supportflow_ticket_post_type', 'sf_ticket' );
+		$this->post_type                = apply_filters( 'supportflow_thread_post_type', 'sf_thread' ); // Retained sf_thread for backward compatiblity with old versions
 		$this->predefinded_replies_type = apply_filters( 'supportflow_predefinded_replies_type', 'sf_predefs' );
 		$this->respondents_tax          = apply_filters( 'supportflow_respondents_taxonomy', 'sf_respondent' );
 		$this->tags_tax                 = apply_filters( 'supportflow_tags_taxonomy', 'sf_tags' );

From 158161d1c5ffdff7aafef397677546135507c71a Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 22 Jul 2014 00:21:57 +0530
Subject: [PATCH 262/485] Test attachment ID's if they are non-integer

Currently intval is currently an empty ID `` into `0`. Instead of this it
should be removed
---
 classes/class-supportflow-admin.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 5daf5ae..fdcf27e 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -1056,7 +1056,12 @@ public function action_save_post( $ticket_id ) {
 
 			$visibility = ( ! empty( $_POST['mark-private'] ) ) ? 'private' : 'public';
 			if ( ! empty( $_POST['reply-attachments'] ) ) {
-				$attachment_ids = array_map( 'intval', explode( ',', trim( $_POST['reply-attachments'], ',' ) ) );
+				$attachements   = explode( ',', trim( $_POST['reply-attachments'], ',' ) );
+				// Remove non-int attachment ID's from array
+				$attachements   = array_filter( $attachements, function ( $val ) {
+					return (string) (int) $val === (string) $val;
+				} );
+				$attachment_ids = array_map( 'intval', $attachements );
 			} else {
 				$attachment_ids = '';
 			}

From 7d105509d5367239f6e3761b9703d91b20fbed4d Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 22 Jul 2014 01:59:47 +0530
Subject: [PATCH 263/485] Prevent locking in new thread

Currently it checks if E-Mail account associated with thread exists but in
new thread there is no E-Mail ID and thus E-Mail account associated with
it
---
 classes/class-supportflow-admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index fdcf27e..82a0cd4 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -734,7 +734,7 @@ public function meta_box_replies() {
 		$email_account_id = get_post_meta( get_the_ID(), 'email_account', true );
 		$email_account    = SupportFlow()->extend->email_accounts->get_email_account( $email_account_id );
 
-		$thread_lock       = ( null == $email_account );
+		$thread_lock       = ( null == $email_account && '' != $email_account_id );
 		$disabled_attr     = $thread_lock ? 'disabled' : '';
 		$submit_attr_array = $thread_lock ? array( 'disabled' => 'true' ) : array();
 
@@ -1020,7 +1020,7 @@ public function is_edit_screen() {
 	public function action_save_post( $ticket_id ) {
 		$email_account_id = get_post_meta($thread_id, 'email_account', true);
 		$email_account = SupportFlow()->extend->email_accounts->get_email_account( $email_account_id );
-		$thread_lock   = ( null == $email_account );
+		$thread_lock   = ( null == $email_account && '' != $email_account );
 
 		if ( SupportFlow()->post_type != get_post_type( $ticket_id ) ) {
 			return;

From 1f71ccca5d9f118d99896f015e69484e5d46fc66 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 22 Jul 2014 02:06:57 +0530
Subject: [PATCH 264/485] Corrected coding standards

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 82a0cd4..0c9c141 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -1018,7 +1018,7 @@ public function is_edit_screen() {
 	 * and new reply data
 	 */
 	public function action_save_post( $ticket_id ) {
-		$email_account_id = get_post_meta($thread_id, 'email_account', true);
+		$email_account_id = get_post_meta( $thread_id, 'email_account', true );
 		$email_account = SupportFlow()->extend->email_accounts->get_email_account( $email_account_id );
 		$thread_lock   = ( null == $email_account && '' != $email_account );
 

From d2a19af8f96ca1f054d9b6a19edb7454ae08e50f Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 22 Jul 2014 17:12:06 +0530
Subject: [PATCH 265/485] Convert usage of word "thread" by "ticket"

---
 classes/class-supportflow-admin.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 0c9c141..5884fca 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -734,12 +734,12 @@ public function meta_box_replies() {
 		$email_account_id = get_post_meta( get_the_ID(), 'email_account', true );
 		$email_account    = SupportFlow()->extend->email_accounts->get_email_account( $email_account_id );
 
-		$thread_lock       = ( null == $email_account && '' != $email_account_id );
-		$disabled_attr     = $thread_lock ? 'disabled' : '';
-		$submit_attr_array = $thread_lock ? array( 'disabled' => 'true' ) : array();
+		$ticket_lock       = ( null == $email_account && '' != $email_account_id );
+		$disabled_attr     = $ticket_lock ? 'disabled' : '';
+		$submit_attr_array = $ticket_lock ? array( 'disabled' => 'true' ) : array();
 
-		if ( $thread_lock ) {
-			$placeholder = __( "Thread is locked permanently because E-Mail account associated with it is deleted. Please create a new thread now. You can't now reply to it.", 'supportflow' );
+		if ( $ticket_lock ) {
+			$placeholder = __( "Ticket is locked permanently because E-Mail account associated with it is deleted. Please create a new ticket now. You can't now reply to it.", 'supportflow' );
 		} else {
 			$placeholders = array(
 				__( "What's burning?", 'supportflow' ),
@@ -757,8 +757,8 @@ public function meta_box_replies() {
 		}
 		echo '</select></div>';
 
-		echo '<div id="thread-reply-box">';
-		echo "<textarea id='reply' name='reply' $disabled_attr class='thread-reply' rows='4' placeholder='" . esc_attr( $placeholder ) . "'>";
+		echo '<div id="ticket-reply-box">';
+		echo "<textarea id='reply' name='reply' $disabled_attr class='ticket-reply' rows='4' placeholder='" . esc_attr( $placeholder ) . "'>";
 		echo "</textarea>";
 
 		echo '<div id="message-tools">';
@@ -1018,9 +1018,9 @@ public function is_edit_screen() {
 	 * and new reply data
 	 */
 	public function action_save_post( $ticket_id ) {
-		$email_account_id = get_post_meta( $thread_id, 'email_account', true );
+		$email_account_id = get_post_meta( $ticket_id, 'email_account', true );
 		$email_account = SupportFlow()->extend->email_accounts->get_email_account( $email_account_id );
-		$thread_lock   = ( null == $email_account && '' != $email_account );
+		$ticket_lock   = ( null == $email_account && '' != $email_account );
 
 		if ( SupportFlow()->post_type != get_post_type( $ticket_id ) ) {
 			return;
@@ -1042,7 +1042,7 @@ public function action_save_post( $ticket_id ) {
 			update_post_meta( $ticket_id, 'email_notifications_override', $email_notifications_override );
 		}
 
-		if ( isset( $_POST['reply'] ) && ! empty( $_POST['reply'] ) && ! $thread_lock ) {
+		if ( isset( $_POST['reply'] ) && ! empty( $_POST['reply'] ) && ! $ticket_lock ) {
 			$reply = $_POST['reply'];
 
 			if ( isset( $_POST['insert-signature'] ) && 'on' == $_POST['insert-signature'] ) {

From 0af787ad2163e8706baa191bf0f96efc631b8061 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 22 Jul 2014 17:30:51 +0530
Subject: [PATCH 266/485] Retaining reply post type as `sf_thread` for backward
 compatibility with older versions

---
 supportflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index aadf491..fb186e3 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -166,7 +166,7 @@ private function setup_globals() {
 		$this->respondents_tax          = apply_filters( 'supportflow_respondents_taxonomy', 'sf_respondent' );
 		$this->tags_tax                 = apply_filters( 'supportflow_tags_taxonomy', 'sf_tags' );
 		$this->comment_type             = apply_filters( 'supportflow_ticket_comment_type', 'sf_comment' );
-		$this->reply_type               = apply_filters( 'supportflow_ticket_reply_type', 'sf_ticket' );
+		$this->reply_type               = apply_filters( 'supportflow_ticket_reply_type', 'sf_thread' ); // Retained sf_thread for backward compatiblity with old versions
 
 		$this->email_term_prefix = 'sf-';
 

From 0064f68aba557302691583f2f0bc1ccdb7592a83 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 19 Jul 2014 02:16:37 +0530
Subject: [PATCH 267/485] A generic table class

It generate a simple table with minimal options
---
 classes/class-supportflow-table.php | 66 +++++++++++++++++++++++++++++
 supportflow.php                     |  1 +
 2 files changed, 67 insertions(+)
 create mode 100644 classes/class-supportflow-table.php

diff --git a/classes/class-supportflow-table.php b/classes/class-supportflow-table.php
new file mode 100644
index 0000000..b9f82ad
--- /dev/null
+++ b/classes/class-supportflow-table.php
@@ -0,0 +1,66 @@
+<?php
+
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
+
+if ( ! class_exists( 'WP_List_Table' ) ) {
+	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
+}
+
+/**
+ * Generates a table with minimal options
+ */
+class SupportFlow_Table extends WP_List_Table {
+	protected $no_item_message;
+
+	/**
+	 * @param string $table_class Class to be used by table
+	 */
+	function __construct( $table_class = '' ) {
+		if ( $table_class ) {
+			parent::__construct( array( 'screen' => 'sf_statistics_table' ) );
+		} else {
+			parent::__construct();
+		}
+	}
+
+	protected function column_default( $item, $column_name ) {
+		return $item[$column_name];
+	}
+
+	/**
+	 * Set message to be display if table contains no items
+	 *
+	 * @param string $msg
+	 */
+	public function set_no_items( $msg ) {
+		$this->no_item_message = $msg;
+	}
+
+	function no_items() {
+		$no_item_message = $this->no_item_message;
+
+		if ( $no_item_message ) {
+			echo $no_item_message;
+		} else {
+			parent::no_items();
+		}
+	}
+
+	/**
+	 * Set columns that should be displayed in table
+	 *
+	 * @param array $columns
+	 */
+	function set_columns( $columns ) {
+		$this->_column_headers = array( $columns, array(), array() );
+	}
+
+	/**
+	 * Set data that should be displayed in table
+	 *
+	 * @param array $data
+	 */
+	function set_data( $data ) {
+		$this->items = $data;
+	}
+}
diff --git a/supportflow.php b/supportflow.php
index fb186e3..8e7ae4a 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -225,6 +225,7 @@ private function includes() {
 		require_once( $this->plugin_dir . 'classes/class-supportflow-predefined-replies.php' );
 		require_once( $this->plugin_dir . 'classes/class-supportflow-email-notifications.php' );
 		require_once( $this->plugin_dir . 'classes/class-supportflow-preferences.php' );
+		require_once( $this->plugin_dir . 'classes/class-supportflow-table.php' );
 
 		/** Extensions ********************************************************/
 

From 623b0709628668d94debdfdd280e55d7dd2231ea Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 19 Jul 2014 02:20:09 +0530
Subject: [PATCH 268/485] Using class SupportFlow_Table to create tables

---
 classes/class-supportflow-email-accounts.php | 103 ++++++-----------
 classes/class-supportflow-permissions.php    | 107 ++++++-----------
 classes/class-supportflow-preferences.php    | 115 +++++++------------
 classes/class-supportflow-statistics.php     |  41 +------
 4 files changed, 118 insertions(+), 248 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 96c4f20..4506752 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -5,71 +5,6 @@
 
 defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
-}
-
-/**
- * Table to show existing E-Mail accounts with a option to remove existing
- */
-class SupportFlow_Email_Accounts_Table extends WP_List_Table {
-	protected $_data;
-
-	function __construct( $accounts ) {
-		parent::__construct();
-
-		$this->_data = array();
-
-		foreach ( $accounts as $account_id => $account ) {
-			// Account is deleted
-			if ( empty( $account ) ) {
-				continue;
-			}
-
-			$this->_data[] = array(
-				'table_username'  => esc_html( $account['username'] ),
-				'table_imap_host' => esc_html( $account['imap_host'] ),
-				'table_imap_port' => esc_html( $account['imap_port'] ),
-				'table_imap_ssl'  => esc_html( $account['imap_ssl'] ? 'True' : 'False' ),
-				'table_smtp_host' => esc_html( $account['smtp_host'] ),
-				'table_smtp_port' => esc_html( $account['smtp_port'] ),
-				'table_smtp_ssl'  => esc_html( $account['smtp_ssl'] ? 'True' : 'False' ),
-				'table_action'    => "<a href='#' data-account-id='" . esc_attr( $account_id ) . "' class='delete_email_account'>" . __( 'Delete', 'supportflow' ) . "</a>",
-			);
-		}
-	}
-
-	function column_default( $item, $column_name ) {
-		return $item[ $column_name ];
-	}
-
-	function no_items() {
-		_e( 'No E-Mail accounts found. Please <b>add them</b> in the form below.', 'supportflow' );
-	}
-
-	function get_columns() {
-		return array(
-			'table_username'  => __( 'Username', 'supportflow' ),
-			'table_imap_host' => __( 'IMAP Host', 'supportflow' ),
-			'table_imap_port' => __( 'IMAP Port', 'supportflow' ),
-			'table_imap_ssl'  => __( 'IMAP use SSL', 'supportflow' ),
-			'table_smtp_host' => __( 'SMTP Host', 'supportflow' ),
-			'table_smtp_port' => __( 'SMTP Port', 'supportflow' ),
-			'table_smtp_ssl'  => __( 'SMTP use SSL', 'supportflow' ),
-			'table_action'    => __( 'Action', 'supportflow' ),
-		);
-	}
-
-	function prepare_items() {
-		$columns               = $this->get_columns();
-		$data                  = $this->_data;
-		$hidden                = array();
-		$sortable              = array();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-		$this->items           = $data;
-	}
-}
-
 /**
  * Setting page to add/remove new E-Mail accounts to get replies
  */
@@ -220,8 +155,42 @@ function process_form_submission() {
 	 * List all the existing E-Mail accounts in a table
 	 */
 	public function list_email_accounts() {
-		$email_accounts_table = new SupportFlow_Email_Accounts_Table( $this->email_accounts );
-		$email_accounts_table->prepare_items();
+		$no_items = __( 'No E-Mail accounts found. Please <b>add them</b> in the form below.', 'supportflow' );
+
+		$columns = array(
+			'table_username'  => __( 'Username', 'supportflow' ),
+			'table_imap_host' => __( 'IMAP Host', 'supportflow' ),
+			'table_imap_port' => __( 'IMAP Port', 'supportflow' ),
+			'table_imap_ssl'  => __( 'IMAP use SSL', 'supportflow' ),
+			'table_smtp_host' => __( 'SMTP Host', 'supportflow' ),
+			'table_smtp_port' => __( 'SMTP Port', 'supportflow' ),
+			'table_smtp_ssl'  => __( 'SMTP use SSL', 'supportflow' ),
+			'table_action'    => __( 'Action', 'supportflow' ),
+		);
+
+		$data = array();
+		foreach ( $this->email_accounts as $account_id => $account ) {
+			// Account is deleted
+			if ( empty( $account ) ) {
+				continue;
+			}
+
+			$data[] = array(
+				'table_username'  => esc_html( $account['username'] ),
+				'table_imap_host' => esc_html( $account['imap_host'] ),
+				'table_imap_port' => esc_html( $account['imap_port'] ),
+				'table_imap_ssl'  => esc_html( $account['imap_ssl'] ? 'True' : 'False' ),
+				'table_smtp_host' => esc_html( $account['smtp_host'] ),
+				'table_smtp_port' => esc_html( $account['smtp_port'] ),
+				'table_smtp_ssl'  => esc_html( $account['smtp_ssl'] ? 'True' : 'False' ),
+				'table_action'    => "<a href='#' data-account-id='" . esc_attr( $account_id ) . "' class='delete_email_account'>" . __( 'Delete', 'supportflow' ) . "</a>",
+			);
+		}
+
+		$email_accounts_table = new SupportFlow_Table();
+		$email_accounts_table->set_columns( $columns );
+		$email_accounts_table->set_no_items( $no_items );
+		$email_accounts_table->set_data( $data );
 		$email_accounts_table->display();
 
 	}
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index b69592b..bb37101 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -7,66 +7,6 @@
 
 defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
-}
-
-/**
- * Table to show existing E-Mail accounts with a option to remove existing
- */
-class SupportFlow_User_Permissions_Table extends WP_List_Table {
-	protected $_data;
-
-	function __construct( $user_permissions ) {
-		parent::__construct( array( 'screen' => 'sf_user_permissions_table' ) );
-
-		$this->_data = array();
-		foreach ( $user_permissions as $id => $user_permission ) {
-			$identfier = json_encode( array(
-				'user_id'        => $user_permission['user_id'],
-				'privilege_type' => $user_permission['privilege_type'],
-				'privilege_id'   => $user_permission['privilege_id'],
-			) );
-			$status    = "<input type='checkbox' id='permission_$id' class='toggle_privilege' data-permission-identifier='" . $identfier . "' " . checked( $user_permission['allowed'], true, false ) . '>';
-			$status .= " <label for='permission_$id' class='privilege_status'>" . __( $user_permission['allowed'] ? 'Allowed' : 'Not allowed', 'supportflow' ) . "</label>";
-			$this->_data[] = array(
-				'status'    => $status,
-				'privilege' => esc_html( $user_permission['privilege'] ),
-				'type'      => $user_permission['type'],
-				'user'      => esc_html( $user_permission['user'] ),
-			);
-		}
-	}
-
-	function column_default( $item, $column_name ) {
-		return $item[$column_name];
-	}
-
-	function no_items() {
-		$message = __('No tag/e-mail accounts found. <b>%s</b> before setting user permissions.<br><b>Note: </b>Administrator accounts automatically have full access in SupportFlow.', 'supportflow');
-		$link = '<a href="">' . __('Please add them', 'supportflow') . '</a>';
-		printf($message, $link);
-	}
-
-	function get_columns() {
-		return array(
-			'status'    => __( 'Status', 'supportflow' ),
-			'privilege' => __( 'Privilege', 'supportflow' ),
-			'type'      => __( 'Type', 'supportflow' ),
-			'user'      => __( 'User', 'supportflow' ),
-		);
-	}
-
-	function prepare_items() {
-		$columns               = $this->get_columns();
-		$data                  = $this->_data;
-		$hidden                = array();
-		$sortable              = array();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-		$this->items           = $data;
-	}
-}
-
 class SupportFlow_Permissions extends SupportFlow {
 
 	/**
@@ -169,11 +109,7 @@ public function permissions_page() {
 		</table>
 
 		<div id="user_permissions_table">
-			<?php
-			$user_permissions_table = new SupportFlow_User_Permissions_Table( $this->get_user_permissions( 0 ) );
-			$user_permissions_table->prepare_items();
-			$user_permissions_table->display();
-			?>
+			<?php $this->show_permissions_table( $this->get_user_permissions( 0 ) ) ?>
 		</div>
 		<script type="text/javascript">
 			jQuery(document).ready(function () {
@@ -268,12 +204,45 @@ public function action_wp_ajax_get_user_permissions() {
 			$get_allowed    = true;
 			$get_disallowed = true;
 		}
+		$this->show_permissions_table( $this->get_user_permissions( $user_id, $get_allowed, $get_disallowed ) );
+		exit;
+	}
 
-		$user_permissions_table = new SupportFlow_User_Permissions_Table( $this->get_user_permissions( $user_id, $get_allowed, $get_disallowed ) );
-		$user_permissions_table->prepare_items();
-		$user_permissions_table->display();
+	public function show_permissions_table( $user_permissions ) {
+		$message  = __( 'No tag/e-mail accounts found. <b>%s</b> before setting user permissions.<br><b>Note: </b>Administrator accounts automatically have full access in SupportFlow.', 'supportflow' );
+		$link     = '<a href="">' . __( 'Please add them', 'supportflow' ) . '</a>';
+		$no_items = sprintf( $message, $link );
+
+		$columns = array(
+			'status'    => __( 'Status', 'supportflow' ),
+			'privilege' => __( 'Privilege', 'supportflow' ),
+			'type'      => __( 'Type', 'supportflow' ),
+			'user'      => __( 'User', 'supportflow' ),
+		);
+
+		$data = array();
+		foreach ( $user_permissions as $id => $user_permission ) {
+			$identfier = json_encode( array(
+				'user_id'        => $user_permission['user_id'],
+				'privilege_type' => $user_permission['privilege_type'],
+				'privilege_id'   => $user_permission['privilege_id'],
+			) );
+			$status    = "<input type='checkbox' id='permission_$id' class='toggle_privilege' data-permission-identifier='" . $identfier . "' " . checked( $user_permission['allowed'], true, false ) . '>';
+			$status .= " <label for='permission_$id' class='privilege_status'>" . __( $user_permission['allowed'] ? 'Allowed' : 'Not allowed', 'supportflow' ) . "</label>";
+			$data[] = array(
+				'status'    => $status,
+				'privilege' => esc_html( $user_permission['privilege'] ),
+				'type'      => $user_permission['type'],
+				'user'      => esc_html( $user_permission['user'] ),
+			);
+		}
+
+		$permissions_table = new SupportFlow_Table( 'sf_user_permissions_table' );
+		$permissions_table->set_columns( $columns );
+		$permissions_table->set_no_items( $no_items );
+		$permissions_table->set_data( $data );
+		$permissions_table->display();
 
-		exit;
 	}
 
 	public function get_user_permissions( $user_id, $return_allowed = true, $return_disallowed = true ) {
diff --git a/classes/class-supportflow-preferences.php b/classes/class-supportflow-preferences.php
index 2382a6b..6d8036e 100644
--- a/classes/class-supportflow-preferences.php
+++ b/classes/class-supportflow-preferences.php
@@ -40,16 +40,15 @@ public function enqueue_scripts() {
 	}
 
 	public function preferences_page() {
+		echo '<div class="wrap">';
+
 		$this->enqueue_scripts();
-		?>
 
-		<div class="wrap">
-			<?php $this->user_ticket_signature_page() ?>
-			<br />
-			<?php $this->notification_setting_page() ?>
-		</div>
+		$this->user_ticket_signature_page();
+		echo '<br />';
+		$this->notification_setting_page();
 
-		<?php
+		echo '</div>';
 	}
 
 	public function user_ticket_signature_page() {
@@ -84,21 +83,41 @@ public function user_ticket_signature_page() {
 	 * Loads the page to change E-Mail notfication settings
 	 */
 	public function notification_setting_page() {
-		?>
-		<h2><?php _e( 'E-Mail Notifications', 'supportflow' ) ?></h2>
-		<p><?php _e( 'Please check the tags/E-Mail accounts for which you want to receive E-Mail notifications of replies. You will be able to override E-Mail notifications settings for individual tickets.', 'supportflow' ) ?></p>
-
-		<div id="email_notification_table">
-			<?php
-			$email_notifications_table = new SupportFlow_Email_Notifications_Table( SupportFlow()->extend->email_notifications->get_notifications_settings( get_current_user_id() ) );
-			$email_notifications_table->prepare_items();
-			$email_notifications_table->display();
-			?>
-		</div>
-	<?php
+		$columns = array(
+			'privilege' => __( 'Privilege', 'supportflow' ),
+			'type'      => __( 'Type', 'supportflow' ),
+			'status'    => __( 'Status', 'supportflow' ),
+		);
 
-	}
+		$no_items = __( "You don't have <b>permission</b> to any tag/e-mail account, or maybe no tag/e-mail account exists yet. Please ask your administrator to give you permission to an e-mail account or tag.", 'supportflow' );
 
+		$data                  = array();
+		$notification_settings = SupportFlow()->extend->email_notifications->get_notifications_settings( get_current_user_id() );
+		foreach ( $notification_settings as $id => $notification_setting ) {
+			$identfier = json_encode( array(
+				'privilege_type' => $notification_setting['privilege_type'],
+				'privilege_id'   => $notification_setting['privilege_id'],
+			) );
+			$status    = "<input type='checkbox' id='permission_$id' class='toggle_privilege' data-email-notfication-identifier='" . $identfier . "' " . checked( $notification_setting['allowed'], true, false ) . '>';
+			$status .= " <label for='permission_$id' class='privilege_status'> " . __( $notification_setting['allowed'] ? 'Subscribed' : 'Unsubscribed', 'supportflow' ) . "</label>";
+			$data[] = array(
+				'status'    => $status,
+				'privilege' => esc_html( $notification_setting['privilege'] ),
+				'type'      => $notification_setting['type'],
+			);
+		}
+
+		$email_notifications_table = new SupportFlow_Table();
+		$email_notifications_table->set_columns( $columns );
+		$email_notifications_table->set_no_items( $no_items );
+		$email_notifications_table->set_data( $data );
+
+		echo '<h2>' . __( 'E-Mail Notifications', 'supportflow' ) . '</h2>';
+		echo '<p>' . __( 'Please check the tags/E-Mail accounts for which you want to receive E-Mail notifications of replies. You will be able to override E-Mail notifications settings for individual tickets.', 'supportflow' ) . '</p>';
+		echo '<div id="email_notification_table">';
+		$email_notifications_table->display();
+		echo '</div>';
+	}
 
 	/**
 	 * AJAX request to change user E-Mail notification settings
@@ -126,59 +145,3 @@ public function action_wp_ajax_set_email_notfication() {
 }
 
 SupportFlow()->extend->preferences = new SupportFlow_Preferences();
-
-
-if ( ! class_exists( 'WP_List_Table' ) ) {
-	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
-}
-
-/**
- * Table to show existing preference with a option to change them
- */
-class SupportFlow_Email_Notifications_Table extends WP_List_Table {
-	protected $_data;
-
-	function __construct( $notification_settings ) {
-		parent::__construct( array( 'screen' => 'sf_user_email_notifications_table' ) );
-
-		$this->_data = array();
-		foreach ( $notification_settings as $id => $notification_setting ) {
-			$identfier = json_encode( array(
-				'privilege_type' => $notification_setting['privilege_type'],
-				'privilege_id'   => $notification_setting['privilege_id'],
-			) );
-			$status    = "<input type='checkbox' id='permission_$id' class='toggle_privilege' data-email-notfication-identifier='" . $identfier . "' " . checked( $notification_setting['allowed'], true, false ) . '>';
-			$status .= " <label for='permission_$id' class='privilege_status'> " . __( $notification_setting['allowed'] ? 'Subscribed' : 'Unsubscribed', 'supportflow' ) . "</label>";
-			$this->_data[] = array(
-				'status'    => $status,
-				'privilege' => esc_html( $notification_setting['privilege'] ),
-				'type'      => $notification_setting['type'],
-			);
-		}
-	}
-
-	function column_default( $item, $column_name ) {
-		return $item[$column_name];
-	}
-
-	function no_items() {
-		_e( "You don't have <b>permission</b> to any tag/e-mail account, or maybe no tag/e-mail account exists yet. Please ask your administrator to give you permission to an e-mail account or tag.", 'supportflow' );
-	}
-
-	function get_columns() {
-		return array(
-			'status'    => __( 'Status', 'supportflow' ),
-			'privilege' => __( 'Privilege', 'supportflow' ),
-			'type'      => __( 'Type', 'supportflow' ),
-		);
-	}
-
-	function prepare_items() {
-		$columns               = $this->get_columns();
-		$data                  = $this->_data;
-		$hidden                = array();
-		$sortable              = array();
-		$this->_column_headers = array( $columns, $hidden, $sortable );
-		$this->items           = $data;
-	}
-}
\ No newline at end of file
diff --git a/classes/class-supportflow-statistics.php b/classes/class-supportflow-statistics.php
index ac9df5f..f97693c 100644
--- a/classes/class-supportflow-statistics.php
+++ b/classes/class-supportflow-statistics.php
@@ -149,7 +149,7 @@ function insert_js_code() {
 	 * Currently shows today, yesterday and overall (whole life) ticket stats
 	 */
 	public function show_overall_stats() {
-		$statistics_table = new SupportFlow_Statistics_Table();
+		$statistics_table = new SupportFlow_Table();
 		$items = array();
 
 		$statistics_table->set_columns( array(
@@ -185,7 +185,7 @@ public function show_overall_stats() {
 	 * Show tickets status per tag
 	 */
 	public function show_tag_stats() {
-		$statistics_table = new SupportFlow_Statistics_Table();
+		$statistics_table = new SupportFlow_Table();
 		$items = array();
 
 		$statistics_table->set_columns( array(
@@ -208,7 +208,7 @@ public function show_tag_stats() {
 	 * Shows stats of ticket created in last 30 days
 	 */
 	public function show_30_days_stats() {
-		$statistics_table = new SupportFlow_Statistics_Table();
+		$statistics_table = new SupportFlow_Table();
 		$items = array();
 
 		$statistics_table->set_columns( array(
@@ -239,7 +239,7 @@ public function show_30_days_stats() {
 	 * Shows stats of ticket created in last 12 months
 	 */
 	public function show_12_month_stats() {
-		$statistics_table = new SupportFlow_Statistics_Table();
+		$statistics_table = new SupportFlow_Table();
 		$items = array();
 
 		$statistics_table->set_columns( array(
@@ -269,7 +269,7 @@ public function show_12_month_stats() {
 	 * Shows stats of ticket created in last 5 years
 	 */
 	public function show_5_year_stats() {
-		$statistics_table = new SupportFlow_Statistics_Table();
+		$statistics_table = new SupportFlow_Table();
 		$items = array();
 
 		$statistics_table->set_columns( array(
@@ -418,35 +418,4 @@ function get_post_link_by_tag( $link_tag = null, $post_status = null, $link_valu
 
 }
 
-
-/**
- * Table to show statistics
- */
-class SupportFlow_Statistics_Table extends WP_List_Table {
-
-	function __construct() {
-		parent::__construct( array( 'screen' => 'sf_statistics_table' ) );
-	}
-
-	protected function column_default( $item, $column_name ) {
-		return $item[$column_name];
-	}
-
-	/**
-	 * Set columns that should be displayed in table
-	 * @param array $columns
-	 */
-	function set_columns( $columns ) {
-		$this->_column_headers = array( $columns, array(), array() );
-	}
-
-	/**
-	 * Set data that should be displayed in table
-	 * @param array $data
-	 */
-	function set_data( $data ) {
-		$this->items = $data;
-	}
-}
-
 SupportFlow()->extend->statistics = new SupportFlow_Statistics();

From a01a36d00c9bf946133dac3c44dabfb6bdaeabd6 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 10 Jul 2014 20:23:31 +0530
Subject: [PATCH 269/485] Autosaving thread data

It will autosave all the elements with class `sf_autosave` as post meta
with key `_sf_autosave_$element_id`. Currenly it autosave cc, bcc and reply box.

Currently it don't support autosave functionality in new threads
---
 classes/class-supportflow-admin.php | 37 ++++++++++++++++++++++++++---
 js/auto_save.js                     | 23 ++++++++++++++++++
 2 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 js/auto_save.js

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 5884fca..6e898a5 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -9,6 +9,8 @@ class SupportFlow_Admin extends SupportFlow {
 
 	function __construct() {
 		add_action( 'wp_ajax_sf_forward_conversation', array( $this, 'action_wp_ajax_sf_email_conversation' ) );
+		add_filter( 'heartbeat_received', array( $this, 'filter_heartbeat_received' ), 10, 2 );
+		add_action( 'wp_ajax_ticket_attachment_upload', array( $this, 'action_wp_ajax_ticket_attachment_upload' ) );
 		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
 	}
 
@@ -82,6 +84,11 @@ public function action_admin_enqueue_scripts() {
 				'no_title_msg'      => __( 'You must need to specify the subject of the ticket', 'supportpress' ),
 				'no_respondent_msg' => __( 'You must need to add atleast one ticket respondent', 'supportpress' ),
 			) );
+
+			wp_enqueue_script( 'supportflow-auto-save', SupportFlow()->plugin_url . 'js/auto_save.js', array( 'jquery', 'heartbeat' ) );
+			wp_localize_script( 'supportflow-auto-save', 'SFAutoSave', array(
+				'ticket_id' => get_the_ID(),
+			) );
 		}
 
 		if ( 'post.php' == $pagenow ) {
@@ -126,6 +133,7 @@ public function action_wp_ajax_sf_email_conversation() {
 
 		_e( 'Successfully sented E-Mails', 'supportflow' );
 		exit;
+
 	}
 
 	/**
@@ -152,6 +160,26 @@ public function filter_post_updated_messages( $messages ) {
 		return $messages;
 	}
 
+	public function filter_heartbeat_received( $response, $data ) {
+		if (
+			is_array( $data['supportflow-autosave'] ) &&
+			isset( $data['supportflow-autosave']['ticket_id'] ) &&
+			current_user_can( 'edit_post', (int) $data['supportflow-autosave']['ticket_id'] )
+		) {
+			// Save data received from client to the database as post meta
+
+			$ticket_id = (int) $data['supportflow-autosave']['ticket_id'];
+			unset( $data['supportflow-autosave']['ticket_id'] );
+
+			foreach ( $data['supportflow-autosave'] as $element_id => $element_value ) {
+				update_post_meta( $ticket_id, "_sf_autosave_$element_id", $element_value );
+			}
+		}
+
+		return $response;
+	}
+
+
 	/**
 	 *
 	 */
@@ -693,12 +721,14 @@ public function meta_box_respondents() {
 	 * Add a form element where you can choose cc and bcc receiver of reply
 	 */
 	public function meta_box_cc_bcc() {
+		$cc_value = esc_attr( get_post_meta( get_the_ID(), '_sf_autosave_cc', true ) );
+		$bcc      = esc_attr( get_post_meta( get_the_ID(), '_sf_autosave_bcc', true ) );
 		?>
 		<p class="description"> <?php _e( "Please add all the E-Mail ID's seperated by comma.", 'supportflow' ) ?></p>
 		<h4 class="inline"><?php _e( "CC: ", 'supportflow' ) ?></h4>
-		<input type="text" id="cc" name="cc" />
+		<input type="text" class="sf_autosave" id="cc" name="cc" value="<?php echo $cc_value ?>" />
 		<h4 class="inline"> <?php _e( "BCC: ", 'supportflow' ) ?></h4>
-		<input type="text" id="bcc" name="bcc" />
+		<input type="text" class="sf_autosave" id="bcc" name="bcc" value="<?php echo $bcc ?>" />
 	<?php
 	}
 
@@ -758,7 +788,8 @@ public function meta_box_replies() {
 		echo '</select></div>';
 
 		echo '<div id="ticket-reply-box">';
-		echo "<textarea id='reply' name='reply' $disabled_attr class='ticket-reply' rows='4' placeholder='" . esc_attr( $placeholder ) . "'>";
+		echo "<textarea id='reply' name='reply' $disabled_attr class='ticket-reply sf_autosave' rows='4' placeholder='" . esc_attr( $placeholder ) . "'>";
+		echo esc_html( get_post_meta( get_the_ID(), '_sf_autosave_reply', true ) );
 		echo "</textarea>";
 
 		echo '<div id="message-tools">';
diff --git a/js/auto_save.js b/js/auto_save.js
new file mode 100644
index 0000000..f0cbe10
--- /dev/null
+++ b/js/auto_save.js
@@ -0,0 +1,23 @@
+jQuery(document).ready(function () {
+
+	// Send elements with class sf_autosave to the server for autosave
+	jQuery('.sf_autosave').keyup(function () {
+
+		var autosave_data = {};
+		autosave_data['ticket_id'] = SFAutoSave.ticket_id;
+
+		jQuery('.sf_autosave').each(function () {
+			element_key = jQuery(this).attr('id')
+			element_value = jQuery(this).val();
+			autosave_data[element_key] = element_value
+		});
+
+		wp.heartbeat.enqueue(
+			'supportflow-autosave',
+			autosave_data,
+			false
+		);
+
+	});
+
+});
\ No newline at end of file

From bffde4e39e44b9d69a5cfabc3299f237d5bc2df0 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 11 Jul 2014 21:27:21 +0530
Subject: [PATCH 270/485] Sending element ID rather than name during autosave

---
 js/auto_save.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/auto_save.js b/js/auto_save.js
index f0cbe10..325bf6b 100644
--- a/js/auto_save.js
+++ b/js/auto_save.js
@@ -7,7 +7,7 @@ jQuery(document).ready(function () {
 		autosave_data['ticket_id'] = SFAutoSave.ticket_id;
 
 		jQuery('.sf_autosave').each(function () {
-			element_key = jQuery(this).attr('id')
+			element_key = jQuery(this).attr('name');
 			element_value = jQuery(this).val();
 			autosave_data[element_key] = element_value
 		});

From a48b7bcd9fc214bb9edf850f6f7cac9571d007e6 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 11 Jul 2014 21:32:48 +0530
Subject: [PATCH 271/485] Corrected WP coding standard

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 6e898a5..d4f3893 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -557,7 +557,7 @@ public function meta_box_details() {
 		$notification_label       = 'Default';
 		$notification_label_title = 'Choose default if you want to receive E-Mail notifications based on what you set in `E-Mail notification` page. Choose Enable/Disable if you want to override those settings';
 		$notification_dropdown    = '';
-		$notification_dropdown   .= '<select class="meta-item-dropdown">';
+		$notification_dropdown .= '<select class="meta-item-dropdown">';
 
 		if ( 'post-new.php' == $pagenow ) {
 			$notification_dropdown .= '<option value="default">' . __( 'Default', 'supportflow' ) . '</option>';

From 54db8a94bb9bd65dcdf6e8541ed7e4b022184cd5 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 11 Jul 2014 21:33:52 +0530
Subject: [PATCH 272/485] Auto save also new tickets

---
 classes/class-supportflow-admin.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index d4f3893..9a2fc97 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -171,6 +171,10 @@ public function filter_heartbeat_received( $response, $data ) {
 			$ticket_id = (int) $data['supportflow-autosave']['ticket_id'];
 			unset( $data['supportflow-autosave']['ticket_id'] );
 
+			if ( 'auto-draft' == get_post_status( $ticket_id ) ) {
+				wp_update_post( array( 'ID' => $ticket_id, 'post_status' => 'draft' ) );
+			}
+
 			foreach ( $data['supportflow-autosave'] as $element_id => $element_value ) {
 				update_post_meta( $ticket_id, "_sf_autosave_$element_id", $element_value );
 			}

From 9fea2ccfb8495ebd4894837cd2160bd92f544476 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 11 Jul 2014 22:27:50 +0530
Subject: [PATCH 273/485] Enable autosave for post title and respondents in
 draft tickets only

---
 classes/class-supportflow-admin.php | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 9a2fc97..e15d5dc 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -162,6 +162,7 @@ public function filter_post_updated_messages( $messages ) {
 
 	public function filter_heartbeat_received( $response, $data ) {
 		if (
+			isset( $data['supportflow-autosave'] ) &&
 			is_array( $data['supportflow-autosave'] ) &&
 			isset( $data['supportflow-autosave']['ticket_id'] ) &&
 			current_user_can( 'edit_post', (int) $data['supportflow-autosave']['ticket_id'] )
@@ -178,6 +179,11 @@ public function filter_heartbeat_received( $response, $data ) {
 			foreach ( $data['supportflow-autosave'] as $element_id => $element_value ) {
 				update_post_meta( $ticket_id, "_sf_autosave_$element_id", $element_value );
 			}
+
+			echo $data['supportflow-autosave']['post_title'];
+			if ( ! empty( $data['supportflow-autosave']['post_title'] ) ) {
+				wp_update_post( array( 'ID' => $ticket_id, 'post_title' => $data['supportflow-autosave']['post_title'] ) );
+			}
 		}
 
 		return $response;
@@ -702,7 +708,7 @@ public function meta_box_subject() {
 
 		$placeholder = __( 'What is your conversation about?', 'supportflow' );
 		echo '<h4>' . __( 'Subject', 'supportflow' ) . '</h4>';
-		echo '<input type="text" id="subject" name="post_title" placeholder="' . $placeholder . '" value="' . get_the_title() . '" autocomplete="off" />';
+		echo '<input type="text" id="subject" name="post_title" class="sf_autosave" placeholder="' . $placeholder . '" value="' . get_the_title() . '" autocomplete="off" />';
 		echo '<p class="description">' . __( 'Please describe what this ticket is about in several words', 'supportflow' ) . '</p>';
 
 	}
@@ -712,12 +718,16 @@ public function meta_box_subject() {
 	 */
 	public function meta_box_respondents() {
 
-		$respondents        = SupportFlow()->get_ticket_respondents( get_the_ID(), array( 'fields' => 'emails' ) );
-		$respondents_string = implode( ', ', $respondents );
-		$respondents_string .= empty( $respondents_string ) ? '' : ', ';
 		$placeholder = __( 'Who are you starting a conversation with?', 'supportflow' );
+		if ( 'draft' == get_post_status( get_the_ID() ) ) {
+			$respondents_string = get_post_meta( get_the_ID(), '_sf_autosave_respondents', true );
+		} else {
+			$respondents        = SupportFlow()->get_ticket_respondents( get_the_ID(), array( 'fields' => 'emails' ) );
+			$respondents_string = implode( ', ', $respondents );
+			$respondents_string .= empty( $respondents_string ) ? '' : ', ';
+		}
 		echo '<h4>' . __( 'Respondent(s)', 'supportflow' ) . '</h4>';
-		echo '<input type="text" id="respondents" name="respondents" placeholder="' . $placeholder . '" value="' . esc_attr( $respondents_string ) . '" autocomplete="off" />';
+		echo '<input type="text" id="respondents" name="respondents" class="sf_autosave" placeholder="' . $placeholder . '" value="' . esc_attr( $respondents_string ) . '" autocomplete="off" />';
 		echo '<p class="description">' . __( 'Enter each respondent email address, separated with a comma', 'supportflow' ) . '</p>';
 	}
 

From d2e0e499e79bfebdea1b1162ae7ee5087f9da98b Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 18 Jul 2014 01:38:40 +0530
Subject: [PATCH 274/485] Prevent race condition of cron jobs

It locks a temp file while cron is executing cron. In case cron completes
or process get terminated unexpectedly lock is opened allowing other crons
to proceed

Fixes #74
---
 classes/class-supportflow-email-replies.php | 30 ++++++++++++++++++++-
 testflock.lock                              |  0
 testflock.txt                               |  1 +
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 testflock.lock
 create mode 100644 testflock.txt

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index a25cf3e..e1c6f5e 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -27,8 +27,32 @@ public function filter_reply_notify_subject( $subject, $reply_id, $ticket_id ) {
 		return $subject;
 	}
 
-
 	function retrieve_email_replies() {
+
+		// Opens a temp file
+		$tmp_file = sys_get_temp_dir() . '/sf_cron_lock.txt';
+		$fp       = fopen( $tmp_file, 'c+' );
+
+		// Unlock file if created 2+ hours earlier
+		$time      = time();
+		$file_time = (int) fgets( $fp );
+		if ( 0 != $file_time && $time > $file_time + 2 * HOUR_IN_SECONDS ) {
+			flock( $fp, LOCK_UN );
+		}
+
+		// Die if temp file is locked. i.e. cron is running
+		if ( 6 != fwrite( $fp, 'length' ) ) {
+			die;
+		}
+
+		// Save current time to file
+		ftruncate( $fp, 0 );
+		rewind( $fp );
+		fwrite( $fp, (string) $time );
+
+		// Lock the file while running cron
+		flock( $fp, LOCK_EX );
+
 		$email_accounts = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 		foreach ( $email_accounts as $id => $email_account ) {
 			$imap_account = array_merge( $email_account, array(
@@ -39,6 +63,10 @@ function retrieve_email_replies() {
 
 			$this->download_and_process_email_replies( $imap_account );
 		}
+
+		// Unlock the file and close it
+		flock( $fp, LOCK_UN );
+		fclose( $fp );
 	}
 
 	/**
diff --git a/testflock.lock b/testflock.lock
new file mode 100644
index 0000000..e69de29
diff --git a/testflock.txt b/testflock.txt
new file mode 100644
index 0000000..2f259b7
--- /dev/null
+++ b/testflock.txt
@@ -0,0 +1 @@
+s
\ No newline at end of file

From 5693384ff5340181b5a235bff26b403a49d42773 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 23 Jul 2014 20:14:15 +0530
Subject: [PATCH 275/485] Add option to filter unassigned (with no owner)
 tickets

---
 classes/class-supportflow-admin.php | 42 ++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 5884fca..a1091d9 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -179,23 +179,32 @@ public function filter_views( $views ) {
 		$class    = empty( $class ) && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['show_sticky'] ) ? ' class="current"' : '';
 		$view_all = "<a href='edit.php?post_type=$post_type'$class>" . sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts, 'posts' ), number_format_i18n( $total_posts ) ) . '</a>';
 
+		$post_statuses = SupportFlow()->post_statuses;
+		array_pop( $post_statuses );
+		$post_statuses = "'" . implode( "','", array_map( 'sanitize_key', array_keys( $post_statuses ) ) ) . "'";
+
+		$my_posts = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_type=%s AND post_author=%d AND post_status IN ({$post_statuses})", SupportFlow()->post_type, get_current_user_id() ) );
 		// @todo Only show "Mine" if the user is an agent
-		$mine_args     = array(
+		$mine_args = array(
 			'post_type' => SupportFlow()->post_type,
 			'author'    => get_current_user_id(),
 		);
-		$post_statuses = SupportFlow()->post_statuses;
-		array_pop( $post_statuses );
-		$post_statuses = "'" . implode( "','", array_map( 'sanitize_key', array_keys( $post_statuses ) ) ) . "'";
-		$my_posts      = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_type=%s AND post_author=%d AND post_status IN ({$post_statuses})", SupportFlow()->post_type, get_current_user_id() ) );
-		$view_mine     = '<a href="' . add_query_arg( $mine_args, admin_url( 'edit.php' ) ) . '">' . sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $my_posts, 'posts' ), number_format_i18n( $my_posts ) ) . '</a>';
+		$view_mine = '<a href="' . add_query_arg( $mine_args, admin_url( 'edit.php' ) ) . '">' . sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $my_posts, 'posts' ), number_format_i18n( $my_posts ) ) . '</a>';
+
+		$unassigned_args  = array(
+			'post_type' => SupportFlow()->post_type,
+			'author'    => 0,
+		);
+		$unassigned_posts = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_type=%s AND post_author=%d AND post_status IN ({$post_statuses})", SupportFlow()->post_type, 0 ) );
+		$view_unassigned  = '<a href="' . add_query_arg( $unassigned_args, admin_url( 'edit.php' ) ) . '">' . sprintf( _nx( 'Unassigned <span class="count">(%s)</span>', 'Unassigned <span class="count">(%s)</span>', $unassigned_posts, 'posts' ), number_format_i18n( $unassigned_posts ) ) . '</a>';
 
 		// Put 'All' and 'Mine' at the beginning of the array
 		array_shift( $views );
-		$views         = array_reverse( $views );
-		$views['mine'] = $view_mine;
-		$views['all']  = $view_all;
-		$views         = array_reverse( $views );
+		$views               = array_reverse( $views );
+		$views['unassigned'] = $view_unassigned;
+		$views['mine']       = $view_mine;
+		$views['all']        = $view_all;
+		$views               = array_reverse( $views );
 
 		// Remove private option from filter links as they are just private replies to ticket
 		unset( $views['private'] );
@@ -374,6 +383,7 @@ function action_pre_get_posts( $query ) {
 			$query->set( 'post_status', $status_slugs );
 		}
 
+		add_action( 'posts_clauses', array( $this, 'filter_author_clause' ), 10, 2 );
 
 		if ( isset( $_GET['email_account'] ) && ! empty( $_GET['email_account'] ) ) {
 			$query->set( 'meta_key', 'email_account' );
@@ -381,6 +391,18 @@ function action_pre_get_posts( $query ) {
 		}
 	}
 
+	/*
+	 * Show unassigned tickets when query author is 0
+	 */
+	public function filter_author_clause( $clauses, $query ) {
+
+		if ( isset( $query->query['author'] ) && 0 == $query->query['author'] ) {
+			$clauses['where'] .= ' AND post_author = 0 ';
+		}
+
+		return $clauses;
+	}
+
 	/**
 	 * Sometimes we want to ignore the original search query because we do our own
 	 */

From 9fd9da8d4cf9e987dcd39520a5a6bbba23b75573 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 24 Jul 2014 00:14:04 +0530
Subject: [PATCH 276/485] Redesigned submission form

---
 .../class-supportflow-ui-submissionform.php   | 117 +++++++++++-------
 1 file changed, 75 insertions(+), 42 deletions(-)

diff --git a/classes/class-supportflow-ui-submissionform.php b/classes/class-supportflow-ui-submissionform.php
index 9ac2892..5a5a80b 100644
--- a/classes/class-supportflow-ui-submissionform.php
+++ b/classes/class-supportflow-ui-submissionform.php
@@ -16,77 +16,110 @@ public function setup_actions() {
 		add_shortcode( 'supportflow_submissionform', array( $this, 'shortcode_submissionform' ) );
 	}
 
-	// TODO: Nonce, l10n, etc.
 	public function shortcode_submissionform() {
-		$html = '';
-
-		$html .= '<div class="supportflow-submissionform">';
-		$html .= '<form action="" method="POST">';
-
-		if ( ! empty( $this->messages ) ) {
-			foreach ( $this->messages as $message ) {
-				$html .= '<p class="supportflow-message" style="font-weight:bold;color:red;">' . $message . '</p>';
-			}
-		}
-
-		$html .= "<p>This is just an ugly form that's meant for testing. We'll probably want something like this in the final version but we can worry about that later.</p>";
-		$html .= '<p>Your Name: <input type="text" name="supportflow[name]" size="30" /></p>';
-		$html .= '<p>Your Email: <input type="text" name="supportflow[email]" size="30" /></p>';
-		$html .= '<p>Subject: <input type="text" name="supportflow[subject]" size="60" /></p>';
-		$html .= '<p>Message:</p>';
-		$html .= '<p><textarea name="supportflow[message]" cols="50" rows="10"></textarea></p>';
-		$html .= '<p><input type="submit" value="Submit" /></p>';
-		$html .= '</form>';
-		$html .= '</div>';
-
-		return $html;
+		?>
+
+		<div class="supportflow-submissionform">
+
+			<?php if ( ! empty( $this->messages ) ) : ?>
+				<p class="supportflow-message" style="font-weight:bold;color:red;">
+					<?php foreach ( $this->messages as $message ) : ?>
+						<?php esc_html_e( $message ) ?>
+						<br />
+					<?php endforeach; ?>
+				</p>
+			<?php endif; ?>
+
+			<form action="" method="POST">
+				<input type="hidden" name="action" value="sf_create_ticket" />
+				<?php wp_nonce_field( '_sf_create_ticket' ) ?>
+
+				<p>
+					<label for="fullname"><?php _e( 'Your Name', 'supportflow' ) ?>:</label>
+					<br />
+					<input type="text" required id="fullname" name="fullname" width="100%" />
+				</p>
+
+				<p>
+					<label for="email"><?php _e( 'Your E-Mail', 'supportflow' ) ?>:</label>
+					<br />
+					<input type="email" required id="email" name="email" />
+				</p>
+
+				<p>
+					<label for="subject"><?php _e( 'Subject', 'supportflow' ) ?>:</label>
+					<br />
+					<input type="text" required id="subject" name="subject" />
+				</p>
+
+				<p>
+					<label for="message"><?php _e( 'Message', 'supportflow' ) ?>:</label>
+					<br />
+					<textarea required id="message" rows=5 name="message"></textarea>
+				</p>
+
+				<p>
+					<input type="submit" value="<?php _e( 'Submit', 'supportflow' ) ?>" />
+				</p>
+
+			</form>
+		</div>
+	<?php
 	}
 
 	public function action_init_handle_form_submission() {
-		if ( empty( $_POST['supportflow'] ) || ! is_array( $_POST['supportflow'] ) ) {
+
+		if (
+			! isset( $_POST['action'], $_POST['_wpnonce'] ) ||
+			! 'sf_create_ticket' == $_POST['action'] ||
+			! wp_verify_nonce( $_POST['_wpnonce'], '_sf_create_ticket' )
+		) {
 			return;
 		}
 
-		$_POST['supportflow'] = array_map( 'stripslashes', $_POST['supportflow'] );
-
-		if ( empty( $_POST['supportflow']['name'] ) ) {
-			$this->messages[] = 'The name field is required.';
+		if ( empty( $_POST['fullname'] ) ) {
+			$this->messages[] = __( 'The name field is required.', 'supportflow' );
 		}
 
-		if ( empty( $_POST['supportflow']['email'] ) ) {
-			$this->messages[] = 'The email field is required.';
-		} elseif ( ! is_email( $_POST['supportflow']['email'] ) ) {
-			$this->messages[] = 'Please enter a valid e-mail address.';
+		if ( empty( $_POST['email'] ) ) {
+			$this->messages[] = __( 'The email field is required.', 'supportflow' );
+
+		} elseif ( ! is_email( $_POST['email'] ) ) {
+			$this->messages[] = __( 'Please enter a valid e-mail address.', 'supportflow' );
 		}
 
-		if ( empty( $_POST['supportflow']['subject'] ) ) {
-			$this->messages[] = 'The subject field is required.';
+		if ( empty( $_POST['subject'] ) ) {
+			$this->messages[] = __( 'The subject field is required.', 'supportflow' );
 		}
 
-		if ( empty( $_POST['supportflow']['message'] ) ) {
-			$this->messages[] = 'You must enter a message.';
+		if ( empty( $_POST['message'] ) ) {
+			$this->messages[] = __( 'You must enter a message.', 'supportflow' );
 		}
 
 		if ( ! empty( $this->messages ) ) {
 			return;
 		}
 
+		// Load required file
+		require_once( SupportFlow()->plugin_dir . 'classes/class-supportflow-admin.php' );
+
 		$ticket_id = SupportFlow()->create_ticket(
 			array(
-				'subject'         => $_POST['supportflow']['subject'],
-				'message'         => $_POST['supportflow']['message'],
-				'requester_name'  => $_POST['supportflow']['name'],
-				'requester_email' => $_POST['supportflow']['email'],
+				'subject'            => $_POST['subject'],
+				'message'            => $_POST['message'],
+				'reply_author'       => $_POST['fullname'],
+				'reply_author_email' => $_POST['email'],
+				'respondent_email'   => array( $_POST['email'] ),
 			)
 		);
 
 		if ( is_wp_error( $ticket_id ) ) {
-			$this->messages[] = 'There was an error creating the ticket: ' . $ticket_id->get_error_message();
+			$this->messages[] = __( 'There is an unknown error while submitting the form. Please try again later.', 'supportflow' );
 
 			return;
 		}
 
-		$this->messages[] = 'Ticket (ticket) number ' . $ticket_id . ' created.';
+		$this->messages[] = __( 'Form submitted successfully', 'supportflow' );
 	}
 }
 

From b65878d742aa1bc2346e172901f77978905bfb23 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 24 Jul 2014 00:20:21 +0530
Subject: [PATCH 277/485] Set E-Mail account as empty be default if not
 specified

---
 supportflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index fb186e3..682183c 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -416,7 +416,7 @@ public function create_ticket( $args ) {
 			'reply_author_email' => '',
 			'status'             => key( $post_statuses ),
 			'assignee'           => - 1, // WordPress user ID or username of ticket assignee/owner
-			'email_account'      => 0,
+			'email_account'      => '',
 		);
 
 		$args = wp_parse_args( $args, $defaults );

From 26b55895abf967717ab5c3ed58bb23e3c8dce7e5 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 24 Jul 2014 00:21:34 +0530
Subject: [PATCH 278/485] Check for E-Mail account ID existence before
 accessing a E-Mail account

---
 classes/class-supportflow-emails.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 88459fe..109a1f0 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -43,6 +43,9 @@ public function notify_agents_ticket_replies( $reply_id ) {
 
 		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 		$email_account_id = get_post_meta( $ticket->ID, 'email_account', true );
+		if ( '' == $email_account_id ) {
+			return;
+		}
 		$smtp_account     = $email_accounts[$email_account_id];
 
 		if ( empty( $agent_ids ) ) {
@@ -104,6 +107,9 @@ public function notify_respondents_ticket_replies( $reply_id, $cc = array(), $bc
 
 		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 		$email_account_id = get_post_meta( $ticket->ID, 'email_account', true );
+		if ( '' == $email_account_id ) {
+			return;
+		}
 		$smtp_account     = $email_accounts[$email_account_id];
 
 		// Don't email the person creating the reply, unless that's desired behavior

From 66ccf33c68bb31bea126db4613b387125a12df66 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 24 Jul 2014 00:35:15 +0530
Subject: [PATCH 279/485] Show E-Mail account drop box always in case it is not
 set

Earlier it was only shown new ticket post. It will help when tickets are
created without a E-Mail account. e.g. support form or auto-drafted
tickets
---
 classes/class-supportflow-admin.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index a1091d9..17b1edd 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -531,19 +531,21 @@ public function meta_box_details() {
 		$user_permissions = SupportFlow()->extend->permissions->get_user_permissions_data( get_current_user_id() );
 		$user_permissions = $user_permissions['email_accounts'];
 
-		if ( 'post-new.php' == $pagenow ) {
+		$email_account_id = get_post_meta( get_the_id(), 'email_account', true );
+
+		if ( '' == $email_account_id ) {
 			$email_account_dropdown = '<select class="meta-item-dropdown">';
-			foreach ( $email_accounts as $id => $email_account_id ) {
-				if ( empty( $email_account_id ) || ( ! current_user_can( 'manage_options' ) && ! in_array( $id, $user_permissions ) ) ) {
+			foreach ( $email_accounts as $id => $email_account ) {
+				if ( empty( $email_account ) || ( ! current_user_can( 'manage_options' ) && ! in_array( $id, $user_permissions ) ) ) {
 					continue;
 				}
-				$email_account_dropdown .= '<option value="' . esc_attr( $id ) . '" ' . '>' . esc_html( $email_account_id['username'] ) . '</option>';
+				$email_account_dropdown .= '<option value="' . esc_attr( $id ) . '" ' . '>' . esc_html( $email_account['username'] ) . '</option>';
 			}
 			$email_account_dropdown .= '</select>';
 
 			$email_account_keys  = array_keys( $email_accounts );
-			$email_account_id    = $email_account_keys[0];
-			$email_account_label = $email_accounts[$email_account_id]['username'];
+			$email_account_first = $email_account_keys[0];
+			$email_account_label = $email_accounts[$email_account_first]['username'];
 		}
 
 		// Get E-Mail notification settings
@@ -591,14 +593,14 @@ public function meta_box_details() {
 		<div id="minor-publishing">
 			<div id="misc-publishing-actions">
 
-				<?php if ( 'post-new.php' == $pagenow ) : ?>
+				<?php if ( '' == $email_account_id ) : ?>
 					<div class="misc-pub-section meta-item">
 						<label class="meta-item-toggle-button"><?php _e( 'Account', 'supportflow' ) ?>:</label>
 						<span class="meta-item-label"><?php _e( $email_account_label, 'supportflow' ) ?></span>
 						<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
 							<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
 						</a>
-						<input name="post_email_account" class="meta-item-name" value="<?php echo $email_account_id ?>" type="hidden" />
+						<input name="post_email_account" class="meta-item-name" value="<?php echo $email_account_first ?>" type="hidden" />
 
 						<div class="meta-item-toggle-content hide-if-js">
 							<?php echo $email_account_dropdown ?>

From 6642007d8b04c6ae1cc966c3839902547b6cdd4f Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 24 Jul 2014 00:52:24 +0530
Subject: [PATCH 280/485] Allow only limited HTML tags in `no_items` message of
 tables

---
 classes/class-supportflow-table.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-table.php b/classes/class-supportflow-table.php
index b9f82ad..e9b48b0 100644
--- a/classes/class-supportflow-table.php
+++ b/classes/class-supportflow-table.php
@@ -33,7 +33,12 @@ protected function column_default( $item, $column_name ) {
 	 * @param string $msg
 	 */
 	public function set_no_items( $msg ) {
-		$this->no_item_message = $msg;
+		$allowed_html = array_merge(
+			wp_kses_allowed_html( 'data' ),
+			array( 'br' => array() )
+		);
+
+		$this->no_item_message = wp_kses( $msg, $allowed_html );
 	}
 
 	function no_items() {

From 6647c2525f374ee328dccef94e78d69220d79e6b Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 24 Jul 2014 01:11:05 +0530
Subject: [PATCH 281/485] Using wp_query to query database

Instead of querying database manually using $wpdb
---
 classes/class-supportflow-admin.php | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index a1091d9..3ebae35 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -156,8 +156,6 @@ public function filter_post_updated_messages( $messages ) {
 	 *
 	 */
 	public function filter_views( $views ) {
-		global $wpdb;
-
 		$post_type     = SupportFlow()->post_type;
 		$statuses     = SupportFlow()->post_statuses;
 		$status_slugs = array();
@@ -183,19 +181,33 @@ public function filter_views( $views ) {
 		array_pop( $post_statuses );
 		$post_statuses = "'" . implode( "','", array_map( 'sanitize_key', array_keys( $post_statuses ) ) ) . "'";
 
-		$my_posts = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_type=%s AND post_author=%d AND post_status IN ({$post_statuses})", SupportFlow()->post_type, get_current_user_id() ) );
 		// @todo Only show "Mine" if the user is an agent
 		$mine_args = array(
 			'post_type' => SupportFlow()->post_type,
 			'author'    => get_current_user_id(),
 		);
+		$wp_query  = new WP_Query( array(
+			'post_type'      => SupportFlow()->post_type,
+			'author'         => get_current_user_id(),
+			'post_status'    => $post_statuses,
+			'posts_per_page' => 1,
+		) );
+
+		$my_posts  = $wp_query->found_posts;
 		$view_mine = '<a href="' . add_query_arg( $mine_args, admin_url( 'edit.php' ) ) . '">' . sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $my_posts, 'posts' ), number_format_i18n( $my_posts ) ) . '</a>';
 
-		$unassigned_args  = array(
+		$unassigned_args = array(
 			'post_type' => SupportFlow()->post_type,
 			'author'    => 0,
 		);
-		$unassigned_posts = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->posts WHERE post_type=%s AND post_author=%d AND post_status IN ({$post_statuses})", SupportFlow()->post_type, 0 ) );
+		$wp_query        = new WP_Query( array(
+			'post_type'      => SupportFlow()->post_type,
+			'author'         => 0,
+			'post_status'    => $post_statuses,
+			'posts_per_page' => 1,
+		) );
+
+		$unassigned_posts = $wp_query->found_posts;
 		$view_unassigned  = '<a href="' . add_query_arg( $unassigned_args, admin_url( 'edit.php' ) ) . '">' . sprintf( _nx( 'Unassigned <span class="count">(%s)</span>', 'Unassigned <span class="count">(%s)</span>', $unassigned_posts, 'posts' ), number_format_i18n( $unassigned_posts ) ) . '</a>';
 
 		// Put 'All' and 'Mine' at the beginning of the array

From 45e39999e1bb514814962c64de935d1f1ed58930 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 24 Jul 2014 01:29:20 +0530
Subject: [PATCH 282/485] Using get_posts() instead of using $wpdb

---
 supportflow.php | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index fb186e3..a7958ba 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -764,10 +764,24 @@ public function get_secret_for_ticket( $ticket_id ) {
 	 * Get the ticket ID from a secret
 	 */
 	public function get_ticket_from_secret( $secret ) {
-		global $wpdb;
-		$ticket_id = $wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE meta_key=%s AND meta_value=%s", $this->ticket_secret_key, $secret ) );
+		$post_statuses = $this->post_statuses;
+
+		$posts = get_posts( array(
+			'post_type'   => SupportFlow()->post_type,
+			'post_status' => key( $post_statuses ),
+			'meta_query'  => array(
+				array(
+					'key'   => $this->ticket_secret_key,
+					'value' => $secret,
+				),
+			)
+		) );
 
-		return ( $ticket_id ) ? (int) $ticket_id : 0;
+		if ( isset( $posts[0] ) ) {
+			return $posts[0]->ID;
+		} else {
+			return 0;
+		}
 	}
 
 	/**

From 42ae80fdac54ebc8f3ebf3aac532064cc8cf281d Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 24 Jul 2014 01:30:20 +0530
Subject: [PATCH 283/485] Removed unused code

---
 supportflow.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index a7958ba..8eed027 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -677,8 +677,6 @@ public function get_ticket_replies_count( $ticket_id, $args = array() ) {
 	 * Add a reply to a given ticket
 	 */
 	public function add_ticket_reply( $ticket_id, $reply_text, $details = array() ) {
-		global $wpdb;
-
 		$default_details = array(
 			'time'               => current_time( 'mysql' ),
 			'reply_author'       => '',

From 37e63a01ded50b58dc301757ebeebafa789a4b28 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 22 Jul 2014 20:50:16 +0530
Subject: [PATCH 284/485] Create dashboard widgets for SupportFlow

It covers:
* PHP Class to add dashboard widgets
* Two widgets
* - Widget to show recent tickets
* - Widget to show ticket assigned to current user
---
 classes/class-supportflow-dashboard.php | 175 ++++++++++++++++++++++++
 css/dashboard.css                       |  23 ++++
 js/dashboard.js                         |  24 ++++
 supportflow.php                         |   1 +
 4 files changed, 223 insertions(+)
 create mode 100644 classes/class-supportflow-dashboard.php
 create mode 100644 css/dashboard.css
 create mode 100644 js/dashboard.js

diff --git a/classes/class-supportflow-dashboard.php b/classes/class-supportflow-dashboard.php
new file mode 100644
index 0000000..6edbeb1
--- /dev/null
+++ b/classes/class-supportflow-dashboard.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * Loads dashboard widgets
+ */
+
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
+
+class SupportFlow_Dashboard extends SupportFlow {
+
+	function __construct() {
+		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
+	}
+
+	public function setup_actions() {
+		add_action( 'wp_dashboard_setup', array( $this, 'action_wp_dashboard_setup' ) );
+	}
+
+	function action_wp_dashboard_setup() {
+		if ( current_user_can( 'edit_posts' ) ) {
+
+			wp_enqueue_script( 'supportflow-dashboard', SupportFlow()->plugin_url . 'js/dashboard.js', array( 'jquery' ) );
+			wp_enqueue_style( 'supportflow-dashboard', SupportFlow()->plugin_url . 'css/dashboard.css', array(), SupportFlow()->version );
+
+			wp_add_dashboard_widget(
+				'sf_recent_tickets',
+				__( "Recent tickets", 'supportflow' ),
+				array( $this, 'action_sf_recent_tickets' )
+			);
+
+			wp_add_dashboard_widget(
+				'sf_my_tickets',
+				__( "My assigned tickets", 'supportflow' ),
+				array( $this, 'action_sf_my_tickets' )
+			);
+		}
+
+	}
+
+	/*
+	 * Show unassigned tickets when query author is 0
+	 */
+	public function filter_author_clause( $clauses, $query ) {
+		if ( isset( $query->query['author'] ) && 0 === $query->query['author'] ) {
+			$clauses['where'] .= ' AND post_author = 0 ';
+		}
+
+		return $clauses;
+	}
+
+
+	function action_sf_recent_tickets() {
+		$statuses     = SupportFlow()->post_statuses;
+		$status_slugs = array();
+
+		foreach ( $statuses as $status => $status_data ) {
+			if ( true == $status_data['show_tickets'] ) {
+				$status_slugs[] = $status;
+			}
+		}
+
+		$args = array(
+			'post_type'   => SupportFlow()->post_type,
+			'post_parent' => 0,
+			'post_status' => $status_slugs,
+			'author'      => 0,
+			'numberposts' => 10,
+		);
+
+		add_filter( 'posts_clauses', array( $this, 'filter_author_clause' ), 10, 2 );
+		$wp_query = new WP_Query( $args );
+		remove_filter( 'posts_clauses', array( $this, 'filter_author_clause' ) );
+
+		$tickets = $wp_query->posts;
+
+		$table = new SupportFlow_Table;
+
+		$no_items = '<a href="post-new.php?post_type=' . SupportFlow()->post_type . '">' . __( '<b>Click here</b>' ) . '</a>';
+		$no_items = sprintf( __( 'No matching ticket exists. %s to create new.', 'supportflow' ), $no_items );
+		$table->set_no_items( $no_items );
+
+		$table->set_columns( array(
+			'title'    => __( 'Subject', 'supportflow' ),
+			'status'   => __( 'Status', 'supportflow' ),
+			'datetime' => __( 'Created', 'supportflow' ),
+		) );
+
+		$data = array();
+		foreach ( $tickets as $ticket ) {
+			$post_date    = strtotime( $ticket->post_date );
+			$time_created = time() - strtotime( $ticket->post_date );
+			if ( $time_created > 2 * DAY_IN_SECONDS ) {
+				$class = 'two_day_old ';
+			} elseif ( $time_created > DAY_IN_SECONDS ) {
+				$class = 'one_two_day_old';
+			} else {
+				$class = 'one_day_old';
+			}
+			$title  = '<b>' . esc_html( $ticket->post_title ) . '</b>';
+			$title  = "<a class='$class' href='post.php?post=" . $ticket->ID . "&action=edit'>" . $title . "</a>";
+			$data[] = array(
+				'title'    => $title,
+				'status'   => esc_html( $statuses[$ticket->post_status]['label'] ),
+				'datetime' => sprintf( __( '%s ago', 'supportflow' ), human_time_diff( time(), $post_date ) ),
+			);
+		}
+
+		$table->set_data( $data );
+		$table->display();
+	}
+
+
+	function action_sf_my_tickets() {
+		$statuses     = SupportFlow()->post_statuses;
+		$status_slugs = array();
+
+		foreach ( $statuses as $status => $status_data ) {
+			if ( true == $status_data['show_tickets'] ) {
+				$status_slugs[] = $status;
+			}
+		}
+
+		$table   = new SupportFlow_Table;
+		$user_id = get_current_user_id();
+
+		foreach ( $status_slugs as $status_slug ) {
+
+			$args = array(
+				'post_type'   => SupportFlow()->post_type,
+				'post_parent' => 0,
+				'post_status' => $status_slug,
+				'author'      => $user_id,
+			);
+
+			$wp_query = new WP_Query( $args );
+			$tickets  = $wp_query->posts;
+
+			$no_items = '<a href="post-new.php?post_type=' . SupportFlow()->post_type . '">' . __( '<b>Click here</b>' ) . '</a>';
+			$no_items = sprintf( __( 'No matching ticket exists. %s to create new.', 'supportflow' ), $no_items );
+			$table->set_no_items( $no_items );
+
+			$table->set_columns( array(
+				'title'    => __( 'Subject', 'supportflow' ),
+				'modified' => __( 'Last modified', 'supportflow' ),
+				'datetime' => __( 'Created', 'supportflow' ),
+			) );
+
+			$data = array();
+			foreach ( $tickets as $ticket ) {
+				$post_date     = strtotime( $ticket->post_date );
+				$post_modified = strtotime( $ticket->post_modified );
+				$title         = '<b>' . esc_html( $ticket->post_title ) . '</b>';
+				$title         = "<a href='post.php?post=" . $ticket->ID . "&action=edit'>" . $title . "</a>";
+				$data[]        = array(
+					'title'    => $title,
+					'modified' => sprintf( __( '%s ago', 'supportflow' ), human_time_diff( time(), $post_modified ) ),
+					'datetime' => sprintf( __( '%s ago', 'supportflow' ), human_time_diff( time(), $post_date ) ),
+				);
+			}
+			$table->set_data( $data );
+
+			echo '<div class="container">';
+			echo "<h3 class='toggle-link'>" . $statuses[$status_slug]['label'] . "</h3>";
+
+			echo "<div class='toggle-content'>";
+			$table->display();
+			echo "</div>";
+
+			echo '</div>';
+		}
+
+	}
+
+}
+
+SupportFlow()->extend->dashboard = new SupportFlow_Dashboard();
diff --git a/css/dashboard.css b/css/dashboard.css
new file mode 100644
index 0000000..3b80f64
--- /dev/null
+++ b/css/dashboard.css
@@ -0,0 +1,23 @@
+#sf_my_tickets .toggle-content {
+	display: none;
+}
+
+#sf_my_tickets .tablenav {
+	height: 10px;
+}
+
+#sf_recent_tickets .tablenav {
+	height: 0px;
+}
+
+#sf_recent_tickets .two_day_old {
+	color: #DF1111;
+}
+
+#sf_recent_tickets .one_two_day_old {
+	color: #BD8A2C;
+}
+
+#sf_recent_tickets .one_day_old {
+
+}
\ No newline at end of file
diff --git a/js/dashboard.js b/js/dashboard.js
new file mode 100644
index 0000000..5458c3b
--- /dev/null
+++ b/js/dashboard.js
@@ -0,0 +1,24 @@
+jQuery(document).ready(function () {
+	// Close all the tables and toggle the status of clicked tables
+	jQuery('.toggle-link').click(function (event) {
+		var current = jQuery(this).siblings('.toggle-content').css('display');
+		jQuery('.toggle-content').hide(500);
+		jQuery('.toggle-link').prop('title', 'Expand');
+		if ('none' == current) {
+			jQuery(this).siblings('.toggle-content').show(500);
+			jQuery(this).prop('title', 'Collapse');
+		}
+		event.preventDefault();
+	});
+
+	// Set different type of link title at page load
+	jQuery(jQuery('.toggle-content')).each(function () {
+		if ('none' == jQuery(this).css('display')) {
+			jQuery(this).siblings('.toggle-link').prop('title', 'Expand');
+		} else {
+			jQuery(this).siblings('.toggle-link').prop('title', 'Collapse');
+		}
+
+		jQuery('.toggle-content').first().show(500);
+	});
+});
\ No newline at end of file
diff --git a/supportflow.php b/supportflow.php
index 8267605..2f76cc4 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -226,6 +226,7 @@ private function includes() {
 		require_once( $this->plugin_dir . 'classes/class-supportflow-email-notifications.php' );
 		require_once( $this->plugin_dir . 'classes/class-supportflow-preferences.php' );
 		require_once( $this->plugin_dir . 'classes/class-supportflow-table.php' );
+		require_once( $this->plugin_dir . 'classes/class-supportflow-dashboard.php' );
 
 		/** Extensions ********************************************************/
 

From d5d7c375e594a1e92f92ebca61584a770f4f9f33 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 25 Jul 2014 23:47:15 +0530
Subject: [PATCH 285/485] Removed accidentaly created empty files

They were created in d2e0e499e79bfebdea1b1162ae7ee5087f9da98b
---
 testflock.lock | 0
 testflock.txt  | 1 -
 2 files changed, 1 deletion(-)
 delete mode 100644 testflock.lock
 delete mode 100644 testflock.txt

diff --git a/testflock.lock b/testflock.lock
deleted file mode 100644
index e69de29..0000000
diff --git a/testflock.txt b/testflock.txt
deleted file mode 100644
index 2f259b7..0000000
--- a/testflock.txt
+++ /dev/null
@@ -1 +0,0 @@
-s
\ No newline at end of file

From 12bb9c2b6d750e45b43f81c1f7f91d0574d586d7 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 25 Jul 2014 23:59:06 +0530
Subject: [PATCH 286/485] Removed unnecessary code

---
 classes/class-supportflow-ui-submissionform.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-ui-submissionform.php b/classes/class-supportflow-ui-submissionform.php
index 5a5a80b..f564dbd 100644
--- a/classes/class-supportflow-ui-submissionform.php
+++ b/classes/class-supportflow-ui-submissionform.php
@@ -37,7 +37,7 @@ public function shortcode_submissionform() {
 				<p>
 					<label for="fullname"><?php _e( 'Your Name', 'supportflow' ) ?>:</label>
 					<br />
-					<input type="text" required id="fullname" name="fullname" width="100%" />
+					<input type="text" required id="fullname" name="fullname" />
 				</p>
 
 				<p>

From 6f13c7010c49e7e92ddec6c71d348e28d828246c Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 25 Jul 2014 23:59:54 +0530
Subject: [PATCH 287/485] Moved inline CSS to style sheet

---
 classes/class-supportflow-ui-submissionform.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-ui-submissionform.php b/classes/class-supportflow-ui-submissionform.php
index f564dbd..c69668f 100644
--- a/classes/class-supportflow-ui-submissionform.php
+++ b/classes/class-supportflow-ui-submissionform.php
@@ -18,11 +18,17 @@ public function setup_actions() {
 
 	public function shortcode_submissionform() {
 		?>
+		<style type="text/css">
+			.supportflow-message {
+				font-weight: bold;
+				color:       red;
+			}
+		</style>
 
 		<div class="supportflow-submissionform">
 
 			<?php if ( ! empty( $this->messages ) ) : ?>
-				<p class="supportflow-message" style="font-weight:bold;color:red;">
+				<p class="supportflow-message">
 					<?php foreach ( $this->messages as $message ) : ?>
 						<?php esc_html_e( $message ) ?>
 						<br />

From 4735597532da7cd7e1b61ba3a495180314f358c3 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 26 Jul 2014 01:53:52 +0530
Subject: [PATCH 288/485] Add parameter to disable loading of table navigations

---
 classes/class-supportflow-table.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-table.php b/classes/class-supportflow-table.php
index e9b48b0..9da2e70 100644
--- a/classes/class-supportflow-table.php
+++ b/classes/class-supportflow-table.php
@@ -11,16 +11,18 @@
  */
 class SupportFlow_Table extends WP_List_Table {
 	protected $no_item_message;
+	protected $display_nav;
 
 	/**
 	 * @param string $table_class Class to be used by table
 	 */
-	function __construct( $table_class = '' ) {
+	function __construct( $table_class = '', $display_nav = true ) {
 		if ( $table_class ) {
 			parent::__construct( array( 'screen' => 'sf_statistics_table' ) );
 		} else {
 			parent::__construct();
 		}
+		$this->display_nav = $display_nav;
 	}
 
 	protected function column_default( $item, $column_name ) {
@@ -51,6 +53,12 @@ function no_items() {
 		}
 	}
 
+	function display_tablenav( $which ) {
+		if ( $this->display_nav ) {
+			parent::display_tablenav( $which );
+		}
+	}
+
 	/**
 	 * Set columns that should be displayed in table
 	 *

From 7a6ed0d72d191f2ed888ce0cb1648a53da58e1a1 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 26 Jul 2014 02:12:23 +0530
Subject: [PATCH 289/485] Add parameter to disable loading of table columns

---
 classes/class-supportflow-table.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-table.php b/classes/class-supportflow-table.php
index 9da2e70..81bcd13 100644
--- a/classes/class-supportflow-table.php
+++ b/classes/class-supportflow-table.php
@@ -12,17 +12,19 @@
 class SupportFlow_Table extends WP_List_Table {
 	protected $no_item_message;
 	protected $display_nav;
+	protected $display_col_headers;
 
 	/**
 	 * @param string $table_class Class to be used by table
 	 */
-	function __construct( $table_class = '', $display_nav = true ) {
+	function __construct( $table_class = '', $display_nav = true, $display_col_headers = true ) {
 		if ( $table_class ) {
 			parent::__construct( array( 'screen' => 'sf_statistics_table' ) );
 		} else {
 			parent::__construct();
 		}
-		$this->display_nav = $display_nav;
+		$this->display_nav         = $display_nav;
+		$this->display_col_headers = $display_col_headers;
 	}
 
 	protected function column_default( $item, $column_name ) {
@@ -53,6 +55,12 @@ function no_items() {
 		}
 	}
 
+	function print_column_headers( $with_id = true ) {
+		if ( $this->display_col_headers ) {
+			parent::print_column_headers( $with_id );
+		}
+	}
+
 	function display_tablenav( $which ) {
 		if ( $this->display_nav ) {
 			parent::display_tablenav( $which );

From 791f9cf31323823e52d4b0114e06060af0963bb1 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 26 Jul 2014 02:12:56 +0530
Subject: [PATCH 290/485] Add comment explaining parameter to table constructor

---
 classes/class-supportflow-table.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/classes/class-supportflow-table.php b/classes/class-supportflow-table.php
index 81bcd13..5b9f325 100644
--- a/classes/class-supportflow-table.php
+++ b/classes/class-supportflow-table.php
@@ -16,6 +16,8 @@ class SupportFlow_Table extends WP_List_Table {
 
 	/**
 	 * @param string $table_class Class to be used by table
+	 * @param boolean $display_nav Show navigation area on header and footer of table. It is generally an empty area with some height
+	 * @param boolean $display_col_headers Show columns name on header and footer of table
 	 */
 	function __construct( $table_class = '', $display_nav = true, $display_col_headers = true ) {
 		if ( $table_class ) {

From 8c83cda5ebe8b1cd43c11b0ad5359da35bbe3e01 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 26 Jul 2014 02:18:54 +0530
Subject: [PATCH 291/485] Allow empty string to be set as table no item message

---
 classes/class-supportflow-table.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/class-supportflow-table.php b/classes/class-supportflow-table.php
index 5b9f325..3bb0bc1 100644
--- a/classes/class-supportflow-table.php
+++ b/classes/class-supportflow-table.php
@@ -10,7 +10,7 @@
  * Generates a table with minimal options
  */
 class SupportFlow_Table extends WP_List_Table {
-	protected $no_item_message;
+	protected $no_item_message = null;
 	protected $display_nav;
 	protected $display_col_headers;
 
@@ -50,10 +50,10 @@ public function set_no_items( $msg ) {
 	function no_items() {
 		$no_item_message = $this->no_item_message;
 
-		if ( $no_item_message ) {
-			echo $no_item_message;
-		} else {
+		if ( $no_item_message === null ) {
 			parent::no_items();
+		} else {
+			echo $no_item_message;
 		}
 	}
 

From 472f89818b241f3b434013dc190444cbc6919cbc Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 26 Jul 2014 02:23:37 +0530
Subject: [PATCH 292/485] Created a meta box in view ticket page showing agent
 recent tickets

---
 classes/class-supportflow-admin.php | 45 +++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 3ebae35..ac06db9 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -476,12 +476,57 @@ public function action_add_meta_boxes() {
 		add_meta_box( 'supportflow-respondents', __( 'Respondents', 'supportflow' ), array( $this, 'meta_box_respondents' ), SupportFlow()->post_type, 'normal' );
 		add_meta_box( 'supportflow-cc-bcc', __( 'CC and BCC', 'supportflow' ), array( $this, 'meta_box_cc_bcc' ), SupportFlow()->post_type, 'normal' );
 		add_meta_box( 'supportflow-replies', __( 'Replies', 'supportflow' ), array( $this, 'meta_box_replies' ), SupportFlow()->post_type, 'normal' );
+		add_meta_box( 'supportflow-recent-tickets', __( 'My recent tickets', 'supportflow' ), array( $this, 'meta_box_recent_tickets' ), SupportFlow()->post_type, 'side' );
 
 		if ( 'post.php' == $pagenow ) {
 			add_meta_box( 'supportflow-forward_conversation', __( 'Forward this conversation', 'supportflow' ), array( $this, 'meta_box_email_conversation' ), SupportFlow()->post_type, 'side' );
 		}
 	}
 
+	public function meta_box_recent_tickets() {
+		$statuses     = SupportFlow()->post_statuses;
+		$status_slugs = array();
+
+		foreach ( $statuses as $status => $status_data ) {
+			if ( true == $status_data['show_tickets'] ) {
+				$status_slugs[] = $status;
+			}
+		}
+
+		$table = new SupportFlow_Table( '', false, false );
+
+		$args = array(
+			'post_type'   => SupportFlow()->post_type,
+			'post_parent' => 0,
+			'post_status' => $status_slugs,
+			'author'      => get_current_user_id(),
+			'numberposts' => 10,
+		);
+
+		$wp_query = new WP_Query( $args );
+		$tickets  = $wp_query->posts;
+
+		$no_items = __( 'No recent tickets found.', 'supportflow' );
+		$table->set_no_items( $no_items );
+
+		$table->set_columns( array(
+			'title' => __( 'Subject', 'supportflow' ),
+		) );
+
+		$data = array();
+		foreach ( $tickets as $ticket ) {
+			$post_date     = strtotime( $ticket->post_date );
+			$post_modified = strtotime( $ticket->post_modified );
+			$title         = '<b>' . esc_html( $ticket->post_title ) . '</b>';
+			$title         = "<a href='post.php?post=" . $ticket->ID . "&action=edit'>" . $title . "</a>";
+			$data[]        = array(
+				'title' => $title,
+			);
+		}
+		$table->set_data( $data );
+		$table->display();
+	}
+
 	public function meta_box_email_conversation() {
 		?>
 		<p class="description"><?php _e( "Please enter E-Mail address seperated by comma to whom you want to send this conversation.", 'supportflow' ) ?></p>

From 86a5d3a9aaef757f0f27754cfc19725286a0f056 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 26 Jul 2014 02:48:36 +0530
Subject: [PATCH 293/485] Allow basic HTML tags to be inserted into reply

Fixes #127
---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index ac06db9..34eb5a5 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -1131,7 +1131,7 @@ public function action_save_post( $ticket_id ) {
 				}
 			}
 
-			$reply = wp_filter_nohtml_kses( $reply );
+			$reply = wp_kses( $reply, wp_kses_allowed_html( 'data' ) );
 
 			$visibility = ( ! empty( $_POST['mark-private'] ) ) ? 'private' : 'public';
 			if ( ! empty( $_POST['reply-attachments'] ) ) {

From cd3110344f46d4e0bde27701c6a6ff619fee2c06 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 26 Jul 2014 02:55:42 +0530
Subject: [PATCH 294/485] Removed created columns todo comment

It is already done
---
 classes/class-supportflow-admin.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 34eb5a5..c09d320 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -950,8 +950,6 @@ public function display_ticket_replies() {
 
 	/**
 	 * Modifications to the columns appearing in the All Tickets view
-	 *
-	 * @todo maybe add 'Created' column
 	 */
 	public function filter_manage_post_columns( $columns ) {
 

From 431ba63fc6013983f4edfa092c08b2cc7aff75a5 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 26 Jul 2014 03:06:04 +0530
Subject: [PATCH 295/485] [Bug] get_ticket_replies_count() was not overriding
 arguments

---
 supportflow.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index 2f76cc4..8ce80cc 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -662,12 +662,13 @@ public function filter_reply_clauses( $clauses, $query ) {
 	 * @todo support filtering to specific types or replier
 	 */
 	public function get_ticket_replies_count( $ticket_id, $args = array() ) {
-		$args = array(
+		$default_args = array(
 			'posts_per_page' => 1,
 			'post_type'      => $this->post_type,
 			'post_status'    => 'public',
 			'post_parent'    => $ticket_id,
 		);
+		$args = array_merge( $default_args, $args );
 
 		$query = new WP_Query( $args );
 		$count = $query->found_posts;

From 0648cbc5608adf95e007cecb57ee58c388f560fe Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 26 Jul 2014 03:16:22 +0530
Subject: [PATCH 296/485] Corrected coding standards

---
 classes/class-supportflow-admin.php           | 23 +++++----
 classes/class-supportflow-email-accounts.php  | 41 +++++++++++----
 .../class-supportflow-email-notifications.php |  8 +--
 classes/class-supportflow-email-replies.php   |  2 +-
 classes/class-supportflow-json-api.php        |  2 +-
 classes/class-supportflow-permissions.php     | 12 ++---
 classes/class-supportflow-preferences.php     | 18 +++----
 classes/class-supportflow-statistics.php      | 50 ++++++++++++-------
 classes/class-supportflow-table.php           |  4 +-
 css/admin.css                                 | 12 ++---
 js/email_conversation.js                      |  6 +--
 js/predefined-replies.js                      |  8 +--
 js/ticket_attachments.js                      |  8 +--
 js/tickets.js                                 |  8 +--
 supportflow.php                               |  2 +-
 15 files changed, 118 insertions(+), 86 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index c09d320..691325a 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -156,7 +156,7 @@ public function filter_post_updated_messages( $messages ) {
 	 *
 	 */
 	public function filter_views( $views ) {
-		$post_type     = SupportFlow()->post_type;
+		$post_type    = SupportFlow()->post_type;
 		$statuses     = SupportFlow()->post_statuses;
 		$status_slugs = array();
 
@@ -608,7 +608,7 @@ public function meta_box_details() {
 		$notification_label       = 'Default';
 		$notification_label_title = 'Choose default if you want to receive E-Mail notifications based on what you set in `E-Mail notification` page. Choose Enable/Disable if you want to override those settings';
 		$notification_dropdown    = '';
-		$notification_dropdown   .= '<select class="meta-item-dropdown">';
+		$notification_dropdown .= '<select class="meta-item-dropdown">';
 
 		if ( 'post-new.php' == $pagenow ) {
 			$notification_dropdown .= '<option value="default">' . __( 'Default', 'supportflow' ) . '</option>';
@@ -824,8 +824,8 @@ public function meta_box_replies() {
 				__( "What's burning?", 'supportflow' ),
 				__( 'What do you need to get off your chest?', 'supportflow' ),
 			);
-			$rand        = array_rand( $placeholders );
-			$placeholder = $placeholders[$rand];
+			$rand         = array_rand( $placeholders );
+			$placeholder  = $placeholders[$rand];
 		}
 
 		echo '<div class="alignleft"><h4>' . __( 'Conversation', 'supportflow' ) . '</h4></div>';
@@ -1043,9 +1043,9 @@ function action_manage_posts_custom_column( $column_name, $ticket_id ) {
 				echo '<a href="' . esc_url( $filter_link ) . '">' . esc_html( $status_name ) . '</a>';
 				break;
 			case 'email':
-				$email_account_id       = get_post_meta( $ticket_id, 'email_account', true );
-				$email_accounts         = SupportFlow()->extend->email_accounts->get_email_accounts();
-				$args                   = array(
+				$email_account_id = get_post_meta( $ticket_id, 'email_account', true );
+				$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts();
+				$args             = array(
 					'post_type'     => SupportFlow()->post_type,
 					'email_account' => $email_account_id,
 				);
@@ -1083,7 +1083,8 @@ public function is_edit_screen() {
 			return $pagenow;
 		} elseif ( 'post.php' == $pagenow && ! empty( $_GET['action'] ) && 'edit' == $_GET['action'] && ! empty( $_GET['post'] ) ) {
 			$the_post = get_post( absint( $_GET['post'] ) );
-			return (  is_a( $the_post, 'WP_Post' ) && $the_post->post_type == SupportFlow()->post_type ) ? $pagenow : false;
+
+			return ( is_a( $the_post, 'WP_Post' ) && $the_post->post_type == SupportFlow()->post_type ) ? $pagenow : false;
 		} else {
 			return false;
 		}
@@ -1096,8 +1097,8 @@ public function is_edit_screen() {
 	 */
 	public function action_save_post( $ticket_id ) {
 		$email_account_id = get_post_meta( $ticket_id, 'email_account', true );
-		$email_account = SupportFlow()->extend->email_accounts->get_email_account( $email_account_id );
-		$ticket_lock   = ( null == $email_account && '' != $email_account );
+		$email_account    = SupportFlow()->extend->email_accounts->get_email_account( $email_account_id );
+		$ticket_lock      = ( null == $email_account && '' != $email_account );
 
 		if ( SupportFlow()->post_type != get_post_type( $ticket_id ) ) {
 			return;
@@ -1133,7 +1134,7 @@ public function action_save_post( $ticket_id ) {
 
 			$visibility = ( ! empty( $_POST['mark-private'] ) ) ? 'private' : 'public';
 			if ( ! empty( $_POST['reply-attachments'] ) ) {
-				$attachements   = explode( ',', trim( $_POST['reply-attachments'], ',' ) );
+				$attachements = explode( ',', trim( $_POST['reply-attachments'], ',' ) );
 				// Remove non-int attachment ID's from array
 				$attachements   = array_filter( $attachements, function ( $val ) {
 					return (string) (int) $val === (string) $val;
diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 4506752..345a05b 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -30,9 +30,9 @@ function __construct() {
 
 		$existing_email_accounts = & $this->existing_email_accounts;
 		$existing_email_accounts = array();
-		foreach ($email_accounts as $uid => $email_account) {
+		foreach ( $email_accounts as $uid => $email_account ) {
 			if ( ! empty( $email_account ) ) {
-				$existing_email_accounts[ $uid ] = $email_account;
+				$existing_email_accounts[$uid] = $email_account;
 			}
 		}
 	}
@@ -65,7 +65,9 @@ function get_email_accounts( $existing_only = false ) {
 
 	/**
 	 * Return a single E-Mail account
+	 *
 	 * @param integer $id ID of E-Mail account
+	 *
 	 * @return null|array array containing E-Mail account on success else null
 	 */
 	function get_email_account( $id ) {
@@ -218,50 +220,67 @@ public function insert_add_new_account_form() {
 			<?php wp_nonce_field( 'add_email_account' ) ?>
 			<table class="form-table">
 				<tr valign="top">
-					<th scope="row"><label for="imap_host"><?php _e( 'IMAP Host:', 'supportflow' ) ?></label></th>
+					<th scope="row">
+						<label for="imap_host"><?php _e( 'IMAP Host:', 'supportflow' ) ?></label></th>
 					<td>
 						<input type="text" required id="imap_host" name="imap_host" value="<?php echo esc_attr( isset( $_POST['imap_host'] ) ? $_POST['imap_host'] : '' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><label for="imap_ssl"><?php _e( 'IMAP Server supports SSL: ', 'supportflow' ) ?></label></th>
+					<th scope="row">
+						<label for="imap_ssl"><?php _e( 'IMAP Server supports SSL: ', 'supportflow' ) ?></label>
+					</th>
 					<td>
 						<input type="checkbox" id="imap_ssl" name="imap_ssl" <?php echo checked( $imap_ssl_enabled ) ?> />
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><label for="imap_port"><?php _e( 'IMAP Port Number: ', 'supportflow' ) ?></label></th>
+					<th scope="row">
+						<label for="imap_port"><?php _e( 'IMAP Port Number: ', 'supportflow' ) ?></label>
+					</th>
 					<td>
 						<input type="number" required id="imap_port" name="imap_port" value="<?php echo esc_attr( isset( $_POST['imap_port'] ) ? $_POST['imap_port'] : '993' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><label for="smtp_host"><?php _e( 'SMTP Host:', 'supportflow' ) ?></label></th>
+					<th scope="row">
+						<label for="smtp_host"><?php _e( 'SMTP Host:', 'supportflow' ) ?></label>
+					</th>
 					<td>
 						<input type="text" required id="smtp_host" name="smtp_host" value="<?php echo esc_attr( isset( $_POST['smtp_host'] ) ? $_POST['smtp_host'] : '' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><label for="smtp_ssl"><?php _e( 'SMTP Server supports SSL: ', 'supportflow' ) ?></label></th>
+					<th scope="row">
+						<label for="smtp_ssl"><?php _e( 'SMTP Server supports SSL: ', 'supportflow' ) ?></label>
+					</th>
 					<td>
 						<input type="checkbox" id="smtp_ssl" name="smtp_ssl" <?php checked( $smtp_ssl_enabled ) ?> />
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><label for="smtp_port"><?php _e( 'SMTP Port Number: ', 'supportflow' ) ?></label></th>
+					<th scope="row">
+						<label for="smtp_port"><?php _e( 'SMTP Port Number: ', 'supportflow' ) ?></label>
+					</th>
 					<td>
 						<input type="number" required id="smtp_port" name="smtp_port" value="<?php echo esc_attr( isset( $_POST['smtp_port'] ) ? $_POST['smtp_port'] : '465' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><label for="username"><?php _e( 'Username:', 'supportflow' ) ?></label></th>
+					<th scope="row">
+						<label for="username"><?php _e( 'Username:', 'supportflow' ) ?></label>
+					</th>
 					<td>
 						<input type="text" required id="username" name="username" value="<?php echo esc_attr( isset( $_POST['username'] ) ? $_POST['username'] : '' ) ?>" />
 					</td>
 				</tr>
 				<tr valign="top">
-					<th scope="row"><label for="password"><?php _e( 'Password:', 'supportflow' ) ?></label></th>
-					<td><input type="password" required id="password" name="password" /></td>
+					<th scope="row">
+						<label for="password"><?php _e( 'Password:', 'supportflow' ) ?></label>
+					</th>
+					<td>
+						<input type="password" required id="password" name="password" />
+					</td>
 				</tr>
 			</table>
 			<?php submit_button( __( 'Add New Server', 'supportflow' ) ); ?>
diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 12b228a..9e5bfb7 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -61,17 +61,17 @@ public function get_notifications_settings( $user_id = null, $allowed_only = fal
 				$user_permissions = array( 'tags' => $permitted_tags, 'email_accounts' => $permitted_email_accounts );
 				unset( $permitted_tags, $permitted_email_accounts );
 
-			// Allow user to show notifications settings of only tags/E-Mail account he is permitted
+				// Allow user to show notifications settings of only tags/E-Mail account he is permitted
 			} else {
 				$user_permissions = SupportFlow()->extend->permissions->get_user_permissions_data( $user->ID );
 				foreach ( $user_permissions['tags'] as $id => $tag ) {
 					if ( ! in_array( $tag, $tags ) ) {
-						unset ( $user_permissions['tags'][ $id ] );
+						unset ( $user_permissions['tags'][$id] );
 					}
 				}
 				foreach ( $user_permissions['email_accounts'] as $index => $email_account_id ) {
-					if ( ! isset( $email_accounts[ $email_account_id ] ) ) {
-						unset ( $user_permissions['email_accounts'][ $index ] );
+					if ( ! isset( $email_accounts[$email_account_id] ) ) {
+						unset ( $user_permissions['email_accounts'][$index] );
 					}
 				}
 			}
diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index e1c6f5e..0a5f106 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -138,7 +138,7 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 		require_once ABSPATH . 'wp-admin/includes/admin.php';
 
 		$new_attachment_ids = array();
-		$k = 0;
+		$k                  = 0;
 
 		if ( isset( $email->structure->parts ) ) {
 			foreach ( $email->structure->parts as $email_part ) {
diff --git a/classes/class-supportflow-json-api.php b/classes/class-supportflow-json-api.php
index 976b540..237d996 100644
--- a/classes/class-supportflow-json-api.php
+++ b/classes/class-supportflow-json-api.php
@@ -24,7 +24,7 @@ public function action_wp_ajax_supportflow_json() {
 		);
 		switch ( $response['api-action'] ) {
 			case 'get-respondents':
-				$search_for         = sanitize_text_field( isset($_REQUEST['respondents']) ? $_REQUEST['respondents'] : '' );
+				$search_for         = sanitize_text_field( isset( $_REQUEST['respondents'] ) ? $_REQUEST['respondents'] : '' );
 				$respondent_matches = SupportFlow()->get_respondents( array( 'search' => $search_for ) );
 				if ( is_wp_error( $respondent_matches ) ) {
 					$response['message'] = $respondent_matches->get_error_message();
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index bb37101..8bc7724 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -247,7 +247,7 @@ public function show_permissions_table( $user_permissions ) {
 
 	public function get_user_permissions( $user_id, $return_allowed = true, $return_disallowed = true ) {
 		$tags             = get_terms( 'sf_tags', 'hide_empty=0' );
-		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts( true);
+		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 		$permissions      = array();
 		$user_permissions = array();
 
@@ -259,7 +259,7 @@ public function get_user_permissions( $user_id, $return_allowed = true, $return_
 
 		foreach ( $users as $user ) {
 			if ( ! $user->has_cap( 'manage_options' ) ) {
-				$permission = $this->get_user_permissions_data( $user->ID );
+				$permission             = $this->get_user_permissions_data( $user->ID );
 				$permissions[$user->ID] = $permission;
 			}
 		}
@@ -390,7 +390,7 @@ function limit_user_permissions( $allcaps, $cap, $args ) {
 				$allcaps["edit_others_posts"] = true;
 				$allcaps["edit_posts"]        = true;
 
-			// Allow if user is creating new ticket with permitted E-Mail account
+				// Allow if user is creating new ticket with permitted E-Mail account
 			} elseif (
 				'post.php' == $pagenow &&
 				isset ( $_REQUEST['action'], $_REQUEST['post_email_account'] ) &&
@@ -400,7 +400,7 @@ function limit_user_permissions( $allcaps, $cap, $args ) {
 				$allcaps["edit_others_posts"] = true;
 				$allcaps["edit_posts"]        = true;
 
-			// Disallow user access to ticket in other cases
+				// Disallow user access to ticket in other cases
 			} else {
 				$allcaps["edit_others_posts"] = false;
 				$allcaps["edit_posts"]        = false;
@@ -421,11 +421,11 @@ function limit_user_permissions( $allcaps, $cap, $args ) {
 			if ( 'post-new.php' != $pagenow && ( ! empty( $user_permissions['email_accounts'] ) || ! empty( $user_permissions['tags'] ) ) ) {
 				$allcaps["edit_posts"] = true;
 
-			// Allow creating new ticket if user have access to atleast one E-Mail account
+				// Allow creating new ticket if user have access to atleast one E-Mail account
 			} elseif ( 'post-new.php' == $pagenow && ! empty( $user_permissions['email_accounts'] ) ) {
 				$allcaps["edit_posts"] = true;
 
-			// Disallow in other cases
+				// Disallow in other cases
 			} else {
 				$allcaps["edit_posts"] = false;
 			}
diff --git a/classes/class-supportflow-preferences.php b/classes/class-supportflow-preferences.php
index 6d8036e..29fe0de 100644
--- a/classes/class-supportflow-preferences.php
+++ b/classes/class-supportflow-preferences.php
@@ -29,14 +29,14 @@ public function action_admin_menu() {
 	}
 
 	public function enqueue_scripts() {
-		wp_enqueue_script('supportflow-preferences', SupportFlow()->plugin_url . 'js/preferences.js', array( 'jquery' ) );
-		wp_localize_script('supportflow-preferences', 'SFPreferences', array (
-		    'changing_state' => __( 'Changing status, please wait.', 'supportflow' ),
-		    'set_email_notfication_nonce' => wp_create_nonce( 'set_email_notfication' ),
-		    'failed_changing_state' => __( 'Failed changing state. Old state is reverted', 'supportflow' ),
-		    'subscribed' => __( 'Subscribed', 'supportflow' ),
-		    'unsubscribed' => __( 'Unsubscribed', 'supportflow' ),
-		));
+		wp_enqueue_script( 'supportflow-preferences', SupportFlow()->plugin_url . 'js/preferences.js', array( 'jquery' ) );
+		wp_localize_script( 'supportflow-preferences', 'SFPreferences', array(
+			'changing_state'              => __( 'Changing status, please wait.', 'supportflow' ),
+			'set_email_notfication_nonce' => wp_create_nonce( 'set_email_notfication' ),
+			'failed_changing_state'       => __( 'Failed changing state. Old state is reverted', 'supportflow' ),
+			'subscribed'                  => __( 'Subscribed', 'supportflow' ),
+			'unsubscribed'                => __( 'Unsubscribed', 'supportflow' ),
+		) );
 	}
 
 	public function preferences_page() {
@@ -57,7 +57,7 @@ public function user_ticket_signature_page() {
 			'update_signature' == $_POST['action'] &&
 			wp_verify_nonce( $_POST['_wpnonce'], 'update_signature' )
 		) {
-			$signature         = wp_kses( $_POST['update_signature_value'], array() );
+			$signature    = wp_kses( $_POST['update_signature_value'], array() );
 			$sign_updated = true;
 			update_user_meta( get_current_user_id(), 'sf_user_signature', $signature );
 		} else {
diff --git a/classes/class-supportflow-statistics.php b/classes/class-supportflow-statistics.php
index f97693c..31973b9 100644
--- a/classes/class-supportflow-statistics.php
+++ b/classes/class-supportflow-statistics.php
@@ -150,7 +150,7 @@ function insert_js_code() {
 	 */
 	public function show_overall_stats() {
 		$statistics_table = new SupportFlow_Table();
-		$items = array();
+		$items            = array();
 
 		$statistics_table->set_columns( array(
 			'table_date'   => __( 'Date', 'supportflow' ),
@@ -186,7 +186,7 @@ public function show_overall_stats() {
 	 */
 	public function show_tag_stats() {
 		$statistics_table = new SupportFlow_Table();
-		$items = array();
+		$items            = array();
 
 		$statistics_table->set_columns( array(
 			'table_tag'    => __( 'Tag', 'supportflow' ),
@@ -195,7 +195,7 @@ public function show_tag_stats() {
 			'table_closed' => __( 'Closed tickets', 'supportflow' ),
 		) );
 
-		foreach ( get_terms(SupportFlow()->tags_tax, 'hide_empty=0' ) as $tag ) {
+		foreach ( get_terms( SupportFlow()->tags_tax, 'hide_empty=0' ) as $tag ) {
 			$items[] = $this->get_post_data_by_tag( $tag->slug, $tag->slug, $tag->name );
 		}
 
@@ -209,7 +209,7 @@ public function show_tag_stats() {
 	 */
 	public function show_30_days_stats() {
 		$statistics_table = new SupportFlow_Table();
-		$items = array();
+		$items            = array();
 
 		$statistics_table->set_columns( array(
 			'table_date'   => __( 'Date', 'supportflow' ),
@@ -240,7 +240,7 @@ public function show_30_days_stats() {
 	 */
 	public function show_12_month_stats() {
 		$statistics_table = new SupportFlow_Table();
-		$items = array();
+		$items            = array();
 
 		$statistics_table->set_columns( array(
 			'table_date'   => __( 'Date', 'supportflow' ),
@@ -270,7 +270,7 @@ public function show_12_month_stats() {
 	 */
 	public function show_5_year_stats() {
 		$statistics_table = new SupportFlow_Table();
-		$items = array();
+		$items            = array();
 
 		$statistics_table->set_columns( array(
 			'table_date'   => __( 'Date', 'supportflow' ),
@@ -296,9 +296,11 @@ public function show_5_year_stats() {
 
 	/**
 	 * Stats of post created on a particular date
-	 * @param array $post_date Date in format like array('year'=>1994, 'month'=>12, 'day'=>5)
-	 * @param integer $link_date Date in format used in filtering by WP in all tickets page. e.g. 19941205
-	 * @param string $link_value Value to show user of link in table
+	 *
+	 * @param array   $post_date  Date in format like array('year'=>1994, 'month'=>12, 'day'=>5)
+	 * @param integer $link_date  Date in format used in filtering by WP in all tickets page. e.g. 19941205
+	 * @param string  $link_value Value to show user of link in table
+	 *
 	 * @return array Tickets stats created on a particular date. This array is directly usable in table
 	 */
 	function get_post_data_by_date( $post_date = null, $link_date = null, $link_value = null ) {
@@ -314,9 +316,11 @@ function get_post_data_by_date( $post_date = null, $link_date = null, $link_valu
 
 	/**
 	 * Stats of post created of a particular tag
-	 * @param string $post_tag Slug of tag for which you want to get stats for
-	 * @param integer $link_tag Tag in format used in filtering by WP in all tickets page.
-	 * @param string $link_value Value to show user of link in table
+	 *
+	 * @param string  $post_tag   Slug of tag for which you want to get stats for
+	 * @param integer $link_tag   Tag in format used in filtering by WP in all tickets page.
+	 * @param string  $link_value Value to show user of link in table
+	 *
 	 * @return array Tickets stats created for a particular tag. This array is directly usable in table
 	 */
 	function get_post_data_by_tag( $post_tag = null, $link_tag = null, $link_value = null ) {
@@ -332,8 +336,10 @@ function get_post_data_by_tag( $post_tag = null, $link_tag = null, $link_value =
 
 	/**
 	 * Get count of post created on a particular date with particular post status.
+	 *
 	 * @param string $post_status Post status you want to get count. Using `*` to get count of all post statuses
-	 * @param type $date Date in format like array('year'=>1994, 'month'=>12, 'day'=>5)
+	 * @param type   $date        Date in format like array('year'=>1994, 'month'=>12, 'day'=>5)
+	 *
 	 * @return integer Count of posts
 	 */
 	public function get_posts_count_by_date( $post_status = '*', $date = null ) {
@@ -356,8 +362,10 @@ public function get_posts_count_by_date( $post_status = '*', $date = null ) {
 
 	/**
 	 * Get count of post created of a particular tag with particular post status.
+	 *
 	 * @param string $post_status Post status you want to get count. Using `*` to get count of all post statuses
-	 * @param type $tag Slug of tag you want to get count of
+	 * @param type   $tag         Slug of tag you want to get count of
+	 *
 	 * @return integer Count of posts
 	 */
 	public function get_posts_count_by_tag( $post_status = '*', $tag = null ) {
@@ -381,9 +389,11 @@ public function get_posts_count_by_tag( $post_status = '*', $tag = null ) {
 
 	/**
 	 * Generate a link that shows matching tickets in all ticket page
-	 * @param integer $link_date Date in format used in filtering by WP in all tickets page. e.g. 19941205
-	 * @param string $post_status Post statuses that should be shown in all tickets page
-	 * @param string $link_value Value of hyperlink that should be shown to user
+	 *
+	 * @param integer $link_date   Date in format used in filtering by WP in all tickets page. e.g. 19941205
+	 * @param string  $post_status Post statuses that should be shown in all tickets page
+	 * @param string  $link_value  Value of hyperlink that should be shown to user
+	 *
 	 * @return string A hyperlink
 	 */
 	function get_post_link_by_date( $link_date = null, $post_status = null, $link_value = null ) {
@@ -400,9 +410,11 @@ function get_post_link_by_date( $link_date = null, $post_status = null, $link_va
 
 	/**
 	 * Generate a link that shows matching tickets in all ticket page
-	 * @param string $link_tag Slug of tag
+	 *
+	 * @param string $link_tag    Slug of tag
 	 * @param string $post_status Post statuses that should be shown in all tickets page
-	 * @param string $link_value Value of hyperlink that should be shown to user
+	 * @param string $link_value  Value of hyperlink that should be shown to user
+	 *
 	 * @return string A hyperlink
 	 */
 	function get_post_link_by_tag( $link_tag = null, $post_status = null, $link_value = null ) {
diff --git a/classes/class-supportflow-table.php b/classes/class-supportflow-table.php
index 3bb0bc1..d58e068 100644
--- a/classes/class-supportflow-table.php
+++ b/classes/class-supportflow-table.php
@@ -15,8 +15,8 @@ class SupportFlow_Table extends WP_List_Table {
 	protected $display_col_headers;
 
 	/**
-	 * @param string $table_class Class to be used by table
-	 * @param boolean $display_nav Show navigation area on header and footer of table. It is generally an empty area with some height
+	 * @param string  $table_class         Class to be used by table
+	 * @param boolean $display_nav         Show navigation area on header and footer of table. It is generally an empty area with some height
 	 * @param boolean $display_col_headers Show columns name on header and footer of table
 	 */
 	function __construct( $table_class = '', $display_nav = true, $display_col_headers = true ) {
diff --git a/css/admin.css b/css/admin.css
index 0f3bc66..8bef932 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -3,7 +3,7 @@
 }
 
 .respondent_link {
-	white-space: pre;
+	white-space:    pre;
 	vertical-align: top;
 }
 
@@ -91,8 +91,8 @@
 	padding-right:  8px;
 	padding-top:    12px;
 	padding-bottom: 10px;
-	line-height: 100%;
-	height: 1.7em;
+	line-height:    100%;
+	height:         1.7em;
 }
 
 #supportflow-respondents.postbox input {
@@ -180,9 +180,9 @@
 }
 
 #supportflow-replies.postbox ul.ticket-replies li .reply-avatar {
-	float: left;
-	width: 100px;	
-        word-wrap: break-word;
+	float:     left;
+	width:     100px;
+	word-wrap: break-word;
 }
 
 #supportflow-replies.postbox ul.ticket-replies li .reply-author {
diff --git a/js/email_conversation.js b/js/email_conversation.js
index 0295568..de266d9 100644
--- a/js/email_conversation.js
+++ b/js/email_conversation.js
@@ -1,6 +1,6 @@
 jQuery(document).ready(function () {
 	// Send conversation to E-Mail ID's
-	
+
 	var email_conversion = function (event) {
 		event.preventDefault();
 		var email_ids = jQuery('#email_conversation_to').val();
@@ -31,12 +31,12 @@ jQuery(document).ready(function () {
 		});
 
 	}
-	
+
 	jQuery('#email_conversation_submit').click(email_conversion);
 	jQuery('#email_conversation_to').keyup(function () {
 		if (event.keyCode == 10) {
 			email_conversion();
 		}
 	});
-	
+
 });
\ No newline at end of file
diff --git a/js/predefined-replies.js b/js/predefined-replies.js
index 54ae9e4..9d27a37 100644
--- a/js/predefined-replies.js
+++ b/js/predefined-replies.js
@@ -4,20 +4,20 @@ jQuery(document).ready(function () {
 		if (this.old_child == undefined) {
 			this.old_child = 1;
 		}
-		
+
 		// New selection of combo box
 		new_content = jQuery('#predefs').find('option:selected').data('content');
-		
+
 		// Previous selection of combo box
 		old_content = jQuery('.predef:nth-child(' + this.old_child + ')').data('content');
-		
+
 		// Current value of reply text box
 		current_content = jQuery('#reply').val();
 
 		if (0 == new_content.length) {
 			return;
 		}
-		
+
 		// Show confirmation message if reply box content is manually changed by user
 		if (current_content != old_content) {
 			if (false == window.confirm(SFPredefinedReplies.message)) {
diff --git a/js/ticket_attachments.js b/js/ticket_attachments.js
index 42483ba..1f6a8a8 100644
--- a/js/ticket_attachments.js
+++ b/js/ticket_attachments.js
@@ -19,9 +19,9 @@ jQuery(document).ready(function ($) {
 			frame.on('close', function () {
 				var attachments = frame.state().get('selection').toJSON();
 				jQuery.each(attachments, function () {
-					var attachment_download_link = '<a class="reply-attachment-link" target="_blank" href="' + _.escape(this.url) + '">' +  _.escape(this.filename) + '</a>';
-					var attachment_remove_link   = '<a class="reply-attachment-remove delete" href="#" data-attachment-id=' + _.escape(this.id) + ' >' + SFTicketAttachments.remove_attachment + '</a>';
-					jQuery('#replies-attachments-list').append('<li id="media-items" class="reply-attachment">' +  attachment_download_link + '&nbsp;' + attachment_remove_link + '</li>');
+					var attachment_download_link = '<a class="reply-attachment-link" target="_blank" href="' + _.escape(this.url) + '">' + _.escape(this.filename) + '</a>';
+					var attachment_remove_link = '<a class="reply-attachment-remove delete" href="#" data-attachment-id=' + _.escape(this.id) + ' >' + SFTicketAttachments.remove_attachment + '</a>';
+					jQuery('#replies-attachments-list').append('<li id="media-items" class="reply-attachment">' + attachment_download_link + '&nbsp;' + attachment_remove_link + '</li>');
 					jQuery('#reply-attachments').val(jQuery('#reply-attachments').val() + _.escape(this.id) + ',');
 				});
 			});
@@ -38,7 +38,7 @@ jQuery(document).ready(function ($) {
 
 				// Remove attachment ID from hidden input box
 				$('#reply-attachments').val(reply_attachments)
-				
+
 				// Remove attachment from attachment list
 				$(this).closest('.reply-attachment').remove();
 			}
diff --git a/js/tickets.js b/js/tickets.js
index 57c496f..cc30670 100644
--- a/js/tickets.js
+++ b/js/tickets.js
@@ -29,11 +29,11 @@ jQuery(document).ready(function () {
 			return;
 		}
 	});
-	
+
 	// Submit post if user pressed Ctrl+Enter in reply content box
 	jQuery('#reply').keypress(function (event) {
-	    if (event.ctrlKey && event.keyCode == 10 && $(this).val() != '') {
-		$('#post').submit();
-	    }
+		if (event.ctrlKey && event.keyCode == 10 && $(this).val() != '') {
+			$('#post').submit();
+		}
 	});
 });
diff --git a/supportflow.php b/supportflow.php
index 8ce80cc..e9252f7 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -668,7 +668,7 @@ public function get_ticket_replies_count( $ticket_id, $args = array() ) {
 			'post_status'    => 'public',
 			'post_parent'    => $ticket_id,
 		);
-		$args = array_merge( $default_args, $args );
+		$args         = array_merge( $default_args, $args );
 
 		$query = new WP_Query( $args );
 		$count = $query->found_posts;

From 79d687932edc1fb2bb75e46ac2b3777bd68f3e89 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 31 Jul 2014 14:02:29 +0530
Subject: [PATCH 297/485] get_ticket_respondents() allow retrieving slug of
 E-Mails

---
 supportflow.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/supportflow.php b/supportflow.php
index e9252f7..1c54552 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -560,6 +560,10 @@ public function get_ticket_respondents( $ticket_id, $args = array() ) {
 			foreach ( $raw_respondents as $raw_respondent ) {
 				$respondents[] = $raw_respondent->name;
 			}
+		} elseif ( 'slugs' == $args['fields'] ) {
+			foreach ( $raw_respondents as $raw_respondent ) {
+				$respondents[] = $raw_respondent->slug;
+			}
 		}
 
 		return $respondents;

From 6533c559adc85bc6b252b902a4da4d1089ac37e1 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 31 Jul 2014 15:23:15 +0530
Subject: [PATCH 298/485] Added meta box to show recent tickets by ticket
 respondents

It replace an earlier meta box which displays other ticket owned by logged
in agent
---
 classes/class-supportflow-admin.php | 35 ++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 691325a..1e5e719 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -476,14 +476,15 @@ public function action_add_meta_boxes() {
 		add_meta_box( 'supportflow-respondents', __( 'Respondents', 'supportflow' ), array( $this, 'meta_box_respondents' ), SupportFlow()->post_type, 'normal' );
 		add_meta_box( 'supportflow-cc-bcc', __( 'CC and BCC', 'supportflow' ), array( $this, 'meta_box_cc_bcc' ), SupportFlow()->post_type, 'normal' );
 		add_meta_box( 'supportflow-replies', __( 'Replies', 'supportflow' ), array( $this, 'meta_box_replies' ), SupportFlow()->post_type, 'normal' );
-		add_meta_box( 'supportflow-recent-tickets', __( 'My recent tickets', 'supportflow' ), array( $this, 'meta_box_recent_tickets' ), SupportFlow()->post_type, 'side' );
 
 		if ( 'post.php' == $pagenow ) {
+			add_meta_box( 'supportflow-other-respondents-tickets', __( 'Other tickets', 'supportflow' ), array( $this, 'meta_box_other_respondents_tickets' ), SupportFlow()->post_type, 'side' );
 			add_meta_box( 'supportflow-forward_conversation', __( 'Forward this conversation', 'supportflow' ), array( $this, 'meta_box_email_conversation' ), SupportFlow()->post_type, 'side' );
 		}
 	}
 
-	public function meta_box_recent_tickets() {
+	public function meta_box_other_respondents_tickets() {
+		$ticket_respondents = SupportFlow()->get_ticket_respondents( get_the_ID(), array( 'fields' => 'slugs' ) );
 		$statuses     = SupportFlow()->post_statuses;
 		$status_slugs = array();
 
@@ -495,16 +496,28 @@ public function meta_box_recent_tickets() {
 
 		$table = new SupportFlow_Table( '', false, false );
 
-		$args = array(
-			'post_type'   => SupportFlow()->post_type,
-			'post_parent' => 0,
-			'post_status' => $status_slugs,
-			'author'      => get_current_user_id(),
-			'numberposts' => 10,
-		);
+		if ( empty( $ticket_respondents ) ) {
+			$tickets = array();
 
-		$wp_query = new WP_Query( $args );
-		$tickets  = $wp_query->posts;
+		} else {
+			$args = array(
+				'post_type'    => SupportFlow()->post_type,
+				'post_parent'  => 0,
+				'post_status'  => $status_slugs,
+				'numberposts'  => 10,
+				'post__not_in' => array( get_the_id() ),
+				'tax_query'    => array(
+					array(
+						'taxonomy' => SupportFlow()->respondents_tax,
+						'field'    => 'slug',
+						'terms'    => $ticket_respondents,
+					),
+				),
+			);
+
+			$wp_query = new WP_Query( $args );
+			$tickets  = $wp_query->posts;
+		}
 
 		$no_items = __( 'No recent tickets found.', 'supportflow' );
 		$table->set_no_items( $no_items );

From 4ad724a7ebb3b734dd306e35974bfa6c49568701 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 31 Jul 2014 16:17:43 +0530
Subject: [PATCH 299/485] Using unique HTML ID for both save buttons

---
 classes/class-supportflow-admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 1e5e719..fed6d78 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -748,7 +748,7 @@ public function meta_box_details() {
 
 		<div id="major-publishing-actions">
 			<div id="publishing-action">
-				<?php submit_button( $submit_text, 'save-button primary', 'save', false ); ?>
+				<?php submit_button( $submit_text, 'save-button primary', 'update-ticket', false ); ?>
 			</div>
 			<div class="clear"></div>
 		</div>
@@ -873,7 +873,7 @@ public function meta_box_replies() {
 		} else {
 			$submit_text = __( 'Send Message', 'supportflow' );
 		}
-		submit_button( $submit_text, 'primary save-button', 'save', false, $submit_attr_array );
+		submit_button( $submit_text, 'primary save-button', 'insert-reply', false, $submit_attr_array );
 		echo '</div>';
 		echo '</div>';
 

From 0539253b74d2fd6850ad676b85d0e9ff20dde9d0 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 31 Jul 2014 16:23:47 +0530
Subject: [PATCH 300/485] Toggle submit button label on adding private note

It toggles between "Send Message" and "Add private note"
---
 classes/class-supportflow-admin.php |  3 +++
 js/tickets.js                       | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index fed6d78..bc8ee8c 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -81,6 +81,9 @@ public function action_admin_enqueue_scripts() {
 			wp_localize_script( 'supportflow-tickets', 'SFTickets', array(
 				'no_title_msg'      => __( 'You must need to specify the subject of the ticket', 'supportpress' ),
 				'no_respondent_msg' => __( 'You must need to add atleast one ticket respondent', 'supportpress' ),
+				'pagenow'           => $pagenow,
+				'send_msg'          => __( 'Send Message', 'supportflow' ),
+				'add_private_note'  => __( 'Add Private Note', 'supportflow' ),
 			) );
 		}
 
diff --git a/js/tickets.js b/js/tickets.js
index cc30670..77adc6e 100644
--- a/js/tickets.js
+++ b/js/tickets.js
@@ -36,4 +36,15 @@ jQuery(document).ready(function () {
 			$('#post').submit();
 		}
 	});
+
+	// Toggle submit button text (Send Message/Add private note)
+	jQuery('#mark-private').change(function () {
+		if ('post.php' == SFTickets.pagenow) {
+			if (jQuery('#mark-private').prop('checked')) {
+				jQuery('#insert-reply').val(SFTickets.add_private_note);
+			} else {
+				jQuery('#insert-reply').val(SFTickets.send_msg);
+			}
+		}
+	});
 });

From dde8937f3d657486d5f8989d12bf837d411cf7b9 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 1 Aug 2014 14:04:26 +0530
Subject: [PATCH 301/485] Added ticket status column to recent tickets by
 respondents meta box

---
 classes/class-supportflow-admin.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index bc8ee8c..b853504 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -526,7 +526,8 @@ public function meta_box_other_respondents_tickets() {
 		$table->set_no_items( $no_items );
 
 		$table->set_columns( array(
-			'title' => __( 'Subject', 'supportflow' ),
+			'title'  => __( 'Subject', 'supportflow' ),
+			'status' => __( 'Status', 'supportflow' ),
 		) );
 
 		$data = array();
@@ -536,7 +537,8 @@ public function meta_box_other_respondents_tickets() {
 			$title         = '<b>' . esc_html( $ticket->post_title ) . '</b>';
 			$title         = "<a href='post.php?post=" . $ticket->ID . "&action=edit'>" . $title . "</a>";
 			$data[]        = array(
-				'title' => $title,
+				'title'  => $title,
+				'status' => $statuses[$ticket->post_status]['label'],
 			);
 		}
 		$table->set_data( $data );

From b25f141398c1cf8fd1f7f6dbcae5717138edd76a Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 1 Aug 2014 18:12:48 +0530
Subject: [PATCH 302/485] Add a link to close ticket in details meta box

Fixes #157
---
 classes/class-supportflow-admin.php |  6 ++++++
 js/tickets.js                       | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index b853504..a201904 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -654,6 +654,7 @@ public function meta_box_details() {
 
 		$notification_dropdown .= '</select>';
 
+		$close_ticket_label = __( 'Close ticket', 'supportflow' );
 
 		// Get submit button label
 		if ( 'post-new.php' == $pagenow ) {
@@ -752,6 +753,11 @@ public function meta_box_details() {
 		</div>
 
 		<div id="major-publishing-actions">
+		<?php if ( 'post.php' == $pagenow ) : ?>
+			<div id="delete-action">
+				<a class="submitdelete deletion" id="close-ticket-link" href="#"><?php echo $close_ticket_label ?></a>
+			</div>
+		<?php endif; ?>
 			<div id="publishing-action">
 				<?php submit_button( $submit_text, 'save-button primary', 'update-ticket', false ); ?>
 			</div>
diff --git a/js/tickets.js b/js/tickets.js
index 77adc6e..cf1b439 100644
--- a/js/tickets.js
+++ b/js/tickets.js
@@ -47,4 +47,23 @@ jQuery(document).ready(function () {
 			}
 		}
 	});
+
+	// Close ticket wehen close ticket link is clicked
+	jQuery('#close-ticket-link').click(function (event) {
+		event.preventDefault();
+
+		var form = '';
+		form += '<form name="post" action="post.php" method="post" id="close_ticket_form">';
+
+		form += '<input type="hidden" name="_wpnonce" value="' + jQuery('#post #_wpnonce').val() + '" />';
+		form += '<input type="hidden" name="_wp_http_referer" value="' + jQuery("#post input[name='_wp_http_referer']").val() + '" />';
+		form += '<input type="hidden" name="action" value="editpost" />';
+		form += '<input type="hidden" name="post_ID" value="' + jQuery('#post #post_ID').val() + '" />';
+		form += '<input type="hidden" name="post_status" value="sf_closed" />';
+
+		form += '</form>';
+
+		jQuery('body').append(form);
+		jQuery('#close_ticket_form').submit();
+	});
 });

From 1e285bb70d29f7cda4d1719cdd7b67ca7f44f6c4 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 1 Aug 2014 18:24:28 +0530
Subject: [PATCH 303/485] Adding a missing echo

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index a201904..90440cf 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -739,7 +739,7 @@ public function meta_box_details() {
 					<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
 						<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
 					</a>
-					<input name="post_email_notifications_override" class="meta-item-name" value="<?php $notification_id ?>" type="hidden" />
+					<input name="post_email_notifications_override" class="meta-item-name" value="<?php echo $notification_id ?>" type="hidden" />
 
 					<div class="meta-item-toggle-content hide-if-js">
 						<?php echo $notification_dropdown ?>

From 939d16708385f050e64c722ee0112aede3be9215 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 1 Aug 2014 19:39:49 +0530
Subject: [PATCH 304/485] Set focus to unfilled box when checking if they are
 filled

---
 js/tickets.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/js/tickets.js b/js/tickets.js
index cf1b439..a41c3b0 100644
--- a/js/tickets.js
+++ b/js/tickets.js
@@ -19,11 +19,13 @@ jQuery(document).ready(function () {
 	// Require title and atleast respondent before saving a ticket
 	jQuery('.save-button').click(function (event) {
 		if ('' == jQuery('#subject').val()) {
+			jQuery('#subject').focus();
 			alert(SFTickets.no_title_msg);
 			event.preventDefault();
 			return;
 		}
 		if ('' == jQuery('#respondents').val()) {
+			jQuery('#respondents').focus();
 			alert(SFTickets.no_respondent_msg);
 			event.preventDefault();
 			return;

From 67a7d7d5f88c7f459804681cacb42e87b1263536 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 1 Aug 2014 22:12:04 +0530
Subject: [PATCH 305/485] [Bug] Unassigned thread owner change automatically

Fixes #152
---
 classes/class-supportflow-admin.php | 6 ++++++
 supportflow.php                     | 9 +++++++++
 2 files changed, 15 insertions(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 90440cf..fe26cd3 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -583,6 +583,12 @@ public function meta_box_details() {
 
 		// Get post authors
 		$post_author_id = get_post( get_the_ID() )->post_author;
+
+		// WP change owner to current user if $post_author_id is 0 (returned when ticket is unassigned)
+		if ( 0 == $post_author_id ) {
+			$post_author_id = - 1;
+		}
+
 		if ( 0 < $post_author_id ) {
 			$post_author_label = get_userdata( $post_author_id )->data->user_nicename;
 		} else {
diff --git a/supportflow.php b/supportflow.php
index 1c54552..f6ccb2c 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -261,6 +261,8 @@ private function setup_actions() {
 		add_action( 'init', array( $this, 'action_init_register_taxonomies' ) );
 		add_action( 'init', array( $this, 'action_init_register_post_statuses' ) );
 
+		add_filter( 'wp_insert_post_data', array( $this, 'filter_wp_insert_post_data' ), 10, 2 );
+
 		do_action_ref_array( 'supportflow_after_setup_actions', array( &$this ) );
 	}
 
@@ -353,6 +355,13 @@ public function action_init_register_post_statuses() {
 		}
 	}
 
+	public function filter_wp_insert_post_data($data, $postarr) {
+		if ( 0 == $postarr['post_author'] ) {
+			$data['post_author'] = 0;
+		}
+		return $data;
+	}
+
 	/** Helper Functions ******************************************************/
 
 	/**

From f3b954f8b2c316f52772f4d7d0455a83d231fabb Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 4 Aug 2014 16:13:18 +0530
Subject: [PATCH 306/485] Allowing inserstion of <code> in reply

Also enabled sanitizing E-Mail reply content
---
 classes/class-supportflow-admin.php         | 6 +++++-
 classes/class-supportflow-email-replies.php | 7 +++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index fe26cd3..79ca4fa 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -1160,7 +1160,11 @@ public function action_save_post( $ticket_id ) {
 				}
 			}
 
-			$reply = wp_kses( $reply, wp_kses_allowed_html( 'data' ) );
+			$reply = preg_replace_callback( '~<code>(.*?)</code>~is', function ( $arr ) {
+				return '<code>' . esc_html( $arr[1] ) . '</code>';
+			}, $reply );
+
+			$reply = wp_kses( $reply, wp_kses_allowed_html( 'post' ) );
 
 			$visibility = ( ! empty( $_POST['mark-private'] ) ) ? 'private' : 'public';
 			if ( ! empty( $_POST['reply-attachments'] ) ) {
diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 0a5f106..c5c6c9c 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -231,6 +231,13 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 		}
 		$respondents[] = $reply_author_email;
 
+		$message = preg_replace_callback( '~<code>(.*?)</code>~is', function ( $arr ) {
+			return '<code>' . esc_html( $arr[1] ) . '</code>';
+
+		}, $reply );
+
+		$message = wp_kses( $message, wp_kses_allowed_html( 'post' ) );
+
 		if ( $ticket_id ) {
 			$reply_args = array(
 				'reply_author'       => $reply_author,

From 33f8437f3a1432af4b8b5e6fe00d9b109e0e9d4b Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 4 Aug 2014 16:18:04 +0530
Subject: [PATCH 307/485] Set E-Mails content type to HTML to display HTML in
 them

---
 classes/class-supportflow-emails.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 88459fe..5728b07 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -86,7 +86,7 @@ public function notify_agents_ticket_replies( $reply_id ) {
 
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $ticket->ID, 'agent' );
 
-		self::mail( $agent_emails, $subject, $message, '', $attachments, $smtp_account );
+		self::mail( $agent_emails, $subject, $message,  'Content-Type: text/html', $attachments, $smtp_account );
 	}
 
 	/**
@@ -128,7 +128,7 @@ public function notify_respondents_ticket_replies( $reply_id, $cc = array(), $bc
 		$message = stripslashes( $reply->post_content );
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $ticket->ID, 'respondent' );
 
-		$headers = '';
+		$headers =  "Content-Type: text/html\r\n";
 
 		if ( is_array( $cc ) && ! empty( $cc ) ) {
 			$headers .= "Cc: " . implode( ', ', $cc ) . "\r\n";

From a43e940c8ea0de04fba6d5221d480206470f7eec Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 4 Aug 2014 17:48:10 +0530
Subject: [PATCH 308/485] Updated readme

Add more content to it
---
 readme.txt | 39 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index e57b892..58a6029 100644
--- a/readme.txt
+++ b/readme.txt
@@ -6,7 +6,44 @@ Stable tag: 0.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
-SupportFlow is a web based help desk support software. It allows agents to reply or create new tickets using web interface.
+SupportFlow is a web based help desk software. It allows teams to manage support tickets using a web interface.
+
+== Description ==
+SupportFlow is a web based help desk software. SupportFlow is a web based help desk software. It allows teams to manage support tickets using a web interface.
+
+###Few of its features are:
+
++ Allow agents to create/reply tickets using web interface.
+
++ Customers can create ticket by sending an E-Mail or filling a web based form.
+
++ Agents can opt to get E-Mail notifications of replies of tickets.
+
++ Administrator can limit agents access to particular tags.
+
++ Administrators can see daily/weekly/monthly ticket statistics.
+
++ Agents can view tickets assigned to them in admin dashboard.
+
++ Agents can insert predefined replies to the tickets.
+
++ Agents can add their signature to tickets using one-click.
+
++ Agents can forward whole conversation to anyone using its E-Mail ID.
+
+To contribute to SupportFlow visit [github] (http://github.com/SupportFlow/supportflow/).
+
+== Installation ==
+1. Install SupportFlow either via the WordPress.org plugin directory, or by uploading the files to your server and activate it.
+
+2. After activating open E-Mail accounts page in SupportFlow menu and add an E-Mail account you wish to use with SupportFlow.
+
+Now you are ready to use SupportFlow.
+
+== Frequently Asked Questions ==
+###How can I insert a SupportFlow contact form in my site.
+
+Just add **[supportflow_submissionform]** shortcode to the post you want to add SupportFlow form to.
 
 == Changelog ==
 

From b4c334599326afc9c0685b1a59ee0d1a0a200be0 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 00:50:02 +0530
Subject: [PATCH 309/485] Using create_function to create anonymous function

Earlier it directly created anonymous function which were unsupported in
PHP 5.2
---
 classes/class-supportflow-admin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 79ca4fa..2fe4e46 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -1160,9 +1160,9 @@ public function action_save_post( $ticket_id ) {
 				}
 			}
 
-			$reply = preg_replace_callback( '~<code>(.*?)</code>~is', function ( $arr ) {
-				return '<code>' . esc_html( $arr[1] ) . '</code>';
-			}, $reply );
+			$reply = preg_replace_callback( '~<code>(.*?)</code>~is', create_function( '$arr',
+				'return "<code>" . esc_html( $arr[1] ) . "</code>";'
+			), $reply );
 
 			$reply = wp_kses( $reply, wp_kses_allowed_html( 'post' ) );
 

From 0ea828ea8b4e985b04a764dc17d9502125356268 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 00:52:36 +0530
Subject: [PATCH 310/485] Using a function to sanitize ticket reply

This is to increase code reuse
---
 classes/class-supportflow-admin.php         |  6 +-----
 classes/class-supportflow-email-replies.php |  7 +------
 supportflow.php                             | 11 +++++++++++
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 2fe4e46..872bdb5 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -1160,11 +1160,7 @@ public function action_save_post( $ticket_id ) {
 				}
 			}
 
-			$reply = preg_replace_callback( '~<code>(.*?)</code>~is', create_function( '$arr',
-				'return "<code>" . esc_html( $arr[1] ) . "</code>";'
-			), $reply );
-
-			$reply = wp_kses( $reply, wp_kses_allowed_html( 'post' ) );
+			$reply = SupportFlow()->sanitize_ticket_reply( $reply );
 
 			$visibility = ( ! empty( $_POST['mark-private'] ) ) ? 'private' : 'public';
 			if ( ! empty( $_POST['reply-attachments'] ) ) {
diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index c5c6c9c..2365522 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -231,12 +231,7 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 		}
 		$respondents[] = $reply_author_email;
 
-		$message = preg_replace_callback( '~<code>(.*?)</code>~is', function ( $arr ) {
-			return '<code>' . esc_html( $arr[1] ) . '</code>';
-
-		}, $reply );
-
-		$message = wp_kses( $message, wp_kses_allowed_html( 'post' ) );
+		$message = SupportFlow()->sanitize_ticket_reply( $message );
 
 		if ( $ticket_id ) {
 			$reply_args = array(
diff --git a/supportflow.php b/supportflow.php
index f6ccb2c..daea1d5 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -823,6 +823,17 @@ public function extract_email_ids( $string, & $invalid_email_ids = array() ) {
 
 		return $emails;
 	}
+
+	public function sanitize_ticket_reply( $reply ) {
+		$reply = preg_replace_callback( '~<code>(.*?)</code>~is', create_function( '$arr',
+			'return "<code>" . esc_html( $arr[1] ) . "</code>";'
+		), $reply );
+
+		$reply = wp_kses( $reply, wp_kses_allowed_html( 'post' ) );
+
+		return $reply;
+	}
+
 }
 
 /**

From 84a84a2511e632a98518255633aa653245d18a27 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 00:53:53 +0530
Subject: [PATCH 311/485] Corrected grammer in readme file

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 58a6029..f67e28d 100644
--- a/readme.txt
+++ b/readme.txt
@@ -11,7 +11,7 @@ SupportFlow is a web based help desk software. It allows teams to manage support
 == Description ==
 SupportFlow is a web based help desk software. SupportFlow is a web based help desk software. It allows teams to manage support tickets using a web interface.
 
-###Few of its features are:
+###A few of its features are:
 
 + Allow agents to create/reply tickets using web interface.
 

From 025b0da32c799a94f65ce9b164c1dc5a1a71c96e Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 01:42:36 +0530
Subject: [PATCH 312/485] Add documentation to sanitize_ticket_reply($reply)
 method

---
 supportflow.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/supportflow.php b/supportflow.php
index daea1d5..c90abe2 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -824,6 +824,13 @@ public function extract_email_ids( $string, & $invalid_email_ids = array() ) {
 		return $emails;
 	}
 
+	/**
+	 * Sanitize reply content. It allows basic HTML tag like <a>, <b>,...
+	 * Apart from this allow embedding code using <code> tag
+	 *
+	 * @param string $reply Reply to be sanitized
+	 * @return string Sanitized reply
+	 */
 	public function sanitize_ticket_reply( $reply ) {
 		$reply = preg_replace_callback( '~<code>(.*?)</code>~is', create_function( '$arr',
 			'return "<code>" . esc_html( $arr[1] ) . "</code>";'

From dbd270194193bf2186850bf5a49fc9110e148b8b Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 02:16:18 +0530
Subject: [PATCH 313/485] Submitting full form data while click close ticket
 link(button)

It is now displayed as button instead of link
Apart from this it is not displayed if ticket is already  closed
---
 classes/class-supportflow-admin.php |  5 ++---
 js/tickets.js                       | 20 +++-----------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 872bdb5..6a1d82a 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -580,7 +580,6 @@ public function meta_box_details() {
 
 		$current_status_label = $post_statuses[$current_status_id]['label'];
 
-
 		// Get post authors
 		$post_author_id = get_post( get_the_ID() )->post_author;
 
@@ -759,9 +758,9 @@ public function meta_box_details() {
 		</div>
 
 		<div id="major-publishing-actions">
-		<?php if ( 'post.php' == $pagenow ) : ?>
+		<?php if ( 'post.php' == $pagenow && $current_status_id != 'sf_closed' ) : ?>
 			<div id="delete-action">
-				<a class="submitdelete deletion" id="close-ticket-link" href="#"><?php echo $close_ticket_label ?></a>
+				<?php submit_button( $close_ticket_label, '', 'close-ticket-submit', false, array( 'id' => 'close-ticket-submit' ) ); ?>
 			</div>
 		<?php endif; ?>
 			<div id="publishing-action">
diff --git a/js/tickets.js b/js/tickets.js
index a41c3b0..0cbd529 100644
--- a/js/tickets.js
+++ b/js/tickets.js
@@ -50,22 +50,8 @@ jQuery(document).ready(function () {
 		}
 	});
 
-	// Close ticket wehen close ticket link is clicked
-	jQuery('#close-ticket-link').click(function (event) {
-		event.preventDefault();
-
-		var form = '';
-		form += '<form name="post" action="post.php" method="post" id="close_ticket_form">';
-
-		form += '<input type="hidden" name="_wpnonce" value="' + jQuery('#post #_wpnonce').val() + '" />';
-		form += '<input type="hidden" name="_wp_http_referer" value="' + jQuery("#post input[name='_wp_http_referer']").val() + '" />';
-		form += '<input type="hidden" name="action" value="editpost" />';
-		form += '<input type="hidden" name="post_ID" value="' + jQuery('#post #post_ID').val() + '" />';
-		form += '<input type="hidden" name="post_status" value="sf_closed" />';
-
-		form += '</form>';
-
-		jQuery('body').append(form);
-		jQuery('#close_ticket_form').submit();
+	// Close ticket wehen close ticket button is submitted
+	jQuery('#close-ticket-submit').click(function (event) {
+		jQuery("#post meta-item input[name='post_status']").val('sf_closed');
 	});
 });

From b9e75abb87eee00d6e12b65e41b3b513fcbe879e Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 04:48:40 +0530
Subject: [PATCH 314/485] Renamed "Other tickets" meta box title to "User's
 Recent Tickets"

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 6a1d82a..c323a07 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -481,7 +481,7 @@ public function action_add_meta_boxes() {
 		add_meta_box( 'supportflow-replies', __( 'Replies', 'supportflow' ), array( $this, 'meta_box_replies' ), SupportFlow()->post_type, 'normal' );
 
 		if ( 'post.php' == $pagenow ) {
-			add_meta_box( 'supportflow-other-respondents-tickets', __( 'Other tickets', 'supportflow' ), array( $this, 'meta_box_other_respondents_tickets' ), SupportFlow()->post_type, 'side' );
+			add_meta_box( 'supportflow-other-respondents-tickets', __( 'User\'s Recent Tickets', 'supportflow' ), array( $this, 'meta_box_other_respondents_tickets' ), SupportFlow()->post_type, 'side' );
 			add_meta_box( 'supportflow-forward_conversation', __( 'Forward this conversation', 'supportflow' ), array( $this, 'meta_box_email_conversation' ), SupportFlow()->post_type, 'side' );
 		}
 	}

From a40c4ec6ab9bf1b16fc309ec8d25c53c88fdcd44 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 04:56:30 +0530
Subject: [PATCH 315/485] Show ticket of all post_statuses in "User recent
 tickets" table

---
 classes/class-supportflow-admin.php | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index c323a07..69eb6f9 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -489,13 +489,7 @@ public function action_add_meta_boxes() {
 	public function meta_box_other_respondents_tickets() {
 		$ticket_respondents = SupportFlow()->get_ticket_respondents( get_the_ID(), array( 'fields' => 'slugs' ) );
 		$statuses     = SupportFlow()->post_statuses;
-		$status_slugs = array();
-
-		foreach ( $statuses as $status => $status_data ) {
-			if ( true == $status_data['show_tickets'] ) {
-				$status_slugs[] = $status;
-			}
-		}
+		$status_slugs = array_keys($statuses);
 
 		$table = new SupportFlow_Table( '', false, false );
 

From 0ff7baed965c76dd2e83d1286325272f55af6e07 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 6 Aug 2014 16:55:14 +0530
Subject: [PATCH 316/485] Moved inline JS in PHP files to external files

---
 classes/class-supportflow-email-accounts.php | 58 ++++---------
 classes/class-supportflow-permissions.php    | 86 +++++---------------
 classes/class-supportflow-statistics.php     | 44 +++-------
 js/email_accounts.js                         | 43 ++++++++++
 js/permissions.js                            | 64 +++++++++++++++
 js/statistics.js                             | 24 ++++++
 6 files changed, 178 insertions(+), 141 deletions(-)
 create mode 100644 js/email_accounts.js
 create mode 100644 js/permissions.js
 create mode 100644 js/statistics.js

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 345a05b..2144cc3 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -95,7 +95,7 @@ function settings_page() {
 
 		echo '</div>';
 
-		$this->insert_js_code();
+		$this->enqueue_script();
 	}
 
 	/*
@@ -289,52 +289,22 @@ public function insert_add_new_account_form() {
 	}
 
 	/*
-	 * Insert JS code required for form submission
+	 * Enqueue JS code required for form submission
 	 */
-	public function insert_js_code() {
-		$msg_title   = __( 'Are you sure want to delete this account?', 'supportflow' );
-		$form_action = "edit.php?post_type=" . SupportFlow()->post_type . "&page=" . $this->slug;
-		?>
-		<script type="text/javascript">
-			jQuery('.delete_email_account').click(function (e) {
-				e.preventDefault();
-				if (!confirm('<?php echo $msg_title ?>')) {
-					return;
-				}
-
-				var account_key = jQuery(this).data('account-id');
-				var form = '<form method="POST" id="remove_email_account" action="<?php echo $form_action ?>">' +
-					'<input type="hidden" name="action" value="delete" />' +
-					'<?php wp_nonce_field( 'delete_email_account'  ) ?>' +
-					'<input type="hidden" name="account_id" value=' + account_key + ' />' +
-					'</form>';
-
-				jQuery('body').append(form);
-				jQuery('#remove_email_account').submit();
-			});
-
+	public function enqueue_script() {
+		wp_enqueue_script(
+			'supportflow-email_accounts',
+			SupportFlow()->plugin_url . 'js/email_accounts.js',
+			array( 'jquery' )
+		);
 
-			jQuery('#add_new_email_account #imap_ssl').change(function () {
-				if (this.checked) {
-					// Change to default IMAP SSL port on enabling SSL
-					jQuery('#add_new_email_account #imap_port').val('993');
-				} else {
-					// Change to default IMAP non-SSL port on disabling SSL
-					jQuery('#add_new_email_account #imap_port').val('143');
-				}
-			});
+		wp_localize_script( 'supportflow-email_accounts', 'SFEmailAccounts', array(
+			'sure_delete_account'        => __( 'Are you sure want to delete this account?', 'supportflow' ),
+			'post_type'                  => SupportFlow()->post_type,
+			'slug'                       => $this->slug,
+			'delete_email_account_nonce' => wp_nonce_field( 'delete_email_account', '_wpnonce', true, false ),
 
-			jQuery('#add_new_email_account #smtp_ssl').change(function () {
-				if (this.checked) {
-					// Change to default SMTP SSL port on enabling SSL
-					jQuery('#add_new_email_account #smtp_port').val('465');
-				} else {
-					// Change to default SMTP non-SSL port on disabling SSL
-					jQuery('#add_new_email_account #smtp_port').val('25');
-				}
-			});
-		</script>
-	<?php
+		) );
 	}
 
 	/**
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 8bc7724..92a636a 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -44,7 +44,6 @@ public function __construct() {
 
 	public function action_admin_menu() {
 		$this->slug = 'sf_permissions';
-
 		add_submenu_page(
 			'edit.php?post_type=' . SupportFlow()->post_type,
 			__( 'Permissions', 'supportflow' ),
@@ -73,6 +72,7 @@ public function get_user_permissions_data( $user_id ) {
 	}
 
 	public function permissions_page() {
+		$this->enqueue_script();
 		?>
 		<div class="wrap">
 		<h2><?php _e( 'Permissions', 'supportflow' ) ?></h2>
@@ -111,73 +111,27 @@ public function permissions_page() {
 		<div id="user_permissions_table">
 			<?php $this->show_permissions_table( $this->get_user_permissions( 0 ) ) ?>
 		</div>
-		<script type="text/javascript">
-			jQuery(document).ready(function () {
-				jQuery('.permission_filters').change(function () {
-					var user_id = jQuery('#change_user option:selected').data('user-id');
-					var status = jQuery('#change_status option:selected').data('status');
-					jQuery.ajax(ajaxurl, {
-						type   : 'post',
-						data   : {
-							action                     : 'get_user_permissions',
-							user_id                    : user_id,
-							status                     : status,
-							_get_user_permissions_nonce: '<?php echo wp_create_nonce( 'get_user_permissions' ) ?>',
-						},
-						success: function (content) {
-							jQuery('#user_permissions_table').html(content);
-						},
-					});
-				});
-
-				jQuery(document).on('change', '.toggle_privilege', function () {
-					var checkbox = jQuery(this);
-					var checkbox_label = checkbox.siblings('.privilege_status');
-					var permission_identifier = checkbox.data('permission-identifier');
-
-					var allowed = checkbox.prop('checked');
-					var user_id = permission_identifier.user_id;
-					var privilege_type = permission_identifier.privilege_type;
-					var privilege_id = permission_identifier.privilege_id;
-
-					checkbox_label.html('<?php _e( 'Changing status, please wait.', 'supportflow' ) ?>');
-					checkbox.prop('disabled', true);
-
-					jQuery.ajax(ajaxurl, {
-						type    : 'post',
-						data    : {
-							action                    : 'set_user_permission',
-							user_id                   : user_id,
-							privilege_type            : privilege_type,
-							privilege_id              : privilege_id,
-							allowed                   : allowed,
-							_set_user_permission_nonce: '<?php echo wp_create_nonce( 'set_user_permission' ) ?>',
-						},
-						success : function (content) {
-							if (1 != content) {
-								checkbox.prop('checked', !checkbox.prop('checked'));
-								alert('<?php _e( 'Failed changing state. Old state is reverted', 'supportflow' ) ?>');
-							}
-						},
-						error   : function () {
-							checkbox.prop('checked', !checkbox.prop('checked'));
-							alert('<?php _e( 'Failed changing state. Old state is reverted', 'supportflow' ) ?>');
-						},
-						complete: function () {
-							var allowed = checkbox.prop('checked');
-							if (true == allowed) {
-								checkbox_label.html('<?php _e( 'Allowed', 'supportflow' ) ?>');
-							} else {
-								checkbox_label.html('<?php _e( 'Not Allowed', 'supportflow' ) ?>');
-							}
-							checkbox.prop('disabled', false);
-						},
-					});
-				});
-			});
-		</script>
 	<?php
+	}
+
+	/*
+	 * Enqueue JS code required by class
+	 */
+	public function enqueue_script() {
+		wp_enqueue_script(
+			'supportflow-permissions',
+			SupportFlow()->plugin_url . 'js/permissions.js',
+			array( 'jquery' )
+		);
 
+		wp_localize_script( 'supportflow-permissions', 'SFPermissions', array(
+			'_get_user_permissions_nonce' => wp_create_nonce( 'get_user_permissions' ),
+			'changing_status'             => __( 'Changing status, please wait.', 'supportflow' ),
+			'_set_user_permission_nonce'  => wp_create_nonce( 'set_user_permission' ),
+			'failed_changing_status'      => __( 'Failed changing state. Old state is reverted.', 'supportflow' ),
+			'allowed'                     => __( 'Allowed', 'supportflow' ),
+			'not_allowed'                 => __( 'Not allowed', 'supportflow' ),
+		) );
 	}
 
 	public function action_wp_ajax_get_user_permissions() {
diff --git a/classes/class-supportflow-statistics.php b/classes/class-supportflow-statistics.php
index 31973b9..54b05db 100644
--- a/classes/class-supportflow-statistics.php
+++ b/classes/class-supportflow-statistics.php
@@ -37,7 +37,7 @@ public function action_admin_menu() {
 	public function statistics_page() {
 		// Add JS and CSS code required by page
 		$this->insert_css_code();
-		$this->insert_js_code();
+		$this->enqueue_script();
 		?>
 		<div class="wrap">
 			<h2><?php _e( 'Statistics', 'supportflow' ) ?></h2>
@@ -111,37 +111,19 @@ function insert_css_code() {
 	}
 
 	/*
-	 * Add JS code required by statistics page
+	 * Enqueue JS code required by statistics page
 	 */
-	function insert_js_code() {
-		?>
-		<script type="text/javascript">
-			jQuery(document).ready(function () {
-				// Close all the different stat tables and toggle the status of clicked stat table
-				jQuery('.toggle-link').click(function (event) {
-					var current = jQuery(this).siblings('.toggle-content').css('display');
-					jQuery('.toggle-content').hide(500);
-					jQuery('.toggle-link').prop('title', 'Expand');
-					if ('none' == current) {
-						jQuery(this).siblings('.toggle-content').show(500);
-						jQuery(this).prop('title', 'Collapse');
-					}
-					event.preventDefault();
-				});
-
-				// Set different type of statistics link title at page load
-				jQuery(jQuery('.toggle-content')).each(function () {
-					if ('none' == jQuery(this).css('display')) {
-						jQuery(this).siblings('.toggle-link').prop('title', 'Expand');
-					} else {
-						jQuery(this).siblings('.toggle-link').prop('title', 'Collapse');
-					}
-
-					jQuery('.toggle-content').first().show(500);
-				});
-			});
-		</script>
-	<?php
+	function enqueue_script() {
+		wp_enqueue_script(
+			'supportflow-statistics',
+			SupportFlow()->plugin_url . 'js/statistics.js',
+			array( 'jquery' )
+		);
+
+		wp_localize_script( 'supportflow-statistics', 'SFStatistics', array(
+			'expand'   => __( 'Expand', 'supportflow' ),
+			'collapse' => __( 'Collapse', 'supportflow' ),
+		) );
 	}
 
 	/*
diff --git a/js/email_accounts.js b/js/email_accounts.js
new file mode 100644
index 0000000..a7b3568
--- /dev/null
+++ b/js/email_accounts.js
@@ -0,0 +1,43 @@
+jQuery(document).ready(function () {
+	jQuery('.delete_email_account').click(function (e) {
+		e.preventDefault();
+
+		if (!confirm(SFEmailAccounts.sure_delete_account)) {
+			return;
+		}
+
+		var account_key = jQuery(this).data('account-id');
+		var form_action = "edit.php?post_type=" + SFEmailAccounts.post_type + "&page=" + SFEmailAccounts.slug;
+
+		var form = '';
+		form += '<form method="POST" id="remove_email_account" action="' + form_action + '">';
+		form += '<input type="hidden" name="action" value="delete" />';
+		form += SFEmailAccounts.delete_email_account_nonce;
+		form += '<input type="hidden" name="account_id" value=' + account_key + ' />';
+		form += '</form>';
+
+		jQuery('body').append(form);
+		jQuery('#remove_email_account').submit();
+	});
+
+
+	jQuery('#add_new_email_account #imap_ssl').change(function () {
+		if (this.checked) {
+			// Change to default IMAP SSL port on enabling SSL
+			jQuery('#add_new_email_account #imap_port').val('993');
+		} else {
+			// Change to default IMAP non-SSL port on disabling SSL
+			jQuery('#add_new_email_account #imap_port').val('143');
+		}
+	});
+
+	jQuery('#add_new_email_account #smtp_ssl').change(function () {
+		if (this.checked) {
+			// Change to default SMTP SSL port on enabling SSL
+			jQuery('#add_new_email_account #smtp_port').val('465');
+		} else {
+			// Change to default SMTP non-SSL port on disabling SSL
+			jQuery('#add_new_email_account #smtp_port').val('25');
+		}
+	});
+});
diff --git a/js/permissions.js b/js/permissions.js
new file mode 100644
index 0000000..59f34f7
--- /dev/null
+++ b/js/permissions.js
@@ -0,0 +1,64 @@
+jQuery(document).ready(function () {
+	jQuery('.permission_filters').change(function () {
+		var user_id = jQuery('#change_user option:selected').data('user-id');
+		var status = jQuery('#change_status option:selected').data('status');
+
+		jQuery.ajax(ajaxurl, {
+			type   : 'post',
+			data   : {
+				action                     : 'get_user_permissions',
+				user_id                    : user_id,
+				status                     : status,
+				_get_user_permissions_nonce: SFPermissions._get_user_permissions_nonce,
+			},
+			success: function (content) {
+				jQuery('#user_permissions_table').html(content);
+			},
+		});
+	});
+
+	jQuery(document).on('change', '.toggle_privilege', function () {
+		var checkbox = jQuery(this);
+		var checkbox_label = checkbox.siblings('.privilege_status');
+		var permission_identifier = checkbox.data('permission-identifier');
+
+		var allowed = checkbox.prop('checked');
+		var user_id = permission_identifier.user_id;
+		var privilege_type = permission_identifier.privilege_type;
+		var privilege_id = permission_identifier.privilege_id;
+
+		checkbox_label.html(SFPermissions.changing_status);
+		checkbox.prop('disabled', true);
+
+		jQuery.ajax(ajaxurl, {
+			type    : 'post',
+			data    : {
+				action                    : 'set_user_permission',
+				user_id                   : user_id,
+				privilege_type            : privilege_type,
+				privilege_id              : privilege_id,
+				allowed                   : allowed,
+				_set_user_permission_nonce: SFPermissions._set_user_permission_nonce,
+			},
+			success : function (content) {
+				if (1 != content) {
+					checkbox.prop('checked', !checkbox.prop('checked'));
+					alert(SFPermissions.failed_changing_status);
+				}
+			},
+			error   : function () {
+				checkbox.prop('checked', !checkbox.prop('checked'));
+				alert(SFPermissions.failed_changing_status);
+			},
+			complete: function () {
+				var allowed = checkbox.prop('checked');
+				if (true == allowed) {
+					checkbox_label.html(SFPermissions.allowed);
+				} else {
+					checkbox_label.html(SFPermissions.not_allowed);
+				}
+				checkbox.prop('disabled', false);
+			},
+		});
+	});
+});
\ No newline at end of file
diff --git a/js/statistics.js b/js/statistics.js
new file mode 100644
index 0000000..6e48826
--- /dev/null
+++ b/js/statistics.js
@@ -0,0 +1,24 @@
+jQuery(document).ready(function () {
+	// Close all the different stat tables and toggle the status of clicked stat table
+	jQuery('.toggle-link').click(function (event) {
+		var current = jQuery(this).siblings('.toggle-content').css('display');
+		jQuery('.toggle-content').hide(500);
+		jQuery('.toggle-link').prop('title', SFStatistics.expand);
+		if ('none' == current) {
+			jQuery(this).siblings('.toggle-content').show(500);
+			jQuery(this).prop('title', SFStatistics.collapse);
+		}
+		event.preventDefault();
+	});
+
+	// Set different type of statistics link title at page load
+	jQuery(jQuery('.toggle-content')).each(function () {
+		if ('none' == jQuery(this).css('display')) {
+			jQuery(this).siblings('.toggle-link').prop('title', SFStatistics.expand);
+		} else {
+			jQuery(this).siblings('.toggle-link').prop('title', SFStatistics.collapse);
+		}
+
+		jQuery('.toggle-content').first().show(500);
+	});
+});
\ No newline at end of file

From efa3245b9d50366c14c78e9f8c733c13ecee6fa6 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 6 Aug 2014 23:58:21 +0530
Subject: [PATCH 317/485] Added dependencies for grunt and grunt-uglifier

---
 .gitignore   |  1 +
 package.json | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 .gitignore
 create mode 100644 package.json

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..40b878d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+node_modules/
\ No newline at end of file
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..c5f5c0a
--- /dev/null
+++ b/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "SupportFlow",
+  "dependencies": {
+    "grunt-contrib-uglify": "^0.5.1",
+    "grunt": "^0.4.5"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/VarunAgw/supportflow.git"
+  },
+  "homepage": "https://github.com/VarunAgw/supportflow"
+}

From 4c4c0b33494e9274294ef03adf1df471ed01d1ca Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 6 Aug 2014 20:20:52 +0530
Subject: [PATCH 318/485] Configuring Grunt to minify JS files

---
 Gruntfile.js | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 Gruntfile.js

diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 0000000..be154ca
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,31 @@
+module.exports = function (grunt) {
+	grunt.initConfig({
+		uglify: {
+			options: {
+				banner: '/*! SupportFlow minified version */\n'
+			},
+			build  : {
+				src : [
+					'js/dashboard.js',
+					'js/email_accounts.js',
+					'js/email_conversation.js',
+					'js/permissions.js',
+					'js/predefined-replies.js',
+					'js/preferences.js',
+					'js/respondents-autocomplete.js',
+					'js/statistics.js',
+					'js/ticket_attachments.js',
+					'js/tickets.js',
+				],
+				dest: 'js/supportflow.min.js'
+			}
+		}
+	});
+
+	// Load the plugin that provides the "uglify" task.
+	grunt.loadNpmTasks('grunt-contrib-uglify');
+
+	// Default task(s).
+	grunt.registerTask('default', ['uglify']);
+
+};
\ No newline at end of file

From e0880f3e0dee99ee35f6885dfc50c2243e211447 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 6 Aug 2014 20:21:42 +0530
Subject: [PATCH 319/485] Building minified version of javascript code

---
 js/supportflow.min.js | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 js/supportflow.min.js

diff --git a/js/supportflow.min.js b/js/supportflow.min.js
new file mode 100644
index 0000000..0f4f799
--- /dev/null
+++ b/js/supportflow.min.js
@@ -0,0 +1,2 @@
+/*! SupportFlow minified version */
+jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title","Expand"),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title","Collapse")),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title","Expand"):jQuery(this).siblings(".toggle-link").prop("title","Collapse"),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(){jQuery(".delete_email_account").click(function(a){if(a.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var b=jQuery(this).data("account-id"),c="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,d="";d+='<form method="POST" id="remove_email_account" action="'+c+'">',d+='<input type="hidden" name="action" value="delete" />',d+=SFEmailAccounts.delete_email_account_nonce,d+='<input type="hidden" name="account_id" value='+b+" />",d+="</form>",jQuery("body").append(d),jQuery("#remove_email_account").submit()}}),jQuery("#add_new_email_account #imap_ssl").change(function(){jQuery("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),jQuery("#add_new_email_account #smtp_ssl").change(function(){jQuery("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(){var a=function(a){a.preventDefault();var b=jQuery("#email_conversation_to").val();jQuery.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:b,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){jQuery("#email_conversation_to").prop("disabled",!0),jQuery("#email_conversation_submit").prop("disabled",!0),jQuery("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(a){jQuery("#email_conversation_status").html(a)},error:function(){jQuery("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){jQuery("#email_conversation_to").prop("disabled",!1),jQuery("#email_conversation_submit").prop("disabled",!1)}})};jQuery("#email_conversation_submit").click(a),jQuery("#email_conversation_to").keyup(function(){10==event.keyCode&&a()})}),jQuery(document).ready(function(){jQuery(".permission_filters").change(function(){var a=jQuery("#change_user option:selected").data("user-id"),b=jQuery("#change_status option:selected").data("status");jQuery.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:a,status:b,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(a){jQuery("#user_permissions_table").html(a)}})}),jQuery(document).on("change",".toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("permission-identifier"),d=a.prop("checked"),e=c.user_id,f=c.privilege_type,g=c.privilege_id;b.html(SFPermissions.changing_status),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:e,privilege_type:f,privilege_id:g,allowed:d,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPermissions.allowed:SFPermissions.not_allowed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(){jQuery("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=jQuery("#predefs").find("option:selected").data("content"),old_content=jQuery(".predef:nth-child("+this.old_child+")").data("content"),current_content=jQuery("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void jQuery(".predef:nth-child("+this.old_child+")").prop("selected",!0);jQuery("#reply").val(new_content),this.old_child=jQuery("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(){jQuery(document).on("change",".toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("email-notfication-identifier"),d=a.prop("checked"),e=c.privilege_type,f=c.privilege_id;b.html(SFPreferences.changing_state),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:e,privilege_id:f,allowed:d,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPreferences.subscribed:SFPreferences.unsubscribed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#respondents").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{respondents:c,"api-action":"get-respondents"}};a("#respondents").autocomplete({source:function(c,d){a.ajax({url:SFRespondentsAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.respondents,function(b){var c=a("#respondents").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title",SFStatistics.expand),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title",SFStatistics.collapse)),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title",SFStatistics.expand):jQuery(this).siblings(".toggle-link").prop("title",SFStatistics.collapse),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var a=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return a.on("close",function(){var b=a.state().get("selection").toJSON();jQuery.each(b,function(){var a='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",b='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";jQuery("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+a+"&nbsp;"+b+"</li>"),jQuery("#reply-attachments").val(jQuery("#reply-attachments").val()+_.escape(this.id)+",")})}),a.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(){jQuery("#supportflow-details .meta-item-ok-button").click(function(a){var b=jQuery(this).siblings(".meta-item-dropdown").children("option:selected"),c=jQuery(this).closest(".meta-item"),d=c.children(".meta-item-name"),e=c.children(".meta-item-label");d.val(b.val()),e.text(b.text()),a.preventDefault()}),jQuery("#supportflow-details .meta-item-toggle-button").click(function(a){jQuery(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),a.preventDefault()}),jQuery(".save-button").click(function(a){return""==jQuery("#subject").val()?(alert(SFTickets.no_title_msg),void a.preventDefault()):""==jQuery("#respondents").val()?(alert(SFTickets.no_respondent_msg),void a.preventDefault()):void 0}),jQuery("#reply").keypress(function(a){a.ctrlKey&&10==a.keyCode&&""!=$(this).val()&&$("#post").submit()})});
\ No newline at end of file

From 5609cc94b53aae204cbe99bed84af7e23d0c2d22 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 6 Aug 2014 20:23:46 +0530
Subject: [PATCH 320/485] Using minified version of JS into production
 environment

Also configuring to use original JS code in dev env
---
 classes/class-supportflow-admin.php           | 52 ++++++++++++++-----
 classes/class-supportflow-dashboard.php       | 11 +++-
 classes/class-supportflow-email-accounts.php  | 17 +++---
 classes/class-supportflow-permissions.php     | 17 +++---
 .../class-supportflow-predefined-replies.php  | 16 ++++--
 classes/class-supportflow-preferences.php     | 14 ++++-
 classes/class-supportflow-statistics.php      | 17 +++---
 supportflow.php                               | 19 +++++++
 8 files changed, 124 insertions(+), 39 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index c99e1ed..7edbcaf 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -62,25 +62,43 @@ function action_admin_init() {
 	 */
 	public function action_admin_enqueue_scripts() {
 		global $pagenow;
+		$script_debugging = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG;
 
 		wp_enqueue_style( 'supportflow-admin', SupportFlow()->plugin_url . 'css/admin.css', array(), SupportFlow()->version );
-		if ( 'post.php' == $pagenow || 'post-new.php' == $pagenow ) {
+
+		if ( in_array( $pagenow, array( 'post.php', 'post-new.php' ) ) ) {
 			wp_enqueue_media();
 
-			wp_enqueue_script( 'supportflow-ticket-attachments', SupportFlow()->plugin_url . 'js/ticket_attachments.js', array( 'jquery' ) );
-			wp_enqueue_script( 'supportflow-respondents-autocomplete', SupportFlow()->plugin_url . 'js/respondents-autocomplete.js', array( 'jquery', 'jquery-ui-autocomplete' ) );
-			wp_enqueue_script( 'supportflow-tickets', SupportFlow()->plugin_url . 'js/tickets.js', array( 'jquery' ) );
+			if ( $script_debugging ) {
+				$respondents_autocomplete_handle = 'supportflow-respondents-autocomplete';
+				$ticket_attachment_handle        = 'supportflow-ticket-attachments';
+				$supportflow_tickets_handle      = 'supportflow-tickets';
+				$auto_save_handle                = 'supportflow-auto-save';
+				wp_enqueue_script( $respondents_autocomplete_handle, SupportFlow()->plugin_url . 'js/respondents-autocomplete.js', array( 'jquery' ) );
+				wp_enqueue_script( $ticket_attachment_handle, SupportFlow()->plugin_url . 'js/ticket_attachments.js', array( 'jquery' ) );
+				wp_enqueue_script( $supportflow_tickets_handle, SupportFlow()->plugin_url . 'js/tickets.js', array( 'jquery' ) );
+				wp_enqueue_script( $auto_save_handle, SupportFlow()->plugin_url . 'js/auto_save.js', array( 'jquery', 'heartbeat' ) );
+			} else {
+				$handle
+					= $respondents_autocomplete_handle
+					= $ticket_attachment_handle
+					= $supportflow_tickets_handle
+					= $auto_save_handle
+					= SupportFlow()->enqueue_scripts();
+			}
 
-			$ajaxurl = add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) );
+			wp_localize_script( $respondents_autocomplete_handle, 'SFRespondentsAc', array(
+				'ajax_url' => add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) )
+			) );
 
-			wp_localize_script( 'supportflow-respondents-autocomplete', 'SFRespondentsAc', array( 'ajax_url' => $ajaxurl ) );
-			wp_localize_script( 'supportflow-ticket-attachments', 'SFTicketAttachments', array(
+			wp_localize_script( $ticket_attachment_handle, 'SFTicketAttachments', array(
 				'frame_title'       => __( 'Attach files', 'supportflow' ),
 				'button_title'      => __( 'Insert as attachment', 'supportflow' ),
 				'remove_attachment' => __( 'Remove', 'supportflow' ),
 				'sure_remove'       => __( 'Are you sure want to remove this attachment?', 'supportflow' ),
 			) );
-			wp_localize_script( 'supportflow-tickets', 'SFTickets', array(
+
+			wp_localize_script( $supportflow_tickets_handle, 'SFTickets', array(
 				'no_title_msg'      => __( 'You must need to specify the subject of the ticket', 'supportpress' ),
 				'no_respondent_msg' => __( 'You must need to add atleast one ticket respondent', 'supportpress' ),
 				'pagenow'           => $pagenow,
@@ -88,18 +106,24 @@ public function action_admin_enqueue_scripts() {
 				'add_private_note'  => __( 'Add Private Note', 'supportflow' ),
 			) );
 
-			wp_enqueue_script( 'supportflow-auto-save', SupportFlow()->plugin_url . 'js/auto_save.js', array( 'jquery', 'heartbeat' ) );
-			wp_localize_script( 'supportflow-auto-save', 'SFAutoSave', array(
+			wp_localize_script( $auto_save_handle, 'SFAutoSave', array(
 				'ticket_id' => get_the_ID(),
 			) );
+
 		}
 
 		if ( 'post.php' == $pagenow ) {
-			wp_enqueue_script( 'supportflow-email-conversation', SupportFlow()->plugin_url . 'js/email_conversation.js', array( 'jquery' ) );
-			wp_localize_script( 'supportflow-email-conversation', 'SFEmailConversation', array(
+			if ( $script_debugging ) {
+				$email_conversation_handle = 'supportflow-email-conversation';
+				wp_enqueue_script( $email_conversation_handle, SupportFlow()->plugin_url . 'js/email_conversation.js', array( 'jquery' ) );
+			} else {
+				$email_conversation_handle = SupportFlow()->enqueue_scripts();
+			}
+
+			wp_localize_script( $email_conversation_handle, 'SFEmailConversation', array(
 				'post_id'                   => get_the_ID(),
-				'sending_emails'            => __( 'Please wait while sending E-Mail(s)', 'supportpress' ),
-				'failed_sending'            => __( 'Failed sending E-Mails', 'supportpress' ),
+				'sending_emails'            => __( 'Please wait while sending E-Mail(s)', 'supportflow' ),
+				'failed_sending'            => __( 'Failed sending E-Mails', 'supportflow' ),
 				'_email_conversation_nonce' => wp_create_nonce( 'sf_email_conversation' ),
 			) );
 		}
diff --git a/classes/class-supportflow-dashboard.php b/classes/class-supportflow-dashboard.php
index 6edbeb1..9c19c44 100644
--- a/classes/class-supportflow-dashboard.php
+++ b/classes/class-supportflow-dashboard.php
@@ -17,8 +17,15 @@ public function setup_actions() {
 
 	function action_wp_dashboard_setup() {
 		if ( current_user_can( 'edit_posts' ) ) {
-
-			wp_enqueue_script( 'supportflow-dashboard', SupportFlow()->plugin_url . 'js/dashboard.js', array( 'jquery' ) );
+			if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+				wp_enqueue_script(
+					'supportflow-dashboard',
+					SupportFlow()->plugin_url . 'js/dashboard.js',
+					array( 'jquery' )
+				);
+			} else {
+				SupportFlow()->enqueue_scripts();
+			}
 			wp_enqueue_style( 'supportflow-dashboard', SupportFlow()->plugin_url . 'css/dashboard.css', array(), SupportFlow()->version );
 
 			wp_add_dashboard_widget(
diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 2144cc3..c833550 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -292,13 +292,18 @@ public function insert_add_new_account_form() {
 	 * Enqueue JS code required for form submission
 	 */
 	public function enqueue_script() {
-		wp_enqueue_script(
-			'supportflow-email_accounts',
-			SupportFlow()->plugin_url . 'js/email_accounts.js',
-			array( 'jquery' )
-		);
+		if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+			$handle = 'supportflow-email_accounts';
+			wp_enqueue_script(
+				$handle,
+				SupportFlow()->plugin_url . 'js/email_accounts.js',
+				array( 'jquery' )
+			);
+		} else {
+			$handle = SupportFlow()->enqueue_scripts();
+		}
 
-		wp_localize_script( 'supportflow-email_accounts', 'SFEmailAccounts', array(
+		wp_localize_script( $handle, 'SFEmailAccounts', array(
 			'sure_delete_account'        => __( 'Are you sure want to delete this account?', 'supportflow' ),
 			'post_type'                  => SupportFlow()->post_type,
 			'slug'                       => $this->slug,
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 92a636a..b6e275f 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -118,13 +118,18 @@ public function permissions_page() {
 	 * Enqueue JS code required by class
 	 */
 	public function enqueue_script() {
-		wp_enqueue_script(
-			'supportflow-permissions',
-			SupportFlow()->plugin_url . 'js/permissions.js',
-			array( 'jquery' )
-		);
+		if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+			$handle = 'supportflow-permissions';
+			wp_enqueue_script(
+				$handle,
+				SupportFlow()->plugin_url . 'js/permissions.js',
+				array( 'jquery' )
+			);
+		} else {
+			$handle = SupportFlow()->enqueue_scripts();
+		}
 
-		wp_localize_script( 'supportflow-permissions', 'SFPermissions', array(
+		wp_localize_script( $handle, 'SFPermissions', array(
 			'_get_user_permissions_nonce' => wp_create_nonce( 'get_user_permissions' ),
 			'changing_status'             => __( 'Changing status, please wait.', 'supportflow' ),
 			'_set_user_permission_nonce'  => wp_create_nonce( 'set_user_permission' ),
diff --git a/classes/class-supportflow-predefined-replies.php b/classes/class-supportflow-predefined-replies.php
index 8dbd310..099fa9f 100644
--- a/classes/class-supportflow-predefined-replies.php
+++ b/classes/class-supportflow-predefined-replies.php
@@ -40,10 +40,20 @@ public function action_admin_enqueue_scripts() {
 		global $pagenow;
 
 		if ( 'post.php' == $pagenow || 'post-new.php' == $pagenow ) {
-			wp_enqueue_script( 'supportflow-predefined-replies', SupportFlow()->plugin_url . 'js/predefined-replies.js', array( 'jquery' ) );
-			$message = __( 'Are you sure want to proceed? It will replace your existing content.', 'supportflow' );
-			wp_localize_script( 'supportflow-predefined-replies', 'SFPredefinedReplies', array( 'message' => $message ) );
+			if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+				$handle = 'supportflow-predefined-replies';
+				wp_enqueue_script(
+					$handle,
+					SupportFlow()->plugin_url . 'js/predefined-replies.js',
+					array( 'jquery' )
+				);
+			} else {
+				$handle = SupportFlow()->enqueue_scripts();
+			}
 
+			wp_localize_script( $handle, 'SFPredefinedReplies', array(
+				'message' => __( 'Are you sure want to proceed? It will replace your existing content.', 'supportflow' ),
+			) );
 		}
 	}
 
diff --git a/classes/class-supportflow-preferences.php b/classes/class-supportflow-preferences.php
index 29fe0de..b1da189 100644
--- a/classes/class-supportflow-preferences.php
+++ b/classes/class-supportflow-preferences.php
@@ -29,8 +29,18 @@ public function action_admin_menu() {
 	}
 
 	public function enqueue_scripts() {
-		wp_enqueue_script( 'supportflow-preferences', SupportFlow()->plugin_url . 'js/preferences.js', array( 'jquery' ) );
-		wp_localize_script( 'supportflow-preferences', 'SFPreferences', array(
+		if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+			$handle = 'supportflow-preferences';
+			wp_enqueue_script(
+				$handle,
+				SupportFlow()->plugin_url . 'js/preferences.js',
+				array( 'jquery' )
+			);
+		} else {
+			$handle = SupportFlow()->enqueue_scripts();
+		}
+
+		wp_localize_script( $handle, 'SFPreferences', array(
 			'changing_state'              => __( 'Changing status, please wait.', 'supportflow' ),
 			'set_email_notfication_nonce' => wp_create_nonce( 'set_email_notfication' ),
 			'failed_changing_state'       => __( 'Failed changing state. Old state is reverted', 'supportflow' ),
diff --git a/classes/class-supportflow-statistics.php b/classes/class-supportflow-statistics.php
index 54b05db..58229a3 100644
--- a/classes/class-supportflow-statistics.php
+++ b/classes/class-supportflow-statistics.php
@@ -114,13 +114,18 @@ function insert_css_code() {
 	 * Enqueue JS code required by statistics page
 	 */
 	function enqueue_script() {
-		wp_enqueue_script(
-			'supportflow-statistics',
-			SupportFlow()->plugin_url . 'js/statistics.js',
-			array( 'jquery' )
-		);
+		if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+			$handle = 'supportflow-statistics';
+			wp_enqueue_script(
+				$handle,
+				SupportFlow()->plugin_url . 'js/statistics.js',
+				array( 'jquery' )
+			);
+		} else {
+			$handle = SupportFlow()->enqueue_scripts();
+		}
 
-		wp_localize_script( 'supportflow-statistics', 'SFStatistics', array(
+		wp_localize_script( $handle, 'SFStatistics', array(
 			'expand'   => __( 'Expand', 'supportflow' ),
 			'collapse' => __( 'Collapse', 'supportflow' ),
 		) );
diff --git a/supportflow.php b/supportflow.php
index 59836d0..5080e1e 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -798,6 +798,25 @@ public function get_ticket_from_secret( $secret ) {
 		}
 	}
 
+	/**
+	 *
+	 * Enqueue minfied and concatenated version all the scripts required by SupportFlow
+	 * Doesn't add localisation data to it
+	 *
+	 * @return string Handle of enqueued script
+	 */
+	public function enqueue_scripts() {
+		$handle = 'supportflow-minified-scripts';
+
+		wp_enqueue_script(
+			$handle,
+			SupportFlow()->plugin_url . 'js/supportflow.min.js',
+			array( 'jquery', 'jquery-ui-autocomplete', 'heartbeat' )
+		);
+
+		return $handle;
+	}
+
 	/**
 	 * Get the special capability given a string
 	 */

From 713bdc2d9f2ed8fe972115bb9511f1c5cb89e8a3 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 02:30:48 +0530
Subject: [PATCH 321/485] Changed git repository URL to main one

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index c5f5c0a..5aaabea 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/VarunAgw/supportflow.git"
+    "url": "https://github.com/SupportFlow/supportflow.git"
   },
-  "homepage": "https://github.com/VarunAgw/supportflow"
+  "homepage": "https://github.com/SupportFlow/supportflow"
 }

From ee108abe7330f689edc4fbe229b77c95be7c9021 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 16:10:27 +0530
Subject: [PATCH 322/485] Corrected coding standards

---
 classes/class-supportflow-admin.php  | 14 +++++++-------
 classes/class-supportflow-emails.php |  8 ++++----
 package.json                         | 20 ++++++++++----------
 supportflow.php                      |  4 +++-
 4 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 7edbcaf..d1d9c6e 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -550,8 +550,8 @@ public function action_add_meta_boxes() {
 
 	public function meta_box_other_respondents_tickets() {
 		$ticket_respondents = SupportFlow()->get_ticket_respondents( get_the_ID(), array( 'fields' => 'slugs' ) );
-		$statuses     = SupportFlow()->post_statuses;
-		$status_slugs = array_keys($statuses);
+		$statuses           = SupportFlow()->post_statuses;
+		$status_slugs       = array_keys( $statuses );
 
 		$table = new SupportFlow_Table( '', false, false );
 
@@ -816,11 +816,11 @@ public function meta_box_details() {
 		</div>
 
 		<div id="major-publishing-actions">
-		<?php if ( 'post.php' == $pagenow && $current_status_id != 'sf_closed' ) : ?>
-			<div id="delete-action">
-				<?php submit_button( $close_ticket_label, '', 'close-ticket-submit', false, array( 'id' => 'close-ticket-submit' ) ); ?>
-			</div>
-		<?php endif; ?>
+			<?php if ( 'post.php' == $pagenow && $current_status_id != 'sf_closed' ) : ?>
+				<div id="delete-action">
+					<?php submit_button( $close_ticket_label, '', 'close-ticket-submit', false, array( 'id' => 'close-ticket-submit' ) ); ?>
+				</div>
+			<?php endif; ?>
 			<div id="publishing-action">
 				<?php submit_button( $submit_text, 'save-button primary', 'update-ticket', false ); ?>
 			</div>
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 6053ab6..0532ec8 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -46,7 +46,7 @@ public function notify_agents_ticket_replies( $reply_id ) {
 		if ( '' == $email_account_id ) {
 			return;
 		}
-		$smtp_account     = $email_accounts[$email_account_id];
+		$smtp_account = $email_accounts[$email_account_id];
 
 		if ( empty( $agent_ids ) ) {
 			return;
@@ -89,7 +89,7 @@ public function notify_agents_ticket_replies( $reply_id ) {
 
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $ticket->ID, 'agent' );
 
-		self::mail( $agent_emails, $subject, $message,  'Content-Type: text/html', $attachments, $smtp_account );
+		self::mail( $agent_emails, $subject, $message, 'Content-Type: text/html', $attachments, $smtp_account );
 	}
 
 	/**
@@ -110,7 +110,7 @@ public function notify_respondents_ticket_replies( $reply_id, $cc = array(), $bc
 		if ( '' == $email_account_id ) {
 			return;
 		}
-		$smtp_account     = $email_accounts[$email_account_id];
+		$smtp_account = $email_accounts[$email_account_id];
 
 		// Don't email the person creating the reply, unless that's desired behavior
 		if ( ! apply_filters( 'supportflow_emails_notify_creator', false, 'reply' ) ) {
@@ -134,7 +134,7 @@ public function notify_respondents_ticket_replies( $reply_id, $cc = array(), $bc
 		$message = stripslashes( $reply->post_content );
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $ticket->ID, 'respondent' );
 
-		$headers =  "Content-Type: text/html\r\n";
+		$headers = "Content-Type: text/html\r\n";
 
 		if ( is_array( $cc ) && ! empty( $cc ) ) {
 			$headers .= "Cc: " . implode( ', ', $cc ) . "\r\n";
diff --git a/package.json b/package.json
index 5aaabea..19eae8f 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
-  "name": "SupportFlow",
-  "dependencies": {
-    "grunt-contrib-uglify": "^0.5.1",
-    "grunt": "^0.4.5"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/SupportFlow/supportflow.git"
-  },
-  "homepage": "https://github.com/SupportFlow/supportflow"
+	"name"        : "SupportFlow",
+	"dependencies": {
+		"grunt-contrib-uglify": "^0.5.1",
+		"grunt"               : "^0.4.5"
+	},
+	"repository"  : {
+		"type": "git",
+		"url" : "https://github.com/SupportFlow/supportflow.git"
+	},
+	"homepage"    : "https://github.com/SupportFlow/supportflow"
 }
diff --git a/supportflow.php b/supportflow.php
index 5080e1e..4f8d2a2 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -355,10 +355,11 @@ public function action_init_register_post_statuses() {
 		}
 	}
 
-	public function filter_wp_insert_post_data($data, $postarr) {
+	public function filter_wp_insert_post_data( $data, $postarr ) {
 		if ( 0 == $postarr['post_author'] ) {
 			$data['post_author'] = 0;
 		}
+
 		return $data;
 	}
 
@@ -848,6 +849,7 @@ public function extract_email_ids( $string, & $invalid_email_ids = array() ) {
 	 * Apart from this allow embedding code using <code> tag
 	 *
 	 * @param string $reply Reply to be sanitized
+	 *
 	 * @return string Sanitized reply
 	 */
 	public function sanitize_ticket_reply( $reply ) {

From 83296e48c5feaf7ce89dd5ceb91315f2cf08d1ab Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 16:11:48 +0530
Subject: [PATCH 323/485] Set grunt as devdependency as it is only required to
 develop

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 19eae8f..abd6b45 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name"        : "SupportFlow",
-	"dependencies": {
+	"devDependencies": {
 		"grunt-contrib-uglify": "^0.5.1",
 		"grunt"               : "^0.4.5"
 	},

From d12bc36630f0e7669e3f0a6850db432fb01938e4 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 16:23:45 +0530
Subject: [PATCH 324/485] Adding a grunt watch task to continously monitor
 changed JS files

---
 Gruntfile.js | 39 ++++++++++++++++++++++++---------------
 package.json |  3 ++-
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index be154ca..1fb54f9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,31 +1,40 @@
 module.exports = function (grunt) {
+	var js_files = [
+		'js/dashboard.js',
+		'js/email_accounts.js',
+		'js/email_conversation.js',
+		'js/permissions.js',
+		'js/predefined-replies.js',
+		'js/preferences.js',
+		'js/respondents-autocomplete.js',
+		'js/statistics.js',
+		'js/ticket_attachments.js',
+		'js/tickets.js',
+	];
+
 	grunt.initConfig({
 		uglify: {
 			options: {
 				banner: '/*! SupportFlow minified version */\n'
 			},
 			build  : {
-				src : [
-					'js/dashboard.js',
-					'js/email_accounts.js',
-					'js/email_conversation.js',
-					'js/permissions.js',
-					'js/predefined-replies.js',
-					'js/preferences.js',
-					'js/respondents-autocomplete.js',
-					'js/statistics.js',
-					'js/ticket_attachments.js',
-					'js/tickets.js',
-				],
+				src : js_files,
 				dest: 'js/supportflow.min.js'
 			}
-		}
+		},
+		watch : {
+			scripts: {
+				files: js_files,
+				tasks: ['uglify'],
+			},
+		},
 	});
 
-	// Load the plugin that provides the "uglify" task.
+	// Load the required plugins.
 	grunt.loadNpmTasks('grunt-contrib-uglify');
+	grunt.loadNpmTasks('grunt-contrib-watch');
 
-	// Default task(s).
+	// Running these tasks by default
 	grunt.registerTask('default', ['uglify']);
 
 };
\ No newline at end of file
diff --git a/package.json b/package.json
index abd6b45..d860fb8 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,8 @@
 	"name"        : "SupportFlow",
 	"devDependencies": {
 		"grunt-contrib-uglify": "^0.5.1",
-		"grunt"               : "^0.4.5"
+		"grunt"               : "^0.4.5",
+		"grunt-contrib-watch" : "^0.6.1"
 	},
 	"repository"  : {
 		"type": "git",

From 3d64ade2c992db294657de62e9f76149db1dd12e Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 16:43:55 +0530
Subject: [PATCH 325/485] Created a task to minifying CSS files

---
 Gruntfile.js | 20 +++++++++++++++++++-
 package.json |  1 +
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 1fb54f9..a328f43 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -11,6 +11,10 @@ module.exports = function (grunt) {
 		'js/ticket_attachments.js',
 		'js/tickets.js',
 	];
+	var css_files = [
+		'css/admin.css',
+		'css/dashboard.css',
+	];
 
 	grunt.initConfig({
 		uglify: {
@@ -22,19 +26,33 @@ module.exports = function (grunt) {
 				dest: 'js/supportflow.min.js'
 			}
 		},
+		cssmin: {
+			options: {
+				banner: '/*! SupportFlow minified version */\n'
+			},
+			build  : {
+				src : css_files,
+				dest: 'css/supportflow.min.css'
+			}
+		},
 		watch : {
 			scripts: {
 				files: js_files,
 				tasks: ['uglify'],
 			},
+			styles : {
+				files: css_files,
+				tasks: ['cssmin'],
+			},
 		},
 	});
 
 	// Load the required plugins.
 	grunt.loadNpmTasks('grunt-contrib-uglify');
 	grunt.loadNpmTasks('grunt-contrib-watch');
+	grunt.loadNpmTasks('grunt-contrib-cssmin');
 
 	// Running these tasks by default
-	grunt.registerTask('default', ['uglify']);
+	grunt.registerTask('default', ['uglify', 'cssmin']);
 
 };
\ No newline at end of file
diff --git a/package.json b/package.json
index d860fb8..2d06898 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,7 @@
 	"devDependencies": {
 		"grunt-contrib-uglify": "^0.5.1",
 		"grunt"               : "^0.4.5",
+		"grunt-contrib-watch" : "^0.6.1",
 		"grunt-contrib-watch" : "^0.6.1"
 	},
 	"repository"  : {

From 5de77d9045880e35548824cc3be368e0a2e1b724 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 16:55:19 +0530
Subject: [PATCH 326/485] Using minified version of styles in producation env.

---
 classes/class-supportflow-admin.php     |  9 ++++++++-
 classes/class-supportflow-dashboard.php |  6 +++++-
 supportflow.php                         | 17 +++++++++++++++++
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index d1d9c6e..bff47da 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -64,7 +64,14 @@ public function action_admin_enqueue_scripts() {
 		global $pagenow;
 		$script_debugging = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG;
 
-		wp_enqueue_style( 'supportflow-admin', SupportFlow()->plugin_url . 'css/admin.css', array(), SupportFlow()->version );
+		if ( $script_debugging ) {
+			wp_enqueue_style(
+				'supportflow-admin',
+				SupportFlow()->plugin_url . 'css/admin.css'
+			);
+		} else {
+			SupportFlow()->enqueue_styles();
+		}
 
 		if ( in_array( $pagenow, array( 'post.php', 'post-new.php' ) ) ) {
 			wp_enqueue_media();
diff --git a/classes/class-supportflow-dashboard.php b/classes/class-supportflow-dashboard.php
index 9c19c44..ddfe89e 100644
--- a/classes/class-supportflow-dashboard.php
+++ b/classes/class-supportflow-dashboard.php
@@ -23,10 +23,14 @@ function action_wp_dashboard_setup() {
 					SupportFlow()->plugin_url . 'js/dashboard.js',
 					array( 'jquery' )
 				);
+				wp_enqueue_style(
+					'supportflow-dashboard',
+					SupportFlow()->plugin_url . 'css/dashboard.css'
+				);
 			} else {
 				SupportFlow()->enqueue_scripts();
+				SupportFlow()->enqueue_styles();
 			}
-			wp_enqueue_style( 'supportflow-dashboard', SupportFlow()->plugin_url . 'css/dashboard.css', array(), SupportFlow()->version );
 
 			wp_add_dashboard_widget(
 				'sf_recent_tickets',
diff --git a/supportflow.php b/supportflow.php
index 4f8d2a2..ae89180 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -818,6 +818,23 @@ public function enqueue_scripts() {
 		return $handle;
 	}
 
+	/**
+	 *
+	 * Enqueue minfied and concatenated version all the styles required by SupportFlow
+	 *
+	 * @return string Handle of enqueued style
+	 */
+	public function enqueue_styles() {
+		$handle = 'supportflow-minified-styles';
+
+		wp_enqueue_style(
+			$handle,
+			SupportFlow()->plugin_url . 'css/supportflow.min.css'
+		);
+
+		return $handle;
+	}
+
 	/**
 	 * Get the special capability given a string
 	 */

From 9ff7b7a1afaefc555425662c9ca634cb158d8780 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 30 Jul 2014 20:44:54 +0530
Subject: [PATCH 327/485] Saving attachment ID as meta data of reply

Earlier reply id was saved as post_parent of attachment. But since an
attachment cannot have more than one parent, more than one reply cannot
use any specific attachment
---
 classes/class-supportflow-admin.php         | 24 +++++++--------------
 classes/class-supportflow-email-replies.php |  4 ++--
 supportflow.php                             |  2 +-
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index c99e1ed..63370b7 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -954,15 +954,11 @@ public function display_ticket_replies() {
 				// Make link clickable
 				$post_content = make_clickable( $post_content );
 				echo $post_content;
-				$attachment_args = array(
-					'post_parent' => $reply->ID,
-					'post_type'   => 'attachment'
-				);
-				if ( $attachments = get_posts( $attachment_args ) ) {
+				if ( $attachment_ids = get_post_meta( $reply->ID, 'sf_attachments' ) ) {
 					echo '<ul class="ticket-reply-attachments">';
-					foreach ( $attachments as $attachment ) {
-						$attachment_link = wp_get_attachment_url( $attachment->ID );
-						echo '<li><a target="_blank" href="' . esc_url( $attachment_link ) . '">' . esc_html( $attachment->post_title ) . '</a></li>';
+					foreach ( $attachment_ids as $attachment_id ) {
+						$attachment_link = wp_get_attachment_url( $attachment_id );
+						echo '<li><a target="_blank" href="' . esc_url( $attachment_link ) . '">' . esc_html( get_the_title( $attachment_id ) ) . '</a></li>';
 					}
 					echo '</ul>';
 				}
@@ -992,15 +988,11 @@ public function display_ticket_replies() {
 				// Make link clickable
 				$post_content = make_clickable( $post_content );
 				echo $post_content;
-				$attachment_args = array(
-					'post_parent' => $reply->ID,
-					'post_type'   => 'attachment'
-				);
-				if ( $attachments = get_posts( $attachment_args ) ) {
+				if ( $attachment_ids = get_post_meta( $reply->ID, 'sf_attachments' ) ) {
 					echo '<ul class="ticket-reply-attachments">';
-					foreach ( $attachments as $attachment ) {
-						$attachment_link = wp_get_attachment_url( $attachment->ID );
-						echo '<li><a target="_blank" href="' . esc_url( $attachment_link ) . '">' . esc_html( $attachment->post_title ) . '</a></li>';
+					foreach ( $attachment_ids as $attachment_id ) {
+						$attachment_link = wp_get_attachment_url( $attachment_id );
+						echo '<li><a target="_blank" href="' . esc_url( $attachment_link ) . '">' . esc_html( get_the_title( $attachment_id ) ) . '</a></li>';
 					}
 					echo '</ul>';
 				}
diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 2365522..1500f2e 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -259,8 +259,8 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 		$new_reply   = $all_replies[count( $all_replies ) - 1];
 
 		foreach ( $new_attachment_ids as $new_attachment_id ) {
-			// Associate the ticket ID as the parent to our new attachment
-			wp_update_post( array( 'ID' => $new_attachment_id, 'post_parent' => $new_reply->ID, 'post_status' => 'inherit' ) );
+			// Save the attachment ID as post meta of reply
+			add_post_meta( $new_reply->ID, 'sf_attachments', $new_attachment_id );
 		}
 
 		// Store the original email ID so we don't accidentally dupe it
diff --git a/supportflow.php b/supportflow.php
index 59836d0..2c7baad 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -738,7 +738,7 @@ public function add_ticket_reply( $ticket_id, $reply_text, $details = array() )
 		// If there are attachment IDs store them as meta
 		if ( is_array( $attachment_ids ) ) {
 			foreach ( $attachment_ids as $attachment_id ) {
-				wp_update_post( array( 'ID' => $attachment_id, 'post_parent' => $reply_id ) );
+				add_post_meta( $reply_id, 'sf_attachments', $attachment_id );
 			}
 		}
 

From 692d3900db9e01897ea920b06c91bb0a6b0093bb Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 30 Jul 2014 23:04:00 +0530
Subject: [PATCH 328/485] Updating attachment database scehma on plugin update

---
 classes/class-supportflow-admin.php |  1 -
 supportflow.php                     | 37 ++++++++++++++++++++++++++++-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 63370b7..e4b90a2 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -942,7 +942,6 @@ public function meta_box_replies() {
 	}
 
 	public function display_ticket_replies() {
-
 		$private_replies = SupportFlow()->get_ticket_replies( get_the_ID(), array( 'status' => 'private' ) );
 
 		if ( ! empty( $private_replies ) ) {
diff --git a/supportflow.php b/supportflow.php
index 2c7baad..18b5a28 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -146,7 +146,7 @@ private function setup_globals() {
 
 		/** Version ***********************************************************/
 
-		$this->version = '0.1-alpha'; // SupportFlow version
+		$this->version = '0.2'; // SupportFlow version
 
 		/** Paths *************************************************************/
 
@@ -260,6 +260,7 @@ private function setup_actions() {
 		add_action( 'init', array( $this, 'action_init_register_post_type' ) );
 		add_action( 'init', array( $this, 'action_init_register_taxonomies' ) );
 		add_action( 'init', array( $this, 'action_init_register_post_statuses' ) );
+		add_action( 'init', array( $this, 'action_init_upgrade' ) );
 
 		add_filter( 'wp_insert_post_data', array( $this, 'filter_wp_insert_post_data' ), 10, 2 );
 
@@ -355,6 +356,40 @@ public function action_init_register_post_statuses() {
 		}
 	}
 
+	/**
+	 * Upgrade database records on update of plugin
+	 *
+	 * @since 0.3
+	 */
+	public function action_init_upgrade() {
+		$code_version = $this->version;
+		$db_version   = get_option( 'sf_version' );
+
+		if ( 0 == version_compare( $code_version, $db_version ) ) {
+			return;
+		}
+
+		// New installation or 0.1 or 0.2
+		if ( ! $db_version ) {
+
+			// Earlier reply ID were stored as post_parent of attachment. Now attachment ID's are stored as post meta of reply
+			$attachments = get_posts( array(
+				'post_type'           => 'attachment',
+				'post_status'         => 'inherit',
+				'post_parent__not_in' => array( '0' ),
+				'posts_per_page'      => - 1,
+
+			) );
+			foreach ( $attachments as $attachment ) {
+				add_post_meta( $attachment->post_parent, 'sf_attachments', $attachment->ID );
+				wp_update_post( array( 'ID' => $attachment->ID, 'post_parent' => 0 ) );
+			}
+		}
+
+		// Update db_version to latest one
+		update_option( 'sf_version', $this->version );
+	}
+
 	public function filter_wp_insert_post_data($data, $postarr) {
 		if ( 0 == $postarr['post_author'] ) {
 			$data['post_author'] = 0;

From 2683b087a9db39ccf4d401073d5bbbb76517f769 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 31 Jul 2014 01:01:50 +0530
Subject: [PATCH 329/485] Serving attachment file securely through PHP

---
 classes/class-supportflow-admin.php         |   4 +-
 classes/class-supportflow-attachments.php   | 219 +++++---------------
 classes/class-supportflow-email-replies.php |   1 +
 supportflow.php                             |   1 +
 4 files changed, 55 insertions(+), 170 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index e4b90a2..7941109 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -956,7 +956,7 @@ public function display_ticket_replies() {
 				if ( $attachment_ids = get_post_meta( $reply->ID, 'sf_attachments' ) ) {
 					echo '<ul class="ticket-reply-attachments">';
 					foreach ( $attachment_ids as $attachment_id ) {
-						$attachment_link = wp_get_attachment_url( $attachment_id );
+						$attachment_link = SupportFlow()->extend->attachments->get_attachment_url( $attachment_id );
 						echo '<li><a target="_blank" href="' . esc_url( $attachment_link ) . '">' . esc_html( get_the_title( $attachment_id ) ) . '</a></li>';
 					}
 					echo '</ul>';
@@ -990,7 +990,7 @@ public function display_ticket_replies() {
 				if ( $attachment_ids = get_post_meta( $reply->ID, 'sf_attachments' ) ) {
 					echo '<ul class="ticket-reply-attachments">';
 					foreach ( $attachment_ids as $attachment_id ) {
-						$attachment_link = wp_get_attachment_url( $attachment_id );
+						$attachment_link = SupportFlow()->extend->attachments->get_attachment_url( $attachment_id );
 						echo '<li><a target="_blank" href="' . esc_url( $attachment_link ) . '">' . esc_html( get_the_title( $attachment_id ) ) . '</a></li>';
 					}
 					echo '</ul>';
diff --git a/classes/class-supportflow-attachments.php b/classes/class-supportflow-attachments.php
index 739a8b2..6a40d83 100644
--- a/classes/class-supportflow-attachments.php
+++ b/classes/class-supportflow-attachments.php
@@ -7,202 +7,85 @@
 
 class SupportFlow_Attachments extends SupportFlow {
 
-	var $file_hash = '';
-	var $secret_key = '';
-
-	var $attachments_require_permission = false;
-
-	const secret_key_option = 'supportflow_attachments_secret';
-
 	function __construct() {
-		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
-	}
-
-	public function setup_actions() {
-
-		add_filter( 'wp_get_attachment_url', array( $this, 'filter_wp_get_attachment_url' ), 10, 2 );
-
-		// Handle delivery of the secure file
-		add_action( 'template_redirect', array( $this, 'handle_file_delivery' ) );
-
-		// Generate a secret key for our hashes the first time this is loaded in the admin
-		$this->secret_key = get_option( self::secret_key_option );
-		if ( is_admin() && ! $this->secret_key ) {
-			$this->secret_key = wp_generate_password();
-			update_option( self::secret_key_option, $this->secret_key );
-		}
-
-		// Only apply to files that are uploaded to a ticket
-		if ( isset( $_REQUEST['post_id'] ) && SupportFlow()->is_ticket( (int) $_REQUEST['post_id'] ) ) {
-			add_filter( 'wp_handle_upload_prefilter', array( $this, 'wp_handle_upload_prefilter' ) );
-			add_filter( 'wp_handle_upload', array( $this, 'wp_handle_upload' ) );
-		}
-
-		$this->attachments_require_permission = apply_filters( 'supportflow_attachments_require_permission', $this->attachments_require_permission );
-
-	}
-
-	public function filter_wp_get_attachment_url( $url, $attachment_id ) {
-
-		if ( $attachment = get_post( $attachment_id ) ) {
-			if ( SupportFlow()->is_ticket( $attachment->post_parent ) ) {
-				return $attachment->guid;
-			}
-
-		}
-
-		return $url;
+		add_action( 'init', array( $this, 'action_init_download_attachment' ) );
 	}
 
-	public function handle_file_delivery( $template ) {
-
-		// First check to see
-		if ( false === stripos( $_SERVER['REQUEST_URI'], "secure-files/" ) ) {
-			return;
-		}
-
-		// Get the file
-		preg_match( '#\/secure\-files\/(.+)$#', $_SERVER['REQUEST_URI'], $matches );
-		if ( empty( $matches ) ) {
+	public function action_init_download_attachment() {
+		if ( empty( $_REQUEST['sf_download_attachment'] ) ) {
 			return;
 		}
 
-		// User must be logged in to see attachments that require permission
-		if ( ! is_user_logged_in() && $this->attachments_require_permission ) {
-			$args = array(
-				'redirect_to' => urlencode( esc_url( home_url( $_SERVER['REQUEST_URI'] ) ) ),
-			);
-			wp_safe_redirect( add_query_arg( $args, site_url( '/wp-login.php' ) ) );
-			exit;
-		}
-
-		global $wpdb;
-		$file  = $matches[1];
-		$query = $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE guid LIKE %s", '%' . $file );
-		$post  = $wpdb->get_row( $query );
-		if ( empty( $post ) ) {
-			return get_404_template();
-		}
-
-		// Check to see whether the user has permission to view the ticket
-		if ( $this->attachments_require_permission && ! $this->can_view_attachment( $post->ID ) ) {
-			wp_die( __( 'Sorry, you do not have permission to view this attachment.', 'supportflow' ) );
-		}
-
-		$post_id = $post->ID;
-
-		$file = get_attached_file( $post_id );
-
-		if ( ! is_file( $file ) ) {
-			return get_404_template();
-		}
-
-		// We may override this later.
-		status_header( 200 );
-
-		//rest inspired by wp-includes/ms-files.php.
-		$mime = wp_check_filetype( $file );
-		if ( false === $mime['type'] && function_exists( 'mime_content_type' ) ) {
-			$mime['type'] = mime_content_type( $file );
-		}
-
-		if ( $mime['type'] ) {
-			$mimetype = $mime['type'];
-		} else {
-			$mimetype = 'image/' . substr( $file, strrpos( $file, '.' ) + 1 );
-		}
+		$attachment_secret = $_REQUEST['sf_download_attachment'];
+		$attachment_id = $this->get_attachment_id( $attachment_secret );
 
-		//fake the filename
-		$filename = $post->post_name;
-
-		//we want the true attachment URL, not the permalink, so temporarily remove our filter
-		$filename .= pathinfo( $file, PATHINFO_EXTENSION );
-
-		header( 'Content-Disposition: inline; filename="' . $filename . '"' );
-		header( 'Content-Type: ' . $mimetype ); // always send this
-		header( 'Content-Length: ' . filesize( $file ) );
-		$last_modified = gmdate( 'D, d M Y H:i:s', filemtime( $file ) );
-		$etag          = '"' . md5( $last_modified ) . '"';
-		header( "Last-Modified: $last_modified GMT" );
-		header( 'ETag: ' . $etag );
-		header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + 100000000 ) . ' GMT' );
-
-		// Support for Conditional GET
-		$client_etag = isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ? stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) : false;
-
-		if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
-			$_SERVER['HTTP_IF_MODIFIED_SINCE'] = false;
+		if ( empty( $attachment_id ) ) {
+			return;
 		}
 
-		$client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
-
-		// If string is empty, return 0. If not, attempt to parse into a timestamp
-		$client_modified_timestamp = $client_last_modified ? strtotime( $client_last_modified ) : 0;
-
-		// Make a timestamp for our most recent modification...
-		$modified_timestamp = strtotime( $last_modified );
-
-		if ( ( $client_last_modified && $client_etag )
-			? ( ( $client_modified_timestamp >= $modified_timestamp ) && ( $client_etag == $etag ) )
-			: ( ( $client_modified_timestamp >= $modified_timestamp ) || ( $client_etag == $etag ) )
-		) {
-			status_header( 304 );
+		$file = get_attached_file( $attachment_id );
 
+		if ( ! file_exists( $file ) ) {
 			return;
 		}
+		header( 'Content-Description: File Transfer' );
+		header('Content-Type: application/octet-stream');
+		header('Content-Disposition: attachment; filename=' . basename($file));
+		header( 'Expires: 0' );
+		header( 'Cache-Control: must-revalidate' );
+		header( 'Pragma: public' );
+		header( 'Content-Length: ' . filesize( $file ) );
 
-		//in case this is a large file, remove PHP time limits
-		@set_time_limit( 0 );
-
-		// If we made it this far, just serve the file
 		readfile( $file );
-
 		exit;
 	}
 
-	/**
-	 * Whether or not a given email address can view the attachment
-	 */
-	public function can_view_attachment( $attachment_id, $email_or_login = false ) {
-
-		if ( ! $email_or_login && is_user_logged_in() ) {
-			$email_or_login = wp_get_current_user()->user_email;
-		}
-
-		if ( ! is_email( $email_or_login ) ) {
-			$user = get_user_by( 'login' );
-			if ( $user ) {
-				$email_or_login = $user->user_email;
-			}
+	public function insert_attachment_secret_key( $attachment_id ) {
+		$secret = $this->get_attachment_secret_key( $attachment_id );
+		if ( $secret ) {
+			return $secret;
 		}
 
-		$ticket_id   = get_post( $attachment_id )->post_parent;
-		$respondents = SupportFlow()->get_ticket_respondents( $ticket_id, array( 'fields' => 'emails' ) );
+		$secret = $this->generate_secret_key();
+		update_post_meta( $attachment_id, 'sf_attachment_secret', $secret );
 
-		// If the email address is a respondent, they can view
-		if ( in_array( $email_or_login, $respondents ) ) {
-			return true;
-		}
-
-		// @todo permissions check on whether the user is logged in as some who can view tickets
-
-		return false;
+		return $secret;
 	}
 
-	public function wp_handle_upload_prefilter( $file ) {
+	public function generate_secret_key() {
+		return wp_generate_password( 20, false );
+	}
 
-		$this->private_hash = md5( $this->secret_key . date( 'Y-m-d' ) . $file['name'] );
-		$file['name']       = $this->private_hash . '.' . basename( $file['name'] );
+	public function get_attachment_secret_key( $attachment_id ) {
+		$secret = get_post_meta( $attachment_id, 'sf_attachment_secret', true );
 
-		return $file;
+		return $secret;
 	}
 
-	public function wp_handle_upload( $file ) {
+	public function get_attachment_id( $attachment_secret ) {
+		$post_statuses = SupportFlow()->post_statuses;
+
+		$posts = get_posts( array(
+			'post_type'   => 'attachment',
+			'post_status' => 'inherit',
+			'meta_query'  => array(
+				array(
+					'key'   => 'sf_attachment_secret',
+					'value' => $attachment_secret,
+				),
+			)
+		) );
+		if ( isset( $posts[0] ) ) {
+			return $posts[0]->ID;
+		} else {
+			return 0;
+		}
+	}
 
-		$secondary_hash = md5( $this->secret_key . date( 'Y-m-d' ) );
-		$file['url']    = site_url( '/secure-files/' ) . str_replace( $this->private_hash . '.', $secondary_hash . '/', basename( $file['file'] ) );
+	public function get_attachment_url( $attachment_id ) {
+		$attachment_secret = $this->get_attachment_secret_key( $attachment_id );
 
-		return $file;
+		return home_url() . '/?sf_download_attachment=' . $attachment_secret;
 	}
 
 }
diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 1500f2e..b1d556f 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -261,6 +261,7 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 		foreach ( $new_attachment_ids as $new_attachment_id ) {
 			// Save the attachment ID as post meta of reply
 			add_post_meta( $new_reply->ID, 'sf_attachments', $new_attachment_id );
+			SupportFlow()->extend->attachments->insert_attachment_secret_key( $new_attachment_id ) ;
 		}
 
 		// Store the original email ID so we don't accidentally dupe it
diff --git a/supportflow.php b/supportflow.php
index 18b5a28..87aa13c 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -774,6 +774,7 @@ public function add_ticket_reply( $ticket_id, $reply_text, $details = array() )
 		if ( is_array( $attachment_ids ) ) {
 			foreach ( $attachment_ids as $attachment_id ) {
 				add_post_meta( $reply_id, 'sf_attachments', $attachment_id );
+				SupportFlow()->extend->attachments->insert_attachment_secret_key( $attachment_id );
 			}
 		}
 

From 1b5ccaf99dbe9ebe301f46d23ec5fd5379eff66a Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 31 Jul 2014 01:13:34 +0530
Subject: [PATCH 330/485] Prevent inserting a same attachment twice in a reply

---
 classes/class-supportflow-admin.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 7941109..9a10dbb 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -1195,7 +1195,9 @@ public function action_save_post( $ticket_id ) {
 
 			$visibility = ( ! empty( $_POST['mark-private'] ) ) ? 'private' : 'public';
 			if ( ! empty( $_POST['reply-attachments'] ) ) {
-				$attachements = explode( ',', trim( $_POST['reply-attachments'], ',' ) );
+				$attachements   = explode( ',', trim( $_POST['reply-attachments'], ',' ) );
+				// Remove same attachment added more than once
+				$attachements   = array_unique($attachements);
 				// Remove non-int attachment ID's from array
 				$attachements   = array_filter( $attachements, function ( $val ) {
 					return (string) (int) $val === (string) $val;

From 8c72cb12c71064c7669489d5aec9ae416538276f Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 01:36:31 +0530
Subject: [PATCH 331/485] Add some random characters to uploaded files

This is to prevent direct access by guessing its name
---
 classes/class-supportflow-attachments.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/classes/class-supportflow-attachments.php b/classes/class-supportflow-attachments.php
index 6a40d83..e685090 100644
--- a/classes/class-supportflow-attachments.php
+++ b/classes/class-supportflow-attachments.php
@@ -9,6 +9,7 @@ class SupportFlow_Attachments extends SupportFlow {
 
 	function __construct() {
 		add_action( 'init', array( $this, 'action_init_download_attachment' ) );
+		add_filter( 'wp_handle_upload_prefilter', array( $this, 'filter_wp_handle_upload_prefilter' ) );
 	}
 
 	public function action_init_download_attachment() {
@@ -40,6 +41,16 @@ public function action_init_download_attachment() {
 		exit;
 	}
 
+	/*
+	 * Adds some random characters to attachments to prevent direct access by guessing name
+	 */
+	public function filter_wp_handle_upload_prefilter( $file ) {
+		$file_parts   = pathinfo( $file['name'] );
+		$file['name'] = $file_parts['filename'] . '_' . wp_generate_password( 5, false ) . '.' . $file_parts['extension'];
+
+		return $file;
+	}
+
 	public function insert_attachment_secret_key( $attachment_id ) {
 		$secret = $this->get_attachment_secret_key( $attachment_id );
 		if ( $secret ) {

From 2c8bdf32552fc63c9592fae7fe80cb5c07eae9a4 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 19:00:18 +0530
Subject: [PATCH 332/485] Adding random characters to only files uploaded to
 SupportFlow

Earlier it cover all file including files not uploaded to SupportFlow
---
 classes/class-supportflow-admin.php         | 32 +++++++++++++++++++++
 classes/class-supportflow-attachments.php   | 30 ++++++++++++-------
 classes/class-supportflow-email-replies.php |  1 +
 3 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 9a10dbb..5b58d1d 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -12,6 +12,7 @@ function __construct() {
 		add_filter( 'heartbeat_received', array( $this, 'filter_heartbeat_received' ), 10, 2 );
 		add_action( 'wp_ajax_ticket_attachment_upload', array( $this, 'action_wp_ajax_ticket_attachment_upload' ) );
 		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
+		add_action( 'add_attachment', array( $this, 'action_add_attachment' ) );
 	}
 
 	public function setup_actions() {
@@ -139,6 +140,37 @@ public function action_wp_ajax_sf_email_conversation() {
 
 	}
 
+	/*
+	 * Add random characters to attachment uploaded through SupportFlow web UI
+	 */
+	function action_add_attachment( $attachment_id ) {
+		if ( empty( $_SERVER['HTTP_REFERER'] ) ) {
+			return;
+		}
+
+		$post_type = SupportFlow()->post_type;
+		$referer   = $_SERVER['HTTP_REFERER'];
+
+		$url  = parse_url( $referer );
+		$path = $url['scheme'] . '://' . $url['host'] . $url['path'];
+		parse_str( $url['query'], $query );
+
+		// Check if referred by SupportFlow ticket page
+		if ( admin_url( 'post-new.php' ) == $path ) {
+			if ( empty( $query['post_type'] ) || $query['post_type'] != $post_type ) {
+				return;
+			}
+		} elseif ( admin_url( 'post.php' ) == $path ) {
+			if ( empty( $query['post'] ) || get_post_type( (int) $query['post'] ) != $post_type ) {
+				return;
+			}
+		} else {
+			return;
+		}
+
+		SupportFlow()->extend->attachments->secure_attachment_file( $attachment_id );
+	}
+
 	/**
 	 * Filter the messages that appear to the user after they perform an action on a ticket
 	 */
diff --git a/classes/class-supportflow-attachments.php b/classes/class-supportflow-attachments.php
index e685090..718f282 100644
--- a/classes/class-supportflow-attachments.php
+++ b/classes/class-supportflow-attachments.php
@@ -9,7 +9,6 @@ class SupportFlow_Attachments extends SupportFlow {
 
 	function __construct() {
 		add_action( 'init', array( $this, 'action_init_download_attachment' ) );
-		add_filter( 'wp_handle_upload_prefilter', array( $this, 'filter_wp_handle_upload_prefilter' ) );
 	}
 
 	public function action_init_download_attachment() {
@@ -41,16 +40,6 @@ public function action_init_download_attachment() {
 		exit;
 	}
 
-	/*
-	 * Adds some random characters to attachments to prevent direct access by guessing name
-	 */
-	public function filter_wp_handle_upload_prefilter( $file ) {
-		$file_parts   = pathinfo( $file['name'] );
-		$file['name'] = $file_parts['filename'] . '_' . wp_generate_password( 5, false ) . '.' . $file_parts['extension'];
-
-		return $file;
-	}
-
 	public function insert_attachment_secret_key( $attachment_id ) {
 		$secret = $this->get_attachment_secret_key( $attachment_id );
 		if ( $secret ) {
@@ -99,6 +88,25 @@ public function get_attachment_url( $attachment_id ) {
 		return home_url() . '/?sf_download_attachment=' . $attachment_secret;
 	}
 
+	/**
+	 * Sufffix random characters to attachment to prevent direct access to it by guessing URL
+	 *
+	 * @param int $attachment_id ID of attachment
+	 * @return boolean True on success else false
+	 */
+	public function secure_attachment_file( $attachment_id ) {
+
+		$file       = get_attached_file( $attachment_id );
+		$file_parts = pathinfo( $file );
+		$file_new   = $file_parts['dirname'] . '/' . $file_parts['filename'] . '_' . wp_generate_password( 5, false ) . '.' . $file_parts['extension'];
+
+		if ( rename( $file, $file_new ) ) {
+			update_attached_file( $attachment_id, $file_new );
+			return true;
+		} else {
+			return false;;
+		}
+	}
 }
 
 SupportFlow()->extend->attachments = new SupportFlow_Attachments();
\ No newline at end of file
diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index b1d556f..458e06e 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -172,6 +172,7 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 					if ( is_wp_error( $upload_result ) ) {
 						WP_CLI::warning( $upload_result->get_error_message() );
 					} else {
+						SupportFlow()->extend->attachments->secure_attachment_file( $upload_result );
 						$new_attachment_ids[] = $upload_result;
 					}
 

From aa706a4af2c3d18ebff278710d6459451309c819 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 19:15:51 +0530
Subject: [PATCH 333/485] Migrate all posts with post type sf_thread to
 sf_ticket

---
 supportflow.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index 87aa13c..d3b9219 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -161,12 +161,12 @@ private function setup_globals() {
 
 		/** Identifiers *******************************************************/
 
-		$this->post_type                = apply_filters( 'supportflow_thread_post_type', 'sf_thread' ); // Retained sf_thread for backward compatiblity with old versions
+		$this->post_type                = apply_filters( 'supportflow_thread_post_type', 'sf_ticket' );
 		$this->predefinded_replies_type = apply_filters( 'supportflow_predefinded_replies_type', 'sf_predefs' );
 		$this->respondents_tax          = apply_filters( 'supportflow_respondents_taxonomy', 'sf_respondent' );
 		$this->tags_tax                 = apply_filters( 'supportflow_tags_taxonomy', 'sf_tags' );
 		$this->comment_type             = apply_filters( 'supportflow_ticket_comment_type', 'sf_comment' );
-		$this->reply_type               = apply_filters( 'supportflow_ticket_reply_type', 'sf_thread' ); // Retained sf_thread for backward compatiblity with old versions
+		$this->reply_type               = apply_filters( 'supportflow_ticket_reply_type', 'sf_ticket' );
 
 		$this->email_term_prefix = 'sf-';
 
@@ -362,6 +362,8 @@ public function action_init_register_post_statuses() {
 	 * @since 0.3
 	 */
 	public function action_init_upgrade() {
+		global $wpdb;
+
 		$code_version = $this->version;
 		$db_version   = get_option( 'sf_version' );
 
@@ -384,6 +386,10 @@ public function action_init_upgrade() {
 				add_post_meta( $attachment->post_parent, 'sf_attachments', $attachment->ID );
 				wp_update_post( array( 'ID' => $attachment->ID, 'post_parent' => 0 ) );
 			}
+
+			// Migrate all posts with post type sf_thread to sf_ticket
+			$db_prefix = $wpdb->prefix;
+			$wpdb->update( "{$db_prefix}posts", array( 'post_type' => 'sf_ticket' ), array( 'post_type' => 'sf_shread' ) );
 		}
 
 		// Update db_version to latest one

From 9fc67474fae7d33d0fb94dd616f83f5e9cb08191 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 22:29:05 +0530
Subject: [PATCH 334/485] Added cssmin dependency to package.json

Also removed duplicate grunt-contrib-watch dependency
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2d06898..4c0a087 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
 		"grunt-contrib-uglify": "^0.5.1",
 		"grunt"               : "^0.4.5",
 		"grunt-contrib-watch" : "^0.6.1",
-		"grunt-contrib-watch" : "^0.6.1"
+		"grunt-contrib-cssmin": "^0.10.0"
 	},
 	"repository"  : {
 		"type": "git",

From 4edb1b737096f7fb9588f5a59396138e8a615fec Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 22:32:02 +0530
Subject: [PATCH 335/485] Add todo note to action_add_attachment()

Note is "Conversion to a better way to determine if attachment if uploaded
through SF web UI rather than HTTP referer"
---
 classes/class-supportflow-admin.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 5b58d1d..3512d14 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -140,8 +140,10 @@ public function action_wp_ajax_sf_email_conversation() {
 
 	}
 
-	/*
+	/**
 	 * Add random characters to attachment uploaded through SupportFlow web UI
+	 *
+	 * @todo Conversion to a better way to determine if attachment if uploaded through SF web UI rather than HTTP referer
 	 */
 	function action_add_attachment( $attachment_id ) {
 		if ( empty( $_SERVER['HTTP_REFERER'] ) ) {

From da744c0be52a2d9db77851785cbd76f0ef08f08f Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 22:36:44 +0530
Subject: [PATCH 336/485] Building minified version of CSS resources

---
 css/supportflow.min.css | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 css/supportflow.min.css

diff --git a/css/supportflow.min.css b/css/supportflow.min.css
new file mode 100644
index 0000000..cc8458b
--- /dev/null
+++ b/css/supportflow.min.css
@@ -0,0 +1,3 @@
+/*! SupportFlow minified version */
+
+.subsubsub li.trash a{color:#BC0B0B}.respondent_link{white-space:pre;vertical-align:top}#poststuff{padding-top:0}#side-sortables{margin-top:34px}#change_user_label{display:inline;font-weight:700;font-size:16px}#update_signature{width:30em}#supportflow-details .meta-item-label{font-weight:600}#supportflow-respondents.postbox,#supportflow-subject.postbox{border:none;background:0 0}#supportflow-respondents.postbox .inside,#supportflow-subject.postbox .inside{padding:0}#supportflow-details .handlediv,#supportflow-details h3.hndle,#supportflow-replies .handlediv,#supportflow-replies h3.hndle,#supportflow-respondents .handlediv,#supportflow-respondents h3.hndle,#supportflow-subject .handlediv,#supportflow-subject h3.hndle{display:none}#supportflow-details .handlediv,#supportflow-details h3.hndle{display:block}#supportflow-details #misc-publishing-actions label{display:inline-block}#supportflow-details #misc-publishing-actions select#post_status{width:100px}#supportflow-details #misc-publishing-actions span.the-date{font-weight:700}#supportflow-details #misc-publishing-actions div.last-activity{font-size:11px}#supportflow-replies h4,#supportflow-respondents h4,#supportflow-subject h4{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:13px;font-weight:400;margin:10px 0 6px}#supportflow-subject.postbox input{width:100%;font-size:1.7em;padding:12px 8px 10px;line-height:100%;height:1.7em}#supportflow-respondents.postbox input{width:100%;padding:8px;font-size:1.2em}#supportflow-cc-bcc.postbox input{width:100%;font-size:1.2em}#supportflow-replies.postbox #ticket-reply-box{width:100%}#supportflow-replies.postbox textarea{width:100%;padding:8px;font-size:1.1em;font-size:1.2em}#supportflow-replies.postbox .inside #message-tools #submit-action{padding:0;margin-top:5px;float:right}#supportflow-replies.postbox .inside #message-tools #replies-attachments-wrap{float:left}#supportflow-replies #replies-attachments-list,#supportflow-replies #upload-messages{margin-top:9px;margin-left:2px;color:#666}#supportflow-replies.postbox .inside #message-tools #submit-action input[type=checkbox]{margin-top:-1px}#supportflow-replies.postbox .inside #message-tools #submit-action label{padding-top:2px;padding-left:5px;padding-right:25px}#supportflow-replies.postbox ul.private-replies{background-color:#FFFFE0;border:1px solid #E6DB55;padding:5px 10px}#supportflow-replies.postbox ul.private-replies li{border-top:1px solid #DFDFDF;margin-top:10px}#supportflow-replies.postbox ul.private-replies li:first-child{border-top:none;margin-top:0}#supportflow-replies.postbox ul.private-replies li .ticket-meta{color:#BBB;font-size:.9em;text-align:right}#supportflow-replies.postbox ul.ticket-replies li{clear:left;margin-top:20px;margin-bottom:20px}#supportflow-replies.postbox ul.private-replies li .ticket-reply-attachments li,#supportflow-replies.postbox ul.ticket-replies li .ticket-reply-attachments li{margin-top:3px;margin-bottom:3px;font-size:.9em}#supportflow-replies.postbox ul.ticket-replies li .reply-avatar{float:left;width:100px;word-wrap:break-word}#supportflow-replies.postbox ul.ticket-replies li .reply-author{margin:0;font-size:.9em;color:#666}#supportflow-replies.postbox ul.ticket-replies li .ticket-reply{background-color:#FFF;margin-left:105px;min-height:80px;padding:10px;font-size:1.1em;border:1px solid #DFDFDF;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;word-wrap:break-word}#supportflow-replies.postbox ul.ticket-replies li .ticket-meta{margin-left:105px;font-size:.9em;color:#666;margin-top:5px}#supportflow-replies.postbox .predefined_replies_dropdown{width:200px}.metabox-holder .postbox-container .empty-container{border:none}input::-webkit-input-placeholder{color:#BBB}input:-moz-placeholder{color:#BBB}textarea::-webkit-input-placeholder{color:#BBB}textarea:-moz-placeholder{color:#BBB}#sf_my_tickets .toggle-content{display:none}#sf_my_tickets .tablenav{height:10px}#sf_recent_tickets .tablenav{height:0}#sf_recent_tickets .two_day_old{color:#DF1111}#sf_recent_tickets .one_two_day_old{color:#BD8A2C}
\ No newline at end of file

From ffb84994c053da0847e4d45a30471979fe75b060 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 22:38:42 +0530
Subject: [PATCH 337/485] Building minified version of JS resources

---
 js/supportflow.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/supportflow.min.js b/js/supportflow.min.js
index 0f4f799..ac6ac4a 100644
--- a/js/supportflow.min.js
+++ b/js/supportflow.min.js
@@ -1,2 +1,2 @@
 /*! SupportFlow minified version */
-jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title","Expand"),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title","Collapse")),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title","Expand"):jQuery(this).siblings(".toggle-link").prop("title","Collapse"),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(){jQuery(".delete_email_account").click(function(a){if(a.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var b=jQuery(this).data("account-id"),c="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,d="";d+='<form method="POST" id="remove_email_account" action="'+c+'">',d+='<input type="hidden" name="action" value="delete" />',d+=SFEmailAccounts.delete_email_account_nonce,d+='<input type="hidden" name="account_id" value='+b+" />",d+="</form>",jQuery("body").append(d),jQuery("#remove_email_account").submit()}}),jQuery("#add_new_email_account #imap_ssl").change(function(){jQuery("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),jQuery("#add_new_email_account #smtp_ssl").change(function(){jQuery("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(){var a=function(a){a.preventDefault();var b=jQuery("#email_conversation_to").val();jQuery.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:b,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){jQuery("#email_conversation_to").prop("disabled",!0),jQuery("#email_conversation_submit").prop("disabled",!0),jQuery("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(a){jQuery("#email_conversation_status").html(a)},error:function(){jQuery("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){jQuery("#email_conversation_to").prop("disabled",!1),jQuery("#email_conversation_submit").prop("disabled",!1)}})};jQuery("#email_conversation_submit").click(a),jQuery("#email_conversation_to").keyup(function(){10==event.keyCode&&a()})}),jQuery(document).ready(function(){jQuery(".permission_filters").change(function(){var a=jQuery("#change_user option:selected").data("user-id"),b=jQuery("#change_status option:selected").data("status");jQuery.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:a,status:b,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(a){jQuery("#user_permissions_table").html(a)}})}),jQuery(document).on("change",".toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("permission-identifier"),d=a.prop("checked"),e=c.user_id,f=c.privilege_type,g=c.privilege_id;b.html(SFPermissions.changing_status),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:e,privilege_type:f,privilege_id:g,allowed:d,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPermissions.allowed:SFPermissions.not_allowed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(){jQuery("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=jQuery("#predefs").find("option:selected").data("content"),old_content=jQuery(".predef:nth-child("+this.old_child+")").data("content"),current_content=jQuery("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void jQuery(".predef:nth-child("+this.old_child+")").prop("selected",!0);jQuery("#reply").val(new_content),this.old_child=jQuery("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(){jQuery(document).on("change",".toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("email-notfication-identifier"),d=a.prop("checked"),e=c.privilege_type,f=c.privilege_id;b.html(SFPreferences.changing_state),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:e,privilege_id:f,allowed:d,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPreferences.subscribed:SFPreferences.unsubscribed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#respondents").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{respondents:c,"api-action":"get-respondents"}};a("#respondents").autocomplete({source:function(c,d){a.ajax({url:SFRespondentsAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.respondents,function(b){var c=a("#respondents").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title",SFStatistics.expand),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title",SFStatistics.collapse)),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title",SFStatistics.expand):jQuery(this).siblings(".toggle-link").prop("title",SFStatistics.collapse),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var a=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return a.on("close",function(){var b=a.state().get("selection").toJSON();jQuery.each(b,function(){var a='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",b='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";jQuery("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+a+"&nbsp;"+b+"</li>"),jQuery("#reply-attachments").val(jQuery("#reply-attachments").val()+_.escape(this.id)+",")})}),a.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(){jQuery("#supportflow-details .meta-item-ok-button").click(function(a){var b=jQuery(this).siblings(".meta-item-dropdown").children("option:selected"),c=jQuery(this).closest(".meta-item"),d=c.children(".meta-item-name"),e=c.children(".meta-item-label");d.val(b.val()),e.text(b.text()),a.preventDefault()}),jQuery("#supportflow-details .meta-item-toggle-button").click(function(a){jQuery(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),a.preventDefault()}),jQuery(".save-button").click(function(a){return""==jQuery("#subject").val()?(alert(SFTickets.no_title_msg),void a.preventDefault()):""==jQuery("#respondents").val()?(alert(SFTickets.no_respondent_msg),void a.preventDefault()):void 0}),jQuery("#reply").keypress(function(a){a.ctrlKey&&10==a.keyCode&&""!=$(this).val()&&$("#post").submit()})});
\ No newline at end of file
+jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title","Expand"),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title","Collapse")),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title","Expand"):jQuery(this).siblings(".toggle-link").prop("title","Collapse"),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(){jQuery(".delete_email_account").click(function(a){if(a.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var b=jQuery(this).data("account-id"),c="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,d="";d+='<form method="POST" id="remove_email_account" action="'+c+'">',d+='<input type="hidden" name="action" value="delete" />',d+=SFEmailAccounts.delete_email_account_nonce,d+='<input type="hidden" name="account_id" value='+b+" />",d+="</form>",jQuery("body").append(d),jQuery("#remove_email_account").submit()}}),jQuery("#add_new_email_account #imap_ssl").change(function(){jQuery("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),jQuery("#add_new_email_account #smtp_ssl").change(function(){jQuery("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(){var a=function(a){a.preventDefault();var b=jQuery("#email_conversation_to").val();jQuery.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:b,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){jQuery("#email_conversation_to").prop("disabled",!0),jQuery("#email_conversation_submit").prop("disabled",!0),jQuery("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(a){jQuery("#email_conversation_status").html(a)},error:function(){jQuery("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){jQuery("#email_conversation_to").prop("disabled",!1),jQuery("#email_conversation_submit").prop("disabled",!1)}})};jQuery("#email_conversation_submit").click(a),jQuery("#email_conversation_to").keyup(function(){10==event.keyCode&&a()})}),jQuery(document).ready(function(){jQuery(".permission_filters").change(function(){var a=jQuery("#change_user option:selected").data("user-id"),b=jQuery("#change_status option:selected").data("status");jQuery.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:a,status:b,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(a){jQuery("#user_permissions_table").html(a)}})}),jQuery(document).on("change",".toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("permission-identifier"),d=a.prop("checked"),e=c.user_id,f=c.privilege_type,g=c.privilege_id;b.html(SFPermissions.changing_status),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:e,privilege_type:f,privilege_id:g,allowed:d,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPermissions.allowed:SFPermissions.not_allowed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(){jQuery("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=jQuery("#predefs").find("option:selected").data("content"),old_content=jQuery(".predef:nth-child("+this.old_child+")").data("content"),current_content=jQuery("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void jQuery(".predef:nth-child("+this.old_child+")").prop("selected",!0);jQuery("#reply").val(new_content),this.old_child=jQuery("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(){jQuery(document).on("change",".toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("email-notfication-identifier"),d=a.prop("checked"),e=c.privilege_type,f=c.privilege_id;b.html(SFPreferences.changing_state),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:e,privilege_id:f,allowed:d,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPreferences.subscribed:SFPreferences.unsubscribed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#respondents").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{respondents:c,"api-action":"get-respondents"}};a("#respondents").autocomplete({source:function(c,d){a.ajax({url:SFRespondentsAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.respondents,function(b){var c=a("#respondents").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title",SFStatistics.expand),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title",SFStatistics.collapse)),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title",SFStatistics.expand):jQuery(this).siblings(".toggle-link").prop("title",SFStatistics.collapse),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var a=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return a.on("close",function(){var b=a.state().get("selection").toJSON();jQuery.each(b,function(){var a='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",b='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";jQuery("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+a+"&nbsp;"+b+"</li>"),jQuery("#reply-attachments").val(jQuery("#reply-attachments").val()+_.escape(this.id)+",")})}),a.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(){jQuery("#supportflow-details .meta-item-ok-button").click(function(a){var b=jQuery(this).siblings(".meta-item-dropdown").children("option:selected"),c=jQuery(this).closest(".meta-item"),d=c.children(".meta-item-name"),e=c.children(".meta-item-label");d.val(b.val()),e.text(b.text()),a.preventDefault()}),jQuery("#supportflow-details .meta-item-toggle-button").click(function(a){jQuery(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),a.preventDefault()}),jQuery(".save-button").click(function(a){return""==jQuery("#subject").val()?(jQuery("#subject").focus(),alert(SFTickets.no_title_msg),void a.preventDefault()):""==jQuery("#respondents").val()?(jQuery("#respondents").focus(),alert(SFTickets.no_respondent_msg),void a.preventDefault()):void 0}),jQuery("#reply").keypress(function(a){a.ctrlKey&&10==a.keyCode&&""!=$(this).val()&&$("#post").submit()}),jQuery("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&jQuery("#insert-reply").val(jQuery("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),jQuery("#close-ticket-submit").click(function(){jQuery("#post meta-item input[name='post_status']").val("sf_closed")})});
\ No newline at end of file

From bd16e3513b9032027f05041c3f9823376348cf6e Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 23:11:53 +0530
Subject: [PATCH 338/485] Added auto_save.js to grunt

---
 Gruntfile.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gruntfile.js b/Gruntfile.js
index a328f43..d820374 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -10,6 +10,7 @@ module.exports = function (grunt) {
 		'js/statistics.js',
 		'js/ticket_attachments.js',
 		'js/tickets.js',
+		'js/auto_save.js',
 	];
 	var css_files = [
 		'css/admin.css',

From 1a1f3ffcb7c6a48d5aa90f7f0fa13cc7273d5aa2 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 23:12:17 +0530
Subject: [PATCH 339/485] Rebuilding grunt minified version of JS code

---
 js/supportflow.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/supportflow.min.js b/js/supportflow.min.js
index ac6ac4a..8c51789 100644
--- a/js/supportflow.min.js
+++ b/js/supportflow.min.js
@@ -1,2 +1,2 @@
 /*! SupportFlow minified version */
-jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title","Expand"),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title","Collapse")),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title","Expand"):jQuery(this).siblings(".toggle-link").prop("title","Collapse"),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(){jQuery(".delete_email_account").click(function(a){if(a.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var b=jQuery(this).data("account-id"),c="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,d="";d+='<form method="POST" id="remove_email_account" action="'+c+'">',d+='<input type="hidden" name="action" value="delete" />',d+=SFEmailAccounts.delete_email_account_nonce,d+='<input type="hidden" name="account_id" value='+b+" />",d+="</form>",jQuery("body").append(d),jQuery("#remove_email_account").submit()}}),jQuery("#add_new_email_account #imap_ssl").change(function(){jQuery("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),jQuery("#add_new_email_account #smtp_ssl").change(function(){jQuery("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(){var a=function(a){a.preventDefault();var b=jQuery("#email_conversation_to").val();jQuery.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:b,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){jQuery("#email_conversation_to").prop("disabled",!0),jQuery("#email_conversation_submit").prop("disabled",!0),jQuery("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(a){jQuery("#email_conversation_status").html(a)},error:function(){jQuery("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){jQuery("#email_conversation_to").prop("disabled",!1),jQuery("#email_conversation_submit").prop("disabled",!1)}})};jQuery("#email_conversation_submit").click(a),jQuery("#email_conversation_to").keyup(function(){10==event.keyCode&&a()})}),jQuery(document).ready(function(){jQuery(".permission_filters").change(function(){var a=jQuery("#change_user option:selected").data("user-id"),b=jQuery("#change_status option:selected").data("status");jQuery.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:a,status:b,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(a){jQuery("#user_permissions_table").html(a)}})}),jQuery(document).on("change",".toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("permission-identifier"),d=a.prop("checked"),e=c.user_id,f=c.privilege_type,g=c.privilege_id;b.html(SFPermissions.changing_status),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:e,privilege_type:f,privilege_id:g,allowed:d,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPermissions.allowed:SFPermissions.not_allowed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(){jQuery("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=jQuery("#predefs").find("option:selected").data("content"),old_content=jQuery(".predef:nth-child("+this.old_child+")").data("content"),current_content=jQuery("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void jQuery(".predef:nth-child("+this.old_child+")").prop("selected",!0);jQuery("#reply").val(new_content),this.old_child=jQuery("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(){jQuery(document).on("change",".toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("email-notfication-identifier"),d=a.prop("checked"),e=c.privilege_type,f=c.privilege_id;b.html(SFPreferences.changing_state),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:e,privilege_id:f,allowed:d,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPreferences.subscribed:SFPreferences.unsubscribed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#respondents").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{respondents:c,"api-action":"get-respondents"}};a("#respondents").autocomplete({source:function(c,d){a.ajax({url:SFRespondentsAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.respondents,function(b){var c=a("#respondents").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title",SFStatistics.expand),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title",SFStatistics.collapse)),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title",SFStatistics.expand):jQuery(this).siblings(".toggle-link").prop("title",SFStatistics.collapse),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var a=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return a.on("close",function(){var b=a.state().get("selection").toJSON();jQuery.each(b,function(){var a='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",b='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";jQuery("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+a+"&nbsp;"+b+"</li>"),jQuery("#reply-attachments").val(jQuery("#reply-attachments").val()+_.escape(this.id)+",")})}),a.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(){jQuery("#supportflow-details .meta-item-ok-button").click(function(a){var b=jQuery(this).siblings(".meta-item-dropdown").children("option:selected"),c=jQuery(this).closest(".meta-item"),d=c.children(".meta-item-name"),e=c.children(".meta-item-label");d.val(b.val()),e.text(b.text()),a.preventDefault()}),jQuery("#supportflow-details .meta-item-toggle-button").click(function(a){jQuery(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),a.preventDefault()}),jQuery(".save-button").click(function(a){return""==jQuery("#subject").val()?(jQuery("#subject").focus(),alert(SFTickets.no_title_msg),void a.preventDefault()):""==jQuery("#respondents").val()?(jQuery("#respondents").focus(),alert(SFTickets.no_respondent_msg),void a.preventDefault()):void 0}),jQuery("#reply").keypress(function(a){a.ctrlKey&&10==a.keyCode&&""!=$(this).val()&&$("#post").submit()}),jQuery("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&jQuery("#insert-reply").val(jQuery("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),jQuery("#close-ticket-submit").click(function(){jQuery("#post meta-item input[name='post_status']").val("sf_closed")})});
\ No newline at end of file
+jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title","Expand"),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title","Collapse")),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title","Expand"):jQuery(this).siblings(".toggle-link").prop("title","Collapse"),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(){jQuery(".delete_email_account").click(function(a){if(a.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var b=jQuery(this).data("account-id"),c="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,d="";d+='<form method="POST" id="remove_email_account" action="'+c+'">',d+='<input type="hidden" name="action" value="delete" />',d+=SFEmailAccounts.delete_email_account_nonce,d+='<input type="hidden" name="account_id" value='+b+" />",d+="</form>",jQuery("body").append(d),jQuery("#remove_email_account").submit()}}),jQuery("#add_new_email_account #imap_ssl").change(function(){jQuery("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),jQuery("#add_new_email_account #smtp_ssl").change(function(){jQuery("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(){var a=function(a){a.preventDefault();var b=jQuery("#email_conversation_to").val();jQuery.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:b,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){jQuery("#email_conversation_to").prop("disabled",!0),jQuery("#email_conversation_submit").prop("disabled",!0),jQuery("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(a){jQuery("#email_conversation_status").html(a)},error:function(){jQuery("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){jQuery("#email_conversation_to").prop("disabled",!1),jQuery("#email_conversation_submit").prop("disabled",!1)}})};jQuery("#email_conversation_submit").click(a),jQuery("#email_conversation_to").keyup(function(){10==event.keyCode&&a()})}),jQuery(document).ready(function(){jQuery(".permission_filters").change(function(){var a=jQuery("#change_user option:selected").data("user-id"),b=jQuery("#change_status option:selected").data("status");jQuery.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:a,status:b,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(a){jQuery("#user_permissions_table").html(a)}})}),jQuery(document).on("change",".toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("permission-identifier"),d=a.prop("checked"),e=c.user_id,f=c.privilege_type,g=c.privilege_id;b.html(SFPermissions.changing_status),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:e,privilege_type:f,privilege_id:g,allowed:d,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPermissions.allowed:SFPermissions.not_allowed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(){jQuery("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=jQuery("#predefs").find("option:selected").data("content"),old_content=jQuery(".predef:nth-child("+this.old_child+")").data("content"),current_content=jQuery("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void jQuery(".predef:nth-child("+this.old_child+")").prop("selected",!0);jQuery("#reply").val(new_content),this.old_child=jQuery("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(){jQuery(document).on("change",".toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("email-notfication-identifier"),d=a.prop("checked"),e=c.privilege_type,f=c.privilege_id;b.html(SFPreferences.changing_state),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:e,privilege_id:f,allowed:d,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPreferences.subscribed:SFPreferences.unsubscribed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#respondents").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{respondents:c,"api-action":"get-respondents"}};a("#respondents").autocomplete({source:function(c,d){a.ajax({url:SFRespondentsAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.respondents,function(b){var c=a("#respondents").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title",SFStatistics.expand),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title",SFStatistics.collapse)),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title",SFStatistics.expand):jQuery(this).siblings(".toggle-link").prop("title",SFStatistics.collapse),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var a=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return a.on("close",function(){var b=a.state().get("selection").toJSON();jQuery.each(b,function(){var a='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",b='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";jQuery("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+a+"&nbsp;"+b+"</li>"),jQuery("#reply-attachments").val(jQuery("#reply-attachments").val()+_.escape(this.id)+",")})}),a.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(){jQuery("#supportflow-details .meta-item-ok-button").click(function(a){var b=jQuery(this).siblings(".meta-item-dropdown").children("option:selected"),c=jQuery(this).closest(".meta-item"),d=c.children(".meta-item-name"),e=c.children(".meta-item-label");d.val(b.val()),e.text(b.text()),a.preventDefault()}),jQuery("#supportflow-details .meta-item-toggle-button").click(function(a){jQuery(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),a.preventDefault()}),jQuery(".save-button").click(function(a){return""==jQuery("#subject").val()?(jQuery("#subject").focus(),alert(SFTickets.no_title_msg),void a.preventDefault()):""==jQuery("#respondents").val()?(jQuery("#respondents").focus(),alert(SFTickets.no_respondent_msg),void a.preventDefault()):void 0}),jQuery("#reply").keypress(function(a){a.ctrlKey&&10==a.keyCode&&""!=$(this).val()&&$("#post").submit()}),jQuery("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&jQuery("#insert-reply").val(jQuery("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),jQuery("#close-ticket-submit").click(function(){jQuery("#post meta-item input[name='post_status']").val("sf_closed")})}),jQuery(document).ready(function(){jQuery(".sf_autosave").keyup(function(){var a={};a.ticket_id=SFAutoSave.ticket_id,jQuery(".sf_autosave").each(function(){element_key=jQuery(this).attr("name"),element_value=jQuery(this).val(),a[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",a,!1)})});
\ No newline at end of file

From 0e67940ab650bd9116508e4ae71f4a21602ad862 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 7 Aug 2014 23:14:41 +0530
Subject: [PATCH 340/485] Add comment to grunt file explaining why some files
 are not included

---
 Gruntfile.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gruntfile.js b/Gruntfile.js
index d820374..a9558cc 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,4 +1,5 @@
 module.exports = function (grunt) {
+	// supportflow-user-widget.js and widget.css are left for now as feature is not completed
 	var js_files = [
 		'js/dashboard.js',
 		'js/email_accounts.js',

From 0d14d8a5da2e27f71fe3ec678f3ef6acde50893f Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 8 Aug 2014 17:31:35 +0530
Subject: [PATCH 341/485] Created enqueue_script and enqueue_style method of
 SupportFlow class

---
 supportflow.php | 53 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/supportflow.php b/supportflow.php
index 3a7e3ef..ebcdf88 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -841,6 +841,59 @@ public function get_ticket_from_secret( $secret ) {
 		}
 	}
 
+	/**
+	 * SupportFlow alternate of wp_enqueue_script() to increase code reuse and save time. Enqueue a JS script
+	 *
+	 * @param string      $handle    Name of the script.
+	 * @param string      $file_name Path to the script "/plugins/supportflow/js/ is automatically prefixed to it.
+	 *                               Example: 'attachment.js'.
+	 * @param array       $deps      Optional. An array of registered handles this script depends on. Default array( 'jquery' )
+	 * @param string|bool $ver       Optional. String specifying the script version number.
+	 *                               If true current version of SupportFlow will be append to it.
+	 *                               Set false to prevent any version added to it or a string for a particular version of choice
+	 * @param bool        $in_footer Optional. Whether to enqueue the script before </head> or before </body>.
+	 *                               Default 'false'. Accepts 'false' or 'true'.
+	 *
+	 * @return string     Handle of enqueued script
+	 */
+	public function enqueue_script( $handle, $file_name, $dependencies = array( 'jquery' ), $version = true, $in_footer = false ) {
+		if ( true === $version ) {
+			$version = $this->version;
+		}
+		$src = SupportFlow()->plugin_url . "js/$file_name";
+
+		wp_enqueue_script( $handle, $src, $dependencies, $version, $in_footer );
+
+		return $handle;
+	}
+
+	/**
+	 * SupportFlow alternate of wp_enqueue_script() to increase code reuse and save time. Enqueue a CSS stylesheet
+	 *
+	 * @param string      $handle    Name of the stylesheet.
+	 * @param string      $file_name Path to the stylesheet "/plugins/supportflow/css/ is automatically prefixed to it.
+	 *                               Example: 'attachment.js'.
+	 * @param array       $deps      Optional. An array of registered handles this script depends on.
+	 * @param string|bool $ver       Optional. String specifying the script version number.
+	 *                               If true current version of SupportFlow will be append to it.
+	 *                               Set false to prevent any version added to it or a string for a particular version of choice
+	 * @param string      $media     Optional. The media for which this stylesheet has been defined.
+	 *                               Default 'all'. Accepts 'all', 'aural', 'braille', 'handheld', 'projection', 'print',
+	 *                               'screen', 'tty', or 'tv'.
+	 *
+	 * @return string     Handle of enqueued style
+	 */
+	public function enqueue_style( $handle, $file_name, $dependencies = array(), $version = true, $media = 'all' ) {
+		if ( true === $version ) {
+			$version = $this->version;
+		}
+		$src = SupportFlow()->plugin_url . "css/$file_name";
+
+		wp_enqueue_style( $handle, $src, $dependencies, $version, $media );
+
+		return $handle;
+	}
+
 	/**
 	 *
 	 * Enqueue minfied and concatenated version all the scripts required by SupportFlow

From 84866b2a8d5c8c29ed04fc186f775f959624e739 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 8 Aug 2014 17:34:51 +0530
Subject: [PATCH 342/485] Created SupportFlow::script_devs property

It is to check if we should use dev. version of script and styles
---
 supportflow.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/supportflow.php b/supportflow.php
index ebcdf88..fe8e778 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -152,6 +152,7 @@ private function setup_globals() {
 
 		// Setup some base path and URL information
 		$this->file       = __FILE__;
+		$this->script_dev = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG;
 		$this->basename   = apply_filters( 'supportflow_plugin_basenname', plugin_basename( $this->file ) );
 		$this->plugin_dir = apply_filters( 'supportflow_plugin_dir_path', plugin_dir_path( $this->file ) );
 		$this->plugin_url = apply_filters( 'supportflow_plugin_dir_url', plugin_dir_url( $this->file ) );

From 2dd587ff0fedc2237a438c7ec82e4e8883eb841d Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 8 Aug 2014 18:19:29 +0530
Subject: [PATCH 343/485] Refactored code

To use:
* SupportFlow->enqueue_script()
* SupportFlow->enqueue_style()
* SupportFlow->script_dev
---
 classes/class-supportflow-admin.php           | 27 +++++++------------
 classes/class-supportflow-dashboard.php       | 13 +++------
 classes/class-supportflow-email-accounts.php  |  9 ++-----
 classes/class-supportflow-permissions.php     |  9 ++-----
 .../class-supportflow-predefined-replies.php  |  9 ++-----
 classes/class-supportflow-preferences.php     |  9 ++-----
 classes/class-supportflow-statistics.php      |  9 ++-----
 supportflow.php                               | 18 +++++--------
 8 files changed, 28 insertions(+), 75 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 74c6307..437ef53 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -63,13 +63,9 @@ function action_admin_init() {
 	 */
 	public function action_admin_enqueue_scripts() {
 		global $pagenow;
-		$script_debugging = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG;
 
-		if ( $script_debugging ) {
-			wp_enqueue_style(
-				'supportflow-admin',
-				SupportFlow()->plugin_url . 'css/admin.css'
-			);
+		if ( SupportFlow()->script_dev ) {
+			$handle = SupportFlow()->enqueue_style( 'supportflow-admin', 'admin.css' );
 		} else {
 			SupportFlow()->enqueue_styles();
 		}
@@ -77,15 +73,11 @@ public function action_admin_enqueue_scripts() {
 		if ( in_array( $pagenow, array( 'post.php', 'post-new.php' ) ) ) {
 			wp_enqueue_media();
 
-			if ( $script_debugging ) {
-				$respondents_autocomplete_handle = 'supportflow-respondents-autocomplete';
-				$ticket_attachment_handle        = 'supportflow-ticket-attachments';
-				$supportflow_tickets_handle      = 'supportflow-tickets';
-				$auto_save_handle                = 'supportflow-auto-save';
-				wp_enqueue_script( $respondents_autocomplete_handle, SupportFlow()->plugin_url . 'js/respondents-autocomplete.js', array( 'jquery' ) );
-				wp_enqueue_script( $ticket_attachment_handle, SupportFlow()->plugin_url . 'js/ticket_attachments.js', array( 'jquery' ) );
-				wp_enqueue_script( $supportflow_tickets_handle, SupportFlow()->plugin_url . 'js/tickets.js', array( 'jquery' ) );
-				wp_enqueue_script( $auto_save_handle, SupportFlow()->plugin_url . 'js/auto_save.js', array( 'jquery', 'heartbeat' ) );
+			if ( SupportFlow()->script_dev ) {
+				$respondents_autocomplete_handle = SupportFlow()->enqueue_script( 'supportflow-respondents-autocomplete', 'respondents-autocomplete.js' );
+				$ticket_attachment_handle        = SupportFlow()->enqueue_script( 'supportflow-ticket-attachments', 'ticket_attachments.js' );
+				$supportflow_tickets_handle      = SupportFlow()->enqueue_script( 'supportflow-tickets', 'tickets.js' );
+				$auto_save_handle                = SupportFlow()->enqueue_script( 'supportflow-auto-save', 'auto_save.js', array( 'jquery', 'heartbeat' ) );
 			} else {
 				$handle
 					= $respondents_autocomplete_handle
@@ -121,9 +113,8 @@ public function action_admin_enqueue_scripts() {
 		}
 
 		if ( 'post.php' == $pagenow ) {
-			if ( $script_debugging ) {
-				$email_conversation_handle = 'supportflow-email-conversation';
-				wp_enqueue_script( $email_conversation_handle, SupportFlow()->plugin_url . 'js/email_conversation.js', array( 'jquery' ) );
+			if ( SupportFlow()->script_dev ) {
+				$email_conversation_handle = SupportFlow()->enqueue_script( 'supportflow-email-conversation', 'email_conversation.js' );
 			} else {
 				$email_conversation_handle = SupportFlow()->enqueue_scripts();
 			}
diff --git a/classes/class-supportflow-dashboard.php b/classes/class-supportflow-dashboard.php
index ddfe89e..307dbf6 100644
--- a/classes/class-supportflow-dashboard.php
+++ b/classes/class-supportflow-dashboard.php
@@ -17,16 +17,9 @@ public function setup_actions() {
 
 	function action_wp_dashboard_setup() {
 		if ( current_user_can( 'edit_posts' ) ) {
-			if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
-				wp_enqueue_script(
-					'supportflow-dashboard',
-					SupportFlow()->plugin_url . 'js/dashboard.js',
-					array( 'jquery' )
-				);
-				wp_enqueue_style(
-					'supportflow-dashboard',
-					SupportFlow()->plugin_url . 'css/dashboard.css'
-				);
+			if ( SupportFlow()->script_dev ) {
+				SupportFlow()->enqueue_script( 'supportflow-dashboard', 'dashboard.js' );
+				SupportFlow()->enqueue_style( 'supportflow-dashboard', 'dashboard.css' );
 			} else {
 				SupportFlow()->enqueue_scripts();
 				SupportFlow()->enqueue_styles();
diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index c833550..c286bf0 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -292,13 +292,8 @@ public function insert_add_new_account_form() {
 	 * Enqueue JS code required for form submission
 	 */
 	public function enqueue_script() {
-		if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
-			$handle = 'supportflow-email_accounts';
-			wp_enqueue_script(
-				$handle,
-				SupportFlow()->plugin_url . 'js/email_accounts.js',
-				array( 'jquery' )
-			);
+		if ( SupportFlow()->script_dev ) {
+			$handle = SupportFlow()->enqueue_script( 'supportflow-email_accounts', 'email_accounts.js' );
 		} else {
 			$handle = SupportFlow()->enqueue_scripts();
 		}
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index b6e275f..5730f42 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -118,13 +118,8 @@ public function permissions_page() {
 	 * Enqueue JS code required by class
 	 */
 	public function enqueue_script() {
-		if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
-			$handle = 'supportflow-permissions';
-			wp_enqueue_script(
-				$handle,
-				SupportFlow()->plugin_url . 'js/permissions.js',
-				array( 'jquery' )
-			);
+		if ( SupportFlow()->script_dev ) {
+			$handle = SupportFlow()->enqueue_script( 'supportflow-permissions', 'permissions.js' );
 		} else {
 			$handle = SupportFlow()->enqueue_scripts();
 		}
diff --git a/classes/class-supportflow-predefined-replies.php b/classes/class-supportflow-predefined-replies.php
index 099fa9f..02d6dd2 100644
--- a/classes/class-supportflow-predefined-replies.php
+++ b/classes/class-supportflow-predefined-replies.php
@@ -40,13 +40,8 @@ public function action_admin_enqueue_scripts() {
 		global $pagenow;
 
 		if ( 'post.php' == $pagenow || 'post-new.php' == $pagenow ) {
-			if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
-				$handle = 'supportflow-predefined-replies';
-				wp_enqueue_script(
-					$handle,
-					SupportFlow()->plugin_url . 'js/predefined-replies.js',
-					array( 'jquery' )
-				);
+			if ( SupportFlow()->script_dev ) {
+				$handle = SupportFlow()->enqueue_script( 'supportflow-predefined-replies', 'predefined-replies.js' );
 			} else {
 				$handle = SupportFlow()->enqueue_scripts();
 			}
diff --git a/classes/class-supportflow-preferences.php b/classes/class-supportflow-preferences.php
index b1da189..0666872 100644
--- a/classes/class-supportflow-preferences.php
+++ b/classes/class-supportflow-preferences.php
@@ -29,13 +29,8 @@ public function action_admin_menu() {
 	}
 
 	public function enqueue_scripts() {
-		if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
-			$handle = 'supportflow-preferences';
-			wp_enqueue_script(
-				$handle,
-				SupportFlow()->plugin_url . 'js/preferences.js',
-				array( 'jquery' )
-			);
+		if ( SupportFlow()->script_dev ) {
+			$handle = SupportFlow()->enqueue_script( 'supportflow-preferences', 'preferences.js' );
 		} else {
 			$handle = SupportFlow()->enqueue_scripts();
 		}
diff --git a/classes/class-supportflow-statistics.php b/classes/class-supportflow-statistics.php
index 58229a3..07aebad 100644
--- a/classes/class-supportflow-statistics.php
+++ b/classes/class-supportflow-statistics.php
@@ -114,13 +114,8 @@ function insert_css_code() {
 	 * Enqueue JS code required by statistics page
 	 */
 	function enqueue_script() {
-		if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
-			$handle = 'supportflow-statistics';
-			wp_enqueue_script(
-				$handle,
-				SupportFlow()->plugin_url . 'js/statistics.js',
-				array( 'jquery' )
-			);
+		if ( SupportFlow()->script_dev ) {
+			$handle = SupportFlow()->enqueue_script( 'supportflow-statistics', 'statistics.js' );
 		} else {
 			$handle = SupportFlow()->enqueue_scripts();
 		}
diff --git a/supportflow.php b/supportflow.php
index fe8e778..80fa5d9 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -903,15 +903,12 @@ public function enqueue_style( $handle, $file_name, $dependencies = array(), $ve
 	 * @return string Handle of enqueued script
 	 */
 	public function enqueue_scripts() {
-		$handle = 'supportflow-minified-scripts';
 
-		wp_enqueue_script(
-			$handle,
-			SupportFlow()->plugin_url . 'js/supportflow.min.js',
+		return $this->enqueue_script(
+			'supportflow-minified-scripts',
+			'supportflow.min.js',
 			array( 'jquery', 'jquery-ui-autocomplete', 'heartbeat' )
 		);
-
-		return $handle;
 	}
 
 	/**
@@ -921,14 +918,11 @@ public function enqueue_scripts() {
 	 * @return string Handle of enqueued style
 	 */
 	public function enqueue_styles() {
-		$handle = 'supportflow-minified-styles';
 
-		wp_enqueue_style(
-			$handle,
-			SupportFlow()->plugin_url . 'css/supportflow.min.css'
+		return $this->enqueue_style(
+			'supportflow-minified-styles',
+			'supportflow.min.css'
 		);
-
-		return $handle;
 	}
 
 	/**

From e9c101d43731fac333ab9813997ec430428dda82 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 8 Aug 2014 19:00:10 +0530
Subject: [PATCH 344/485] [Bug] Incorrect table classes were added to
 SupportFlow tables

---
 classes/class-supportflow-table.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-table.php b/classes/class-supportflow-table.php
index d58e068..839181f 100644
--- a/classes/class-supportflow-table.php
+++ b/classes/class-supportflow-table.php
@@ -21,7 +21,7 @@ class SupportFlow_Table extends WP_List_Table {
 	 */
 	function __construct( $table_class = '', $display_nav = true, $display_col_headers = true ) {
 		if ( $table_class ) {
-			parent::__construct( array( 'screen' => 'sf_statistics_table' ) );
+			parent::__construct( array( 'screen' => $table_class ) );
 		} else {
 			parent::__construct();
 		}

From 7ede7ae42df06c7dde142c773862c97242c8cc87 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 8 Aug 2014 19:52:04 +0530
Subject: [PATCH 345/485] [Bug] Code for one table messed up with other

Tables were E-Mail notification and permissions

Added a unique class to both to prevent both from iterfering with each
other
---
 classes/class-supportflow-preferences.php | 2 +-
 js/permissions.js                         | 2 +-
 js/preferences.js                         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/class-supportflow-preferences.php b/classes/class-supportflow-preferences.php
index 0666872..7fb0a9b 100644
--- a/classes/class-supportflow-preferences.php
+++ b/classes/class-supportflow-preferences.php
@@ -112,7 +112,7 @@ public function notification_setting_page() {
 			);
 		}
 
-		$email_notifications_table = new SupportFlow_Table();
+		$email_notifications_table = new SupportFlow_Table( 'sf_email_accounts_table' );
 		$email_notifications_table->set_columns( $columns );
 		$email_notifications_table->set_no_items( $no_items );
 		$email_notifications_table->set_data( $data );
diff --git a/js/permissions.js b/js/permissions.js
index 59f34f7..11942b9 100644
--- a/js/permissions.js
+++ b/js/permissions.js
@@ -17,7 +17,7 @@ jQuery(document).ready(function () {
 		});
 	});
 
-	jQuery(document).on('change', '.toggle_privilege', function () {
+	jQuery(document).on('change', '.sf_user_permissions_table .toggle_privilege', function () {
 		var checkbox = jQuery(this);
 		var checkbox_label = checkbox.siblings('.privilege_status');
 		var permission_identifier = checkbox.data('permission-identifier');
diff --git a/js/preferences.js b/js/preferences.js
index e5c22ec..7f567f9 100644
--- a/js/preferences.js
+++ b/js/preferences.js
@@ -1,7 +1,7 @@
 jQuery(document).ready(function () {
 
 	// Update E-Mail notification settings on checkbox toggle
-	jQuery(document).on('change', '.toggle_privilege', function () {
+	jQuery(document).on('change', '.sf_email_accounts_table .toggle_privilege', function () {
 		var checkbox = jQuery(this);
 		var checkbox_label = checkbox.siblings('.privilege_status');
 		var email_notfication_identifier = checkbox.data('email-notfication-identifier');

From 61a1f231e0eb03cba71de3cbd5ac4bb360b75ee8 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 8 Aug 2014 19:54:11 +0530
Subject: [PATCH 346/485] Merge statistics.js, dashboard.js into one

Both were providing links to toggle content of a div
---
 Gruntfile.js                             |  3 +--
 classes/class-supportflow-dashboard.php  |  9 +++++++--
 classes/class-supportflow-statistics.php |  5 ++---
 js/dashboard.js                          | 24 ------------------------
 js/{statistics.js => toggle-links.js}    |  8 ++++----
 5 files changed, 14 insertions(+), 35 deletions(-)
 delete mode 100644 js/dashboard.js
 rename js/{statistics.js => toggle-links.js} (69%)

diff --git a/Gruntfile.js b/Gruntfile.js
index a9558cc..52e5945 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,14 +1,13 @@
 module.exports = function (grunt) {
 	// supportflow-user-widget.js and widget.css are left for now as feature is not completed
 	var js_files = [
-		'js/dashboard.js',
+		'js/toggle-links.js',
 		'js/email_accounts.js',
 		'js/email_conversation.js',
 		'js/permissions.js',
 		'js/predefined-replies.js',
 		'js/preferences.js',
 		'js/respondents-autocomplete.js',
-		'js/statistics.js',
 		'js/ticket_attachments.js',
 		'js/tickets.js',
 		'js/auto_save.js',
diff --git a/classes/class-supportflow-dashboard.php b/classes/class-supportflow-dashboard.php
index 307dbf6..426ac20 100644
--- a/classes/class-supportflow-dashboard.php
+++ b/classes/class-supportflow-dashboard.php
@@ -18,13 +18,18 @@ public function setup_actions() {
 	function action_wp_dashboard_setup() {
 		if ( current_user_can( 'edit_posts' ) ) {
 			if ( SupportFlow()->script_dev ) {
-				SupportFlow()->enqueue_script( 'supportflow-dashboard', 'dashboard.js' );
+				$handle = SupportFlow()->enqueue_script( 'supportflow-statistics', 'toggle-links.js' );
 				SupportFlow()->enqueue_style( 'supportflow-dashboard', 'dashboard.css' );
 			} else {
-				SupportFlow()->enqueue_scripts();
+				$handle = SupportFlow()->enqueue_scripts();
 				SupportFlow()->enqueue_styles();
 			}
 
+			wp_localize_script( $handle, 'SFToggleLinks', array(
+				'expand'   => __( 'Expand', 'supportflow' ),
+				'collapse' => __( 'Collapse', 'supportflow' ),
+			) );
+
 			wp_add_dashboard_widget(
 				'sf_recent_tickets',
 				__( "Recent tickets", 'supportflow' ),
diff --git a/classes/class-supportflow-statistics.php b/classes/class-supportflow-statistics.php
index 07aebad..876893f 100644
--- a/classes/class-supportflow-statistics.php
+++ b/classes/class-supportflow-statistics.php
@@ -115,12 +115,11 @@ function insert_css_code() {
 	 */
 	function enqueue_script() {
 		if ( SupportFlow()->script_dev ) {
-			$handle = SupportFlow()->enqueue_script( 'supportflow-statistics', 'statistics.js' );
+			$handle = SupportFlow()->enqueue_script( 'supportflow-statistics', 'toggle-links.js' );
 		} else {
 			$handle = SupportFlow()->enqueue_scripts();
 		}
-
-		wp_localize_script( $handle, 'SFStatistics', array(
+		wp_localize_script( $handle, 'SFToggleLinks', array(
 			'expand'   => __( 'Expand', 'supportflow' ),
 			'collapse' => __( 'Collapse', 'supportflow' ),
 		) );
diff --git a/js/dashboard.js b/js/dashboard.js
deleted file mode 100644
index 5458c3b..0000000
--- a/js/dashboard.js
+++ /dev/null
@@ -1,24 +0,0 @@
-jQuery(document).ready(function () {
-	// Close all the tables and toggle the status of clicked tables
-	jQuery('.toggle-link').click(function (event) {
-		var current = jQuery(this).siblings('.toggle-content').css('display');
-		jQuery('.toggle-content').hide(500);
-		jQuery('.toggle-link').prop('title', 'Expand');
-		if ('none' == current) {
-			jQuery(this).siblings('.toggle-content').show(500);
-			jQuery(this).prop('title', 'Collapse');
-		}
-		event.preventDefault();
-	});
-
-	// Set different type of link title at page load
-	jQuery(jQuery('.toggle-content')).each(function () {
-		if ('none' == jQuery(this).css('display')) {
-			jQuery(this).siblings('.toggle-link').prop('title', 'Expand');
-		} else {
-			jQuery(this).siblings('.toggle-link').prop('title', 'Collapse');
-		}
-
-		jQuery('.toggle-content').first().show(500);
-	});
-});
\ No newline at end of file
diff --git a/js/statistics.js b/js/toggle-links.js
similarity index 69%
rename from js/statistics.js
rename to js/toggle-links.js
index 6e48826..8b0ff88 100644
--- a/js/statistics.js
+++ b/js/toggle-links.js
@@ -3,10 +3,10 @@ jQuery(document).ready(function () {
 	jQuery('.toggle-link').click(function (event) {
 		var current = jQuery(this).siblings('.toggle-content').css('display');
 		jQuery('.toggle-content').hide(500);
-		jQuery('.toggle-link').prop('title', SFStatistics.expand);
+		jQuery('.toggle-link').prop('title', SFToggleLinks.expand);
 		if ('none' == current) {
 			jQuery(this).siblings('.toggle-content').show(500);
-			jQuery(this).prop('title', SFStatistics.collapse);
+			jQuery(this).prop('title', SFToggleLinks.collapse);
 		}
 		event.preventDefault();
 	});
@@ -14,9 +14,9 @@ jQuery(document).ready(function () {
 	// Set different type of statistics link title at page load
 	jQuery(jQuery('.toggle-content')).each(function () {
 		if ('none' == jQuery(this).css('display')) {
-			jQuery(this).siblings('.toggle-link').prop('title', SFStatistics.expand);
+			jQuery(this).siblings('.toggle-link').prop('title', SFToggleLinks.expand);
 		} else {
-			jQuery(this).siblings('.toggle-link').prop('title', SFStatistics.collapse);
+			jQuery(this).siblings('.toggle-link').prop('title', SFToggleLinks.collapse);
 		}
 
 		jQuery('.toggle-content').first().show(500);

From 87b333e53a8a5dab2605a0f592259994ba8dd423 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 8 Aug 2014 19:55:49 +0530
Subject: [PATCH 347/485] Rebuilding js/supportflow.min.js

---
 js/supportflow.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/supportflow.min.js b/js/supportflow.min.js
index 8c51789..adcdf8c 100644
--- a/js/supportflow.min.js
+++ b/js/supportflow.min.js
@@ -1,2 +1,2 @@
 /*! SupportFlow minified version */
-jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title","Expand"),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title","Collapse")),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title","Expand"):jQuery(this).siblings(".toggle-link").prop("title","Collapse"),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(){jQuery(".delete_email_account").click(function(a){if(a.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var b=jQuery(this).data("account-id"),c="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,d="";d+='<form method="POST" id="remove_email_account" action="'+c+'">',d+='<input type="hidden" name="action" value="delete" />',d+=SFEmailAccounts.delete_email_account_nonce,d+='<input type="hidden" name="account_id" value='+b+" />",d+="</form>",jQuery("body").append(d),jQuery("#remove_email_account").submit()}}),jQuery("#add_new_email_account #imap_ssl").change(function(){jQuery("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),jQuery("#add_new_email_account #smtp_ssl").change(function(){jQuery("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(){var a=function(a){a.preventDefault();var b=jQuery("#email_conversation_to").val();jQuery.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:b,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){jQuery("#email_conversation_to").prop("disabled",!0),jQuery("#email_conversation_submit").prop("disabled",!0),jQuery("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(a){jQuery("#email_conversation_status").html(a)},error:function(){jQuery("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){jQuery("#email_conversation_to").prop("disabled",!1),jQuery("#email_conversation_submit").prop("disabled",!1)}})};jQuery("#email_conversation_submit").click(a),jQuery("#email_conversation_to").keyup(function(){10==event.keyCode&&a()})}),jQuery(document).ready(function(){jQuery(".permission_filters").change(function(){var a=jQuery("#change_user option:selected").data("user-id"),b=jQuery("#change_status option:selected").data("status");jQuery.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:a,status:b,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(a){jQuery("#user_permissions_table").html(a)}})}),jQuery(document).on("change",".toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("permission-identifier"),d=a.prop("checked"),e=c.user_id,f=c.privilege_type,g=c.privilege_id;b.html(SFPermissions.changing_status),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:e,privilege_type:f,privilege_id:g,allowed:d,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPermissions.allowed:SFPermissions.not_allowed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(){jQuery("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=jQuery("#predefs").find("option:selected").data("content"),old_content=jQuery(".predef:nth-child("+this.old_child+")").data("content"),current_content=jQuery("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void jQuery(".predef:nth-child("+this.old_child+")").prop("selected",!0);jQuery("#reply").val(new_content),this.old_child=jQuery("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(){jQuery(document).on("change",".toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("email-notfication-identifier"),d=a.prop("checked"),e=c.privilege_type,f=c.privilege_id;b.html(SFPreferences.changing_state),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:e,privilege_id:f,allowed:d,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPreferences.subscribed:SFPreferences.unsubscribed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#respondents").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{respondents:c,"api-action":"get-respondents"}};a("#respondents").autocomplete({source:function(c,d){a.ajax({url:SFRespondentsAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.respondents,function(b){var c=a("#respondents").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title",SFStatistics.expand),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title",SFStatistics.collapse)),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title",SFStatistics.expand):jQuery(this).siblings(".toggle-link").prop("title",SFStatistics.collapse),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var a=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return a.on("close",function(){var b=a.state().get("selection").toJSON();jQuery.each(b,function(){var a='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",b='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";jQuery("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+a+"&nbsp;"+b+"</li>"),jQuery("#reply-attachments").val(jQuery("#reply-attachments").val()+_.escape(this.id)+",")})}),a.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(){jQuery("#supportflow-details .meta-item-ok-button").click(function(a){var b=jQuery(this).siblings(".meta-item-dropdown").children("option:selected"),c=jQuery(this).closest(".meta-item"),d=c.children(".meta-item-name"),e=c.children(".meta-item-label");d.val(b.val()),e.text(b.text()),a.preventDefault()}),jQuery("#supportflow-details .meta-item-toggle-button").click(function(a){jQuery(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),a.preventDefault()}),jQuery(".save-button").click(function(a){return""==jQuery("#subject").val()?(jQuery("#subject").focus(),alert(SFTickets.no_title_msg),void a.preventDefault()):""==jQuery("#respondents").val()?(jQuery("#respondents").focus(),alert(SFTickets.no_respondent_msg),void a.preventDefault()):void 0}),jQuery("#reply").keypress(function(a){a.ctrlKey&&10==a.keyCode&&""!=$(this).val()&&$("#post").submit()}),jQuery("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&jQuery("#insert-reply").val(jQuery("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),jQuery("#close-ticket-submit").click(function(){jQuery("#post meta-item input[name='post_status']").val("sf_closed")})}),jQuery(document).ready(function(){jQuery(".sf_autosave").keyup(function(){var a={};a.ticket_id=SFAutoSave.ticket_id,jQuery(".sf_autosave").each(function(){element_key=jQuery(this).attr("name"),element_value=jQuery(this).val(),a[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",a,!1)})});
\ No newline at end of file
+jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title",SFToggleLinks.expand),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title",SFToggleLinks.collapse)),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(){jQuery(".delete_email_account").click(function(a){if(a.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var b=jQuery(this).data("account-id"),c="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,d="";d+='<form method="POST" id="remove_email_account" action="'+c+'">',d+='<input type="hidden" name="action" value="delete" />',d+=SFEmailAccounts.delete_email_account_nonce,d+='<input type="hidden" name="account_id" value='+b+" />",d+="</form>",jQuery("body").append(d),jQuery("#remove_email_account").submit()}}),jQuery("#add_new_email_account #imap_ssl").change(function(){jQuery("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),jQuery("#add_new_email_account #smtp_ssl").change(function(){jQuery("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(){var a=function(a){a.preventDefault();var b=jQuery("#email_conversation_to").val();jQuery.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:b,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){jQuery("#email_conversation_to").prop("disabled",!0),jQuery("#email_conversation_submit").prop("disabled",!0),jQuery("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(a){jQuery("#email_conversation_status").html(a)},error:function(){jQuery("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){jQuery("#email_conversation_to").prop("disabled",!1),jQuery("#email_conversation_submit").prop("disabled",!1)}})};jQuery("#email_conversation_submit").click(a),jQuery("#email_conversation_to").keyup(function(){10==event.keyCode&&a()})}),jQuery(document).ready(function(){jQuery(".permission_filters").change(function(){var a=jQuery("#change_user option:selected").data("user-id"),b=jQuery("#change_status option:selected").data("status");jQuery.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:a,status:b,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(a){jQuery("#user_permissions_table").html(a)}})}),jQuery(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("permission-identifier"),d=a.prop("checked"),e=c.user_id,f=c.privilege_type,g=c.privilege_id;b.html(SFPermissions.changing_status),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:e,privilege_type:f,privilege_id:g,allowed:d,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPermissions.allowed:SFPermissions.not_allowed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(){jQuery("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=jQuery("#predefs").find("option:selected").data("content"),old_content=jQuery(".predef:nth-child("+this.old_child+")").data("content"),current_content=jQuery("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void jQuery(".predef:nth-child("+this.old_child+")").prop("selected",!0);jQuery("#reply").val(new_content),this.old_child=jQuery("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(){jQuery(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("email-notfication-identifier"),d=a.prop("checked"),e=c.privilege_type,f=c.privilege_id;b.html(SFPreferences.changing_state),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:e,privilege_id:f,allowed:d,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPreferences.subscribed:SFPreferences.unsubscribed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#respondents").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{respondents:c,"api-action":"get-respondents"}};a("#respondents").autocomplete({source:function(c,d){a.ajax({url:SFRespondentsAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.respondents,function(b){var c=a("#respondents").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var a=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return a.on("close",function(){var b=a.state().get("selection").toJSON();jQuery.each(b,function(){var a='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",b='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";jQuery("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+a+"&nbsp;"+b+"</li>"),jQuery("#reply-attachments").val(jQuery("#reply-attachments").val()+_.escape(this.id)+",")})}),a.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(){jQuery("#supportflow-details .meta-item-ok-button").click(function(a){var b=jQuery(this).siblings(".meta-item-dropdown").children("option:selected"),c=jQuery(this).closest(".meta-item"),d=c.children(".meta-item-name"),e=c.children(".meta-item-label");d.val(b.val()),e.text(b.text()),a.preventDefault()}),jQuery("#supportflow-details .meta-item-toggle-button").click(function(a){jQuery(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),a.preventDefault()}),jQuery(".save-button").click(function(a){return""==jQuery("#subject").val()?(jQuery("#subject").focus(),alert(SFTickets.no_title_msg),void a.preventDefault()):""==jQuery("#respondents").val()?(jQuery("#respondents").focus(),alert(SFTickets.no_respondent_msg),void a.preventDefault()):void 0}),jQuery("#reply").keypress(function(a){a.ctrlKey&&10==a.keyCode&&""!=$(this).val()&&$("#post").submit()}),jQuery("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&jQuery("#insert-reply").val(jQuery("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),jQuery("#close-ticket-submit").click(function(){jQuery("#post meta-item input[name='post_status']").val("sf_closed")})}),jQuery(document).ready(function(){jQuery(".sf_autosave").keyup(function(){var a={};a.ticket_id=SFAutoSave.ticket_id,jQuery(".sf_autosave").each(function(){element_key=jQuery(this).attr("name"),element_value=jQuery(this).val(),a[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",a,!1)})});
\ No newline at end of file

From ae1c4e4fa6ca740bb233f9f14fde481d5297c651 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 8 Aug 2014 21:42:37 +0530
Subject: [PATCH 348/485] Fix typo in post type

---
 supportflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index d3b9219..57afd2d 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -389,7 +389,7 @@ public function action_init_upgrade() {
 
 			// Migrate all posts with post type sf_thread to sf_ticket
 			$db_prefix = $wpdb->prefix;
-			$wpdb->update( "{$db_prefix}posts", array( 'post_type' => 'sf_ticket' ), array( 'post_type' => 'sf_shread' ) );
+			$wpdb->update( "{$db_prefix}posts", array( 'post_type' => 'sf_ticket' ), array( 'post_type' => 'sf_thread' ) );
 		}
 
 		// Update db_version to latest one

From 39ca0e3aebbb98edd37093dd57ac9dd8cede0b91 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 8 Aug 2014 22:40:59 +0530
Subject: [PATCH 349/485] Rename enqueue_script method by insert_script

This is to prevent strict standard error
There is also a methos with same name in SupportFlow main class_
---
 classes/class-supportflow-email-accounts.php | 4 ++--
 classes/class-supportflow-permissions.php    | 4 ++--
 classes/class-supportflow-preferences.php    | 4 ++--
 classes/class-supportflow-statistics.php     | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index c286bf0..a3d7fa0 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -95,7 +95,7 @@ function settings_page() {
 
 		echo '</div>';
 
-		$this->enqueue_script();
+		$this->insert_script();
 	}
 
 	/*
@@ -291,7 +291,7 @@ public function insert_add_new_account_form() {
 	/*
 	 * Enqueue JS code required for form submission
 	 */
-	public function enqueue_script() {
+	public function insert_script() {
 		if ( SupportFlow()->script_dev ) {
 			$handle = SupportFlow()->enqueue_script( 'supportflow-email_accounts', 'email_accounts.js' );
 		} else {
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 5730f42..6beca69 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -72,7 +72,7 @@ public function get_user_permissions_data( $user_id ) {
 	}
 
 	public function permissions_page() {
-		$this->enqueue_script();
+		$this->insert_script();
 		?>
 		<div class="wrap">
 		<h2><?php _e( 'Permissions', 'supportflow' ) ?></h2>
@@ -117,7 +117,7 @@ public function permissions_page() {
 	/*
 	 * Enqueue JS code required by class
 	 */
-	public function enqueue_script() {
+	public function insert_script() {
 		if ( SupportFlow()->script_dev ) {
 			$handle = SupportFlow()->enqueue_script( 'supportflow-permissions', 'permissions.js' );
 		} else {
diff --git a/classes/class-supportflow-preferences.php b/classes/class-supportflow-preferences.php
index 7fb0a9b..d804d8e 100644
--- a/classes/class-supportflow-preferences.php
+++ b/classes/class-supportflow-preferences.php
@@ -28,7 +28,7 @@ public function action_admin_menu() {
 
 	}
 
-	public function enqueue_scripts() {
+	public function insert_scripts() {
 		if ( SupportFlow()->script_dev ) {
 			$handle = SupportFlow()->enqueue_script( 'supportflow-preferences', 'preferences.js' );
 		} else {
@@ -47,7 +47,7 @@ public function enqueue_scripts() {
 	public function preferences_page() {
 		echo '<div class="wrap">';
 
-		$this->enqueue_scripts();
+		$this->insert_scripts();
 
 		$this->user_ticket_signature_page();
 		echo '<br />';
diff --git a/classes/class-supportflow-statistics.php b/classes/class-supportflow-statistics.php
index 876893f..c843f67 100644
--- a/classes/class-supportflow-statistics.php
+++ b/classes/class-supportflow-statistics.php
@@ -37,7 +37,7 @@ public function action_admin_menu() {
 	public function statistics_page() {
 		// Add JS and CSS code required by page
 		$this->insert_css_code();
-		$this->enqueue_script();
+		$this->insert_script();
 		?>
 		<div class="wrap">
 			<h2><?php _e( 'Statistics', 'supportflow' ) ?></h2>
@@ -113,7 +113,7 @@ function insert_css_code() {
 	/*
 	 * Enqueue JS code required by statistics page
 	 */
-	function enqueue_script() {
+	function insert_script() {
 		if ( SupportFlow()->script_dev ) {
 			$handle = SupportFlow()->enqueue_script( 'supportflow-statistics', 'toggle-links.js' );
 		} else {

From db517708449a216105d538c04ebd23d9fc76d582 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 8 Aug 2014 22:50:06 +0530
Subject: [PATCH 350/485] Checking if term is not wp_error before adding to
 collection

---
 supportflow.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index d3b9219..6751959 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -643,7 +643,10 @@ public function update_ticket_respondents( $ticket_id, $respondents, $append = f
 				$term_ids[] = (int) $term->term_id;
 			} else {
 				$term       = wp_insert_term( $email, $this->respondents_tax, array( 'slug' => $this->get_email_hash( $email ) ) );
-				$term_ids[] = $term['term_id'];
+				if ( ! is_wp_error( $term ) ) {
+					$term_ids[] = $term['term_id'];
+				}
+
 			}
 		}
 		wp_set_object_terms( $ticket_id, $term_ids, $this->respondents_tax, $append );

From 9facbad2bdcbc05c63175f8245dddd7bc1137752 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 8 Aug 2014 20:37:47 +0530
Subject: [PATCH 351/485] Not showing respondents page in SupportFlow in menu

There's no situation where someone would want to add a respondent term
directly, instead of adding them to the ticket, so the Respondents screen
should be hidden.

Fixes #166
---
 supportflow.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index d245648..6747e80 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -319,8 +319,7 @@ public function action_init_register_taxonomies() {
 				'update_item'  => __( 'Update Respondent', 'supportflow' ),
 				'add_new_item' => __( 'Add New Respondent', 'supportflow' ),
 			),
-			'public'            => true,
-			'show_in_nav_menus' => true,
+			'public'            => false,
 			'rewrite'           => false,
 			'capabilities'      => $capabilities,
 		);

From 459dd09834ad562e304d7dc3c788c049dd8da114 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 8 Aug 2014 21:35:07 +0530
Subject: [PATCH 352/485] Replaces usage of word respondent by customer

Just a case sensitive replace
---
 classes/class-supportflow-admin.php           | 75 ++++++++--------
 classes/class-supportflow-email-replies.php   | 12 +--
 classes/class-supportflow-emails.php          | 22 ++---
 classes/class-supportflow-json-api.php        | 12 +--
 .../class-supportflow-ui-submissionform.php   |  2 +-
 classes/class-supportflow-ui-widget.php       |  4 +-
 classes/class-supportflow-wp-cli.php          |  4 +-
 css/admin.css                                 | 14 +--
 js/respondents-autocomplete.js                | 18 ++--
 js/tickets.js                                 |  8 +-
 supportflow.php                               | 90 +++++++++----------
 11 files changed, 131 insertions(+), 130 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 437ef53..3f04fea 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -73,8 +73,9 @@ public function action_admin_enqueue_scripts() {
 		if ( in_array( $pagenow, array( 'post.php', 'post-new.php' ) ) ) {
 			wp_enqueue_media();
 
+
 			if ( SupportFlow()->script_dev ) {
-				$respondents_autocomplete_handle = SupportFlow()->enqueue_script( 'supportflow-respondents-autocomplete', 'respondents-autocomplete.js' );
+				$customers_autocomplete_handle   = SupportFlow()->enqueue_script( 'supportflow-customers-autocomplete', 'respondents-autocomplete.js' );
 				$ticket_attachment_handle        = SupportFlow()->enqueue_script( 'supportflow-ticket-attachments', 'ticket_attachments.js' );
 				$supportflow_tickets_handle      = SupportFlow()->enqueue_script( 'supportflow-tickets', 'tickets.js' );
 				$auto_save_handle                = SupportFlow()->enqueue_script( 'supportflow-auto-save', 'auto_save.js', array( 'jquery', 'heartbeat' ) );
@@ -87,7 +88,7 @@ public function action_admin_enqueue_scripts() {
 					= SupportFlow()->enqueue_scripts();
 			}
 
-			wp_localize_script( $respondents_autocomplete_handle, 'SFRespondentsAc', array(
+			wp_localize_script( $customers_autocomplete_handle, 'SFCustomersAc', array(
 				'ajax_url' => add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) )
 			) );
 
@@ -100,7 +101,7 @@ public function action_admin_enqueue_scripts() {
 
 			wp_localize_script( $supportflow_tickets_handle, 'SFTickets', array(
 				'no_title_msg'      => __( 'You must need to specify the subject of the ticket', 'supportpress' ),
-				'no_respondent_msg' => __( 'You must need to add atleast one ticket respondent', 'supportpress' ),
+				'no_customer_msg'   => __( 'You must need to add atleast one customer', 'supportpress' ),
 				'pagenow'           => $pagenow,
 				'send_msg'          => __( 'Send Message', 'supportflow' ),
 				'add_private_note'  => __( 'Add Private Note', 'supportflow' ),
@@ -563,31 +564,31 @@ public function action_add_meta_boxes() {
 			return;
 		}
 
-		$respondents_box = 'tagsdiv-' . SupportFlow()->respondents_tax;
+		$customers_box = 'tagsdiv-' . SupportFlow()->customers_tax;
 		remove_meta_box( 'submitdiv', SupportFlow()->post_type, 'side' );
-		remove_meta_box( $respondents_box, SupportFlow()->post_type, 'side' );
+		remove_meta_box( $customers_box, SupportFlow()->post_type, 'side' );
 		remove_meta_box( 'slugdiv', SupportFlow()->post_type, 'normal' );
 
 		add_meta_box( 'supportflow-details', __( 'Details', 'supportflow' ), array( $this, 'meta_box_details' ), SupportFlow()->post_type, 'side' );
 		add_meta_box( 'supportflow-subject', __( 'Subject', 'supportflow' ), array( $this, 'meta_box_subject' ), SupportFlow()->post_type, 'normal' );
-		add_meta_box( 'supportflow-respondents', __( 'Respondents', 'supportflow' ), array( $this, 'meta_box_respondents' ), SupportFlow()->post_type, 'normal' );
+		add_meta_box( 'supportflow-customers', __( 'Customers', 'supportflow' ), array( $this, 'meta_box_customers' ), SupportFlow()->post_type, 'normal' );
 		add_meta_box( 'supportflow-cc-bcc', __( 'CC and BCC', 'supportflow' ), array( $this, 'meta_box_cc_bcc' ), SupportFlow()->post_type, 'normal' );
 		add_meta_box( 'supportflow-replies', __( 'Replies', 'supportflow' ), array( $this, 'meta_box_replies' ), SupportFlow()->post_type, 'normal' );
 
 		if ( 'post.php' == $pagenow ) {
-			add_meta_box( 'supportflow-other-respondents-tickets', __( 'User\'s Recent Tickets', 'supportflow' ), array( $this, 'meta_box_other_respondents_tickets' ), SupportFlow()->post_type, 'side' );
+			add_meta_box( 'supportflow-other-customers-tickets', __( 'User\'s Recent Tickets', 'supportflow' ), array( $this, 'meta_box_other_customers_tickets' ), SupportFlow()->post_type, 'side' );
 			add_meta_box( 'supportflow-forward_conversation', __( 'Forward this conversation', 'supportflow' ), array( $this, 'meta_box_email_conversation' ), SupportFlow()->post_type, 'side' );
 		}
 	}
 
-	public function meta_box_other_respondents_tickets() {
-		$ticket_respondents = SupportFlow()->get_ticket_respondents( get_the_ID(), array( 'fields' => 'slugs' ) );
-		$statuses           = SupportFlow()->post_statuses;
-		$status_slugs       = array_keys( $statuses );
+	public function meta_box_other_customers_tickets() {
+		$ticket_customers = SupportFlow()->get_ticket_customers( get_the_ID(), array( 'fields' => 'slugs' ) );
+		$statuses         = SupportFlow()->post_statuses;
+		$status_slugs     = array_keys($statuses);
 
 		$table = new SupportFlow_Table( '', false, false );
 
-		if ( empty( $ticket_respondents ) ) {
+		if ( empty( $ticket_customers ) ) {
 			$tickets = array();
 
 		} else {
@@ -599,9 +600,9 @@ public function meta_box_other_respondents_tickets() {
 				'post__not_in' => array( get_the_id() ),
 				'tax_query'    => array(
 					array(
-						'taxonomy' => SupportFlow()->respondents_tax,
+						'taxonomy' => SupportFlow()->customers_tax,
 						'field'    => 'slug',
-						'terms'    => $ticket_respondents,
+						'terms'    => $ticket_customers,
 					),
 				),
 			);
@@ -874,21 +875,21 @@ public function meta_box_subject() {
 	}
 
 	/**
-	 * Add a form element where the user can change the respondents
+	 * Add a form element where the user can change the customers
 	 */
-	public function meta_box_respondents() {
+	public function meta_box_customers() {
 
 		$placeholder = __( 'Who are you starting a conversation with?', 'supportflow' );
 		if ( 'draft' == get_post_status( get_the_ID() ) ) {
-			$respondents_string = get_post_meta( get_the_ID(), '_sf_autosave_respondents', true );
+			$customers_string = get_post_meta( get_the_ID(), '_sf_autosave_customers', true );
 		} else {
-			$respondents        = SupportFlow()->get_ticket_respondents( get_the_ID(), array( 'fields' => 'emails' ) );
-			$respondents_string = implode( ', ', $respondents );
-			$respondents_string .= empty( $respondents_string ) ? '' : ', ';
+			$customers        = SupportFlow()->get_ticket_customers( get_the_ID(), array( 'fields' => 'emails' ) );
+			$customers_string = implode( ', ', $customers );
+			$customers_string .= empty( $customers_string ) ? '' : ', ';
 		}
-		echo '<h4>' . __( 'Respondent(s)', 'supportflow' ) . '</h4>';
-		echo '<input type="text" id="respondents" name="respondents" class="sf_autosave" placeholder="' . $placeholder . '" value="' . esc_attr( $respondents_string ) . '" autocomplete="off" />';
-		echo '<p class="description">' . __( 'Enter each respondent email address, separated with a comma', 'supportflow' ) . '</p>';
+		echo '<h4>' . __( 'Customer(s)', 'supportflow' ) . '</h4>';
+		echo '<input type="text" id="customers" name="customers" class="sf_autosave" placeholder="' . $placeholder . '" value="' . esc_attr( $customers_string ) . '" autocomplete="off" />';
+		echo '<p class="description">' . __( 'Enter each customer email address, separated with a comma', 'supportflow' ) . '</p>';
 	}
 
 	/**
@@ -1075,7 +1076,7 @@ public function filter_manage_post_columns( $columns ) {
 			'updated'     => __( 'Updated', 'supportflow' ),
 			'title'       => __( 'Subject', 'supportflow' ),
 			'sf_excerpt'  => __( 'Excerpt', 'supportflow' ),
-			'respondents' => __( 'Respondents', 'supportflow' ),
+			'customers' => __( 'Customers', 'supportflow' ),
 			'status'      => __( 'Status', 'supportflow' ),
 			'author'      => __( 'Agent', 'supportflow' ),
 			'sf_replies'  => '<span title="' . __( 'Reply count', 'supportflow' ) . '" class="comment-grey-bubble"></span>',
@@ -1132,22 +1133,22 @@ function action_manage_posts_custom_column( $column_name, $ticket_id ) {
 				}
 				echo $first_reply;
 				break;
-			case 'respondents':
-				$respondents = SupportFlow()->get_ticket_respondents( $ticket_id, array( 'fields' => 'emails' ) );
-				if ( empty( $respondents ) ) {
+			case 'customers':
+				$customers = SupportFlow()->get_ticket_customers( $ticket_id, array( 'fields' => 'emails' ) );
+				if ( empty( $customers ) ) {
 					echo '—';
 					break;
 				}
-				foreach ( $respondents as $key => $respondent_email ) {
+				foreach ( $customers as $key => $customer_email ) {
 					$args              = array(
-						SupportFlow()->respondents_tax => SupportFlow()->get_email_hash( $respondent_email ),
+						SupportFlow()->customers_tax => SupportFlow()->get_email_hash( $customer_email ),
 						'post_type'                    => SupportFlow()->post_type,
 					);
-					$respondent_photo  = get_avatar( $respondent_email, 16 );
-					$respondent_link   = '<a class="respondent_link" href="' . esc_url( add_query_arg( $args, admin_url( 'edit.php' ) ) ) . '">' . $respondent_email . '</a>';
-					$respondents[$key] = $respondent_photo . '&nbsp;' . $respondent_link;
+					$customer_photo  = get_avatar( $customer_email, 16 );
+					$customer_link   = '<a class="customer_link" href="' . esc_url( add_query_arg( $args, admin_url( 'edit.php' ) ) ) . '">' . $customer_email . '</a>';
+					$customers[$key] = $customer_photo . '&nbsp;' . $customer_link;
 				}
-				echo implode( '<br />', $respondents );
+				echo implode( '<br />', $customers );
 				break;
 			case 'status':
 				$post_status = get_post_status( $ticket_id );
@@ -1209,7 +1210,7 @@ public function is_edit_screen() {
 	}
 
 	/**
-	 * When a ticket is saved or updated, make sure we save the respondent
+	 * When a ticket is saved or updated, make sure we save the customer
 	 * and new reply data
 	 */
 	public function action_save_post( $ticket_id ) {
@@ -1221,9 +1222,9 @@ public function action_save_post( $ticket_id ) {
 			return;
 		}
 
-		if ( isset( $_POST['respondents'] ) ) {
-			$respondents = array_map( 'sanitize_email', explode( ',', $_POST['respondents'] ) );
-			SupportFlow()->update_ticket_respondents( $ticket_id, $respondents );
+		if ( isset( $_POST['customers'] ) ) {
+			$customers = array_map( 'sanitize_email', explode( ',', $_POST['customers'] ) );
+			SupportFlow()->update_ticket_customers( $ticket_id, $customers );
 		}
 
 		if ( isset( $_POST['post_email_account'] ) && is_numeric( $_POST['post_email_account'] ) && '' == $email_account_id ) {
diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 458e06e..2112af4 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -217,20 +217,20 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 			$ticket_id = SupportFlow()->get_ticket_from_secret( $matches[1] );
 		}
 
-		// Add anyone else that was in the 'to' or 'cc' fields as respondents
-		$respondents = array();
+		// Add anyone else that was in the 'to' or 'cc' fields as customers
+		$customers = array();
 		$fields      = array( 'to', 'cc' );
 		foreach ( $fields as $field ) {
 			if ( ! empty( $email->headers->$field ) ) {
 				foreach ( $email->headers->$field as $recipient ) {
 					$email_address = $recipient->mailbox . '@' . $recipient->host;
 					if ( is_email( $email_address ) && $email_address != SupportFlow()->extend->emails->from_address && strcasecmp( $email_address, $to ) != 0 ) {
-						$respondents[] = $email_address;
+						$customers[] = $email_address;
 					}
 				}
 			}
 		}
-		$respondents[] = $reply_author_email;
+		$customers[] = $reply_author_email;
 
 		$message = SupportFlow()->sanitize_ticket_reply( $message );
 
@@ -239,7 +239,7 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 				'reply_author'       => $reply_author,
 				'reply_author_email' => $reply_author_email,
 			);
-			SupportFlow()->update_ticket_respondents( $ticket_id, $respondents, true );
+			SupportFlow()->update_ticket_customers( $ticket_id, $customers, true );
 			SupportFlow()->add_ticket_reply( $ticket_id, $message, $reply_args );
 
 		} else {
@@ -249,7 +249,7 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 				'reply_author'       => $reply_author,
 				'reply_author_email' => $reply_author_email,
 				'message'            => $message,
-				'respondent_email'   => $respondents,
+				'customer_email'   => $customers,
 				'email_account'      => $email_account_id,
 			);
 
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 0532ec8..6bce326 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -21,9 +21,9 @@ public function setup_actions() {
 			return;
 		}
 
-		// When a new reply is added to a ticket, notify the respondents and the agents
+		// When a new reply is added to a ticket, notify the customers and the agents
 		add_action( 'supportflow_ticket_reply_added', array( $this, 'notify_agents_ticket_replies' ) );
-		add_action( 'supportflow_ticket_reply_added', array( $this, 'notify_respondents_ticket_replies' ), 10, 3 );
+		add_action( 'supportflow_ticket_reply_added', array( $this, 'notify_customers_ticket_replies' ), 10, 3 );
 	}
 
 	/**
@@ -93,17 +93,17 @@ public function notify_agents_ticket_replies( $reply_id ) {
 	}
 
 	/**
-	 * When a new reply is added to the ticket, notify all of the respondents on the ticket
+	 * When a new reply is added to the ticket, notify all of the customers on the ticket
 	 */
-	public function notify_respondents_ticket_replies( $reply_id, $cc = array(), $bcc = array() ) {
-		// Respondents shouldn't receive private replies
+	public function notify_customers_ticket_replies( $reply_id, $cc = array(), $bcc = array() ) {
+		// Customers shouldn't receive private replies
 		$reply = get_post( $reply_id );
 		if ( ! $reply || 'private' == $reply->post_status ) {
 			return;
 		}
 
 		$ticket      = SupportFlow()->get_ticket( $reply->post_parent );
-		$respondents = SupportFlow()->get_ticket_respondents( $ticket->ID, array( 'fields' => 'emails' ) );
+		$customers = SupportFlow()->get_ticket_customers( $ticket->ID, array( 'fields' => 'emails' ) );
 
 		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 		$email_account_id = get_post_meta( $ticket->ID, 'email_account', true );
@@ -115,14 +115,14 @@ public function notify_respondents_ticket_replies( $reply_id, $cc = array(), $bc
 		// Don't email the person creating the reply, unless that's desired behavior
 		if ( ! apply_filters( 'supportflow_emails_notify_creator', false, 'reply' ) ) {
 			$reply_author_email = get_post_meta( $reply->ID, 'reply_author_email', true );
-			$key                = array_search( $reply_author_email, $respondents );
+			$key                = array_search( $reply_author_email, $customers );
 			if ( false !== $key ) {
-				unset( $respondents[$key] );
+				unset( $customers[$key] );
 			}
 		}
 
 		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $ticket->ID );
-		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $ticket->ID, 'respondent' );
+		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $ticket->ID, 'customer' );
 
 		$attachments = array();
 		if ( $ticket_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply->ID ) ) ) {
@@ -132,7 +132,7 @@ public function notify_respondents_ticket_replies( $reply_id, $cc = array(), $bc
 		}
 
 		$message = stripslashes( $reply->post_content );
-		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $ticket->ID, 'respondent' );
+		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $ticket->ID, 'customer' );
 
 		$headers = "Content-Type: text/html\r\n";
 
@@ -148,7 +148,7 @@ public function notify_respondents_ticket_replies( $reply_id, $cc = array(), $bc
 			$headers .= "Bcc: $bcc\r\n";
 		}
 
-		self::mail( $respondents, $subject, $message, $headers, $attachments, $smtp_account );
+		self::mail( $customers, $subject, $message, $headers, $attachments, $smtp_account );
 	}
 
 	/**
diff --git a/classes/class-supportflow-json-api.php b/classes/class-supportflow-json-api.php
index 237d996..3849c48 100644
--- a/classes/class-supportflow-json-api.php
+++ b/classes/class-supportflow-json-api.php
@@ -23,15 +23,15 @@ public function action_wp_ajax_supportflow_json() {
 			'html'       => '',
 		);
 		switch ( $response['api-action'] ) {
-			case 'get-respondents':
-				$search_for         = sanitize_text_field( isset( $_REQUEST['respondents'] ) ? $_REQUEST['respondents'] : '' );
-				$respondent_matches = SupportFlow()->get_respondents( array( 'search' => $search_for ) );
-				if ( is_wp_error( $respondent_matches ) ) {
-					$response['message'] = $respondent_matches->get_error_message();
+			case 'get-customers':
+				$search_for         = sanitize_text_field( isset( $_REQUEST['customers'] ) ? $_REQUEST['customers'] : '' );
+				$customer_matches = SupportFlow()->get_customers( array( 'search' => $search_for ) );
+				if ( is_wp_error( $customer_matches ) ) {
+					$response['message'] = $customer_matches->get_error_message();
 				} else {
 					$response['query']       = $search_for;
 					$response['status']      = "ok";
-					$response['respondents'] = $respondent_matches;
+					$response['customers'] = $customer_matches;
 				}
 
 				break;
diff --git a/classes/class-supportflow-ui-submissionform.php b/classes/class-supportflow-ui-submissionform.php
index c69668f..6b672c9 100644
--- a/classes/class-supportflow-ui-submissionform.php
+++ b/classes/class-supportflow-ui-submissionform.php
@@ -115,7 +115,7 @@ public function action_init_handle_form_submission() {
 				'message'            => $_POST['message'],
 				'reply_author'       => $_POST['fullname'],
 				'reply_author_email' => $_POST['email'],
-				'respondent_email'   => array( $_POST['email'] ),
+				'customer_email'   => array( $_POST['email'] ),
 			)
 		);
 
diff --git a/classes/class-supportflow-ui-widget.php b/classes/class-supportflow-ui-widget.php
index 79a8f52..86a51b7 100644
--- a/classes/class-supportflow-ui-widget.php
+++ b/classes/class-supportflow-ui-widget.php
@@ -72,12 +72,12 @@ public function render_single_reply_html( $reply ) {
 	public function render_all_tickets_html() {
 		$user = wp_get_current_user();
 
-		$tickets = SupportFlow()->get_tickets( array( 'respondent_email' => $user->user_email ) );
+		$tickets = SupportFlow()->get_tickets( array( 'customer_email' => $user->user_email ) );
 
 		if ( empty( $tickets ) ) {
 			$output = '<div class="ticket notickets">' . __( 'No open tickets.', 'supportflow' ) . '</div>';
 		} else {
-			$output = '<ul id="respondent-tickets">';
+			$output = '<ul id="customer-tickets">';
 			foreach ( $tickets as $ticket ) {
 				$output .= '<li id="ticket-' . $ticket->ID . '">';
 				$output .= '<h4 class="ticket-title">' . get_the_title( $ticket->ID ) . '</h4>';
diff --git a/classes/class-supportflow-wp-cli.php b/classes/class-supportflow-wp-cli.php
index 4a079c7..ad3fa10 100644
--- a/classes/class-supportflow-wp-cli.php
+++ b/classes/class-supportflow-wp-cli.php
@@ -124,8 +124,8 @@ public function import_remote( $args, $assoc_args ) {
 				continue;
 			}
 
-			// Add the respondent to the ticket
-			SupportFlow()->update_ticket_respondents( $ticket_id, $old_ticket->email );
+			// Add the customer to the ticket
+			SupportFlow()->update_ticket_customers( $ticket_id, $old_ticket->email );
 
 			// Get the ticket's messages and import those too
 			$old_messages  = (array) $spdb->get_results( $spdb->prepare( "SELECT * FROM $spdb->messages WHERE ticket_id=%d", $old_ticket->ticket_id ) );
diff --git a/css/admin.css b/css/admin.css
index 8bef932..3628980 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -2,7 +2,7 @@
 	color: #BC0B0B;
 }
 
-.respondent_link {
+.customer_link {
 	white-space:    pre;
 	vertical-align: top;
 }
@@ -30,13 +30,13 @@
 }
 
 #supportflow-subject.postbox,
-#supportflow-respondents.postbox {
+#supportflow-customers.postbox {
 	border:     none;
 	background: none;
 }
 
 #supportflow-subject.postbox .inside,
-#supportflow-respondents.postbox .inside {
+#supportflow-customers.postbox .inside {
 	padding: 0;
 }
 
@@ -44,8 +44,8 @@
 #supportflow-details h3.hndle,
 #supportflow-subject .handlediv,
 #supportflow-subject h3.hndle,
-#supportflow-respondents .handlediv,
-#supportflow-respondents h3.hndle,
+#supportflow-customers .handlediv,
+#supportflow-customers h3.hndle,
 #supportflow-replies .handlediv,
 #supportflow-replies h3.hndle {
 	display: none;
@@ -73,7 +73,7 @@
 }
 
 #supportflow-subject h4,
-#supportflow-respondents h4,
+#supportflow-customers h4,
 #supportflow-replies h4 {
 	font-family:   Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
 	font-size:     13px;
@@ -95,7 +95,7 @@
 	height:         1.7em;
 }
 
-#supportflow-respondents.postbox input {
+#supportflow-customers.postbox input {
 	width:     100%;
 	padding:   8px;
 	font-size: 1.2em;
diff --git a/js/respondents-autocomplete.js b/js/respondents-autocomplete.js
index 5b98d31..1baac58 100644
--- a/js/respondents-autocomplete.js
+++ b/js/respondents-autocomplete.js
@@ -2,9 +2,9 @@ jQuery(document).ready(function ($) {
 
 	var getSearchTerm = function () {
 
-		// Input of the Respondents field can contain multiple addresses,
+		// Input of the Customers field can contain multiple addresses,
 		// we only want to search on the last address
-		var resps = $('#respondents').val().replace(" ", '').split(",");
+		var resps = $('#customers').val().replace(" ", '').split(",");
 
 		if ($.isArray(resps) && resps.length > 1) {
 			var search_for = resps.pop();
@@ -13,16 +13,16 @@ jQuery(document).ready(function ($) {
 			search_for = resps[0];
 		}
 
-		return { "respondents": search_for, "api-action": 'get-respondents' };
+		return { "customers": search_for, "api-action": 'get-customers' };
 
 	}
 
-	$('#respondents').autocomplete({
+	$('#customers').autocomplete({
 
 		source   : function (req, response) {
 
 			$.ajax({
-				url     : SFRespondentsAc.ajax_url,
+				url     : SFCustomersAc.ajax_url,
 				dataType: 'json',
 				data    : getSearchTerm(),
 				success : function (data) {
@@ -30,12 +30,12 @@ jQuery(document).ready(function ($) {
 						response(false);
 						return false;
 					}
-					response($.map(data.respondents, function (item) {
+					response($.map(data.customers, function (item) {
 
 						// normaliz input
-						var resps = $('#respondents').val().split(' ').join('').split(",");
+						var resps = $('#customers').val().split(' ').join('').split(",");
 
-						// remove partial respondent
+						// remove partial customer
 						resps.pop();
 
 						// Check if e-mail id already exists
@@ -47,7 +47,7 @@ jQuery(document).ready(function ($) {
 							// make it a string
 							var retval = resps.join(", ") + ", ";
 
-							// return those respondents!
+							// return those customers!
 							return {
 								label: item.name,
 								value: retval
diff --git a/js/tickets.js b/js/tickets.js
index 0cbd529..24c58cf 100644
--- a/js/tickets.js
+++ b/js/tickets.js
@@ -16,7 +16,7 @@ jQuery(document).ready(function () {
 		event.preventDefault();
 	});
 
-	// Require title and atleast respondent before saving a ticket
+	// Require title and atleast customer before saving a ticket
 	jQuery('.save-button').click(function (event) {
 		if ('' == jQuery('#subject').val()) {
 			jQuery('#subject').focus();
@@ -24,9 +24,9 @@ jQuery(document).ready(function () {
 			event.preventDefault();
 			return;
 		}
-		if ('' == jQuery('#respondents').val()) {
-			jQuery('#respondents').focus();
-			alert(SFTickets.no_respondent_msg);
+		if ('' == jQuery('#customers').val()) {
+			jQuery('#customers').focus();
+			alert(SFTickets.no_customer_msg);
 			event.preventDefault();
 			return;
 		}
diff --git a/supportflow.php b/supportflow.php
index 6747e80..c85981d 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -164,7 +164,7 @@ private function setup_globals() {
 
 		$this->post_type                = apply_filters( 'supportflow_thread_post_type', 'sf_ticket' );
 		$this->predefinded_replies_type = apply_filters( 'supportflow_predefinded_replies_type', 'sf_predefs' );
-		$this->respondents_tax          = apply_filters( 'supportflow_respondents_taxonomy', 'sf_respondent' );
+		$this->customers_tax          = apply_filters( 'supportflow_customers_taxonomy', 'sf_customer' );
 		$this->tags_tax                 = apply_filters( 'supportflow_tags_taxonomy', 'sf_tags' );
 		$this->comment_type             = apply_filters( 'supportflow_ticket_comment_type', 'sf_comment' );
 		$this->reply_type               = apply_filters( 'supportflow_ticket_reply_type', 'sf_ticket' );
@@ -311,13 +311,13 @@ public function action_init_register_taxonomies() {
 			'assign_terms' => 'manage_options',
 		);
 
-		$args_respondents_tax = array(
-			'label'             => __( 'Respondents', 'supportflow' ),
+		$args_customers_tax = array(
+			'label'             => __( 'Customers', 'supportflow' ),
 			'labels'            => array(
-				'search_items' => __( 'Search Respondents', 'supportflow' ),
-				'edit_item'    => __( 'Edit Respondent', 'supportflow' ),
-				'update_item'  => __( 'Update Respondent', 'supportflow' ),
-				'add_new_item' => __( 'Add New Respondent', 'supportflow' ),
+				'search_items' => __( 'Search Customers', 'supportflow' ),
+				'edit_item'    => __( 'Edit Customer', 'supportflow' ),
+				'update_item'  => __( 'Update Customer', 'supportflow' ),
+				'add_new_item' => __( 'Add New Customer', 'supportflow' ),
 			),
 			'public'            => false,
 			'rewrite'           => false,
@@ -338,7 +338,7 @@ public function action_init_register_taxonomies() {
 			'capabilities'      => $capabilities,
 		);
 
-		register_taxonomy( $this->respondents_tax, $this->post_type, $args_respondents_tax );
+		register_taxonomy( $this->customers_tax, $this->post_type, $args_customers_tax );
 		register_taxonomy( $this->tags_tax, $this->post_type, $args_tags_tax );
 	}
 
@@ -463,8 +463,8 @@ public function create_ticket( $args ) {
 			'subject'            => '',
 			'message'            => '',
 			'date'               => '',
-			'respondent_id'      => 0, // If the requester has a WordPress account (ID or username)
-			'respondent_email'   => array(), // And an e-mail address
+			'customer_id'      => 0, // If the requester has a WordPress account (ID or username)
+			'customer_email'   => array(), // And an e-mail address
 			'reply_author'       => '',
 			'reply_author_email' => '',
 			'status'             => key( $post_statuses ),
@@ -492,9 +492,9 @@ public function create_ticket( $args ) {
 			return $ticket_id;
 		}
 
-		// Assign the respondent(s)
-		if ( ! empty( $args['respondent_email'] ) ) {
-			$this->update_ticket_respondents( $ticket_id, $args['respondent_email'] );
+		// Assign the customer(s)
+		if ( ! empty( $args['customer_email'] ) ) {
+			$this->update_ticket_customers( $ticket_id, $args['customer_email'] );
 		}
 
 		if ( is_numeric( $args['email_account'] ) ) {
@@ -502,11 +502,11 @@ public function create_ticket( $args ) {
 		}
 
 		// If there was a message, add it to the ticket
-		if ( ! empty( $args['message'] ) && ! empty( $args['respondent_email'] ) ) {
+		if ( ! empty( $args['message'] ) && ! empty( $args['customer_email'] ) ) {
 			$reply_details = array(
 				'reply_author'       => $args['reply_author'],
 				'reply_author_email' => $args['reply_author_email'],
-				'user_id'            => $args['respondent_id'],
+				'user_id'            => $args['customer_id'],
 			);
 			$this->add_ticket_reply( $ticket_id, $args['message'], $reply_details );
 		}
@@ -515,7 +515,7 @@ public function create_ticket( $args ) {
 	}
 
 	/**
-	 * @todo This should produce an object with ticket details, respondents, and replies
+	 * @todo This should produce an object with ticket details, customers, and replies
 	 */
 	public function get_ticket( $ticket_id ) {
 
@@ -523,12 +523,12 @@ public function get_ticket( $ticket_id ) {
 	}
 
 	/**
-	 * @todo This should produce a series of ticket objects with respondents, replies, etc.
+	 * @todo This should produce a series of ticket objects with customers, replies, etc.
 	 */
 	public function get_tickets( $args = array() ) {
 
 		$defaults = array(
-			'respondent_email' => '',
+			'customer_email' => '',
 			'post_status'      => '',
 			'orderby'          => 'modified',
 		);
@@ -539,12 +539,12 @@ public function get_tickets( $args = array() ) {
 			$ticket_args['post_status'] = array_keys( $this->post_statuses );
 		}
 
-		if ( ! empty( $args['respondent_email'] ) ) {
+		if ( ! empty( $args['customer_email'] ) ) {
 			$ticket_args['tax_query'] = array(
 				array(
-					'taxonomy' => $this->respondents_tax,
+					'taxonomy' => $this->customers_tax,
 					'field'    => 'slug',
-					'terms'    => $this->get_email_hash( $args['respondent_email'] ),
+					'terms'    => $this->get_email_hash( $args['customer_email'] ),
 				),
 			);
 		}
@@ -561,11 +561,11 @@ public function get_tickets( $args = array() ) {
 	}
 
 	/**
-	 * Get respondents matching $query
+	 * Get customers matching $query
 	 *
 	 * @param string $query partial email address to search for
 	 */
-	public function get_respondents( $args = array() ) {
+	public function get_customers( $args = array() ) {
 
 		$defaults = array(
 			'search' => '',
@@ -580,7 +580,7 @@ public function get_respondents( $args = array() ) {
 			'name__like' => $args['search'],
 			'number'     => $args['number'],
 		);
-		$matches   = get_terms( $this->respondents_tax, $term_args );
+		$matches   = get_terms( $this->customers_tax, $term_args );
 
 		if ( ! $matches ) {
 			return array();
@@ -590,67 +590,67 @@ public function get_respondents( $args = array() ) {
 	}
 
 	/**
-	 * Get a ticket's respondents
+	 * Get a ticket's customers
 	 *
 	 * @todo support retrieving more fields
 	 */
-	public function get_ticket_respondents( $ticket_id, $args = array() ) {
+	public function get_ticket_customers( $ticket_id, $args = array() ) {
 
 		$default_args = array(
 			'fields' => 'all', // 'all', 'emails'
 		);
 		$args         = array_merge( $default_args, $args );
 
-		$raw_respondents = wp_get_object_terms( $ticket_id, $this->respondents_tax );
-		if ( is_wp_error( $raw_respondents ) ) {
+		$raw_customers = wp_get_object_terms( $ticket_id, $this->customers_tax );
+		if ( is_wp_error( $raw_customers ) ) {
 			return array();
 		}
 
-		$respondents = array();
+		$customers = array();
 		if ( 'emails' == $args['fields'] ) {
-			foreach ( $raw_respondents as $raw_respondent ) {
-				$respondents[] = $raw_respondent->name;
+			foreach ( $raw_customers as $raw_customer ) {
+				$customers[] = $raw_customer->name;
 			}
 		} elseif ( 'slugs' == $args['fields'] ) {
-			foreach ( $raw_respondents as $raw_respondent ) {
-				$respondents[] = $raw_respondent->slug;
+			foreach ( $raw_customers as $raw_customer ) {
+				$customers[] = $raw_customer->slug;
 			}
 		}
 
-		return $respondents;
+		return $customers;
 	}
 
 	/**
-	 * Update a ticket's respondents
+	 * Update a ticket's customers
 	 *
 	 * @param int   $ticket_id
-	 * @param array $respondents An array of email addresses
+	 * @param array $customers An array of email addresses
 	 * @param bool  $append      Whether or not to append these email addresses to any existing addresses
 	 */
-	public function update_ticket_respondents( $ticket_id, $respondents, $append = false ) {
+	public function update_ticket_customers( $ticket_id, $customers, $append = false ) {
 
-		if ( is_string( $respondents ) ) {
-			$respondents = array( $respondents );
+		if ( is_string( $customers ) ) {
+			$customers = array( $customers );
 		}
 
 		$term_ids = array();
-		foreach ( $respondents as $dirty_respondent ) {
-			if ( empty( $dirty_respondent ) ) {
+		foreach ( $customers as $dirty_customer ) {
+			if ( empty( $dirty_customer ) ) {
 				continue;
 			}
 			// Create a term if it doesn't yet exist
-			$email = ( is_array( $dirty_respondent ) ) ? $dirty_respondent['user_email'] : $dirty_respondent;
-			if ( $term = get_term_by( 'name', $email, $this->respondents_tax ) ) {
+			$email = ( is_array( $dirty_customer ) ) ? $dirty_customer['user_email'] : $dirty_customer;
+			if ( $term = get_term_by( 'name', $email, $this->customers_tax ) ) {
 				$term_ids[] = (int) $term->term_id;
 			} else {
-				$term       = wp_insert_term( $email, $this->respondents_tax, array( 'slug' => $this->get_email_hash( $email ) ) );
+				$term       = wp_insert_term( $email, $this->customers_tax, array( 'slug' => $this->get_email_hash( $email ) ) );
 				if ( ! is_wp_error( $term ) ) {
 					$term_ids[] = $term['term_id'];
 				}
 
 			}
 		}
-		wp_set_object_terms( $ticket_id, $term_ids, $this->respondents_tax, $append );
+		wp_set_object_terms( $ticket_id, $term_ids, $this->customers_tax, $append );
 	}
 
 	/**

From 21b0d9d3b22e5cce260a99b61b3decf1259b44c1 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 8 Aug 2014 21:49:44 +0530
Subject: [PATCH 353/485] Migrate all terms with taxonomy sf_respondent to
 sf_customer during upgrade

---
 supportflow.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index c85981d..712a9fe 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -363,6 +363,7 @@ public function action_init_register_post_statuses() {
 	 */
 	public function action_init_upgrade() {
 		global $wpdb;
+		$db_prefix = $wpdb->prefix;
 
 		$code_version = $this->version;
 		$db_version   = get_option( 'sf_version' );
@@ -388,8 +389,10 @@ public function action_init_upgrade() {
 			}
 
 			// Migrate all posts with post type sf_thread to sf_ticket
-			$db_prefix = $wpdb->prefix;
 			$wpdb->update( "{$db_prefix}posts", array( 'post_type' => 'sf_ticket' ), array( 'post_type' => 'sf_thread' ) );
+
+			// Migrate all terms with taxonomy sf_respondent to sf_customer
+			$wpdb->update( "{$db_prefix}term_taxonomy", array( 'taxonomy' => 'sf_customer' ), array( 'taxonomy' => 'sf_respondent' ) );
 		}
 
 		// Update db_version to latest one

From 95ca4c45504c3e68acbabfa6ab8e4308dd896871 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 8 Aug 2014 23:43:45 +0530
Subject: [PATCH 354/485] Renamed $respondents_autocomplete_handle to
 $customers_autocomplete_handle

It was missed when conversion from respondent to customer due to a
merge conflict
---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 3f04fea..d3c28f6 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -81,7 +81,7 @@ public function action_admin_enqueue_scripts() {
 				$auto_save_handle                = SupportFlow()->enqueue_script( 'supportflow-auto-save', 'auto_save.js', array( 'jquery', 'heartbeat' ) );
 			} else {
 				$handle
-					= $respondents_autocomplete_handle
+					= $customers_autocomplete_handle
 					= $ticket_attachment_handle
 					= $supportflow_tickets_handle
 					= $auto_save_handle

From 8af842ed078f02ea00096f6ffbcbe18b8d26b4df Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 8 Aug 2014 23:45:38 +0530
Subject: [PATCH 355/485] Renamed respondents-autocomplete.js to
 customers-autocomplete.js

---
 classes/class-supportflow-admin.php                           | 2 +-
 js/{respondents-autocomplete.js => customers-autocomplete.js} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename js/{respondents-autocomplete.js => customers-autocomplete.js} (100%)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index d3c28f6..dd8edf5 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -75,7 +75,7 @@ public function action_admin_enqueue_scripts() {
 
 
 			if ( SupportFlow()->script_dev ) {
-				$customers_autocomplete_handle   = SupportFlow()->enqueue_script( 'supportflow-customers-autocomplete', 'respondents-autocomplete.js' );
+				$customers_autocomplete_handle   = SupportFlow()->enqueue_script( 'supportflow-customers-autocomplete', 'customers-autocomplete.js' );
 				$ticket_attachment_handle        = SupportFlow()->enqueue_script( 'supportflow-ticket-attachments', 'ticket_attachments.js' );
 				$supportflow_tickets_handle      = SupportFlow()->enqueue_script( 'supportflow-tickets', 'tickets.js' );
 				$auto_save_handle                = SupportFlow()->enqueue_script( 'supportflow-auto-save', 'auto_save.js', array( 'jquery', 'heartbeat' ) );
diff --git a/js/respondents-autocomplete.js b/js/customers-autocomplete.js
similarity index 100%
rename from js/respondents-autocomplete.js
rename to js/customers-autocomplete.js

From 1d5b7c0c165bcc2b05735ee1e9eca929e72f7345 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 8 Aug 2014 23:54:58 +0530
Subject: [PATCH 356/485] Renamed changed file in grunt as file is renamed

---
 Gruntfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 52e5945..64c9e45 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -7,7 +7,7 @@ module.exports = function (grunt) {
 		'js/permissions.js',
 		'js/predefined-replies.js',
 		'js/preferences.js',
-		'js/respondents-autocomplete.js',
+		'js/customers-autocomplete.js',
 		'js/ticket_attachments.js',
 		'js/tickets.js',
 		'js/auto_save.js',

From fe16cb6972a511a3d8b633671fc46886d66d59fb Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 8 Aug 2014 23:55:35 +0530
Subject: [PATCH 357/485] Rebuilded CSS/JS resources

---
 css/supportflow.min.css | 2 +-
 js/supportflow.min.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/css/supportflow.min.css b/css/supportflow.min.css
index cc8458b..10ed9af 100644
--- a/css/supportflow.min.css
+++ b/css/supportflow.min.css
@@ -1,3 +1,3 @@
 /*! SupportFlow minified version */
 
-.subsubsub li.trash a{color:#BC0B0B}.respondent_link{white-space:pre;vertical-align:top}#poststuff{padding-top:0}#side-sortables{margin-top:34px}#change_user_label{display:inline;font-weight:700;font-size:16px}#update_signature{width:30em}#supportflow-details .meta-item-label{font-weight:600}#supportflow-respondents.postbox,#supportflow-subject.postbox{border:none;background:0 0}#supportflow-respondents.postbox .inside,#supportflow-subject.postbox .inside{padding:0}#supportflow-details .handlediv,#supportflow-details h3.hndle,#supportflow-replies .handlediv,#supportflow-replies h3.hndle,#supportflow-respondents .handlediv,#supportflow-respondents h3.hndle,#supportflow-subject .handlediv,#supportflow-subject h3.hndle{display:none}#supportflow-details .handlediv,#supportflow-details h3.hndle{display:block}#supportflow-details #misc-publishing-actions label{display:inline-block}#supportflow-details #misc-publishing-actions select#post_status{width:100px}#supportflow-details #misc-publishing-actions span.the-date{font-weight:700}#supportflow-details #misc-publishing-actions div.last-activity{font-size:11px}#supportflow-replies h4,#supportflow-respondents h4,#supportflow-subject h4{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:13px;font-weight:400;margin:10px 0 6px}#supportflow-subject.postbox input{width:100%;font-size:1.7em;padding:12px 8px 10px;line-height:100%;height:1.7em}#supportflow-respondents.postbox input{width:100%;padding:8px;font-size:1.2em}#supportflow-cc-bcc.postbox input{width:100%;font-size:1.2em}#supportflow-replies.postbox #ticket-reply-box{width:100%}#supportflow-replies.postbox textarea{width:100%;padding:8px;font-size:1.1em;font-size:1.2em}#supportflow-replies.postbox .inside #message-tools #submit-action{padding:0;margin-top:5px;float:right}#supportflow-replies.postbox .inside #message-tools #replies-attachments-wrap{float:left}#supportflow-replies #replies-attachments-list,#supportflow-replies #upload-messages{margin-top:9px;margin-left:2px;color:#666}#supportflow-replies.postbox .inside #message-tools #submit-action input[type=checkbox]{margin-top:-1px}#supportflow-replies.postbox .inside #message-tools #submit-action label{padding-top:2px;padding-left:5px;padding-right:25px}#supportflow-replies.postbox ul.private-replies{background-color:#FFFFE0;border:1px solid #E6DB55;padding:5px 10px}#supportflow-replies.postbox ul.private-replies li{border-top:1px solid #DFDFDF;margin-top:10px}#supportflow-replies.postbox ul.private-replies li:first-child{border-top:none;margin-top:0}#supportflow-replies.postbox ul.private-replies li .ticket-meta{color:#BBB;font-size:.9em;text-align:right}#supportflow-replies.postbox ul.ticket-replies li{clear:left;margin-top:20px;margin-bottom:20px}#supportflow-replies.postbox ul.private-replies li .ticket-reply-attachments li,#supportflow-replies.postbox ul.ticket-replies li .ticket-reply-attachments li{margin-top:3px;margin-bottom:3px;font-size:.9em}#supportflow-replies.postbox ul.ticket-replies li .reply-avatar{float:left;width:100px;word-wrap:break-word}#supportflow-replies.postbox ul.ticket-replies li .reply-author{margin:0;font-size:.9em;color:#666}#supportflow-replies.postbox ul.ticket-replies li .ticket-reply{background-color:#FFF;margin-left:105px;min-height:80px;padding:10px;font-size:1.1em;border:1px solid #DFDFDF;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;word-wrap:break-word}#supportflow-replies.postbox ul.ticket-replies li .ticket-meta{margin-left:105px;font-size:.9em;color:#666;margin-top:5px}#supportflow-replies.postbox .predefined_replies_dropdown{width:200px}.metabox-holder .postbox-container .empty-container{border:none}input::-webkit-input-placeholder{color:#BBB}input:-moz-placeholder{color:#BBB}textarea::-webkit-input-placeholder{color:#BBB}textarea:-moz-placeholder{color:#BBB}#sf_my_tickets .toggle-content{display:none}#sf_my_tickets .tablenav{height:10px}#sf_recent_tickets .tablenav{height:0}#sf_recent_tickets .two_day_old{color:#DF1111}#sf_recent_tickets .one_two_day_old{color:#BD8A2C}
\ No newline at end of file
+.subsubsub li.trash a{color:#BC0B0B}.customer_link{white-space:pre;vertical-align:top}#poststuff{padding-top:0}#side-sortables{margin-top:34px}#change_user_label{display:inline;font-weight:700;font-size:16px}#update_signature{width:30em}#supportflow-details .meta-item-label{font-weight:600}#supportflow-customers.postbox,#supportflow-subject.postbox{border:none;background:0 0}#supportflow-customers.postbox .inside,#supportflow-subject.postbox .inside{padding:0}#supportflow-customers .handlediv,#supportflow-customers h3.hndle,#supportflow-details .handlediv,#supportflow-details h3.hndle,#supportflow-replies .handlediv,#supportflow-replies h3.hndle,#supportflow-subject .handlediv,#supportflow-subject h3.hndle{display:none}#supportflow-details .handlediv,#supportflow-details h3.hndle{display:block}#supportflow-details #misc-publishing-actions label{display:inline-block}#supportflow-details #misc-publishing-actions select#post_status{width:100px}#supportflow-details #misc-publishing-actions span.the-date{font-weight:700}#supportflow-details #misc-publishing-actions div.last-activity{font-size:11px}#supportflow-customers h4,#supportflow-replies h4,#supportflow-subject h4{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:13px;font-weight:400;margin:10px 0 6px}#supportflow-subject.postbox input{width:100%;font-size:1.7em;padding:12px 8px 10px;line-height:100%;height:1.7em}#supportflow-customers.postbox input{width:100%;padding:8px;font-size:1.2em}#supportflow-cc-bcc.postbox input{width:100%;font-size:1.2em}#supportflow-replies.postbox #ticket-reply-box{width:100%}#supportflow-replies.postbox textarea{width:100%;padding:8px;font-size:1.1em;font-size:1.2em}#supportflow-replies.postbox .inside #message-tools #submit-action{padding:0;margin-top:5px;float:right}#supportflow-replies.postbox .inside #message-tools #replies-attachments-wrap{float:left}#supportflow-replies #replies-attachments-list,#supportflow-replies #upload-messages{margin-top:9px;margin-left:2px;color:#666}#supportflow-replies.postbox .inside #message-tools #submit-action input[type=checkbox]{margin-top:-1px}#supportflow-replies.postbox .inside #message-tools #submit-action label{padding-top:2px;padding-left:5px;padding-right:25px}#supportflow-replies.postbox ul.private-replies{background-color:#FFFFE0;border:1px solid #E6DB55;padding:5px 10px}#supportflow-replies.postbox ul.private-replies li{border-top:1px solid #DFDFDF;margin-top:10px}#supportflow-replies.postbox ul.private-replies li:first-child{border-top:none;margin-top:0}#supportflow-replies.postbox ul.private-replies li .ticket-meta{color:#BBB;font-size:.9em;text-align:right}#supportflow-replies.postbox ul.ticket-replies li{clear:left;margin-top:20px;margin-bottom:20px}#supportflow-replies.postbox ul.private-replies li .ticket-reply-attachments li,#supportflow-replies.postbox ul.ticket-replies li .ticket-reply-attachments li{margin-top:3px;margin-bottom:3px;font-size:.9em}#supportflow-replies.postbox ul.ticket-replies li .reply-avatar{float:left;width:100px;word-wrap:break-word}#supportflow-replies.postbox ul.ticket-replies li .reply-author{margin:0;font-size:.9em;color:#666}#supportflow-replies.postbox ul.ticket-replies li .ticket-reply{background-color:#FFF;margin-left:105px;min-height:80px;padding:10px;font-size:1.1em;border:1px solid #DFDFDF;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;word-wrap:break-word}#supportflow-replies.postbox ul.ticket-replies li .ticket-meta{margin-left:105px;font-size:.9em;color:#666;margin-top:5px}#supportflow-replies.postbox .predefined_replies_dropdown{width:200px}.metabox-holder .postbox-container .empty-container{border:none}input::-webkit-input-placeholder{color:#BBB}input:-moz-placeholder{color:#BBB}textarea::-webkit-input-placeholder{color:#BBB}textarea:-moz-placeholder{color:#BBB}#sf_my_tickets .toggle-content{display:none}#sf_my_tickets .tablenav{height:10px}#sf_recent_tickets .tablenav{height:0}#sf_recent_tickets .two_day_old{color:#DF1111}#sf_recent_tickets .one_two_day_old{color:#BD8A2C}
\ No newline at end of file
diff --git a/js/supportflow.min.js b/js/supportflow.min.js
index adcdf8c..9ee815b 100644
--- a/js/supportflow.min.js
+++ b/js/supportflow.min.js
@@ -1,2 +1,2 @@
 /*! SupportFlow minified version */
-jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title",SFToggleLinks.expand),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title",SFToggleLinks.collapse)),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(){jQuery(".delete_email_account").click(function(a){if(a.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var b=jQuery(this).data("account-id"),c="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,d="";d+='<form method="POST" id="remove_email_account" action="'+c+'">',d+='<input type="hidden" name="action" value="delete" />',d+=SFEmailAccounts.delete_email_account_nonce,d+='<input type="hidden" name="account_id" value='+b+" />",d+="</form>",jQuery("body").append(d),jQuery("#remove_email_account").submit()}}),jQuery("#add_new_email_account #imap_ssl").change(function(){jQuery("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),jQuery("#add_new_email_account #smtp_ssl").change(function(){jQuery("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(){var a=function(a){a.preventDefault();var b=jQuery("#email_conversation_to").val();jQuery.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:b,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){jQuery("#email_conversation_to").prop("disabled",!0),jQuery("#email_conversation_submit").prop("disabled",!0),jQuery("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(a){jQuery("#email_conversation_status").html(a)},error:function(){jQuery("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){jQuery("#email_conversation_to").prop("disabled",!1),jQuery("#email_conversation_submit").prop("disabled",!1)}})};jQuery("#email_conversation_submit").click(a),jQuery("#email_conversation_to").keyup(function(){10==event.keyCode&&a()})}),jQuery(document).ready(function(){jQuery(".permission_filters").change(function(){var a=jQuery("#change_user option:selected").data("user-id"),b=jQuery("#change_status option:selected").data("status");jQuery.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:a,status:b,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(a){jQuery("#user_permissions_table").html(a)}})}),jQuery(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("permission-identifier"),d=a.prop("checked"),e=c.user_id,f=c.privilege_type,g=c.privilege_id;b.html(SFPermissions.changing_status),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:e,privilege_type:f,privilege_id:g,allowed:d,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPermissions.allowed:SFPermissions.not_allowed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(){jQuery("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=jQuery("#predefs").find("option:selected").data("content"),old_content=jQuery(".predef:nth-child("+this.old_child+")").data("content"),current_content=jQuery("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void jQuery(".predef:nth-child("+this.old_child+")").prop("selected",!0);jQuery("#reply").val(new_content),this.old_child=jQuery("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(){jQuery(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("email-notfication-identifier"),d=a.prop("checked"),e=c.privilege_type,f=c.privilege_id;b.html(SFPreferences.changing_state),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:e,privilege_id:f,allowed:d,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPreferences.subscribed:SFPreferences.unsubscribed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#respondents").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{respondents:c,"api-action":"get-respondents"}};a("#respondents").autocomplete({source:function(c,d){a.ajax({url:SFRespondentsAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.respondents,function(b){var c=a("#respondents").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var a=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return a.on("close",function(){var b=a.state().get("selection").toJSON();jQuery.each(b,function(){var a='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",b='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";jQuery("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+a+"&nbsp;"+b+"</li>"),jQuery("#reply-attachments").val(jQuery("#reply-attachments").val()+_.escape(this.id)+",")})}),a.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(){jQuery("#supportflow-details .meta-item-ok-button").click(function(a){var b=jQuery(this).siblings(".meta-item-dropdown").children("option:selected"),c=jQuery(this).closest(".meta-item"),d=c.children(".meta-item-name"),e=c.children(".meta-item-label");d.val(b.val()),e.text(b.text()),a.preventDefault()}),jQuery("#supportflow-details .meta-item-toggle-button").click(function(a){jQuery(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),a.preventDefault()}),jQuery(".save-button").click(function(a){return""==jQuery("#subject").val()?(jQuery("#subject").focus(),alert(SFTickets.no_title_msg),void a.preventDefault()):""==jQuery("#respondents").val()?(jQuery("#respondents").focus(),alert(SFTickets.no_respondent_msg),void a.preventDefault()):void 0}),jQuery("#reply").keypress(function(a){a.ctrlKey&&10==a.keyCode&&""!=$(this).val()&&$("#post").submit()}),jQuery("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&jQuery("#insert-reply").val(jQuery("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),jQuery("#close-ticket-submit").click(function(){jQuery("#post meta-item input[name='post_status']").val("sf_closed")})}),jQuery(document).ready(function(){jQuery(".sf_autosave").keyup(function(){var a={};a.ticket_id=SFAutoSave.ticket_id,jQuery(".sf_autosave").each(function(){element_key=jQuery(this).attr("name"),element_value=jQuery(this).val(),a[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",a,!1)})});
\ No newline at end of file
+jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title",SFToggleLinks.expand),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title",SFToggleLinks.collapse)),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(){jQuery(".delete_email_account").click(function(a){if(a.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var b=jQuery(this).data("account-id"),c="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,d="";d+='<form method="POST" id="remove_email_account" action="'+c+'">',d+='<input type="hidden" name="action" value="delete" />',d+=SFEmailAccounts.delete_email_account_nonce,d+='<input type="hidden" name="account_id" value='+b+" />",d+="</form>",jQuery("body").append(d),jQuery("#remove_email_account").submit()}}),jQuery("#add_new_email_account #imap_ssl").change(function(){jQuery("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),jQuery("#add_new_email_account #smtp_ssl").change(function(){jQuery("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(){var a=function(a){a.preventDefault();var b=jQuery("#email_conversation_to").val();jQuery.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:b,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){jQuery("#email_conversation_to").prop("disabled",!0),jQuery("#email_conversation_submit").prop("disabled",!0),jQuery("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(a){jQuery("#email_conversation_status").html(a)},error:function(){jQuery("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){jQuery("#email_conversation_to").prop("disabled",!1),jQuery("#email_conversation_submit").prop("disabled",!1)}})};jQuery("#email_conversation_submit").click(a),jQuery("#email_conversation_to").keyup(function(){10==event.keyCode&&a()})}),jQuery(document).ready(function(){jQuery(".permission_filters").change(function(){var a=jQuery("#change_user option:selected").data("user-id"),b=jQuery("#change_status option:selected").data("status");jQuery.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:a,status:b,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(a){jQuery("#user_permissions_table").html(a)}})}),jQuery(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("permission-identifier"),d=a.prop("checked"),e=c.user_id,f=c.privilege_type,g=c.privilege_id;b.html(SFPermissions.changing_status),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:e,privilege_type:f,privilege_id:g,allowed:d,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPermissions.allowed:SFPermissions.not_allowed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(){jQuery("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=jQuery("#predefs").find("option:selected").data("content"),old_content=jQuery(".predef:nth-child("+this.old_child+")").data("content"),current_content=jQuery("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void jQuery(".predef:nth-child("+this.old_child+")").prop("selected",!0);jQuery("#reply").val(new_content),this.old_child=jQuery("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(){jQuery(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("email-notfication-identifier"),d=a.prop("checked"),e=c.privilege_type,f=c.privilege_id;b.html(SFPreferences.changing_state),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:e,privilege_id:f,allowed:d,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPreferences.subscribed:SFPreferences.unsubscribed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var a=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return a.on("close",function(){var b=a.state().get("selection").toJSON();jQuery.each(b,function(){var a='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",b='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";jQuery("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+a+"&nbsp;"+b+"</li>"),jQuery("#reply-attachments").val(jQuery("#reply-attachments").val()+_.escape(this.id)+",")})}),a.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(){jQuery("#supportflow-details .meta-item-ok-button").click(function(a){var b=jQuery(this).siblings(".meta-item-dropdown").children("option:selected"),c=jQuery(this).closest(".meta-item"),d=c.children(".meta-item-name"),e=c.children(".meta-item-label");d.val(b.val()),e.text(b.text()),a.preventDefault()}),jQuery("#supportflow-details .meta-item-toggle-button").click(function(a){jQuery(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),a.preventDefault()}),jQuery(".save-button").click(function(a){return""==jQuery("#subject").val()?(jQuery("#subject").focus(),alert(SFTickets.no_title_msg),void a.preventDefault()):""==jQuery("#customers").val()?(jQuery("#customers").focus(),alert(SFTickets.no_customer_msg),void a.preventDefault()):void 0}),jQuery("#reply").keypress(function(a){a.ctrlKey&&10==a.keyCode&&""!=$(this).val()&&$("#post").submit()}),jQuery("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&jQuery("#insert-reply").val(jQuery("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),jQuery("#close-ticket-submit").click(function(){jQuery("#post meta-item input[name='post_status']").val("sf_closed")})}),jQuery(document).ready(function(){jQuery(".sf_autosave").keyup(function(){var a={};a.ticket_id=SFAutoSave.ticket_id,jQuery(".sf_autosave").each(function(){element_key=jQuery(this).attr("name"),element_value=jQuery(this).val(),a[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",a,!1)})});
\ No newline at end of file

From 6da01217378e5894d8e86ea13980635bd3cf436b Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Fri, 8 Aug 2014 11:42:26 -0700
Subject: [PATCH 358/485] Bump version for cachebusters.

---
 supportflow.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index 712a9fe..afc44c9 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -7,7 +7,7 @@
  * Plugin URI:  https://wordpress.org/plugins/supportflow/
  * Description: Reinventing how you support your customers.
  * Author:      Daniel Bachhuber, Varun Agrawal, Alex Mills, Andrew Spittle
- * Version:     0.2
+ * Version:     0.3-beta1
  *
  * Text Domain: supportflow
  * Domain Path: /languages/
@@ -146,7 +146,7 @@ private function setup_globals() {
 
 		/** Version ***********************************************************/
 
-		$this->version = '0.2'; // SupportFlow version
+		$this->version = '0.3-beta1'; // SupportFlow version
 
 		/** Paths *************************************************************/
 

From 938748a07b098f4d17ff0b3929decaa1097ad4c9 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 9 Aug 2014 00:22:33 +0530
Subject: [PATCH 359/485] Close ticket link was not working

Fixes #174
---
 js/tickets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/tickets.js b/js/tickets.js
index 24c58cf..e6aa361 100644
--- a/js/tickets.js
+++ b/js/tickets.js
@@ -52,6 +52,6 @@ jQuery(document).ready(function () {
 
 	// Close ticket wehen close ticket button is submitted
 	jQuery('#close-ticket-submit').click(function (event) {
-		jQuery("#post meta-item input[name='post_status']").val('sf_closed');
+		jQuery("#post .meta-item input[name='post_status']").val('sf_closed');
 	});
 });

From b6125f6ac91bcd17d5c9c0b5e6402b80fd10ab17 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 9 Aug 2014 00:23:46 +0530
Subject: [PATCH 360/485] Add required dependencies to customer-autocomplete
 script file

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index dd8edf5..25a24d5 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -75,7 +75,7 @@ public function action_admin_enqueue_scripts() {
 
 
 			if ( SupportFlow()->script_dev ) {
-				$customers_autocomplete_handle   = SupportFlow()->enqueue_script( 'supportflow-customers-autocomplete', 'customers-autocomplete.js' );
+				$customers_autocomplete_handle   = SupportFlow()->enqueue_script( 'supportflow-customers-autocomplete', 'customers-autocomplete.js', array( 'jquery', 'jquery-ui-autocomplete' ) );
 				$ticket_attachment_handle        = SupportFlow()->enqueue_script( 'supportflow-ticket-attachments', 'ticket_attachments.js' );
 				$supportflow_tickets_handle      = SupportFlow()->enqueue_script( 'supportflow-tickets', 'tickets.js' );
 				$auto_save_handle                = SupportFlow()->enqueue_script( 'supportflow-auto-save', 'auto_save.js', array( 'jquery', 'heartbeat' ) );

From 642315b313cf71c0d9f027ab04df81828d5cdc06 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Fri, 8 Aug 2014 12:11:51 -0700
Subject: [PATCH 361/485] Bump version for cachebusters.

---
 supportflow.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index afc44c9..d842b8b 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -7,7 +7,7 @@
  * Plugin URI:  https://wordpress.org/plugins/supportflow/
  * Description: Reinventing how you support your customers.
  * Author:      Daniel Bachhuber, Varun Agrawal, Alex Mills, Andrew Spittle
- * Version:     0.3-beta1
+ * Version:     0.3-beta2
  *
  * Text Domain: supportflow
  * Domain Path: /languages/
@@ -146,7 +146,7 @@ private function setup_globals() {
 
 		/** Version ***********************************************************/
 
-		$this->version = '0.3-beta1'; // SupportFlow version
+		$this->version = '0.3-beta2'; // SupportFlow version
 
 		/** Paths *************************************************************/
 

From 82741964cf27b38a4aeed79a6795f5aea1e1a56a Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 9 Aug 2014 00:53:14 +0530
Subject: [PATCH 362/485] Subject input field clipped in Firefox

Fixes #175
---
 css/admin.css | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/css/admin.css b/css/admin.css
index 3628980..66b1b12 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -89,8 +89,6 @@
 	font-size:      1.7em;
 	padding-left:   8px;
 	padding-right:  8px;
-	padding-top:    12px;
-	padding-bottom: 10px;
 	line-height:    100%;
 	height:         1.7em;
 }
@@ -99,6 +97,7 @@
 	width:     100%;
 	padding:   8px;
 	font-size: 1.2em;
+	height:     2.6em;
 }
 
 #supportflow-cc-bcc.postbox input {

From 4695ae1bc758979c0c475c7a49d05c47ab50d763 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 9 Aug 2014 01:27:21 +0530
Subject: [PATCH 363/485] [Bug] Conversation box populated with previous
 comment

Fixes #176
---
 supportflow.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/supportflow.php b/supportflow.php
index d842b8b..b39d839 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -794,6 +794,8 @@ public function add_ticket_reply( $ticket_id, $reply_text, $details = array() )
 		add_post_meta( $reply_id, 'reply_author', esc_sql( $details['reply_author'] ) );
 		add_post_meta( $reply_id, 'reply_author_email', esc_sql( $details['reply_author_email'] ) );
 
+		// Empty autosaved reply
+		delete_post_meta( $ticket_id, '_sf_autosave_reply' );
 
 		// Adding a ticket reply updates the post modified time for the ticket
 		remove_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );

From 84b0e52956c7b26faa2041f54d215435331f8c16 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 9 Aug 2014 02:14:52 +0530
Subject: [PATCH 364/485] Refactored enqueue_script

---
 classes/class-supportflow-admin.php           | 30 ++-----
 classes/class-supportflow-dashboard.php       |  9 +-
 classes/class-supportflow-email-accounts.php  |  6 +-
 classes/class-supportflow-permissions.php     |  6 +-
 .../class-supportflow-predefined-replies.php  |  6 +-
 classes/class-supportflow-preferences.php     |  6 +-
 classes/class-supportflow-statistics.php      |  7 +-
 js/supportflow.min.js                         |  2 +-
 supportflow.php                               | 85 +++++++------------
 9 files changed, 44 insertions(+), 113 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 25a24d5..785a5d9 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -64,29 +64,15 @@ function action_admin_init() {
 	public function action_admin_enqueue_scripts() {
 		global $pagenow;
 
-		if ( SupportFlow()->script_dev ) {
-			$handle = SupportFlow()->enqueue_style( 'supportflow-admin', 'admin.css' );
-		} else {
-			SupportFlow()->enqueue_styles();
-		}
+		$handle = SupportFlow()->enqueue_style( 'supportflow-admin', 'admin.css' );
 
 		if ( in_array( $pagenow, array( 'post.php', 'post-new.php' ) ) ) {
 			wp_enqueue_media();
 
-
-			if ( SupportFlow()->script_dev ) {
-				$customers_autocomplete_handle   = SupportFlow()->enqueue_script( 'supportflow-customers-autocomplete', 'customers-autocomplete.js', array( 'jquery', 'jquery-ui-autocomplete' ) );
-				$ticket_attachment_handle        = SupportFlow()->enqueue_script( 'supportflow-ticket-attachments', 'ticket_attachments.js' );
-				$supportflow_tickets_handle      = SupportFlow()->enqueue_script( 'supportflow-tickets', 'tickets.js' );
-				$auto_save_handle                = SupportFlow()->enqueue_script( 'supportflow-auto-save', 'auto_save.js', array( 'jquery', 'heartbeat' ) );
-			} else {
-				$handle
-					= $customers_autocomplete_handle
-					= $ticket_attachment_handle
-					= $supportflow_tickets_handle
-					= $auto_save_handle
-					= SupportFlow()->enqueue_scripts();
-			}
+			$customers_autocomplete_handle   = SupportFlow()->enqueue_script( 'supportflow-customers-autocomplete', 'customers-autocomplete.js', array( 'jquery', 'jquery-ui-autocomplete' ) );
+			$ticket_attachment_handle        = SupportFlow()->enqueue_script( 'supportflow-ticket-attachments', 'ticket_attachments.js' );
+			$supportflow_tickets_handle      = SupportFlow()->enqueue_script( 'supportflow-tickets', 'tickets.js' );
+			$auto_save_handle                = SupportFlow()->enqueue_script( 'supportflow-auto-save', 'auto_save.js', array( 'jquery', 'heartbeat' ) );
 
 			wp_localize_script( $customers_autocomplete_handle, 'SFCustomersAc', array(
 				'ajax_url' => add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) )
@@ -114,11 +100,7 @@ public function action_admin_enqueue_scripts() {
 		}
 
 		if ( 'post.php' == $pagenow ) {
-			if ( SupportFlow()->script_dev ) {
-				$email_conversation_handle = SupportFlow()->enqueue_script( 'supportflow-email-conversation', 'email_conversation.js' );
-			} else {
-				$email_conversation_handle = SupportFlow()->enqueue_scripts();
-			}
+			$email_conversation_handle = SupportFlow()->enqueue_script( 'supportflow-email-conversation', 'email_conversation.js' );
 
 			wp_localize_script( $email_conversation_handle, 'SFEmailConversation', array(
 				'post_id'                   => get_the_ID(),
diff --git a/classes/class-supportflow-dashboard.php b/classes/class-supportflow-dashboard.php
index 426ac20..5ed9ddf 100644
--- a/classes/class-supportflow-dashboard.php
+++ b/classes/class-supportflow-dashboard.php
@@ -17,13 +17,8 @@ public function setup_actions() {
 
 	function action_wp_dashboard_setup() {
 		if ( current_user_can( 'edit_posts' ) ) {
-			if ( SupportFlow()->script_dev ) {
-				$handle = SupportFlow()->enqueue_script( 'supportflow-statistics', 'toggle-links.js' );
-				SupportFlow()->enqueue_style( 'supportflow-dashboard', 'dashboard.css' );
-			} else {
-				$handle = SupportFlow()->enqueue_scripts();
-				SupportFlow()->enqueue_styles();
-			}
+			$handle = SupportFlow()->enqueue_script( 'supportflow-statistics', 'toggle-links.js' );
+			SupportFlow()->enqueue_style( 'supportflow-dashboard', 'dashboard.css' );
 
 			wp_localize_script( $handle, 'SFToggleLinks', array(
 				'expand'   => __( 'Expand', 'supportflow' ),
diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index a3d7fa0..2437016 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -292,11 +292,7 @@ public function insert_add_new_account_form() {
 	 * Enqueue JS code required for form submission
 	 */
 	public function insert_script() {
-		if ( SupportFlow()->script_dev ) {
-			$handle = SupportFlow()->enqueue_script( 'supportflow-email_accounts', 'email_accounts.js' );
-		} else {
-			$handle = SupportFlow()->enqueue_scripts();
-		}
+		$handle = SupportFlow()->enqueue_script( 'supportflow-email_accounts', 'email_accounts.js' );
 
 		wp_localize_script( $handle, 'SFEmailAccounts', array(
 			'sure_delete_account'        => __( 'Are you sure want to delete this account?', 'supportflow' ),
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 6beca69..f0cf56b 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -118,11 +118,7 @@ public function permissions_page() {
 	 * Enqueue JS code required by class
 	 */
 	public function insert_script() {
-		if ( SupportFlow()->script_dev ) {
-			$handle = SupportFlow()->enqueue_script( 'supportflow-permissions', 'permissions.js' );
-		} else {
-			$handle = SupportFlow()->enqueue_scripts();
-		}
+		$handle = SupportFlow()->enqueue_script( 'supportflow-permissions', 'permissions.js' );
 
 		wp_localize_script( $handle, 'SFPermissions', array(
 			'_get_user_permissions_nonce' => wp_create_nonce( 'get_user_permissions' ),
diff --git a/classes/class-supportflow-predefined-replies.php b/classes/class-supportflow-predefined-replies.php
index 02d6dd2..0fe8859 100644
--- a/classes/class-supportflow-predefined-replies.php
+++ b/classes/class-supportflow-predefined-replies.php
@@ -40,11 +40,7 @@ public function action_admin_enqueue_scripts() {
 		global $pagenow;
 
 		if ( 'post.php' == $pagenow || 'post-new.php' == $pagenow ) {
-			if ( SupportFlow()->script_dev ) {
-				$handle = SupportFlow()->enqueue_script( 'supportflow-predefined-replies', 'predefined-replies.js' );
-			} else {
-				$handle = SupportFlow()->enqueue_scripts();
-			}
+			$handle = SupportFlow()->enqueue_script( 'supportflow-predefined-replies', 'predefined-replies.js' );
 
 			wp_localize_script( $handle, 'SFPredefinedReplies', array(
 				'message' => __( 'Are you sure want to proceed? It will replace your existing content.', 'supportflow' ),
diff --git a/classes/class-supportflow-preferences.php b/classes/class-supportflow-preferences.php
index d804d8e..0f9b5f1 100644
--- a/classes/class-supportflow-preferences.php
+++ b/classes/class-supportflow-preferences.php
@@ -29,11 +29,7 @@ public function action_admin_menu() {
 	}
 
 	public function insert_scripts() {
-		if ( SupportFlow()->script_dev ) {
-			$handle = SupportFlow()->enqueue_script( 'supportflow-preferences', 'preferences.js' );
-		} else {
-			$handle = SupportFlow()->enqueue_scripts();
-		}
+		$handle = SupportFlow()->enqueue_script( 'supportflow-preferences', 'preferences.js' );
 
 		wp_localize_script( $handle, 'SFPreferences', array(
 			'changing_state'              => __( 'Changing status, please wait.', 'supportflow' ),
diff --git a/classes/class-supportflow-statistics.php b/classes/class-supportflow-statistics.php
index c843f67..ea8b9c8 100644
--- a/classes/class-supportflow-statistics.php
+++ b/classes/class-supportflow-statistics.php
@@ -114,11 +114,8 @@ function insert_css_code() {
 	 * Enqueue JS code required by statistics page
 	 */
 	function insert_script() {
-		if ( SupportFlow()->script_dev ) {
-			$handle = SupportFlow()->enqueue_script( 'supportflow-statistics', 'toggle-links.js' );
-		} else {
-			$handle = SupportFlow()->enqueue_scripts();
-		}
+		$handle = SupportFlow()->enqueue_script( 'supportflow-statistics', 'toggle-links.js' );
+
 		wp_localize_script( $handle, 'SFToggleLinks', array(
 			'expand'   => __( 'Expand', 'supportflow' ),
 			'collapse' => __( 'Collapse', 'supportflow' ),
diff --git a/js/supportflow.min.js b/js/supportflow.min.js
index 9ee815b..3cd6d27 100644
--- a/js/supportflow.min.js
+++ b/js/supportflow.min.js
@@ -1,2 +1,2 @@
 /*! SupportFlow minified version */
-jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title",SFToggleLinks.expand),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title",SFToggleLinks.collapse)),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(){jQuery(".delete_email_account").click(function(a){if(a.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var b=jQuery(this).data("account-id"),c="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,d="";d+='<form method="POST" id="remove_email_account" action="'+c+'">',d+='<input type="hidden" name="action" value="delete" />',d+=SFEmailAccounts.delete_email_account_nonce,d+='<input type="hidden" name="account_id" value='+b+" />",d+="</form>",jQuery("body").append(d),jQuery("#remove_email_account").submit()}}),jQuery("#add_new_email_account #imap_ssl").change(function(){jQuery("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),jQuery("#add_new_email_account #smtp_ssl").change(function(){jQuery("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(){var a=function(a){a.preventDefault();var b=jQuery("#email_conversation_to").val();jQuery.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:b,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){jQuery("#email_conversation_to").prop("disabled",!0),jQuery("#email_conversation_submit").prop("disabled",!0),jQuery("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(a){jQuery("#email_conversation_status").html(a)},error:function(){jQuery("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){jQuery("#email_conversation_to").prop("disabled",!1),jQuery("#email_conversation_submit").prop("disabled",!1)}})};jQuery("#email_conversation_submit").click(a),jQuery("#email_conversation_to").keyup(function(){10==event.keyCode&&a()})}),jQuery(document).ready(function(){jQuery(".permission_filters").change(function(){var a=jQuery("#change_user option:selected").data("user-id"),b=jQuery("#change_status option:selected").data("status");jQuery.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:a,status:b,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(a){jQuery("#user_permissions_table").html(a)}})}),jQuery(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("permission-identifier"),d=a.prop("checked"),e=c.user_id,f=c.privilege_type,g=c.privilege_id;b.html(SFPermissions.changing_status),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:e,privilege_type:f,privilege_id:g,allowed:d,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPermissions.allowed:SFPermissions.not_allowed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(){jQuery("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=jQuery("#predefs").find("option:selected").data("content"),old_content=jQuery(".predef:nth-child("+this.old_child+")").data("content"),current_content=jQuery("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void jQuery(".predef:nth-child("+this.old_child+")").prop("selected",!0);jQuery("#reply").val(new_content),this.old_child=jQuery("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(){jQuery(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("email-notfication-identifier"),d=a.prop("checked"),e=c.privilege_type,f=c.privilege_id;b.html(SFPreferences.changing_state),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:e,privilege_id:f,allowed:d,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPreferences.subscribed:SFPreferences.unsubscribed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var a=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return a.on("close",function(){var b=a.state().get("selection").toJSON();jQuery.each(b,function(){var a='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",b='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";jQuery("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+a+"&nbsp;"+b+"</li>"),jQuery("#reply-attachments").val(jQuery("#reply-attachments").val()+_.escape(this.id)+",")})}),a.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(){jQuery("#supportflow-details .meta-item-ok-button").click(function(a){var b=jQuery(this).siblings(".meta-item-dropdown").children("option:selected"),c=jQuery(this).closest(".meta-item"),d=c.children(".meta-item-name"),e=c.children(".meta-item-label");d.val(b.val()),e.text(b.text()),a.preventDefault()}),jQuery("#supportflow-details .meta-item-toggle-button").click(function(a){jQuery(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),a.preventDefault()}),jQuery(".save-button").click(function(a){return""==jQuery("#subject").val()?(jQuery("#subject").focus(),alert(SFTickets.no_title_msg),void a.preventDefault()):""==jQuery("#customers").val()?(jQuery("#customers").focus(),alert(SFTickets.no_customer_msg),void a.preventDefault()):void 0}),jQuery("#reply").keypress(function(a){a.ctrlKey&&10==a.keyCode&&""!=$(this).val()&&$("#post").submit()}),jQuery("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&jQuery("#insert-reply").val(jQuery("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),jQuery("#close-ticket-submit").click(function(){jQuery("#post meta-item input[name='post_status']").val("sf_closed")})}),jQuery(document).ready(function(){jQuery(".sf_autosave").keyup(function(){var a={};a.ticket_id=SFAutoSave.ticket_id,jQuery(".sf_autosave").each(function(){element_key=jQuery(this).attr("name"),element_value=jQuery(this).val(),a[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",a,!1)})});
\ No newline at end of file
+jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title",SFToggleLinks.expand),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title",SFToggleLinks.collapse)),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(){jQuery(".delete_email_account").click(function(a){if(a.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var b=jQuery(this).data("account-id"),c="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,d="";d+='<form method="POST" id="remove_email_account" action="'+c+'">',d+='<input type="hidden" name="action" value="delete" />',d+=SFEmailAccounts.delete_email_account_nonce,d+='<input type="hidden" name="account_id" value='+b+" />",d+="</form>",jQuery("body").append(d),jQuery("#remove_email_account").submit()}}),jQuery("#add_new_email_account #imap_ssl").change(function(){jQuery("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),jQuery("#add_new_email_account #smtp_ssl").change(function(){jQuery("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(){var a=function(a){a.preventDefault();var b=jQuery("#email_conversation_to").val();jQuery.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:b,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){jQuery("#email_conversation_to").prop("disabled",!0),jQuery("#email_conversation_submit").prop("disabled",!0),jQuery("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(a){jQuery("#email_conversation_status").html(a)},error:function(){jQuery("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){jQuery("#email_conversation_to").prop("disabled",!1),jQuery("#email_conversation_submit").prop("disabled",!1)}})};jQuery("#email_conversation_submit").click(a),jQuery("#email_conversation_to").keyup(function(){10==event.keyCode&&a()})}),jQuery(document).ready(function(){jQuery(".permission_filters").change(function(){var a=jQuery("#change_user option:selected").data("user-id"),b=jQuery("#change_status option:selected").data("status");jQuery.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:a,status:b,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(a){jQuery("#user_permissions_table").html(a)}})}),jQuery(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("permission-identifier"),d=a.prop("checked"),e=c.user_id,f=c.privilege_type,g=c.privilege_id;b.html(SFPermissions.changing_status),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:e,privilege_type:f,privilege_id:g,allowed:d,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPermissions.allowed:SFPermissions.not_allowed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(){jQuery("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=jQuery("#predefs").find("option:selected").data("content"),old_content=jQuery(".predef:nth-child("+this.old_child+")").data("content"),current_content=jQuery("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void jQuery(".predef:nth-child("+this.old_child+")").prop("selected",!0);jQuery("#reply").val(new_content),this.old_child=jQuery("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(){jQuery(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("email-notfication-identifier"),d=a.prop("checked"),e=c.privilege_type,f=c.privilege_id;b.html(SFPreferences.changing_state),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:e,privilege_id:f,allowed:d,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPreferences.subscribed:SFPreferences.unsubscribed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var a=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return a.on("close",function(){var b=a.state().get("selection").toJSON();jQuery.each(b,function(){var a='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",b='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";jQuery("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+a+"&nbsp;"+b+"</li>"),jQuery("#reply-attachments").val(jQuery("#reply-attachments").val()+_.escape(this.id)+",")})}),a.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(){jQuery("#supportflow-details .meta-item-ok-button").click(function(a){var b=jQuery(this).siblings(".meta-item-dropdown").children("option:selected"),c=jQuery(this).closest(".meta-item"),d=c.children(".meta-item-name"),e=c.children(".meta-item-label");d.val(b.val()),e.text(b.text()),a.preventDefault()}),jQuery("#supportflow-details .meta-item-toggle-button").click(function(a){jQuery(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),a.preventDefault()}),jQuery(".save-button").click(function(a){return""==jQuery("#subject").val()?(jQuery("#subject").focus(),alert(SFTickets.no_title_msg),void a.preventDefault()):""==jQuery("#customers").val()?(jQuery("#customers").focus(),alert(SFTickets.no_customer_msg),void a.preventDefault()):void 0}),jQuery("#reply").keypress(function(a){a.ctrlKey&&10==a.keyCode&&""!=$(this).val()&&$("#post").submit()}),jQuery("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&jQuery("#insert-reply").val(jQuery("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),jQuery("#close-ticket-submit").click(function(){jQuery("#post .meta-item input[name='post_status']").val("sf_closed")})}),jQuery(document).ready(function(){jQuery(".sf_autosave").keyup(function(){var a={};a.ticket_id=SFAutoSave.ticket_id,jQuery(".sf_autosave").each(function(){element_key=jQuery(this).attr("name"),element_value=jQuery(this).val(),a[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",a,!1)})});
\ No newline at end of file
diff --git a/supportflow.php b/supportflow.php
index d842b8b..d8c5010 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -850,25 +850,27 @@ public function get_ticket_from_secret( $secret ) {
 	/**
 	 * SupportFlow alternate of wp_enqueue_script() to increase code reuse and save time. Enqueue a JS script
 	 *
-	 * @param string      $handle    Name of the script.
-	 * @param string      $file_name Path to the script "/plugins/supportflow/js/ is automatically prefixed to it.
+	 * @param string $handle         Name of the script.
+	 * @param string $file_name      Path to the script "/plugins/supportflow/js/ is automatically prefixed to it.
 	 *                               Example: 'attachment.js'.
-	 * @param array       $deps      Optional. An array of registered handles this script depends on. Default array( 'jquery' )
-	 * @param string|bool $ver       Optional. String specifying the script version number.
-	 *                               If true current version of SupportFlow will be append to it.
-	 *                               Set false to prevent any version added to it or a string for a particular version of choice
-	 * @param bool        $in_footer Optional. Whether to enqueue the script before </head> or before </body>.
-	 *                               Default 'false'. Accepts 'false' or 'true'.
+	 * @param array  $deps           Optional. An array of registered handles this script depends on. Default array( 'jquery' )
 	 *
 	 * @return string     Handle of enqueued script
 	 */
-	public function enqueue_script( $handle, $file_name, $dependencies = array( 'jquery' ), $version = true, $in_footer = false ) {
-		if ( true === $version ) {
-			$version = $this->version;
+	public function enqueue_script( $handle, $file_name, $deps = array( 'jquery' ) ) {
+		if ( ! $this->script_dev ) {
+			$handle    = 'supportflow-minified-scripts';
+			$file_name = 'supportflow.min.js';
 		}
-		$src = SupportFlow()->plugin_url . "js/$file_name";
 
-		wp_enqueue_script( $handle, $src, $dependencies, $version, $in_footer );
+		foreach ( $deps as $dep ) {
+			wp_enqueue_script( $dep );
+		}
+
+		$version = $this->version;
+		$src     = SupportFlow()->plugin_url . "js/$file_name";
+
+		wp_enqueue_script( $handle, $src, array(), $version );
 
 		return $handle;
 	}
@@ -876,58 +878,29 @@ public function enqueue_script( $handle, $file_name, $dependencies = array( 'jqu
 	/**
 	 * SupportFlow alternate of wp_enqueue_script() to increase code reuse and save time. Enqueue a CSS stylesheet
 	 *
-	 * @param string      $handle    Name of the stylesheet.
-	 * @param string      $file_name Path to the stylesheet "/plugins/supportflow/css/ is automatically prefixed to it.
+	 * @param string $handle         Handle of the stylesheet. It can be changed within method. You must use use the handle returned by it
+	 * @param string $file_name      Path to the stylesheet "/plugins/supportflow/css/ is automatically prefixed to it.
 	 *                               Example: 'attachment.js'.
-	 * @param array       $deps      Optional. An array of registered handles this script depends on.
-	 * @param string|bool $ver       Optional. String specifying the script version number.
-	 *                               If true current version of SupportFlow will be append to it.
-	 *                               Set false to prevent any version added to it or a string for a particular version of choice
-	 * @param string      $media     Optional. The media for which this stylesheet has been defined.
-	 *                               Default 'all'. Accepts 'all', 'aural', 'braille', 'handheld', 'projection', 'print',
-	 *                               'screen', 'tty', or 'tv'.
+	 * @param array  $deps           Optional. An array of registered handles this syles depends on.
 	 *
 	 * @return string     Handle of enqueued style
 	 */
-	public function enqueue_style( $handle, $file_name, $dependencies = array(), $version = true, $media = 'all' ) {
-		if ( true === $version ) {
-			$version = $this->version;
+	public function enqueue_style( $handle, $file_name, $deps = array() ) {
+		if ( ! $this->script_dev ) {
+			$handle    = 'supportflow-minified-styles';
+			$file_name = 'supportflow.min.css';
 		}
-		$src = SupportFlow()->plugin_url . "css/$file_name";
-
-		wp_enqueue_style( $handle, $src, $dependencies, $version, $media );
-
-		return $handle;
-	}
 
-	/**
-	 *
-	 * Enqueue minfied and concatenated version all the scripts required by SupportFlow
-	 * Doesn't add localisation data to it
-	 *
-	 * @return string Handle of enqueued script
-	 */
-	public function enqueue_scripts() {
+		foreach ( $deps as $dep ) {
+			wp_enqueue_style( $dep );
+		}
 
-		return $this->enqueue_script(
-			'supportflow-minified-scripts',
-			'supportflow.min.js',
-			array( 'jquery', 'jquery-ui-autocomplete', 'heartbeat' )
-		);
-	}
+		$version = $this->version;
+		$src     = SupportFlow()->plugin_url . "css/$file_name";
 
-	/**
-	 *
-	 * Enqueue minfied and concatenated version all the styles required by SupportFlow
-	 *
-	 * @return string Handle of enqueued style
-	 */
-	public function enqueue_styles() {
+		wp_enqueue_style( $handle, $src, array(), $version );
 
-		return $this->enqueue_style(
-			'supportflow-minified-styles',
-			'supportflow.min.css'
-		);
+		return $handle;
 	}
 
 	/**

From acc2cf7e2eb7f8bc78e72f6ba157b6b3affa2e83 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 9 Aug 2014 02:18:28 +0530
Subject: [PATCH 365/485] Rebuilded JS/CSS resources

---
 css/supportflow.min.css | 2 +-
 js/supportflow.min.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/css/supportflow.min.css b/css/supportflow.min.css
index 10ed9af..0cc8f94 100644
--- a/css/supportflow.min.css
+++ b/css/supportflow.min.css
@@ -1,3 +1,3 @@
 /*! SupportFlow minified version */
 
-.subsubsub li.trash a{color:#BC0B0B}.customer_link{white-space:pre;vertical-align:top}#poststuff{padding-top:0}#side-sortables{margin-top:34px}#change_user_label{display:inline;font-weight:700;font-size:16px}#update_signature{width:30em}#supportflow-details .meta-item-label{font-weight:600}#supportflow-customers.postbox,#supportflow-subject.postbox{border:none;background:0 0}#supportflow-customers.postbox .inside,#supportflow-subject.postbox .inside{padding:0}#supportflow-customers .handlediv,#supportflow-customers h3.hndle,#supportflow-details .handlediv,#supportflow-details h3.hndle,#supportflow-replies .handlediv,#supportflow-replies h3.hndle,#supportflow-subject .handlediv,#supportflow-subject h3.hndle{display:none}#supportflow-details .handlediv,#supportflow-details h3.hndle{display:block}#supportflow-details #misc-publishing-actions label{display:inline-block}#supportflow-details #misc-publishing-actions select#post_status{width:100px}#supportflow-details #misc-publishing-actions span.the-date{font-weight:700}#supportflow-details #misc-publishing-actions div.last-activity{font-size:11px}#supportflow-customers h4,#supportflow-replies h4,#supportflow-subject h4{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:13px;font-weight:400;margin:10px 0 6px}#supportflow-subject.postbox input{width:100%;font-size:1.7em;padding:12px 8px 10px;line-height:100%;height:1.7em}#supportflow-customers.postbox input{width:100%;padding:8px;font-size:1.2em}#supportflow-cc-bcc.postbox input{width:100%;font-size:1.2em}#supportflow-replies.postbox #ticket-reply-box{width:100%}#supportflow-replies.postbox textarea{width:100%;padding:8px;font-size:1.1em;font-size:1.2em}#supportflow-replies.postbox .inside #message-tools #submit-action{padding:0;margin-top:5px;float:right}#supportflow-replies.postbox .inside #message-tools #replies-attachments-wrap{float:left}#supportflow-replies #replies-attachments-list,#supportflow-replies #upload-messages{margin-top:9px;margin-left:2px;color:#666}#supportflow-replies.postbox .inside #message-tools #submit-action input[type=checkbox]{margin-top:-1px}#supportflow-replies.postbox .inside #message-tools #submit-action label{padding-top:2px;padding-left:5px;padding-right:25px}#supportflow-replies.postbox ul.private-replies{background-color:#FFFFE0;border:1px solid #E6DB55;padding:5px 10px}#supportflow-replies.postbox ul.private-replies li{border-top:1px solid #DFDFDF;margin-top:10px}#supportflow-replies.postbox ul.private-replies li:first-child{border-top:none;margin-top:0}#supportflow-replies.postbox ul.private-replies li .ticket-meta{color:#BBB;font-size:.9em;text-align:right}#supportflow-replies.postbox ul.ticket-replies li{clear:left;margin-top:20px;margin-bottom:20px}#supportflow-replies.postbox ul.private-replies li .ticket-reply-attachments li,#supportflow-replies.postbox ul.ticket-replies li .ticket-reply-attachments li{margin-top:3px;margin-bottom:3px;font-size:.9em}#supportflow-replies.postbox ul.ticket-replies li .reply-avatar{float:left;width:100px;word-wrap:break-word}#supportflow-replies.postbox ul.ticket-replies li .reply-author{margin:0;font-size:.9em;color:#666}#supportflow-replies.postbox ul.ticket-replies li .ticket-reply{background-color:#FFF;margin-left:105px;min-height:80px;padding:10px;font-size:1.1em;border:1px solid #DFDFDF;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;word-wrap:break-word}#supportflow-replies.postbox ul.ticket-replies li .ticket-meta{margin-left:105px;font-size:.9em;color:#666;margin-top:5px}#supportflow-replies.postbox .predefined_replies_dropdown{width:200px}.metabox-holder .postbox-container .empty-container{border:none}input::-webkit-input-placeholder{color:#BBB}input:-moz-placeholder{color:#BBB}textarea::-webkit-input-placeholder{color:#BBB}textarea:-moz-placeholder{color:#BBB}#sf_my_tickets .toggle-content{display:none}#sf_my_tickets .tablenav{height:10px}#sf_recent_tickets .tablenav{height:0}#sf_recent_tickets .two_day_old{color:#DF1111}#sf_recent_tickets .one_two_day_old{color:#BD8A2C}
\ No newline at end of file
+.subsubsub li.trash a{color:#BC0B0B}.customer_link{white-space:pre;vertical-align:top}#poststuff{padding-top:0}#side-sortables{margin-top:34px}#change_user_label{display:inline;font-weight:700;font-size:16px}#update_signature{width:30em}#supportflow-details .meta-item-label{font-weight:600}#supportflow-customers.postbox,#supportflow-subject.postbox{border:none;background:0 0}#supportflow-customers.postbox .inside,#supportflow-subject.postbox .inside{padding:0}#supportflow-customers .handlediv,#supportflow-customers h3.hndle,#supportflow-details .handlediv,#supportflow-details h3.hndle,#supportflow-replies .handlediv,#supportflow-replies h3.hndle,#supportflow-subject .handlediv,#supportflow-subject h3.hndle{display:none}#supportflow-details .handlediv,#supportflow-details h3.hndle{display:block}#supportflow-details #misc-publishing-actions label{display:inline-block}#supportflow-details #misc-publishing-actions select#post_status{width:100px}#supportflow-details #misc-publishing-actions span.the-date{font-weight:700}#supportflow-details #misc-publishing-actions div.last-activity{font-size:11px}#supportflow-customers h4,#supportflow-replies h4,#supportflow-subject h4{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:13px;font-weight:400;margin:10px 0 6px}#supportflow-subject.postbox input{width:100%;font-size:1.7em;padding-left:8px;padding-right:8px;line-height:100%;height:1.7em}#supportflow-customers.postbox input{width:100%;padding:8px;font-size:1.2em;height:2.6em}#supportflow-cc-bcc.postbox input{width:100%;font-size:1.2em}#supportflow-replies.postbox #ticket-reply-box{width:100%}#supportflow-replies.postbox textarea{width:100%;padding:8px;font-size:1.1em;font-size:1.2em}#supportflow-replies.postbox .inside #message-tools #submit-action{padding:0;margin-top:5px;float:right}#supportflow-replies.postbox .inside #message-tools #replies-attachments-wrap{float:left}#supportflow-replies #replies-attachments-list,#supportflow-replies #upload-messages{margin-top:9px;margin-left:2px;color:#666}#supportflow-replies.postbox .inside #message-tools #submit-action input[type=checkbox]{margin-top:-1px}#supportflow-replies.postbox .inside #message-tools #submit-action label{padding-top:2px;padding-left:5px;padding-right:25px}#supportflow-replies.postbox ul.private-replies{background-color:#FFFFE0;border:1px solid #E6DB55;padding:5px 10px}#supportflow-replies.postbox ul.private-replies li{border-top:1px solid #DFDFDF;margin-top:10px}#supportflow-replies.postbox ul.private-replies li:first-child{border-top:none;margin-top:0}#supportflow-replies.postbox ul.private-replies li .ticket-meta{color:#BBB;font-size:.9em;text-align:right}#supportflow-replies.postbox ul.ticket-replies li{clear:left;margin-top:20px;margin-bottom:20px}#supportflow-replies.postbox ul.private-replies li .ticket-reply-attachments li,#supportflow-replies.postbox ul.ticket-replies li .ticket-reply-attachments li{margin-top:3px;margin-bottom:3px;font-size:.9em}#supportflow-replies.postbox ul.ticket-replies li .reply-avatar{float:left;width:100px;word-wrap:break-word}#supportflow-replies.postbox ul.ticket-replies li .reply-author{margin:0;font-size:.9em;color:#666}#supportflow-replies.postbox ul.ticket-replies li .ticket-reply{background-color:#FFF;margin-left:105px;min-height:80px;padding:10px;font-size:1.1em;border:1px solid #DFDFDF;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;word-wrap:break-word}#supportflow-replies.postbox ul.ticket-replies li .ticket-meta{margin-left:105px;font-size:.9em;color:#666;margin-top:5px}#supportflow-replies.postbox .predefined_replies_dropdown{width:200px}.metabox-holder .postbox-container .empty-container{border:none}input::-webkit-input-placeholder{color:#BBB}input:-moz-placeholder{color:#BBB}textarea::-webkit-input-placeholder{color:#BBB}textarea:-moz-placeholder{color:#BBB}#sf_my_tickets .toggle-content{display:none}#sf_my_tickets .tablenav{height:10px}#sf_recent_tickets .tablenav{height:0}#sf_recent_tickets .two_day_old{color:#DF1111}#sf_recent_tickets .one_two_day_old{color:#BD8A2C}
\ No newline at end of file
diff --git a/js/supportflow.min.js b/js/supportflow.min.js
index 9ee815b..3cd6d27 100644
--- a/js/supportflow.min.js
+++ b/js/supportflow.min.js
@@ -1,2 +1,2 @@
 /*! SupportFlow minified version */
-jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title",SFToggleLinks.expand),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title",SFToggleLinks.collapse)),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(){jQuery(".delete_email_account").click(function(a){if(a.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var b=jQuery(this).data("account-id"),c="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,d="";d+='<form method="POST" id="remove_email_account" action="'+c+'">',d+='<input type="hidden" name="action" value="delete" />',d+=SFEmailAccounts.delete_email_account_nonce,d+='<input type="hidden" name="account_id" value='+b+" />",d+="</form>",jQuery("body").append(d),jQuery("#remove_email_account").submit()}}),jQuery("#add_new_email_account #imap_ssl").change(function(){jQuery("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),jQuery("#add_new_email_account #smtp_ssl").change(function(){jQuery("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(){var a=function(a){a.preventDefault();var b=jQuery("#email_conversation_to").val();jQuery.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:b,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){jQuery("#email_conversation_to").prop("disabled",!0),jQuery("#email_conversation_submit").prop("disabled",!0),jQuery("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(a){jQuery("#email_conversation_status").html(a)},error:function(){jQuery("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){jQuery("#email_conversation_to").prop("disabled",!1),jQuery("#email_conversation_submit").prop("disabled",!1)}})};jQuery("#email_conversation_submit").click(a),jQuery("#email_conversation_to").keyup(function(){10==event.keyCode&&a()})}),jQuery(document).ready(function(){jQuery(".permission_filters").change(function(){var a=jQuery("#change_user option:selected").data("user-id"),b=jQuery("#change_status option:selected").data("status");jQuery.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:a,status:b,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(a){jQuery("#user_permissions_table").html(a)}})}),jQuery(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("permission-identifier"),d=a.prop("checked"),e=c.user_id,f=c.privilege_type,g=c.privilege_id;b.html(SFPermissions.changing_status),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:e,privilege_type:f,privilege_id:g,allowed:d,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPermissions.allowed:SFPermissions.not_allowed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(){jQuery("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=jQuery("#predefs").find("option:selected").data("content"),old_content=jQuery(".predef:nth-child("+this.old_child+")").data("content"),current_content=jQuery("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void jQuery(".predef:nth-child("+this.old_child+")").prop("selected",!0);jQuery("#reply").val(new_content),this.old_child=jQuery("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(){jQuery(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("email-notfication-identifier"),d=a.prop("checked"),e=c.privilege_type,f=c.privilege_id;b.html(SFPreferences.changing_state),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:e,privilege_id:f,allowed:d,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPreferences.subscribed:SFPreferences.unsubscribed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var a=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return a.on("close",function(){var b=a.state().get("selection").toJSON();jQuery.each(b,function(){var a='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",b='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";jQuery("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+a+"&nbsp;"+b+"</li>"),jQuery("#reply-attachments").val(jQuery("#reply-attachments").val()+_.escape(this.id)+",")})}),a.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(){jQuery("#supportflow-details .meta-item-ok-button").click(function(a){var b=jQuery(this).siblings(".meta-item-dropdown").children("option:selected"),c=jQuery(this).closest(".meta-item"),d=c.children(".meta-item-name"),e=c.children(".meta-item-label");d.val(b.val()),e.text(b.text()),a.preventDefault()}),jQuery("#supportflow-details .meta-item-toggle-button").click(function(a){jQuery(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),a.preventDefault()}),jQuery(".save-button").click(function(a){return""==jQuery("#subject").val()?(jQuery("#subject").focus(),alert(SFTickets.no_title_msg),void a.preventDefault()):""==jQuery("#customers").val()?(jQuery("#customers").focus(),alert(SFTickets.no_customer_msg),void a.preventDefault()):void 0}),jQuery("#reply").keypress(function(a){a.ctrlKey&&10==a.keyCode&&""!=$(this).val()&&$("#post").submit()}),jQuery("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&jQuery("#insert-reply").val(jQuery("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),jQuery("#close-ticket-submit").click(function(){jQuery("#post meta-item input[name='post_status']").val("sf_closed")})}),jQuery(document).ready(function(){jQuery(".sf_autosave").keyup(function(){var a={};a.ticket_id=SFAutoSave.ticket_id,jQuery(".sf_autosave").each(function(){element_key=jQuery(this).attr("name"),element_value=jQuery(this).val(),a[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",a,!1)})});
\ No newline at end of file
+jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title",SFToggleLinks.expand),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title",SFToggleLinks.collapse)),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(){jQuery(".delete_email_account").click(function(a){if(a.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var b=jQuery(this).data("account-id"),c="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,d="";d+='<form method="POST" id="remove_email_account" action="'+c+'">',d+='<input type="hidden" name="action" value="delete" />',d+=SFEmailAccounts.delete_email_account_nonce,d+='<input type="hidden" name="account_id" value='+b+" />",d+="</form>",jQuery("body").append(d),jQuery("#remove_email_account").submit()}}),jQuery("#add_new_email_account #imap_ssl").change(function(){jQuery("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),jQuery("#add_new_email_account #smtp_ssl").change(function(){jQuery("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(){var a=function(a){a.preventDefault();var b=jQuery("#email_conversation_to").val();jQuery.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:b,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){jQuery("#email_conversation_to").prop("disabled",!0),jQuery("#email_conversation_submit").prop("disabled",!0),jQuery("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(a){jQuery("#email_conversation_status").html(a)},error:function(){jQuery("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){jQuery("#email_conversation_to").prop("disabled",!1),jQuery("#email_conversation_submit").prop("disabled",!1)}})};jQuery("#email_conversation_submit").click(a),jQuery("#email_conversation_to").keyup(function(){10==event.keyCode&&a()})}),jQuery(document).ready(function(){jQuery(".permission_filters").change(function(){var a=jQuery("#change_user option:selected").data("user-id"),b=jQuery("#change_status option:selected").data("status");jQuery.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:a,status:b,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(a){jQuery("#user_permissions_table").html(a)}})}),jQuery(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("permission-identifier"),d=a.prop("checked"),e=c.user_id,f=c.privilege_type,g=c.privilege_id;b.html(SFPermissions.changing_status),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:e,privilege_type:f,privilege_id:g,allowed:d,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPermissions.allowed:SFPermissions.not_allowed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(){jQuery("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=jQuery("#predefs").find("option:selected").data("content"),old_content=jQuery(".predef:nth-child("+this.old_child+")").data("content"),current_content=jQuery("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void jQuery(".predef:nth-child("+this.old_child+")").prop("selected",!0);jQuery("#reply").val(new_content),this.old_child=jQuery("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(){jQuery(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("email-notfication-identifier"),d=a.prop("checked"),e=c.privilege_type,f=c.privilege_id;b.html(SFPreferences.changing_state),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:e,privilege_id:f,allowed:d,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPreferences.subscribed:SFPreferences.unsubscribed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var a=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return a.on("close",function(){var b=a.state().get("selection").toJSON();jQuery.each(b,function(){var a='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",b='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";jQuery("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+a+"&nbsp;"+b+"</li>"),jQuery("#reply-attachments").val(jQuery("#reply-attachments").val()+_.escape(this.id)+",")})}),a.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(){jQuery("#supportflow-details .meta-item-ok-button").click(function(a){var b=jQuery(this).siblings(".meta-item-dropdown").children("option:selected"),c=jQuery(this).closest(".meta-item"),d=c.children(".meta-item-name"),e=c.children(".meta-item-label");d.val(b.val()),e.text(b.text()),a.preventDefault()}),jQuery("#supportflow-details .meta-item-toggle-button").click(function(a){jQuery(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),a.preventDefault()}),jQuery(".save-button").click(function(a){return""==jQuery("#subject").val()?(jQuery("#subject").focus(),alert(SFTickets.no_title_msg),void a.preventDefault()):""==jQuery("#customers").val()?(jQuery("#customers").focus(),alert(SFTickets.no_customer_msg),void a.preventDefault()):void 0}),jQuery("#reply").keypress(function(a){a.ctrlKey&&10==a.keyCode&&""!=$(this).val()&&$("#post").submit()}),jQuery("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&jQuery("#insert-reply").val(jQuery("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),jQuery("#close-ticket-submit").click(function(){jQuery("#post .meta-item input[name='post_status']").val("sf_closed")})}),jQuery(document).ready(function(){jQuery(".sf_autosave").keyup(function(){var a={};a.ticket_id=SFAutoSave.ticket_id,jQuery(".sf_autosave").each(function(){element_key=jQuery(this).attr("name"),element_value=jQuery(this).val(),a[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",a,!1)})});
\ No newline at end of file

From 387022fbe801966d002eb582ebb3193dde2ed845 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Fri, 8 Aug 2014 13:59:19 -0700
Subject: [PATCH 366/485] Bump version

---
 supportflow.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index b39d839..60e6089 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -7,7 +7,7 @@
  * Plugin URI:  https://wordpress.org/plugins/supportflow/
  * Description: Reinventing how you support your customers.
  * Author:      Daniel Bachhuber, Varun Agrawal, Alex Mills, Andrew Spittle
- * Version:     0.3-beta2
+ * Version:     0.3-beta3
  *
  * Text Domain: supportflow
  * Domain Path: /languages/
@@ -146,7 +146,7 @@ private function setup_globals() {
 
 		/** Version ***********************************************************/
 
-		$this->version = '0.3-beta2'; // SupportFlow version
+		$this->version = '0.3-beta3'; // SupportFlow version
 
 		/** Paths *************************************************************/
 

From c1535678da9a8380e42672ceef71174f2d01fc88 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 9 Aug 2014 02:37:15 +0530
Subject: [PATCH 367/485] Updated version to 0.3

---
 supportflow.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index 60e6089..1f6bd5e 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -7,7 +7,7 @@
  * Plugin URI:  https://wordpress.org/plugins/supportflow/
  * Description: Reinventing how you support your customers.
  * Author:      Daniel Bachhuber, Varun Agrawal, Alex Mills, Andrew Spittle
- * Version:     0.3-beta3
+ * Version:     0.3
  *
  * Text Domain: supportflow
  * Domain Path: /languages/
@@ -146,7 +146,7 @@ private function setup_globals() {
 
 		/** Version ***********************************************************/
 
-		$this->version = '0.3-beta3'; // SupportFlow version
+		$this->version = '0.3'; // SupportFlow version
 
 		/** Paths *************************************************************/
 

From 5ac479b0c6a38645ee3b226c9a400b760f4a5f8a Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 9 Aug 2014 02:47:24 +0530
Subject: [PATCH 368/485] Renamed User's Recent Tickets widget to Customer(s)
 recent Tickets

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 25a24d5..bf39e08 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -576,7 +576,7 @@ public function action_add_meta_boxes() {
 		add_meta_box( 'supportflow-replies', __( 'Replies', 'supportflow' ), array( $this, 'meta_box_replies' ), SupportFlow()->post_type, 'normal' );
 
 		if ( 'post.php' == $pagenow ) {
-			add_meta_box( 'supportflow-other-customers-tickets', __( 'User\'s Recent Tickets', 'supportflow' ), array( $this, 'meta_box_other_customers_tickets' ), SupportFlow()->post_type, 'side' );
+			add_meta_box( 'supportflow-other-customers-tickets', __( 'Customer(s) recent Tickets', 'supportflow' ), array( $this, 'meta_box_other_customers_tickets' ), SupportFlow()->post_type, 'side' );
 			add_meta_box( 'supportflow-forward_conversation', __( 'Forward this conversation', 'supportflow' ), array( $this, 'meta_box_email_conversation' ), SupportFlow()->post_type, 'side' );
 		}
 	}

From de6933f764aeac66283aa1f5df2f604cd499f045 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 9 Aug 2014 02:50:14 +0530
Subject: [PATCH 369/485] Updated readme

---
 readme.txt | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/readme.txt b/readme.txt
index f67e28d..872e315 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,8 +1,8 @@
 === SupportFlow ===
 Contributors: VarunAgw, danielbachhuber, Viper007Bond, andrewspittle
 Tags: Ticket, support, admin, customer, customer support, help desk, helpdesk, IT, support, ticket
-Tested up to: 3.9.1
-Stable tag: 0.2
+Tested up to: 3.9.2
+Stable tag: 0.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -47,6 +47,17 @@ Just add **[supportflow_submissionform]** shortcode to the post you want to add
 
 == Changelog ==
 
+= 0.3 =
+* Auto-saving tickets
+* Recently created tickets widget in dashboard
+* Ticket assigned to current agent widget in dashboard
+* Other tickets by the customer in view ticket page
+* Allow agents to add signature in ticket
+* Allowing basic HTML in replies
+* Easy creation of support form using [supportflow_submissionform] shortcode
+* Securely saving attachments
+* Fixed bugs
+
 = 0.2 =
 * Fix nonce and escaping bugs.
 * Add ability to forward a ticket to someone outside of SupportFlow.

From 540c292e796c336f250eea7395e5651b26680981 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Mon, 11 Aug 2014 23:36:16 +0530
Subject: [PATCH 370/485] Hide quoted text from tickets

It consider line starting with > sign as quoted text. It will hide them
and place an anchor in place of them. Clicking the anchor will show them
---
 classes/class-supportflow-admin.php | 25 +++++++++++++++++++++++++
 js/tickets.js                       |  7 +++++++
 2 files changed, 32 insertions(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index bf39e08..a352461 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -1009,6 +1009,7 @@ public function display_ticket_replies() {
 				$post_content = wpautop( stripslashes( $reply->post_content ) );
 				// Make link clickable
 				$post_content = make_clickable( $post_content );
+				$post_content = $this->hide_quoted_text( $post_content );
 				echo $post_content;
 				if ( $attachment_ids = get_post_meta( $reply->ID, 'sf_attachments' ) ) {
 					echo '<ul class="ticket-reply-attachments">';
@@ -1043,6 +1044,7 @@ public function display_ticket_replies() {
 				$post_content = wpautop( stripslashes( $reply->post_content ) );
 				// Make link clickable
 				$post_content = make_clickable( $post_content );
+				$post_content = $this->hide_quoted_text( $post_content );
 				echo $post_content;
 				if ( $attachment_ids = get_post_meta( $reply->ID, 'sf_attachments' ) ) {
 					echo '<ul class="ticket-reply-attachments">';
@@ -1276,6 +1278,29 @@ public function action_save_post( $ticket_id ) {
 		}
 
 	}
+
+	/**
+	 * Hide quoted content in a message and display a link to show it.
+	 * Line startings with ">" sign are considered quoted content
+	 */
+	public function hide_quoted_text( $text ) {
+
+		$ws     = '\s'; // Whitespace ( matches \r\n\t\f )
+		$gt     = '&gt;'; // Greater than sign
+		$br     = "<{$ws}*br[^>]*>"; // BR tag
+		$non_br = "<(\s|/)*(?:(?!br( |>)).)*[^>]>"; // Any tag other than BR
+
+		$regex = "(^|$br)($non_br|$ws)*$gt(.*?)($br(?!($non_br|$ws)*$gt)|$)";
+
+		$res = preg_replace_callback( "~$regex~is", function ( $matches ) {
+			$match    = esc_attr( $matches[0] );
+			$show_msg = __( 'Show quoted content', 'supportflow' );
+
+			return "<span><a href='' class='sf_toggle_quoted_text' data-quoted_text='$match'><br />$show_msg</a><br /></span>";
+		}, $text );
+
+		return $res;
+	}
 }
 
 SupportFlow()->extend->admin = new SupportFlow_Admin();
diff --git a/js/tickets.js b/js/tickets.js
index e6aa361..662b8fd 100644
--- a/js/tickets.js
+++ b/js/tickets.js
@@ -54,4 +54,11 @@ jQuery(document).ready(function () {
 	jQuery('#close-ticket-submit').click(function (event) {
 		jQuery("#post .meta-item input[name='post_status']").val('sf_closed');
 	});
+
+	// Show quoted text	
+	jQuery('.sf_toggle_quoted_text').click(function (event) {
+		event.preventDefault();
+		$(this).parent().html($(this).data('quoted_text'))
+	});
+
 });

From 7c1f8c265a7c18ba72e3c6f07a292aed114e226a Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 00:19:18 +0530
Subject: [PATCH 371/485] Converting from anonymous function to a method

This is to maintain backward compatibility with PHP 5.2
---
 classes/class-supportflow-admin.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index a352461..46a344a 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -1292,15 +1292,22 @@ public function hide_quoted_text( $text ) {
 
 		$regex = "(^|$br)($non_br|$ws)*$gt(.*?)($br(?!($non_br|$ws)*$gt)|$)";
 
-		$res = preg_replace_callback( "~$regex~is", function ( $matches ) {
-			$match    = esc_attr( $matches[0] );
-			$show_msg = __( 'Show quoted content', 'supportflow' );
-
-			return "<span><a href='' class='sf_toggle_quoted_text' data-quoted_text='$match'><br />$show_msg</a><br /></span>";
-		}, $text );
+		$res = preg_replace_callback( "~$regex~is", array( $this, 'hide_quoted_text_regex_callback' ), $text );
 
 		return $res;
 	}
+
+	/**
+	 * Just a function used by hide_quoted_text() for its regex callback
+	 * Anonymous function are not used as they unavailable in PHP 5.2.x
+	 * create_function() is not used as it it not readable
+	 */
+	protected function hide_quoted_text_regex_callback( $matches ) {
+		$match    = esc_attr( $matches[0] );
+		$show_msg = __( 'Show quoted content', 'supportflow' );
+
+		return "<span><a href='' class='sf_toggle_quoted_text' data-quoted_text='$match'><br />$show_msg</a><br /></span>";
+	}
 }
 
 SupportFlow()->extend->admin = new SupportFlow_Admin();

From 85b6e13d945b7b5332b2bf3dba295cc26ee60767 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 01:04:10 +0530
Subject: [PATCH 372/485] Using jQuery variable instead of $

---
 js/tickets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/tickets.js b/js/tickets.js
index 662b8fd..865b833 100644
--- a/js/tickets.js
+++ b/js/tickets.js
@@ -58,7 +58,7 @@ jQuery(document).ready(function () {
 	// Show quoted text	
 	jQuery('.sf_toggle_quoted_text').click(function (event) {
 		event.preventDefault();
-		$(this).parent().html($(this).data('quoted_text'))
+		jQuery(this).parent().html(jQuery(this).data('quoted_text'))
 	});
 
 });

From 9e57813663d13b01f3660c5c06a0a2889b111962 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 01:04:31 +0530
Subject: [PATCH 373/485] Rebuilding minified resources

---
 js/supportflow.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/supportflow.min.js b/js/supportflow.min.js
index 3cd6d27..4ea5cbf 100644
--- a/js/supportflow.min.js
+++ b/js/supportflow.min.js
@@ -1,2 +1,2 @@
 /*! SupportFlow minified version */
-jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title",SFToggleLinks.expand),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title",SFToggleLinks.collapse)),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(){jQuery(".delete_email_account").click(function(a){if(a.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var b=jQuery(this).data("account-id"),c="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,d="";d+='<form method="POST" id="remove_email_account" action="'+c+'">',d+='<input type="hidden" name="action" value="delete" />',d+=SFEmailAccounts.delete_email_account_nonce,d+='<input type="hidden" name="account_id" value='+b+" />",d+="</form>",jQuery("body").append(d),jQuery("#remove_email_account").submit()}}),jQuery("#add_new_email_account #imap_ssl").change(function(){jQuery("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),jQuery("#add_new_email_account #smtp_ssl").change(function(){jQuery("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(){var a=function(a){a.preventDefault();var b=jQuery("#email_conversation_to").val();jQuery.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:b,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){jQuery("#email_conversation_to").prop("disabled",!0),jQuery("#email_conversation_submit").prop("disabled",!0),jQuery("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(a){jQuery("#email_conversation_status").html(a)},error:function(){jQuery("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){jQuery("#email_conversation_to").prop("disabled",!1),jQuery("#email_conversation_submit").prop("disabled",!1)}})};jQuery("#email_conversation_submit").click(a),jQuery("#email_conversation_to").keyup(function(){10==event.keyCode&&a()})}),jQuery(document).ready(function(){jQuery(".permission_filters").change(function(){var a=jQuery("#change_user option:selected").data("user-id"),b=jQuery("#change_status option:selected").data("status");jQuery.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:a,status:b,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(a){jQuery("#user_permissions_table").html(a)}})}),jQuery(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("permission-identifier"),d=a.prop("checked"),e=c.user_id,f=c.privilege_type,g=c.privilege_id;b.html(SFPermissions.changing_status),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:e,privilege_type:f,privilege_id:g,allowed:d,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPermissions.allowed:SFPermissions.not_allowed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(){jQuery("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=jQuery("#predefs").find("option:selected").data("content"),old_content=jQuery(".predef:nth-child("+this.old_child+")").data("content"),current_content=jQuery("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void jQuery(".predef:nth-child("+this.old_child+")").prop("selected",!0);jQuery("#reply").val(new_content),this.old_child=jQuery("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(){jQuery(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("email-notfication-identifier"),d=a.prop("checked"),e=c.privilege_type,f=c.privilege_id;b.html(SFPreferences.changing_state),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:e,privilege_id:f,allowed:d,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPreferences.subscribed:SFPreferences.unsubscribed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var a=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return a.on("close",function(){var b=a.state().get("selection").toJSON();jQuery.each(b,function(){var a='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",b='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";jQuery("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+a+"&nbsp;"+b+"</li>"),jQuery("#reply-attachments").val(jQuery("#reply-attachments").val()+_.escape(this.id)+",")})}),a.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(){jQuery("#supportflow-details .meta-item-ok-button").click(function(a){var b=jQuery(this).siblings(".meta-item-dropdown").children("option:selected"),c=jQuery(this).closest(".meta-item"),d=c.children(".meta-item-name"),e=c.children(".meta-item-label");d.val(b.val()),e.text(b.text()),a.preventDefault()}),jQuery("#supportflow-details .meta-item-toggle-button").click(function(a){jQuery(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),a.preventDefault()}),jQuery(".save-button").click(function(a){return""==jQuery("#subject").val()?(jQuery("#subject").focus(),alert(SFTickets.no_title_msg),void a.preventDefault()):""==jQuery("#customers").val()?(jQuery("#customers").focus(),alert(SFTickets.no_customer_msg),void a.preventDefault()):void 0}),jQuery("#reply").keypress(function(a){a.ctrlKey&&10==a.keyCode&&""!=$(this).val()&&$("#post").submit()}),jQuery("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&jQuery("#insert-reply").val(jQuery("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),jQuery("#close-ticket-submit").click(function(){jQuery("#post .meta-item input[name='post_status']").val("sf_closed")})}),jQuery(document).ready(function(){jQuery(".sf_autosave").keyup(function(){var a={};a.ticket_id=SFAutoSave.ticket_id,jQuery(".sf_autosave").each(function(){element_key=jQuery(this).attr("name"),element_value=jQuery(this).val(),a[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",a,!1)})});
\ No newline at end of file
+jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title",SFToggleLinks.expand),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title",SFToggleLinks.collapse)),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(){jQuery(".delete_email_account").click(function(a){if(a.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var b=jQuery(this).data("account-id"),c="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,d="";d+='<form method="POST" id="remove_email_account" action="'+c+'">',d+='<input type="hidden" name="action" value="delete" />',d+=SFEmailAccounts.delete_email_account_nonce,d+='<input type="hidden" name="account_id" value='+b+" />",d+="</form>",jQuery("body").append(d),jQuery("#remove_email_account").submit()}}),jQuery("#add_new_email_account #imap_ssl").change(function(){jQuery("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),jQuery("#add_new_email_account #smtp_ssl").change(function(){jQuery("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(){var a=function(a){a.preventDefault();var b=jQuery("#email_conversation_to").val();jQuery.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:b,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){jQuery("#email_conversation_to").prop("disabled",!0),jQuery("#email_conversation_submit").prop("disabled",!0),jQuery("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(a){jQuery("#email_conversation_status").html(a)},error:function(){jQuery("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){jQuery("#email_conversation_to").prop("disabled",!1),jQuery("#email_conversation_submit").prop("disabled",!1)}})};jQuery("#email_conversation_submit").click(a),jQuery("#email_conversation_to").keyup(function(){10==event.keyCode&&a()})}),jQuery(document).ready(function(){jQuery(".permission_filters").change(function(){var a=jQuery("#change_user option:selected").data("user-id"),b=jQuery("#change_status option:selected").data("status");jQuery.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:a,status:b,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(a){jQuery("#user_permissions_table").html(a)}})}),jQuery(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("permission-identifier"),d=a.prop("checked"),e=c.user_id,f=c.privilege_type,g=c.privilege_id;b.html(SFPermissions.changing_status),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:e,privilege_type:f,privilege_id:g,allowed:d,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPermissions.allowed:SFPermissions.not_allowed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(){jQuery("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=jQuery("#predefs").find("option:selected").data("content"),old_content=jQuery(".predef:nth-child("+this.old_child+")").data("content"),current_content=jQuery("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void jQuery(".predef:nth-child("+this.old_child+")").prop("selected",!0);jQuery("#reply").val(new_content),this.old_child=jQuery("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(){jQuery(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("email-notfication-identifier"),d=a.prop("checked"),e=c.privilege_type,f=c.privilege_id;b.html(SFPreferences.changing_state),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:e,privilege_id:f,allowed:d,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPreferences.subscribed:SFPreferences.unsubscribed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var a=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return a.on("close",function(){var b=a.state().get("selection").toJSON();jQuery.each(b,function(){var a='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",b='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";jQuery("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+a+"&nbsp;"+b+"</li>"),jQuery("#reply-attachments").val(jQuery("#reply-attachments").val()+_.escape(this.id)+",")})}),a.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(){jQuery("#supportflow-details .meta-item-ok-button").click(function(a){var b=jQuery(this).siblings(".meta-item-dropdown").children("option:selected"),c=jQuery(this).closest(".meta-item"),d=c.children(".meta-item-name"),e=c.children(".meta-item-label");d.val(b.val()),e.text(b.text()),a.preventDefault()}),jQuery("#supportflow-details .meta-item-toggle-button").click(function(a){jQuery(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),a.preventDefault()}),jQuery(".save-button").click(function(a){return""==jQuery("#subject").val()?(jQuery("#subject").focus(),alert(SFTickets.no_title_msg),void a.preventDefault()):""==jQuery("#customers").val()?(jQuery("#customers").focus(),alert(SFTickets.no_customer_msg),void a.preventDefault()):void 0}),jQuery("#reply").keypress(function(a){a.ctrlKey&&10==a.keyCode&&""!=$(this).val()&&$("#post").submit()}),jQuery("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&jQuery("#insert-reply").val(jQuery("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),jQuery("#close-ticket-submit").click(function(){jQuery("#post .meta-item input[name='post_status']").val("sf_closed")}),jQuery(".sf_toggle_quoted_text").click(function(a){a.preventDefault(),jQuery(this).parent().html(jQuery(this).data("quoted_text"))})}),jQuery(document).ready(function(){jQuery(".sf_autosave").keyup(function(){var a={};a.ticket_id=SFAutoSave.ticket_id,jQuery(".sf_autosave").each(function(){element_key=jQuery(this).attr("name"),element_value=jQuery(this).val(),a[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",a,!1)})});
\ No newline at end of file

From 6e94dbd522eb181f1249eca068fddb2cf9693bc9 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 01:33:29 +0530
Subject: [PATCH 374/485] Sending last second message as quoted content

Each of its lines are prefixed with `> ` sign. It is then added to the end
of script
---
 classes/class-supportflow-emails.php | 30 ++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 6bce326..ff36e5b 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -89,6 +89,21 @@ public function notify_agents_ticket_replies( $reply_id ) {
 
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $ticket->ID, 'agent' );
 
+		// Insert last second reply as quoted text
+		$replies = SupportFlow()->get_ticket_replies( $ticket->ID, array( 'numberposts' => 2, ) );
+		if ( ! empty( $replies[1] ) ) {
+			$quoted_reply = $replies[1];
+			$reply_author = get_post_meta( $quoted_reply->ID, 'reply_author', true );
+			if ( empty( $reply_author ) ) {
+				$reply_author = get_post_meta( $ticket_reply->ID, 'reply_author_email', true );
+			}
+			$time_stamp   = $ticket->post_date_gmt;
+			$heading      = sprintf( "On %s GMT, %s wrote:", $time_stamp, $reply_author );
+			$content      = '> ' . stripslashes( $quoted_reply->post_content );
+			$content      = str_replace( "\n", "\n> ", $content );
+			$message .= "\n\n$heading\n>$content";
+		}
+
 		self::mail( $agent_emails, $subject, $message, 'Content-Type: text/html', $attachments, $smtp_account );
 	}
 
@@ -134,6 +149,21 @@ public function notify_customers_ticket_replies( $reply_id, $cc = array(), $bcc
 		$message = stripslashes( $reply->post_content );
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $ticket->ID, 'customer' );
 
+		// Insert last second reply as quoted text
+		$replies = SupportFlow()->get_ticket_replies( $ticket->ID, array( 'numberposts' => 2, ) );
+		if ( ! empty( $replies[1] ) ) {
+			$quoted_reply = $replies[1];
+			$reply_author = get_post_meta( $quoted_reply->ID, 'reply_author', true );
+			if ( empty( $reply_author ) ) {
+				$reply_author = get_post_meta( $ticket_reply->ID, 'reply_author_email', true );
+			}
+			$time_stamp   = $ticket->post_date_gmt;
+			$heading      = sprintf( "On %s GMT, %s wrote:", $time_stamp, $reply_author );
+			$content      = '> ' . stripslashes( $quoted_reply->post_content );
+			$content      = str_replace( "\n", "\n> ", $content );
+			$message .= "\n\n$heading\n>$content";
+		}
+
 		$headers = "Content-Type: text/html\r\n";
 
 		if ( is_array( $cc ) && ! empty( $cc ) ) {

From 22250062c81dbeeb9fe45bd64e0750d52e94984b Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 01:42:00 +0530
Subject: [PATCH 375/485] Convert new lines to html equivalents

Now E-Mails are send as HTML content type so it content should be in
proper HTML format

\n will convert to <br />
\n\n will convert to new paragraph
---
 classes/class-supportflow-emails.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index ff36e5b..e3d6a42 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -103,6 +103,7 @@ public function notify_agents_ticket_replies( $reply_id ) {
 			$content      = str_replace( "\n", "\n> ", $content );
 			$message .= "\n\n$heading\n>$content";
 		}
+		$message = wpautop( $message );
 
 		self::mail( $agent_emails, $subject, $message, 'Content-Type: text/html', $attachments, $smtp_account );
 	}
@@ -148,6 +149,7 @@ public function notify_customers_ticket_replies( $reply_id, $cc = array(), $bcc
 
 		$message = stripslashes( $reply->post_content );
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $ticket->ID, 'customer' );
+		$message = wpautop( $message );
 
 		// Insert last second reply as quoted text
 		$replies = SupportFlow()->get_ticket_replies( $ticket->ID, array( 'numberposts' => 2, ) );

From e000a5a6e6bc3dad8cb1f986cf0d8ebc68053ba9 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 03:22:17 +0530
Subject: [PATCH 376/485] Refactored classes/class-supportflow-emails.php

---
 classes/class-supportflow-emails.php | 130 +++++++++++++--------------
 1 file changed, 63 insertions(+), 67 deletions(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index e3d6a42..d343e62 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -30,16 +30,12 @@ public function setup_actions() {
 	 * When a new reply is added to the ticket, notify the agent on the ticket if there is one
 	 */
 	public function notify_agents_ticket_replies( $reply_id ) {
-
 		$reply = get_post( $reply_id );
 		if ( ! $reply ) {
 			return;
 		}
 
 		$ticket = SupportFlow()->get_ticket( $reply->post_parent );
-		// One agent by default, but easily allow notifications to a triage team
-		$agent_ids = SupportFlow()->extend->email_notifications->get_notified_user( $ticket->ID );
-		$agent_ids = apply_filters( 'supportflow_emails_notify_agent_ids', $agent_ids, $ticket, 'reply' );
 
 		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 		$email_account_id = get_post_meta( $ticket->ID, 'email_account', true );
@@ -48,6 +44,9 @@ public function notify_agents_ticket_replies( $reply_id ) {
 		}
 		$smtp_account = $email_accounts[$email_account_id];
 
+
+		$agent_ids = SupportFlow()->extend->email_notifications->get_notified_user( $ticket->ID );
+		$agent_ids = apply_filters( 'supportflow_emails_notify_agent_ids', $agent_ids, $ticket, 'reply' );
 		if ( empty( $agent_ids ) ) {
 			return;
 		}
@@ -62,7 +61,7 @@ public function notify_agents_ticket_replies( $reply_id ) {
 		// Don't email the person adding the reply, unless that's desired behavior
 		if ( ! apply_filters( 'supportflow_emails_notify_creator', false, 'reply' ) ) {
 			$key = array_search( get_post_meta( $reply->ID, 'reply_author_email', true ), $agent_emails );
-			if ( false !== $key ) {
+			if ( false !== ( $key ) ) {
 				unset( $agent_emails[$key] );
 			}
 		}
@@ -70,39 +69,19 @@ public function notify_agents_ticket_replies( $reply_id ) {
 		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $ticket->ID );
 		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $ticket->ID, 'agent' );
 
-		$attachments = array();
-		if ( $ticket_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply->ID ) ) ) {
-			foreach ( $ticket_attachments as $attachment ) {
-				$attachments[] = get_attached_file( $attachment->ID );
-			}
-		}
+		$attachments = get_attached_files( $reply->ID );
+
+		$post_status    = SupportFlow()->post_statuses[$ticket->post_status]['label'];
+		$assigned_agent = ( $ticket->post_author ) ? get_user_by( 'id', $ticket->post_author )->display_name : __( 'None assigned', 'supportflow' );
 
 		$message = stripslashes( $reply->post_content );
-		// Ticket details that are relevant to the agent
 		$message .= "\n\n-------";
-		// Ticket status
-		$post_status = SupportFlow()->post_statuses[$ticket->post_status]['label'];
-		$message .= "\n" . sprintf( __( "Status: %s", 'supportflow' ), $post_status );
-		// Assigned agent
-		$assigned_agent = ( $ticket->post_author ) ? get_user_by( 'id', $ticket->post_author )->display_name : __( 'None assigned', 'supportflow' );
-		$message .= "\n" . sprintf( __( "Agent: %s", 'supportflow' ), $assigned_agent );
+		$message .= "\n" . __( "Status: ", 'supportflow' ) . $post_status;
+		$message .= "\n" . __( "Agent: ", 'supportflow' ) . $assigned_agent;
 
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $ticket->ID, 'agent' );
 
-		// Insert last second reply as quoted text
-		$replies = SupportFlow()->get_ticket_replies( $ticket->ID, array( 'numberposts' => 2, ) );
-		if ( ! empty( $replies[1] ) ) {
-			$quoted_reply = $replies[1];
-			$reply_author = get_post_meta( $quoted_reply->ID, 'reply_author', true );
-			if ( empty( $reply_author ) ) {
-				$reply_author = get_post_meta( $ticket_reply->ID, 'reply_author_email', true );
-			}
-			$time_stamp   = $ticket->post_date_gmt;
-			$heading      = sprintf( "On %s GMT, %s wrote:", $time_stamp, $reply_author );
-			$content      = '> ' . stripslashes( $quoted_reply->post_content );
-			$content      = str_replace( "\n", "\n> ", $content );
-			$message .= "\n\n$heading\n>$content";
-		}
+		$messge .= "\n\n" . $this->get_quoted_text( $ticket );
 		$message = wpautop( $message );
 
 		self::mail( $agent_emails, $subject, $message, 'Content-Type: text/html', $attachments, $smtp_account );
@@ -118,7 +97,7 @@ public function notify_customers_ticket_replies( $reply_id, $cc = array(), $bcc
 			return;
 		}
 
-		$ticket      = SupportFlow()->get_ticket( $reply->post_parent );
+		$ticket    = SupportFlow()->get_ticket( $reply->post_parent );
 		$customers = SupportFlow()->get_ticket_customers( $ticket->ID, array( 'fields' => 'emails' ) );
 
 		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts( true );
@@ -137,48 +116,19 @@ public function notify_customers_ticket_replies( $reply_id, $cc = array(), $bcc
 			}
 		}
 
+		$attachments = get_attached_files( $reply->ID );
+
 		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $ticket->ID );
 		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $ticket->ID, 'customer' );
 
-		$attachments = array();
-		if ( $ticket_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply->ID ) ) ) {
-			foreach ( $ticket_attachments as $attachment ) {
-				$attachments[] = get_attached_file( $attachment->ID );
-			}
-		}
-
 		$message = stripslashes( $reply->post_content );
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $ticket->ID, 'customer' );
+		$messge .= "\n\n" . $this->get_quoted_text( $ticket );
 		$message = wpautop( $message );
 
-		// Insert last second reply as quoted text
-		$replies = SupportFlow()->get_ticket_replies( $ticket->ID, array( 'numberposts' => 2, ) );
-		if ( ! empty( $replies[1] ) ) {
-			$quoted_reply = $replies[1];
-			$reply_author = get_post_meta( $quoted_reply->ID, 'reply_author', true );
-			if ( empty( $reply_author ) ) {
-				$reply_author = get_post_meta( $ticket_reply->ID, 'reply_author_email', true );
-			}
-			$time_stamp   = $ticket->post_date_gmt;
-			$heading      = sprintf( "On %s GMT, %s wrote:", $time_stamp, $reply_author );
-			$content      = '> ' . stripslashes( $quoted_reply->post_content );
-			$content      = str_replace( "\n", "\n> ", $content );
-			$message .= "\n\n$heading\n>$content";
-		}
-
 		$headers = "Content-Type: text/html\r\n";
-
-		if ( is_array( $cc ) && ! empty( $cc ) ) {
-			$headers .= "Cc: " . implode( ', ', $cc ) . "\r\n";
-		} elseif ( is_string( $cc ) && ! empty( $cc ) ) {
-			$headers .= "Cc: $cc\r\n";
-		}
-
-		if ( is_array( $bcc ) && ! empty( $bcc ) ) {
-			$headers .= "Bcc: " . implode( ', ', $bcc ) . "\r\n";
-		} elseif ( is_string( $bcc ) && ! empty( $cc ) ) {
-			$headers .= "Bcc: $bcc\r\n";
-		}
+		$headers .= $this->get_cc_header( $cc );
+		$headers .= $this->get_bcc_header( $bcc );
 
 		self::mail( $customers, $subject, $message, $headers, $attachments, $smtp_account );
 	}
@@ -257,6 +207,52 @@ public function action_set_smtp_settings( $phpmailer ) {
 		$phpmailer->SMTPAuth   = true;
 	}
 
+	public function get_cc_header( $cc ) {
+		if ( is_array( $cc ) && ! empty( $cc ) ) {
+			return "Cc: " . implode( ', ', $cc ) . "\r\n";
+		} elseif ( is_string( $cc ) && ! empty( $cc ) ) {
+			return "Cc: $cc\r\n";
+		}
+	}
+
+	public function get_bcc_header( $bcc ) {
+		if ( is_array( $bcc ) && ! empty( $bcc ) ) {
+			return "Bcc: " . implode( ', ', $bcc ) . "\r\n";
+		} elseif ( is_string( $bcc ) && ! empty( $cc ) ) {
+			return "Bcc: $bcc\r\n";
+		}
+	}
+
+	public function get_quoted_text( $ticket ) {
+		// Insert last second reply as quoted text
+		$replies = SupportFlow()->get_ticket_replies( $ticket->ID, array( 'numberposts' => 2, ) );
+		if ( empty( $replies[1] ) ) {
+			return '';
+		} else {
+			$quoted_reply = $replies[1];
+			$reply_author = get_post_meta( $quoted_reply->ID, 'reply_author', true );
+			if ( empty( $reply_author ) ) {
+				$reply_author = get_post_meta( $ticket_reply->ID, 'reply_author_email', true );
+			}
+			$time_stamp = $ticket->post_date_gmt;
+			$heading    = sprintf( "On %s GMT, %s wrote:", $time_stamp, $reply_author );
+			$content    = '> ' . stripslashes( $quoted_reply->post_content );
+			$content    = str_replace( "\n", "\n> ", $content );
+
+			return "$heading\n$content";
+		}
+	}
+
+	public function get_attached_files( $reply_id ) {
+		$attachments = array();
+		if ( $ticket_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply_id ) ) ) {
+			foreach ( $ticket_attachments as $attachment ) {
+				$attachments[] = get_attached_file( $attachment->ID );
+			}
+		}
+
+		return $attachments;
+	}
 }
 
 SupportFlow()->extend->emails = new SupportFlow_Emails();
\ No newline at end of file

From 24393a1888b9c656e78303979cdd81824234a217 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 03:31:15 +0530
Subject: [PATCH 377/485] Checking both CR and LF for enter key press

---
 js/tickets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/tickets.js b/js/tickets.js
index 865b833..1c5a12c 100644
--- a/js/tickets.js
+++ b/js/tickets.js
@@ -34,7 +34,7 @@ jQuery(document).ready(function () {
 
 	// Submit post if user pressed Ctrl+Enter in reply content box
 	jQuery('#reply').keypress(function (event) {
-		if (event.ctrlKey && event.keyCode == 10 && $(this).val() != '') {
+		if (event.ctrlKey && ( event.keyCode == 10 || event.keyCode == 13 ) && $(this).val() != '') {
 			$('#post').submit();
 		}
 	});

From 026b7da2eb1bc1968e3ab1077ca4fa95f532df01 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 03:46:14 +0530
Subject: [PATCH 378/485] Solving jQuery-$ mix issue

Now we will only use $ everywhere other than main document.ready function
---
 js/auto_save.js          | 10 +++++-----
 js/email_accounts.js     | 22 +++++++++++-----------
 js/email_conversation.js | 24 ++++++++++++------------
 js/permissions.js        | 18 +++++++++---------
 js/predefined-replies.js | 16 ++++++++--------
 js/preferences.js        |  8 ++++----
 js/ticket_attachments.js |  6 +++---
 js/tickets.js            | 40 ++++++++++++++++++++--------------------
 js/toggle-links.js       | 22 +++++++++++-----------
 9 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/js/auto_save.js b/js/auto_save.js
index 325bf6b..6e83ceb 100644
--- a/js/auto_save.js
+++ b/js/auto_save.js
@@ -1,14 +1,14 @@
-jQuery(document).ready(function () {
+jQuery(document).ready(function ($) {
 
 	// Send elements with class sf_autosave to the server for autosave
-	jQuery('.sf_autosave').keyup(function () {
+	$('.sf_autosave').keyup(function () {
 
 		var autosave_data = {};
 		autosave_data['ticket_id'] = SFAutoSave.ticket_id;
 
-		jQuery('.sf_autosave').each(function () {
-			element_key = jQuery(this).attr('name');
-			element_value = jQuery(this).val();
+		$('.sf_autosave').each(function () {
+			element_key = $(this).attr('name');
+			element_value = $(this).val();
 			autosave_data[element_key] = element_value
 		});
 
diff --git a/js/email_accounts.js b/js/email_accounts.js
index a7b3568..832b1d5 100644
--- a/js/email_accounts.js
+++ b/js/email_accounts.js
@@ -1,12 +1,12 @@
-jQuery(document).ready(function () {
-	jQuery('.delete_email_account').click(function (e) {
+jQuery(document).ready(function ($) {
+	$('.delete_email_account').click(function (e) {
 		e.preventDefault();
 
 		if (!confirm(SFEmailAccounts.sure_delete_account)) {
 			return;
 		}
 
-		var account_key = jQuery(this).data('account-id');
+		var account_key = $(this).data('account-id');
 		var form_action = "edit.php?post_type=" + SFEmailAccounts.post_type + "&page=" + SFEmailAccounts.slug;
 
 		var form = '';
@@ -16,28 +16,28 @@ jQuery(document).ready(function () {
 		form += '<input type="hidden" name="account_id" value=' + account_key + ' />';
 		form += '</form>';
 
-		jQuery('body').append(form);
-		jQuery('#remove_email_account').submit();
+		$('body').append(form);
+		$('#remove_email_account').submit();
 	});
 
 
-	jQuery('#add_new_email_account #imap_ssl').change(function () {
+	$('#add_new_email_account #imap_ssl').change(function () {
 		if (this.checked) {
 			// Change to default IMAP SSL port on enabling SSL
-			jQuery('#add_new_email_account #imap_port').val('993');
+			$('#add_new_email_account #imap_port').val('993');
 		} else {
 			// Change to default IMAP non-SSL port on disabling SSL
-			jQuery('#add_new_email_account #imap_port').val('143');
+			$('#add_new_email_account #imap_port').val('143');
 		}
 	});
 
-	jQuery('#add_new_email_account #smtp_ssl').change(function () {
+	$('#add_new_email_account #smtp_ssl').change(function () {
 		if (this.checked) {
 			// Change to default SMTP SSL port on enabling SSL
-			jQuery('#add_new_email_account #smtp_port').val('465');
+			$('#add_new_email_account #smtp_port').val('465');
 		} else {
 			// Change to default SMTP non-SSL port on disabling SSL
-			jQuery('#add_new_email_account #smtp_port').val('25');
+			$('#add_new_email_account #smtp_port').val('25');
 		}
 	});
 });
diff --git a/js/email_conversation.js b/js/email_conversation.js
index de266d9..3d39a19 100644
--- a/js/email_conversation.js
+++ b/js/email_conversation.js
@@ -1,11 +1,11 @@
-jQuery(document).ready(function () {
+jQuery(document).ready(function ($) {
 	// Send conversation to E-Mail ID's
 
 	var email_conversion = function (event) {
 		event.preventDefault();
-		var email_ids = jQuery('#email_conversation_to').val();
+		var email_ids = $('#email_conversation_to').val();
 
-		jQuery.ajax(ajaxurl, {
+		$.ajax(ajaxurl, {
 			type      : 'post',
 			data      : {
 				action                   : 'sf_forward_conversation',
@@ -14,26 +14,26 @@ jQuery(document).ready(function () {
 				_email_conversation_nonce: SFEmailConversation._email_conversation_nonce,
 			},
 			beforeSend: function () {
-				jQuery('#email_conversation_to').prop('disabled', true);
-				jQuery('#email_conversation_submit').prop('disabled', true);
-				jQuery('#email_conversation_status').text(SFEmailConversation.sending_emails);
+				$('#email_conversation_to').prop('disabled', true);
+				$('#email_conversation_submit').prop('disabled', true);
+				$('#email_conversation_status').text(SFEmailConversation.sending_emails);
 			},
 			success   : function (content) {
-				jQuery('#email_conversation_status').html(content);
+				$('#email_conversation_status').html(content);
 			},
 			error     : function () {
-				jQuery('#email_conversation_status').text(SFEmailConversation.failed_sending);
+				$('#email_conversation_status').text(SFEmailConversation.failed_sending);
 			},
 			complete  : function () {
-				jQuery('#email_conversation_to').prop('disabled', false);
-				jQuery('#email_conversation_submit').prop('disabled', false);
+				$('#email_conversation_to').prop('disabled', false);
+				$('#email_conversation_submit').prop('disabled', false);
 			},
 		});
 
 	}
 
-	jQuery('#email_conversation_submit').click(email_conversion);
-	jQuery('#email_conversation_to').keyup(function () {
+	$('#email_conversation_submit').click(email_conversion);
+	$('#email_conversation_to').keyup(function () {
 		if (event.keyCode == 10) {
 			email_conversion();
 		}
diff --git a/js/permissions.js b/js/permissions.js
index 11942b9..bb3594f 100644
--- a/js/permissions.js
+++ b/js/permissions.js
@@ -1,9 +1,9 @@
-jQuery(document).ready(function () {
-	jQuery('.permission_filters').change(function () {
-		var user_id = jQuery('#change_user option:selected').data('user-id');
-		var status = jQuery('#change_status option:selected').data('status');
+jQuery(document).ready(function ($) {
+	$('.permission_filters').change(function () {
+		var user_id = $('#change_user option:selected').data('user-id');
+		var status = $('#change_status option:selected').data('status');
 
-		jQuery.ajax(ajaxurl, {
+		$.ajax(ajaxurl, {
 			type   : 'post',
 			data   : {
 				action                     : 'get_user_permissions',
@@ -12,13 +12,13 @@ jQuery(document).ready(function () {
 				_get_user_permissions_nonce: SFPermissions._get_user_permissions_nonce,
 			},
 			success: function (content) {
-				jQuery('#user_permissions_table').html(content);
+				$('#user_permissions_table').html(content);
 			},
 		});
 	});
 
-	jQuery(document).on('change', '.sf_user_permissions_table .toggle_privilege', function () {
-		var checkbox = jQuery(this);
+	$(document).on('change', '.sf_user_permissions_table .toggle_privilege', function () {
+		var checkbox = $(this);
 		var checkbox_label = checkbox.siblings('.privilege_status');
 		var permission_identifier = checkbox.data('permission-identifier');
 
@@ -30,7 +30,7 @@ jQuery(document).ready(function () {
 		checkbox_label.html(SFPermissions.changing_status);
 		checkbox.prop('disabled', true);
 
-		jQuery.ajax(ajaxurl, {
+		$.ajax(ajaxurl, {
 			type    : 'post',
 			data    : {
 				action                    : 'set_user_permission',
diff --git a/js/predefined-replies.js b/js/predefined-replies.js
index 9d27a37..f2969b5 100644
--- a/js/predefined-replies.js
+++ b/js/predefined-replies.js
@@ -1,18 +1,18 @@
-jQuery(document).ready(function () {
+jQuery(document).ready(function ($) {
 
-	jQuery('#predefs').change(function () {
+	$('#predefs').change(function () {
 		if (this.old_child == undefined) {
 			this.old_child = 1;
 		}
 
 		// New selection of combo box
-		new_content = jQuery('#predefs').find('option:selected').data('content');
+		new_content = $('#predefs').find('option:selected').data('content');
 
 		// Previous selection of combo box
-		old_content = jQuery('.predef:nth-child(' + this.old_child + ')').data('content');
+		old_content = $('.predef:nth-child(' + this.old_child + ')').data('content');
 
 		// Current value of reply text box
-		current_content = jQuery('#reply').val();
+		current_content = $('#reply').val();
 
 		if (0 == new_content.length) {
 			return;
@@ -21,12 +21,12 @@ jQuery(document).ready(function () {
 		// Show confirmation message if reply box content is manually changed by user
 		if (current_content != old_content) {
 			if (false == window.confirm(SFPredefinedReplies.message)) {
-				jQuery('.predef:nth-child(' + this.old_child + ')').prop('selected', true);
+				$('.predef:nth-child(' + this.old_child + ')').prop('selected', true);
 				return;
 			}
 		}
 
-		jQuery('#reply').val(new_content);
-		this.old_child = jQuery('#predefs').find('option:selected').index() + 1;
+		$('#reply').val(new_content);
+		this.old_child = $('#predefs').find('option:selected').index() + 1;
 	});
 });
\ No newline at end of file
diff --git a/js/preferences.js b/js/preferences.js
index 7f567f9..0a36235 100644
--- a/js/preferences.js
+++ b/js/preferences.js
@@ -1,8 +1,8 @@
-jQuery(document).ready(function () {
+jQuery(document).ready(function ($) {
 
 	// Update E-Mail notification settings on checkbox toggle
-	jQuery(document).on('change', '.sf_email_accounts_table .toggle_privilege', function () {
-		var checkbox = jQuery(this);
+	$(document).on('change', '.sf_email_accounts_table .toggle_privilege', function () {
+		var checkbox = $(this);
 		var checkbox_label = checkbox.siblings('.privilege_status');
 		var email_notfication_identifier = checkbox.data('email-notfication-identifier');
 
@@ -13,7 +13,7 @@ jQuery(document).ready(function () {
 		checkbox_label.html(SFPreferences.changing_state);
 		checkbox.prop('disabled', true);
 
-		jQuery.ajax(ajaxurl, {
+		$.ajax(ajaxurl, {
 			type    : 'post',
 			data    : {
 				action                      : 'set_email_notfication',
diff --git a/js/ticket_attachments.js b/js/ticket_attachments.js
index 1f6a8a8..d0e85f2 100644
--- a/js/ticket_attachments.js
+++ b/js/ticket_attachments.js
@@ -18,11 +18,11 @@ jQuery(document).ready(function ($) {
 			// Handle results from media manager.
 			frame.on('close', function () {
 				var attachments = frame.state().get('selection').toJSON();
-				jQuery.each(attachments, function () {
+				$.each(attachments, function () {
 					var attachment_download_link = '<a class="reply-attachment-link" target="_blank" href="' + _.escape(this.url) + '">' + _.escape(this.filename) + '</a>';
 					var attachment_remove_link = '<a class="reply-attachment-remove delete" href="#" data-attachment-id=' + _.escape(this.id) + ' >' + SFTicketAttachments.remove_attachment + '</a>';
-					jQuery('#replies-attachments-list').append('<li id="media-items" class="reply-attachment">' + attachment_download_link + '&nbsp;' + attachment_remove_link + '</li>');
-					jQuery('#reply-attachments').val(jQuery('#reply-attachments').val() + _.escape(this.id) + ',');
+					$('#replies-attachments-list').append('<li id="media-items" class="reply-attachment">' + attachment_download_link + '&nbsp;' + attachment_remove_link + '</li>');
+					$('#reply-attachments').val($('#reply-attachments').val() + _.escape(this.id) + ',');
 				});
 			});
 
diff --git a/js/tickets.js b/js/tickets.js
index 1c5a12c..d2bdd62 100644
--- a/js/tickets.js
+++ b/js/tickets.js
@@ -1,7 +1,7 @@
-jQuery(document).ready(function () {
-	jQuery('#supportflow-details .meta-item-ok-button').click(function (event) {
-		var dropdown = jQuery(this).siblings('.meta-item-dropdown').children('option:selected');
-		var meta_item = jQuery(this).closest('.meta-item');
+jQuery(document).ready(function ($) {
+	$('#supportflow-details .meta-item-ok-button').click(function (event) {
+		var dropdown = $(this).siblings('.meta-item-dropdown').children('option:selected');
+		var meta_item = $(this).closest('.meta-item');
 		var form_input = meta_item.children('.meta-item-name');
 		var label = meta_item.children('.meta-item-label');
 
@@ -11,21 +11,21 @@ jQuery(document).ready(function () {
 		event.preventDefault();
 	});
 
-	jQuery('#supportflow-details .meta-item-toggle-button').click(function (event) {
-		jQuery(this).closest('.meta-item').children('.meta-item-toggle-content').toggle(250);
+	$('#supportflow-details .meta-item-toggle-button').click(function (event) {
+		$(this).closest('.meta-item').children('.meta-item-toggle-content').toggle(250);
 		event.preventDefault();
 	});
 
 	// Require title and atleast customer before saving a ticket
-	jQuery('.save-button').click(function (event) {
-		if ('' == jQuery('#subject').val()) {
-			jQuery('#subject').focus();
+	$('.save-button').click(function (event) {
+		if ('' == $('#subject').val()) {
+			$('#subject').focus();
 			alert(SFTickets.no_title_msg);
 			event.preventDefault();
 			return;
 		}
-		if ('' == jQuery('#customers').val()) {
-			jQuery('#customers').focus();
+		if ('' == $('#customers').val()) {
+			$('#customers').focus();
 			alert(SFTickets.no_customer_msg);
 			event.preventDefault();
 			return;
@@ -33,32 +33,32 @@ jQuery(document).ready(function () {
 	});
 
 	// Submit post if user pressed Ctrl+Enter in reply content box
-	jQuery('#reply').keypress(function (event) {
+	$('#reply').keypress(function (event) {
 		if (event.ctrlKey && ( event.keyCode == 10 || event.keyCode == 13 ) && $(this).val() != '') {
 			$('#post').submit();
 		}
 	});
 
 	// Toggle submit button text (Send Message/Add private note)
-	jQuery('#mark-private').change(function () {
+	$('#mark-private').change(function () {
 		if ('post.php' == SFTickets.pagenow) {
-			if (jQuery('#mark-private').prop('checked')) {
-				jQuery('#insert-reply').val(SFTickets.add_private_note);
+			if ($('#mark-private').prop('checked')) {
+				$('#insert-reply').val(SFTickets.add_private_note);
 			} else {
-				jQuery('#insert-reply').val(SFTickets.send_msg);
+				$('#insert-reply').val(SFTickets.send_msg);
 			}
 		}
 	});
 
 	// Close ticket wehen close ticket button is submitted
-	jQuery('#close-ticket-submit').click(function (event) {
-		jQuery("#post .meta-item input[name='post_status']").val('sf_closed');
+	$('#close-ticket-submit').click(function (event) {
+		$("#post .meta-item input[name='post_status']").val('sf_closed');
 	});
 
 	// Show quoted text	
-	jQuery('.sf_toggle_quoted_text').click(function (event) {
+	$('.sf_toggle_quoted_text').click(function (event) {
 		event.preventDefault();
-		jQuery(this).parent().html(jQuery(this).data('quoted_text'))
+		$(this).parent().html($(this).data('quoted_text'))
 	});
 
 });
diff --git a/js/toggle-links.js b/js/toggle-links.js
index 8b0ff88..1aac58b 100644
--- a/js/toggle-links.js
+++ b/js/toggle-links.js
@@ -1,24 +1,24 @@
 jQuery(document).ready(function () {
 	// Close all the different stat tables and toggle the status of clicked stat table
-	jQuery('.toggle-link').click(function (event) {
-		var current = jQuery(this).siblings('.toggle-content').css('display');
-		jQuery('.toggle-content').hide(500);
-		jQuery('.toggle-link').prop('title', SFToggleLinks.expand);
+	$('.toggle-link').click(function (event) {
+		var current = $(this).siblings('.toggle-content').css('display');
+		$('.toggle-content').hide(500);
+		$('.toggle-link').prop('title', SFToggleLinks.expand);
 		if ('none' == current) {
-			jQuery(this).siblings('.toggle-content').show(500);
-			jQuery(this).prop('title', SFToggleLinks.collapse);
+			$(this).siblings('.toggle-content').show(500);
+			$(this).prop('title', SFToggleLinks.collapse);
 		}
 		event.preventDefault();
 	});
 
 	// Set different type of statistics link title at page load
-	jQuery(jQuery('.toggle-content')).each(function () {
-		if ('none' == jQuery(this).css('display')) {
-			jQuery(this).siblings('.toggle-link').prop('title', SFToggleLinks.expand);
+	$($('.toggle-content')).each(function () {
+		if ('none' == $(this).css('display')) {
+			$(this).siblings('.toggle-link').prop('title', SFToggleLinks.expand);
 		} else {
-			jQuery(this).siblings('.toggle-link').prop('title', SFToggleLinks.collapse);
+			$(this).siblings('.toggle-link').prop('title', SFToggleLinks.collapse);
 		}
 
-		jQuery('.toggle-content').first().show(500);
+		$('.toggle-content').first().show(500);
 	});
 });
\ No newline at end of file

From 0e4b4ff151fa277d19b237f5e6c759fd015c5f65 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 04:09:45 +0530
Subject: [PATCH 379/485] Rebuilding minified JS resources

---
 js/supportflow.min.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/supportflow.min.js b/js/supportflow.min.js
index 4ea5cbf..3c33819 100644
--- a/js/supportflow.min.js
+++ b/js/supportflow.min.js
@@ -1,2 +1,2 @@
 /*! SupportFlow minified version */
-jQuery(document).ready(function(){jQuery(".toggle-link").click(function(a){var b=jQuery(this).siblings(".toggle-content").css("display");jQuery(".toggle-content").hide(500),jQuery(".toggle-link").prop("title",SFToggleLinks.expand),"none"==b&&(jQuery(this).siblings(".toggle-content").show(500),jQuery(this).prop("title",SFToggleLinks.collapse)),a.preventDefault()}),jQuery(jQuery(".toggle-content")).each(function(){"none"==jQuery(this).css("display")?jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):jQuery(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),jQuery(".toggle-content").first().show(500)})}),jQuery(document).ready(function(){jQuery(".delete_email_account").click(function(a){if(a.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var b=jQuery(this).data("account-id"),c="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,d="";d+='<form method="POST" id="remove_email_account" action="'+c+'">',d+='<input type="hidden" name="action" value="delete" />',d+=SFEmailAccounts.delete_email_account_nonce,d+='<input type="hidden" name="account_id" value='+b+" />",d+="</form>",jQuery("body").append(d),jQuery("#remove_email_account").submit()}}),jQuery("#add_new_email_account #imap_ssl").change(function(){jQuery("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),jQuery("#add_new_email_account #smtp_ssl").change(function(){jQuery("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(){var a=function(a){a.preventDefault();var b=jQuery("#email_conversation_to").val();jQuery.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:b,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){jQuery("#email_conversation_to").prop("disabled",!0),jQuery("#email_conversation_submit").prop("disabled",!0),jQuery("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(a){jQuery("#email_conversation_status").html(a)},error:function(){jQuery("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){jQuery("#email_conversation_to").prop("disabled",!1),jQuery("#email_conversation_submit").prop("disabled",!1)}})};jQuery("#email_conversation_submit").click(a),jQuery("#email_conversation_to").keyup(function(){10==event.keyCode&&a()})}),jQuery(document).ready(function(){jQuery(".permission_filters").change(function(){var a=jQuery("#change_user option:selected").data("user-id"),b=jQuery("#change_status option:selected").data("status");jQuery.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:a,status:b,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(a){jQuery("#user_permissions_table").html(a)}})}),jQuery(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("permission-identifier"),d=a.prop("checked"),e=c.user_id,f=c.privilege_type,g=c.privilege_id;b.html(SFPermissions.changing_status),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:e,privilege_type:f,privilege_id:g,allowed:d,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPermissions.allowed:SFPermissions.not_allowed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(){jQuery("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=jQuery("#predefs").find("option:selected").data("content"),old_content=jQuery(".predef:nth-child("+this.old_child+")").data("content"),current_content=jQuery("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void jQuery(".predef:nth-child("+this.old_child+")").prop("selected",!0);jQuery("#reply").val(new_content),this.old_child=jQuery("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(){jQuery(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var a=jQuery(this),b=a.siblings(".privilege_status"),c=a.data("email-notfication-identifier"),d=a.prop("checked"),e=c.privilege_type,f=c.privilege_id;b.html(SFPreferences.changing_state),a.prop("disabled",!0),jQuery.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:e,privilege_id:f,allowed:d,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(b){1!=b&&(a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){a.prop("checked",!a.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var c=a.prop("checked");b.html(1==c?SFPreferences.subscribed:SFPreferences.unsubscribed),a.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var a=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return a.on("close",function(){var b=a.state().get("selection").toJSON();jQuery.each(b,function(){var a='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",b='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";jQuery("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+a+"&nbsp;"+b+"</li>"),jQuery("#reply-attachments").val(jQuery("#reply-attachments").val()+_.escape(this.id)+",")})}),a.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(){jQuery("#supportflow-details .meta-item-ok-button").click(function(a){var b=jQuery(this).siblings(".meta-item-dropdown").children("option:selected"),c=jQuery(this).closest(".meta-item"),d=c.children(".meta-item-name"),e=c.children(".meta-item-label");d.val(b.val()),e.text(b.text()),a.preventDefault()}),jQuery("#supportflow-details .meta-item-toggle-button").click(function(a){jQuery(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),a.preventDefault()}),jQuery(".save-button").click(function(a){return""==jQuery("#subject").val()?(jQuery("#subject").focus(),alert(SFTickets.no_title_msg),void a.preventDefault()):""==jQuery("#customers").val()?(jQuery("#customers").focus(),alert(SFTickets.no_customer_msg),void a.preventDefault()):void 0}),jQuery("#reply").keypress(function(a){a.ctrlKey&&10==a.keyCode&&""!=$(this).val()&&$("#post").submit()}),jQuery("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&jQuery("#insert-reply").val(jQuery("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),jQuery("#close-ticket-submit").click(function(){jQuery("#post .meta-item input[name='post_status']").val("sf_closed")}),jQuery(".sf_toggle_quoted_text").click(function(a){a.preventDefault(),jQuery(this).parent().html(jQuery(this).data("quoted_text"))})}),jQuery(document).ready(function(){jQuery(".sf_autosave").keyup(function(){var a={};a.ticket_id=SFAutoSave.ticket_id,jQuery(".sf_autosave").each(function(){element_key=jQuery(this).attr("name"),element_value=jQuery(this).val(),a[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",a,!1)})});
\ No newline at end of file
+jQuery(document).ready(function(){$(".toggle-link").click(function(a){var b=$(this).siblings(".toggle-content").css("display");$(".toggle-content").hide(500),$(".toggle-link").prop("title",SFToggleLinks.expand),"none"==b&&($(this).siblings(".toggle-content").show(500),$(this).prop("title",SFToggleLinks.collapse)),a.preventDefault()}),$($(".toggle-content")).each(function(){"none"==$(this).css("display")?$(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):$(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),$(".toggle-content").first().show(500)})}),jQuery(document).ready(function(a){a(".delete_email_account").click(function(b){if(b.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var c=a(this).data("account-id"),d="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,e="";e+='<form method="POST" id="remove_email_account" action="'+d+'">',e+='<input type="hidden" name="action" value="delete" />',e+=SFEmailAccounts.delete_email_account_nonce,e+='<input type="hidden" name="account_id" value='+c+" />",e+="</form>",a("body").append(e),a("#remove_email_account").submit()}}),a("#add_new_email_account #imap_ssl").change(function(){a("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),a("#add_new_email_account #smtp_ssl").change(function(){a("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(a){var b=function(b){b.preventDefault();var c=a("#email_conversation_to").val();a.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:c,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){a("#email_conversation_to").prop("disabled",!0),a("#email_conversation_submit").prop("disabled",!0),a("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(b){a("#email_conversation_status").html(b)},error:function(){a("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){a("#email_conversation_to").prop("disabled",!1),a("#email_conversation_submit").prop("disabled",!1)}})};a("#email_conversation_submit").click(b),a("#email_conversation_to").keyup(function(){10==event.keyCode&&b()})}),jQuery(document).ready(function(a){a(".permission_filters").change(function(){var b=a("#change_user option:selected").data("user-id"),c=a("#change_status option:selected").data("status");a.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:b,status:c,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(b){a("#user_permissions_table").html(b)}})}),a(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("permission-identifier"),e=b.prop("checked"),f=d.user_id,g=d.privilege_type,h=d.privilege_id;c.html(SFPermissions.changing_status),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:f,privilege_type:g,privilege_id:h,allowed:e,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var a=b.prop("checked");c.html(1==a?SFPermissions.allowed:SFPermissions.not_allowed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){a("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=a("#predefs").find("option:selected").data("content"),old_content=a(".predef:nth-child("+this.old_child+")").data("content"),current_content=a("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void a(".predef:nth-child("+this.old_child+")").prop("selected",!0);a("#reply").val(new_content),this.old_child=a("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(a){a(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("email-notfication-identifier"),e=b.prop("checked"),f=d.privilege_type,g=d.privilege_id;c.html(SFPreferences.changing_state),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:f,privilege_id:g,allowed:e,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var a=b.prop("checked");c.html(1==a?SFPreferences.subscribed:SFPreferences.unsubscribed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var b=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return b.on("close",function(){var c=b.state().get("selection").toJSON();a.each(c,function(){var b='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",c='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";a("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+b+"&nbsp;"+c+"</li>"),a("#reply-attachments").val(a("#reply-attachments").val()+_.escape(this.id)+",")})}),b.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(a){a("#supportflow-details .meta-item-ok-button").click(function(b){var c=a(this).siblings(".meta-item-dropdown").children("option:selected"),d=a(this).closest(".meta-item"),e=d.children(".meta-item-name"),f=d.children(".meta-item-label");e.val(c.val()),f.text(c.text()),b.preventDefault()}),a("#supportflow-details .meta-item-toggle-button").click(function(b){a(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),b.preventDefault()}),a(".save-button").click(function(b){return""==a("#subject").val()?(a("#subject").focus(),alert(SFTickets.no_title_msg),void b.preventDefault()):""==a("#customers").val()?(a("#customers").focus(),alert(SFTickets.no_customer_msg),void b.preventDefault()):void 0}),a("#reply").keypress(function(b){!b.ctrlKey||10!=b.keyCode&&13!=b.keyCode||""==a(this).val()||a("#post").submit()}),a("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&a("#insert-reply").val(a("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),a("#close-ticket-submit").click(function(){a("#post .meta-item input[name='post_status']").val("sf_closed")}),a(".sf_toggle_quoted_text").click(function(b){b.preventDefault(),a(this).parent().html(a(this).data("quoted_text"))})}),jQuery(document).ready(function(a){a(".sf_autosave").keyup(function(){var b={};b.ticket_id=SFAutoSave.ticket_id,a(".sf_autosave").each(function(){element_key=a(this).attr("name"),element_value=a(this).val(),b[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",b,!1)})});
\ No newline at end of file

From 097a0aae44fa699991f6af67da80060606e08a7e Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 04:43:13 +0530
Subject: [PATCH 380/485] Auto-resize reply box height dynamically

A jQuery plugin is used: https://github.com/jackmoore/autosize

Fixes #159
---
 classes/class-supportflow-admin.php | 1 +
 js/jquery.autosize.min.js           | 7 +++++++
 js/tickets.js                       | 2 ++
 3 files changed, 10 insertions(+)
 create mode 100644 js/jquery.autosize.min.js

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 934c8f5..c8fb1ca 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -68,6 +68,7 @@ public function action_admin_enqueue_scripts() {
 
 		if ( in_array( $pagenow, array( 'post.php', 'post-new.php' ) ) ) {
 			wp_enqueue_media();
+			wp_enqueue_script( 'supportflow-jquery-autosize', SupportFlow()->plugin_url . "js/jquery.autosize.min.js", array( 'jquery' ), '1.18.9' );
 
 			$customers_autocomplete_handle   = SupportFlow()->enqueue_script( 'supportflow-customers-autocomplete', 'customers-autocomplete.js', array( 'jquery', 'jquery-ui-autocomplete' ) );
 			$ticket_attachment_handle        = SupportFlow()->enqueue_script( 'supportflow-ticket-attachments', 'ticket_attachments.js' );
diff --git a/js/jquery.autosize.min.js b/js/jquery.autosize.min.js
new file mode 100644
index 0000000..958b43b
--- /dev/null
+++ b/js/jquery.autosize.min.js
@@ -0,0 +1,7 @@
+/*!
+	Autosize v1.18.9 - 2014-05-27
+	Automatically adjust textarea height based on user input.
+	(c) 2014 Jack Moore - http://www.jacklmoore.com/autosize
+	license: http://www.opensource.org/licenses/mit-license.php
+*/
+(function(e){var t,o={className:"autosizejs",id:"autosizejs",append:"\n",callback:!1,resizeDelay:10,placeholder:!0},i='<textarea tabindex="-1" style="position:absolute; top:-999px; left:0; right:auto; bottom:auto; border:0; padding: 0; -moz-box-sizing:content-box; -webkit-box-sizing:content-box; box-sizing:content-box; word-wrap:break-word; height:0 !important; min-height:0 !important; overflow:hidden; transition:none; -webkit-transition:none; -moz-transition:none;"/>',n=["fontFamily","fontSize","fontWeight","fontStyle","letterSpacing","textTransform","wordSpacing","textIndent"],s=e(i).data("autosize",!0)[0];s.style.lineHeight="99px","99px"===e(s).css("lineHeight")&&n.push("lineHeight"),s.style.lineHeight="",e.fn.autosize=function(i){return this.length?(i=e.extend({},o,i||{}),s.parentNode!==document.body&&e(document.body).append(s),this.each(function(){function o(){var t,o=window.getComputedStyle?window.getComputedStyle(u,null):!1;o?(t=u.getBoundingClientRect().width,(0===t||"number"!=typeof t)&&(t=parseInt(o.width,10)),e.each(["paddingLeft","paddingRight","borderLeftWidth","borderRightWidth"],function(e,i){t-=parseInt(o[i],10)})):t=p.width(),s.style.width=Math.max(t,0)+"px"}function a(){var a={};if(t=u,s.className=i.className,s.id=i.id,d=parseInt(p.css("maxHeight"),10),e.each(n,function(e,t){a[t]=p.css(t)}),e(s).css(a).attr("wrap",p.attr("wrap")),o(),window.chrome){var r=u.style.width;u.style.width="0px",u.offsetWidth,u.style.width=r}}function r(){var e,n;t!==u?a():o(),s.value=!u.value&&i.placeholder?(p.attr("placeholder")||"")+i.append:u.value+i.append,s.style.overflowY=u.style.overflowY,n=parseInt(u.style.height,10),s.scrollTop=0,s.scrollTop=9e4,e=s.scrollTop,d&&e>d?(u.style.overflowY="scroll",e=d):(u.style.overflowY="hidden",c>e&&(e=c)),e+=w,n!==e&&(u.style.height=e+"px",f&&i.callback.call(u,u))}function l(){clearTimeout(h),h=setTimeout(function(){var e=p.width();e!==g&&(g=e,r())},parseInt(i.resizeDelay,10))}var d,c,h,u=this,p=e(u),w=0,f=e.isFunction(i.callback),z={height:u.style.height,overflow:u.style.overflow,overflowY:u.style.overflowY,wordWrap:u.style.wordWrap,resize:u.style.resize},g=p.width(),y=p.css("resize");p.data("autosize")||(p.data("autosize",!0),("border-box"===p.css("box-sizing")||"border-box"===p.css("-moz-box-sizing")||"border-box"===p.css("-webkit-box-sizing"))&&(w=p.outerHeight()-p.height()),c=Math.max(parseInt(p.css("minHeight"),10)-w||0,p.height()),p.css({overflow:"hidden",overflowY:"hidden",wordWrap:"break-word"}),"vertical"===y?p.css("resize","none"):"both"===y&&p.css("resize","horizontal"),"onpropertychange"in u?"oninput"in u?p.on("input.autosize keyup.autosize",r):p.on("propertychange.autosize",function(){"value"===event.propertyName&&r()}):p.on("input.autosize",r),i.resizeDelay!==!1&&e(window).on("resize.autosize",l),p.on("autosize.resize",r),p.on("autosize.resizeIncludeStyle",function(){t=null,r()}),p.on("autosize.destroy",function(){t=null,clearTimeout(h),e(window).off("resize",l),p.off("autosize").off(".autosize").css(z).removeData("autosize")}),r())})):this}})(window.jQuery||window.$);
\ No newline at end of file
diff --git a/js/tickets.js b/js/tickets.js
index d2bdd62..7a95489 100644
--- a/js/tickets.js
+++ b/js/tickets.js
@@ -61,4 +61,6 @@ jQuery(document).ready(function ($) {
 		$(this).parent().html($(this).data('quoted_text'))
 	});
 
+	// Auto-resize height of reply text box
+	$('#reply').autosize();
 });

From 60fafe2de7c5ba13be9fee4fd51b29777366a3f4 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 16:19:36 +0530
Subject: [PATCH 381/485] Showing last modified tickets instead of recently
 created tickets

Fixes #187
---
 classes/class-supportflow-dashboard.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/classes/class-supportflow-dashboard.php b/classes/class-supportflow-dashboard.php
index 5ed9ddf..7f7e8fd 100644
--- a/classes/class-supportflow-dashboard.php
+++ b/classes/class-supportflow-dashboard.php
@@ -66,7 +66,8 @@ function action_sf_recent_tickets() {
 			'post_type'   => SupportFlow()->post_type,
 			'post_parent' => 0,
 			'post_status' => $status_slugs,
-			'author'      => 0,
+			'orderby'     => 'modified',
+			'order'	      => "ASC",
 			'numberposts' => 10,
 		);
 
@@ -85,16 +86,16 @@ function action_sf_recent_tickets() {
 		$table->set_columns( array(
 			'title'    => __( 'Subject', 'supportflow' ),
 			'status'   => __( 'Status', 'supportflow' ),
-			'datetime' => __( 'Created', 'supportflow' ),
+			'datetime' => __( 'Last Updated', 'supportflow' ),
 		) );
 
 		$data = array();
 		foreach ( $tickets as $ticket ) {
-			$post_date    = strtotime( $ticket->post_date );
-			$time_created = time() - strtotime( $ticket->post_date );
-			if ( $time_created > 2 * DAY_IN_SECONDS ) {
+			$post_date_modified    = strtotime( $ticket->post_modified_gmt );
+			$time_modified = time() - strtotime( $ticket->post_modified_gmt );
+			if ( $time_modified > 2 * DAY_IN_SECONDS ) {
 				$class = 'two_day_old ';
-			} elseif ( $time_created > DAY_IN_SECONDS ) {
+			} elseif ( $time_modified > DAY_IN_SECONDS ) {
 				$class = 'one_two_day_old';
 			} else {
 				$class = 'one_day_old';
@@ -104,7 +105,7 @@ function action_sf_recent_tickets() {
 			$data[] = array(
 				'title'    => $title,
 				'status'   => esc_html( $statuses[$ticket->post_status]['label'] ),
-				'datetime' => sprintf( __( '%s ago', 'supportflow' ), human_time_diff( time(), $post_date ) ),
+				'datetime' => sprintf( __( '%s ago', 'supportflow' ), human_time_diff( time(), $post_date_modified ) ),
 			);
 		}
 

From 9301f1c3f6a55ed4a0ab5e193ae04df2fb095e17 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 16:29:41 +0530
Subject: [PATCH 382/485] Renamed "Recent tickets" widget

Now it is "Last Updated tickets"
---
 classes/class-supportflow-dashboard.php | 8 ++++----
 css/dashboard.css                       | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/classes/class-supportflow-dashboard.php b/classes/class-supportflow-dashboard.php
index 7f7e8fd..585f988 100644
--- a/classes/class-supportflow-dashboard.php
+++ b/classes/class-supportflow-dashboard.php
@@ -26,9 +26,9 @@ function action_wp_dashboard_setup() {
 			) );
 
 			wp_add_dashboard_widget(
-				'sf_recent_tickets',
-				__( "Recent tickets", 'supportflow' ),
-				array( $this, 'action_sf_recent_tickets' )
+				'sf_last_updated_tickets',
+				__( "Last Updated tickets", 'supportflow' ),
+				array( $this, 'sf_last_updated_tickets' )
 			);
 
 			wp_add_dashboard_widget(
@@ -52,7 +52,7 @@ public function filter_author_clause( $clauses, $query ) {
 	}
 
 
-	function action_sf_recent_tickets() {
+	function sf_last_updated_tickets() {
 		$statuses     = SupportFlow()->post_statuses;
 		$status_slugs = array();
 
diff --git a/css/dashboard.css b/css/dashboard.css
index 3b80f64..33bda79 100644
--- a/css/dashboard.css
+++ b/css/dashboard.css
@@ -6,18 +6,18 @@
 	height: 10px;
 }
 
-#sf_recent_tickets .tablenav {
+#sf_last_updated_tickets .tablenav {
 	height: 0px;
 }
 
-#sf_recent_tickets .two_day_old {
+#sf_last_updated_tickets .two_day_old {
 	color: #DF1111;
 }
 
-#sf_recent_tickets .one_two_day_old {
+#sf_last_updated_tickets .one_two_day_old {
 	color: #BD8A2C;
 }
 
-#sf_recent_tickets .one_day_old {
+#sf_last_updated_tickets .one_day_old {
 
 }
\ No newline at end of file

From 9522b2bae6d3ebc194ae1bfb26821edc9351ce4e Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 16:30:24 +0530
Subject: [PATCH 383/485] Rebuilding minified resources

---
 css/supportflow.min.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/supportflow.min.css b/css/supportflow.min.css
index 0cc8f94..08c709b 100644
--- a/css/supportflow.min.css
+++ b/css/supportflow.min.css
@@ -1,3 +1,3 @@
 /*! SupportFlow minified version */
 
-.subsubsub li.trash a{color:#BC0B0B}.customer_link{white-space:pre;vertical-align:top}#poststuff{padding-top:0}#side-sortables{margin-top:34px}#change_user_label{display:inline;font-weight:700;font-size:16px}#update_signature{width:30em}#supportflow-details .meta-item-label{font-weight:600}#supportflow-customers.postbox,#supportflow-subject.postbox{border:none;background:0 0}#supportflow-customers.postbox .inside,#supportflow-subject.postbox .inside{padding:0}#supportflow-customers .handlediv,#supportflow-customers h3.hndle,#supportflow-details .handlediv,#supportflow-details h3.hndle,#supportflow-replies .handlediv,#supportflow-replies h3.hndle,#supportflow-subject .handlediv,#supportflow-subject h3.hndle{display:none}#supportflow-details .handlediv,#supportflow-details h3.hndle{display:block}#supportflow-details #misc-publishing-actions label{display:inline-block}#supportflow-details #misc-publishing-actions select#post_status{width:100px}#supportflow-details #misc-publishing-actions span.the-date{font-weight:700}#supportflow-details #misc-publishing-actions div.last-activity{font-size:11px}#supportflow-customers h4,#supportflow-replies h4,#supportflow-subject h4{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:13px;font-weight:400;margin:10px 0 6px}#supportflow-subject.postbox input{width:100%;font-size:1.7em;padding-left:8px;padding-right:8px;line-height:100%;height:1.7em}#supportflow-customers.postbox input{width:100%;padding:8px;font-size:1.2em;height:2.6em}#supportflow-cc-bcc.postbox input{width:100%;font-size:1.2em}#supportflow-replies.postbox #ticket-reply-box{width:100%}#supportflow-replies.postbox textarea{width:100%;padding:8px;font-size:1.1em;font-size:1.2em}#supportflow-replies.postbox .inside #message-tools #submit-action{padding:0;margin-top:5px;float:right}#supportflow-replies.postbox .inside #message-tools #replies-attachments-wrap{float:left}#supportflow-replies #replies-attachments-list,#supportflow-replies #upload-messages{margin-top:9px;margin-left:2px;color:#666}#supportflow-replies.postbox .inside #message-tools #submit-action input[type=checkbox]{margin-top:-1px}#supportflow-replies.postbox .inside #message-tools #submit-action label{padding-top:2px;padding-left:5px;padding-right:25px}#supportflow-replies.postbox ul.private-replies{background-color:#FFFFE0;border:1px solid #E6DB55;padding:5px 10px}#supportflow-replies.postbox ul.private-replies li{border-top:1px solid #DFDFDF;margin-top:10px}#supportflow-replies.postbox ul.private-replies li:first-child{border-top:none;margin-top:0}#supportflow-replies.postbox ul.private-replies li .ticket-meta{color:#BBB;font-size:.9em;text-align:right}#supportflow-replies.postbox ul.ticket-replies li{clear:left;margin-top:20px;margin-bottom:20px}#supportflow-replies.postbox ul.private-replies li .ticket-reply-attachments li,#supportflow-replies.postbox ul.ticket-replies li .ticket-reply-attachments li{margin-top:3px;margin-bottom:3px;font-size:.9em}#supportflow-replies.postbox ul.ticket-replies li .reply-avatar{float:left;width:100px;word-wrap:break-word}#supportflow-replies.postbox ul.ticket-replies li .reply-author{margin:0;font-size:.9em;color:#666}#supportflow-replies.postbox ul.ticket-replies li .ticket-reply{background-color:#FFF;margin-left:105px;min-height:80px;padding:10px;font-size:1.1em;border:1px solid #DFDFDF;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;word-wrap:break-word}#supportflow-replies.postbox ul.ticket-replies li .ticket-meta{margin-left:105px;font-size:.9em;color:#666;margin-top:5px}#supportflow-replies.postbox .predefined_replies_dropdown{width:200px}.metabox-holder .postbox-container .empty-container{border:none}input::-webkit-input-placeholder{color:#BBB}input:-moz-placeholder{color:#BBB}textarea::-webkit-input-placeholder{color:#BBB}textarea:-moz-placeholder{color:#BBB}#sf_my_tickets .toggle-content{display:none}#sf_my_tickets .tablenav{height:10px}#sf_recent_tickets .tablenav{height:0}#sf_recent_tickets .two_day_old{color:#DF1111}#sf_recent_tickets .one_two_day_old{color:#BD8A2C}
\ No newline at end of file
+.subsubsub li.trash a{color:#BC0B0B}.customer_link{white-space:pre;vertical-align:top}#poststuff{padding-top:0}#side-sortables{margin-top:34px}#change_user_label{display:inline;font-weight:700;font-size:16px}#update_signature{width:30em}#supportflow-details .meta-item-label{font-weight:600}#supportflow-customers.postbox,#supportflow-subject.postbox{border:none;background:0 0}#supportflow-customers.postbox .inside,#supportflow-subject.postbox .inside{padding:0}#supportflow-customers .handlediv,#supportflow-customers h3.hndle,#supportflow-details .handlediv,#supportflow-details h3.hndle,#supportflow-replies .handlediv,#supportflow-replies h3.hndle,#supportflow-subject .handlediv,#supportflow-subject h3.hndle{display:none}#supportflow-details .handlediv,#supportflow-details h3.hndle{display:block}#supportflow-details #misc-publishing-actions label{display:inline-block}#supportflow-details #misc-publishing-actions select#post_status{width:100px}#supportflow-details #misc-publishing-actions span.the-date{font-weight:700}#supportflow-details #misc-publishing-actions div.last-activity{font-size:11px}#supportflow-customers h4,#supportflow-replies h4,#supportflow-subject h4{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:13px;font-weight:400;margin:10px 0 6px}#supportflow-subject.postbox input{width:100%;font-size:1.7em;padding-left:8px;padding-right:8px;line-height:100%;height:1.7em}#supportflow-customers.postbox input{width:100%;padding:8px;font-size:1.2em;height:2.6em}#supportflow-cc-bcc.postbox input{width:100%;font-size:1.2em}#supportflow-replies.postbox #ticket-reply-box{width:100%}#supportflow-replies.postbox textarea{width:100%;padding:8px;font-size:1.1em;font-size:1.2em}#supportflow-replies.postbox .inside #message-tools #submit-action{padding:0;margin-top:5px;float:right}#supportflow-replies.postbox .inside #message-tools #replies-attachments-wrap{float:left}#supportflow-replies #replies-attachments-list,#supportflow-replies #upload-messages{margin-top:9px;margin-left:2px;color:#666}#supportflow-replies.postbox .inside #message-tools #submit-action input[type=checkbox]{margin-top:-1px}#supportflow-replies.postbox .inside #message-tools #submit-action label{padding-top:2px;padding-left:5px;padding-right:25px}#supportflow-replies.postbox ul.private-replies{background-color:#FFFFE0;border:1px solid #E6DB55;padding:5px 10px}#supportflow-replies.postbox ul.private-replies li{border-top:1px solid #DFDFDF;margin-top:10px}#supportflow-replies.postbox ul.private-replies li:first-child{border-top:none;margin-top:0}#supportflow-replies.postbox ul.private-replies li .ticket-meta{color:#BBB;font-size:.9em;text-align:right}#supportflow-replies.postbox ul.ticket-replies li{clear:left;margin-top:20px;margin-bottom:20px}#supportflow-replies.postbox ul.private-replies li .ticket-reply-attachments li,#supportflow-replies.postbox ul.ticket-replies li .ticket-reply-attachments li{margin-top:3px;margin-bottom:3px;font-size:.9em}#supportflow-replies.postbox ul.ticket-replies li .reply-avatar{float:left;width:100px;word-wrap:break-word}#supportflow-replies.postbox ul.ticket-replies li .reply-author{margin:0;font-size:.9em;color:#666}#supportflow-replies.postbox ul.ticket-replies li .ticket-reply{background-color:#FFF;margin-left:105px;min-height:80px;padding:10px;font-size:1.1em;border:1px solid #DFDFDF;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;word-wrap:break-word}#supportflow-replies.postbox ul.ticket-replies li .ticket-meta{margin-left:105px;font-size:.9em;color:#666;margin-top:5px}#supportflow-replies.postbox .predefined_replies_dropdown{width:200px}.metabox-holder .postbox-container .empty-container{border:none}input::-webkit-input-placeholder{color:#BBB}input:-moz-placeholder{color:#BBB}textarea::-webkit-input-placeholder{color:#BBB}textarea:-moz-placeholder{color:#BBB}#sf_my_tickets .toggle-content{display:none}#sf_my_tickets .tablenav{height:10px}#sf_last_updated_tickets .tablenav{height:0}#sf_last_updated_tickets .two_day_old{color:#DF1111}#sf_last_updated_tickets .one_two_day_old{color:#BD8A2C}
\ No newline at end of file

From 9bb0afdb726871456421b3929ee17a9faa5c0585 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 17:38:20 +0530
Subject: [PATCH 384/485] Add option to toggle of "Insert sign" checkbox in
 ticket page

---
 classes/class-supportflow-admin.php       |  3 ++-
 classes/class-supportflow-preferences.php | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 934c8f5..5526704 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -960,7 +960,8 @@ public function meta_box_replies() {
 		echo '</div>';
 		echo '<div id="submit-action">';
 		$signature_label_title = __( 'Append your signature at the bottom of the reply. Signature can be removed or changed in preferences page', 'supportflow' );
-		echo '<input type="checkbox" ' . $disabled_attr . '	checked="checked" id="insert-signature" name="insert-signature" />';
+		$insert_signature_default = (boolean) get_user_meta( get_current_user_id(), 'sf_insert_signature_default', true );
+		echo '<input type="checkbox" ' . $disabled_attr . checked( $insert_signature_default, true, false ) . ' id="insert-signature" name="insert-signature" />';
 		echo "<label for='insert-signature' title='$signature_label_title'>" . __( 'Insert signature', 'supportflow' ) . '</label>';
 		echo '<input type="checkbox" ' . $disabled_attr . ' id="mark-private" name="mark-private" />';
 		echo '<label for="mark-private">' . __( 'Mark private', 'supportflow' ) . '</label>';
diff --git a/classes/class-supportflow-preferences.php b/classes/class-supportflow-preferences.php
index 0f9b5f1..756f65e 100644
--- a/classes/class-supportflow-preferences.php
+++ b/classes/class-supportflow-preferences.php
@@ -58,23 +58,32 @@ public function user_ticket_signature_page() {
 			'update_signature' == $_POST['action'] &&
 			wp_verify_nonce( $_POST['_wpnonce'], 'update_signature' )
 		) {
-			$signature    = wp_kses( $_POST['update_signature_value'], array() );
-			$sign_updated = true;
+			$signature = wp_kses( $_POST['update_signature_value'], array() );
 			update_user_meta( get_current_user_id(), 'sf_user_signature', $signature );
+
+			$insert_signature_default = isset( $_REQUEST['insert_signature_default'] ) && 'on' == $_REQUEST['insert_signature_default'];
+			update_user_meta( get_current_user_id(), 'sf_insert_signature_default', $insert_signature_default );
+
+			$sign_updated = true;
 		} else {
-			$signature = get_user_meta( get_current_user_id(), 'sf_user_signature', true );
+			$signature                = get_user_meta( get_current_user_id(), 'sf_user_signature', true );
+			$insert_signature_default = (boolean) get_user_meta( get_current_user_id(), 'sf_insert_signature_default', true );
 		}
 
 		?>
 		<h2><?php _e( 'My signature', 'supportflow' ) ?></h2>
 		<p><?php _e( 'Please enter your signature you wish to add to your ticket reply. To remove signature clear the text box and then update it. Note: It will be automatically appended at the end of your ticket replies', 'supportflow' ) ?></p>
-		<?php if ( isset( $sign_updated ) && $sign_updated ) {
+		<?php if ( ! empty( $sign_updated ) ) {
 			echo '<h3>' . __( 'Signature updated successfully.', 'supportflow' ) . '</h3>';
 		} ?>
 		<form id="update_signature" method="POST">
 			<?php wp_nonce_field( 'update_signature' ) ?>
 			<input type="hidden" name="action" value="update_signature" />
 			<textarea id="update_signature" name="update_signature_value" rows="7"><?php esc_html_e( $signature ) ?></textarea>
+			<input type="checkbox" name="insert_signature_default" id="insert_signature_default" <?php checked( $insert_signature_default ) ?> />
+			<label for="insert_signature_default" title="<?php _e( 'This will toggle on/off the insert signature checkbox in ticket page by default', 'supportflow' ) ?>">
+				<?php _e( 'Insert my signature by default', 'supportflow' ) ?>
+			</label>
 			<?php submit_button( __( 'Update my signature', 'supportflow' ) ); ?>
 		</form>
 	<?php

From cb8ff80805e8d207588d8d0eebd8f84177254a98 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 17:50:24 +0530
Subject: [PATCH 385/485] Moved cron related actions as static methods

---
 supportflow.php | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index a3ecbd8..88adb2d 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -949,6 +949,22 @@ public function sanitize_ticket_reply( $reply ) {
 		return $reply;
 	}
 
+	public static function action_cron_schedules( $schedules ) {
+		$schedules['five_minutes'] = array(
+			'interval' => 5 * MINUTE_IN_SECONDS,
+			'display'  => __( 'Five Minutes', 'supportflow' )
+		);
+
+		return $schedules;
+	}
+
+	public static function action_register_activation_hook() {
+		wp_schedule_event( time(), 'five_minutes', 'sf_cron_retrieve_email_replies' );
+	}
+
+	public static function action_register_deactivation_hook() {
+		wp_clear_scheduled_hook( 'sf_cron_retrieve_email_replies' );
+	}
 }
 
 /**
@@ -966,21 +982,9 @@ function SupportFlow() {
 	return SupportFlow::instance();
 }
 
-add_filter( 'cron_schedules', function ( $schedules ) {
-	$schedules['five_minutes'] = array(
-		'interval' => 5 * MINUTE_IN_SECONDS,
-		'display'  => __( 'Five Minutes', 'supportflow' )
-	);
-
-	return $schedules;
-} );
-
-register_activation_hook( __FILE__, function () {
-	wp_schedule_event( time(), 'five_minutes', 'sf_cron_retrieve_email_replies' );
-} );
-
-register_deactivation_hook( __FILE__, function () {
-	wp_clear_scheduled_hook( 'sf_cron_retrieve_email_replies' );
-} );
-
 add_action( 'plugins_loaded', 'SupportFlow' );
+
+// Related to cron
+add_filter( 'cron_schedules', 'SupportFlow::action_cron_schedules' );
+register_activation_hook( __FILE__, 'SupportFlow::action_register_activation_hook' );
+register_deactivation_hook( __FILE__, 'SupportFlow::action_register_deactivation_hook' );
\ No newline at end of file

From caf523c9d2f85091a09701eabe9932ac081e9d4c Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 13 Aug 2014 00:32:31 +0530
Subject: [PATCH 386/485] Using disabled function to create disabled attr

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 5526704..2a21e92 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -922,7 +922,7 @@ public function meta_box_replies() {
 		$email_account    = SupportFlow()->extend->email_accounts->get_email_account( $email_account_id );
 
 		$ticket_lock       = ( null == $email_account && '' != $email_account_id );
-		$disabled_attr     = $ticket_lock ? 'disabled' : '';
+		$disabled_attr     = disabled( $ticket_lock, true, false );
 		$submit_attr_array = $ticket_lock ? array( 'disabled' => 'true' ) : array();
 
 		if ( $ticket_lock ) {

From e4efa37afa49e5c69e7d5fd411c1e1c8f5fde708 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 13 Aug 2014 00:38:17 +0530
Subject: [PATCH 387/485] Revert "Auto-resize reply box height dynamically"

This feature is now transferred to its own new branch
This reverts commit 097a0aae44fa699991f6af67da80060606e08a7e.
---
 classes/class-supportflow-admin.php | 1 -
 js/jquery.autosize.min.js           | 7 -------
 js/tickets.js                       | 2 --
 3 files changed, 10 deletions(-)
 delete mode 100644 js/jquery.autosize.min.js

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index c8fb1ca..934c8f5 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -68,7 +68,6 @@ public function action_admin_enqueue_scripts() {
 
 		if ( in_array( $pagenow, array( 'post.php', 'post-new.php' ) ) ) {
 			wp_enqueue_media();
-			wp_enqueue_script( 'supportflow-jquery-autosize', SupportFlow()->plugin_url . "js/jquery.autosize.min.js", array( 'jquery' ), '1.18.9' );
 
 			$customers_autocomplete_handle   = SupportFlow()->enqueue_script( 'supportflow-customers-autocomplete', 'customers-autocomplete.js', array( 'jquery', 'jquery-ui-autocomplete' ) );
 			$ticket_attachment_handle        = SupportFlow()->enqueue_script( 'supportflow-ticket-attachments', 'ticket_attachments.js' );
diff --git a/js/jquery.autosize.min.js b/js/jquery.autosize.min.js
deleted file mode 100644
index 958b43b..0000000
--- a/js/jquery.autosize.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
-	Autosize v1.18.9 - 2014-05-27
-	Automatically adjust textarea height based on user input.
-	(c) 2014 Jack Moore - http://www.jacklmoore.com/autosize
-	license: http://www.opensource.org/licenses/mit-license.php
-*/
-(function(e){var t,o={className:"autosizejs",id:"autosizejs",append:"\n",callback:!1,resizeDelay:10,placeholder:!0},i='<textarea tabindex="-1" style="position:absolute; top:-999px; left:0; right:auto; bottom:auto; border:0; padding: 0; -moz-box-sizing:content-box; -webkit-box-sizing:content-box; box-sizing:content-box; word-wrap:break-word; height:0 !important; min-height:0 !important; overflow:hidden; transition:none; -webkit-transition:none; -moz-transition:none;"/>',n=["fontFamily","fontSize","fontWeight","fontStyle","letterSpacing","textTransform","wordSpacing","textIndent"],s=e(i).data("autosize",!0)[0];s.style.lineHeight="99px","99px"===e(s).css("lineHeight")&&n.push("lineHeight"),s.style.lineHeight="",e.fn.autosize=function(i){return this.length?(i=e.extend({},o,i||{}),s.parentNode!==document.body&&e(document.body).append(s),this.each(function(){function o(){var t,o=window.getComputedStyle?window.getComputedStyle(u,null):!1;o?(t=u.getBoundingClientRect().width,(0===t||"number"!=typeof t)&&(t=parseInt(o.width,10)),e.each(["paddingLeft","paddingRight","borderLeftWidth","borderRightWidth"],function(e,i){t-=parseInt(o[i],10)})):t=p.width(),s.style.width=Math.max(t,0)+"px"}function a(){var a={};if(t=u,s.className=i.className,s.id=i.id,d=parseInt(p.css("maxHeight"),10),e.each(n,function(e,t){a[t]=p.css(t)}),e(s).css(a).attr("wrap",p.attr("wrap")),o(),window.chrome){var r=u.style.width;u.style.width="0px",u.offsetWidth,u.style.width=r}}function r(){var e,n;t!==u?a():o(),s.value=!u.value&&i.placeholder?(p.attr("placeholder")||"")+i.append:u.value+i.append,s.style.overflowY=u.style.overflowY,n=parseInt(u.style.height,10),s.scrollTop=0,s.scrollTop=9e4,e=s.scrollTop,d&&e>d?(u.style.overflowY="scroll",e=d):(u.style.overflowY="hidden",c>e&&(e=c)),e+=w,n!==e&&(u.style.height=e+"px",f&&i.callback.call(u,u))}function l(){clearTimeout(h),h=setTimeout(function(){var e=p.width();e!==g&&(g=e,r())},parseInt(i.resizeDelay,10))}var d,c,h,u=this,p=e(u),w=0,f=e.isFunction(i.callback),z={height:u.style.height,overflow:u.style.overflow,overflowY:u.style.overflowY,wordWrap:u.style.wordWrap,resize:u.style.resize},g=p.width(),y=p.css("resize");p.data("autosize")||(p.data("autosize",!0),("border-box"===p.css("box-sizing")||"border-box"===p.css("-moz-box-sizing")||"border-box"===p.css("-webkit-box-sizing"))&&(w=p.outerHeight()-p.height()),c=Math.max(parseInt(p.css("minHeight"),10)-w||0,p.height()),p.css({overflow:"hidden",overflowY:"hidden",wordWrap:"break-word"}),"vertical"===y?p.css("resize","none"):"both"===y&&p.css("resize","horizontal"),"onpropertychange"in u?"oninput"in u?p.on("input.autosize keyup.autosize",r):p.on("propertychange.autosize",function(){"value"===event.propertyName&&r()}):p.on("input.autosize",r),i.resizeDelay!==!1&&e(window).on("resize.autosize",l),p.on("autosize.resize",r),p.on("autosize.resizeIncludeStyle",function(){t=null,r()}),p.on("autosize.destroy",function(){t=null,clearTimeout(h),e(window).off("resize",l),p.off("autosize").off(".autosize").css(z).removeData("autosize")}),r())})):this}})(window.jQuery||window.$);
\ No newline at end of file
diff --git a/js/tickets.js b/js/tickets.js
index 7a95489..d2bdd62 100644
--- a/js/tickets.js
+++ b/js/tickets.js
@@ -61,6 +61,4 @@ jQuery(document).ready(function ($) {
 		$(this).parent().html($(this).data('quoted_text'))
 	});
 
-	// Auto-resize height of reply text box
-	$('#reply').autosize();
 });

From bc8b51d3790ee19ada4abf217bc7d5b0cfa2f2c3 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 13 Aug 2014 23:07:59 +0530
Subject: [PATCH 388/485] WordPress not determining correct count of tickets
 using a tag

It is causing get_terms('hide_empty=1') to return nothing as it is always
0
---
 supportflow.php | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/supportflow.php b/supportflow.php
index a3ecbd8..e69fc1e 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -262,6 +262,7 @@ private function setup_actions() {
 		add_action( 'init', array( $this, 'action_init_register_taxonomies' ) );
 		add_action( 'init', array( $this, 'action_init_register_post_statuses' ) );
 		add_action( 'init', array( $this, 'action_init_upgrade' ) );
+		add_action( 'edited_term_taxonomy', array( $this, 'action_edited_term_taxonomy' ), 10, 2 );
 
 		add_filter( 'wp_insert_post_data', array( $this, 'filter_wp_insert_post_data' ), 10, 2 );
 
@@ -399,6 +400,36 @@ public function action_init_upgrade() {
 		update_option( 'sf_version', $this->version );
 	}
 
+	/**
+	 * Update count of tickets using a particular tag.
+	 * WP include only post with `published` status when evaluating count. So it is causing problems since SF use different post_stasuses
+	 */
+	public function action_edited_term_taxonomy( $term, $taxonomy ) {
+		global $wpdb;
+
+		if ( $taxonomy->name != $this->tags_tax ) {
+			return;
+		}
+
+		$post_type = $this->post_type;
+
+		$statuses = $this->post_statuses;
+		foreach ( $statuses as $status => $status_data ) {
+			if ( true == $status_data['show_tickets'] ) {
+				$status_slugs[] = $status;
+			}
+		}
+
+		$status_slugs = implode( "', '", $status_slugs );
+
+		$count = $wpdb->get_var(
+			"SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE "
+			. "$wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_type = '$post_type' AND post_status IN ('$status_slugs') AND term_taxonomy_id = $term"
+		);
+
+		$wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
+	}
+
 	public function filter_wp_insert_post_data( $data, $postarr ) {
 		if ( 0 == $postarr['post_author'] ) {
 			$data['post_author'] = 0;

From 82d1ba42d434e8ed6c8509486f51c83ce3599b1e Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 16:40:33 +0530
Subject: [PATCH 389/485] Removed unused line

I don't know from where it came but we are using SupportFlow()->reply_type
---
 supportflow.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index 88adb2d..2af0b66 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -166,7 +166,6 @@ private function setup_globals() {
 		$this->predefinded_replies_type = apply_filters( 'supportflow_predefinded_replies_type', 'sf_predefs' );
 		$this->customers_tax          = apply_filters( 'supportflow_customers_taxonomy', 'sf_customer' );
 		$this->tags_tax                 = apply_filters( 'supportflow_tags_taxonomy', 'sf_tags' );
-		$this->comment_type             = apply_filters( 'supportflow_ticket_comment_type', 'sf_comment' );
 		$this->reply_type               = apply_filters( 'supportflow_ticket_reply_type', 'sf_ticket' );
 
 		$this->email_term_prefix = 'sf-';

From a0e87023d83e7b5888fc34c89254c810e4d02880 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 16:44:39 +0530
Subject: [PATCH 390/485] Using global identifiers for taxonomies

e.g. using SupportFlow()->tags_tax instead of `sf_tags` directly
---
 classes/class-supportflow-admin.php               | 4 ++--
 classes/class-supportflow-email-notifications.php | 6 +++---
 classes/class-supportflow-permissions.php         | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 2a21e92..f1ce9d7 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -321,7 +321,7 @@ public function action_restrict_manage_posts() {
 
 		// Filter to specify tag
 		$tax_slug = SupportFlow()->tags_tax;
-		$terms    = get_terms( 'sf_tags', array( 'hide_empty' => false ) );
+		$terms    = get_terms( SupportFlow()->tags_tax, array( 'hide_empty' => false ) );
 
 		echo "<select name='" . esc_attr( $tax_slug ) . "' id='" . esc_attr( $tax_slug ) . "' class='postform'>";
 		echo "<option value=''>" . __( 'Show All tags', 'supportflow' ) . "</option>";
@@ -896,7 +896,7 @@ public function meta_box_cc_bcc() {
 	public function meta_box_replies() {
 		global $pagenow;
 
-		$predefined_replies = get_posts( array( 'post_type' => 'sf_predefs' ) );
+		$predefined_replies = get_posts( array( 'post_type' => SupportFlow()->predefinded_replies_type ) );
 		$pre_defs           = array( array( 'title' => __( 'Pre-defined Replies', 'supportflow' ), 'content' => '' ) );
 
 		foreach ( $predefined_replies as $predefined_reply ) {
diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 9e5bfb7..665d882 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -42,7 +42,7 @@ public function get_notifications_settings( $user_id = null, $allowed_only = fal
 		}
 
 		// Load all tags and E-Mail accounts
-		$tags                  = get_terms( 'sf_tags', 'hide_empty=0' );
+		$tags                  = get_terms( SupportFlow()->tags_tax, 'hide_empty=0' );
 		$email_accounts        = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 		$notification_settings = array();
 
@@ -102,7 +102,7 @@ public function get_notifications_settings( $user_id = null, $allowed_only = fal
 				if ( ! in_array( $slug, $email_notifications['tags'] ) && $allowed_only ) {
 					continue;
 				}
-				$tag                     = get_term_by( 'slug', $slug, 'sf_tags' );
+				$tag                     = get_term_by( 'slug', $slug, SupportFlow()->tags_tax );
 				$notification_settings[] = array(
 					'user_id'        => $user->ID,
 					'privilege_type' => 'tags',
@@ -164,7 +164,7 @@ public function set_notfication_settings( $privilege_type, $privilege_id, $allow
 	 * @return type array
 	 */
 	public function get_notified_user( $ticket_id ) {
-		$tags                         = wp_get_post_terms( $ticket_id, 'sf_tags', array( 'fields' => 'slugs' ) );
+		$tags                         = wp_get_post_terms( $ticket_id, SupportFlow()->tags_tax, array( 'fields' => 'slugs' ) );
 		$email_account                = get_post_meta( $ticket_id, 'email_account', true );
 		$email_notifications_override = get_post_meta( $ticket_id, 'email_notifications_override', true );
 
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index f0cf56b..75f13e8 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -196,7 +196,7 @@ public function show_permissions_table( $user_permissions ) {
 	}
 
 	public function get_user_permissions( $user_id, $return_allowed = true, $return_disallowed = true ) {
-		$tags             = get_terms( 'sf_tags', 'hide_empty=0' );
+		$tags             = get_terms( SupportFlow()->tags_tax, 'hide_empty=0' );
 		$email_accounts   = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 		$permissions      = array();
 		$user_permissions = array();
@@ -390,7 +390,7 @@ function limit_user_permissions( $allcaps, $cap, $args ) {
 	public function is_user_allowed_post( $user_id, $post_id ) {
 		$user_permissions   = $this->get_user_permissions_data( $user_id );
 		$post_email_account = get_post_meta( $post_id, 'email_account', true );
-		$post_tags          = wp_get_post_terms( $post_id, 'sf_tags' );
+		$post_tags          = wp_get_post_terms( $post_id, SupportFlow()->tags_tax );
 
 		if ( in_array( $post_email_account, $user_permissions['email_accounts'] ) ) {
 			return true;

From 4d570e8264e7e087aff7d248541e466ac551d846 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 16:55:27 +0530
Subject: [PATCH 391/485] using `posts_per_page` everywhere

It is now used instead of `numberposts`. Both of them serve same
functionality
---
 classes/class-supportflow-admin.php     | 4 ++--
 classes/class-supportflow-dashboard.php | 3 ++-
 supportflow.php                         | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index f1ce9d7..40811e2 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -578,7 +578,7 @@ public function meta_box_other_customers_tickets() {
 				'post_type'    => SupportFlow()->post_type,
 				'post_parent'  => 0,
 				'post_status'  => $status_slugs,
-				'numberposts'  => 10,
+				'posts_per_page'  => 10,
 				'post__not_in' => array( get_the_id() ),
 				'tax_query'    => array(
 					array(
@@ -1107,7 +1107,7 @@ function action_manage_posts_custom_column( $column_name, $ticket_id ) {
 				echo sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
 				break;
 			case 'sf_excerpt':
-				$replies = SupportFlow()->get_ticket_replies( $ticket_id, array( 'numberposts' => 1, 'order' => 'ASC' ) );
+				$replies = SupportFlow()->get_ticket_replies( $ticket_id, array( 'posts_per_page' => 1, 'order' => 'ASC' ) );
 				if ( ! isset( $replies[0] ) ) {
 					echo '—';
 					break;
diff --git a/classes/class-supportflow-dashboard.php b/classes/class-supportflow-dashboard.php
index 585f988..81ac4fc 100644
--- a/classes/class-supportflow-dashboard.php
+++ b/classes/class-supportflow-dashboard.php
@@ -68,7 +68,8 @@ function sf_last_updated_tickets() {
 			'post_status' => $status_slugs,
 			'orderby'     => 'modified',
 			'order'	      => "ASC",
-			'numberposts' => 10,
+			'author'      => 0,
+			'posts_per_page' => 10,
 		);
 
 		add_filter( 'posts_clauses', array( $this, 'filter_author_clause' ), 10, 2 );
diff --git a/supportflow.php b/supportflow.php
index 2af0b66..822039a 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -676,7 +676,7 @@ public function get_replies( $args ) {
 			'post_id'     => '',
 			'search'      => '',
 			'order'       => 'DESC', // 'DESC', 'ASC',
-			'numberposts' => - 1,
+			'posts_per_page' => - 1,
 		);
 
 		$args      = array_merge( $default_args, $args );
@@ -686,7 +686,7 @@ public function get_replies( $args ) {
 			'post_status'      => $args['status'],
 			'post_type'        => $this->reply_type,
 			'order'            => $args['order'],
-			'numberposts'      => $args['numberposts'],
+			'posts_per_page'      => $args['posts_per_page'],
 			'suppress_filters' => false,
 		);
 		add_filter( 'posts_clauses', array( $this, 'filter_reply_clauses' ), 10, 2 );
@@ -986,4 +986,4 @@ function SupportFlow() {
 // Related to cron
 add_filter( 'cron_schedules', 'SupportFlow::action_cron_schedules' );
 register_activation_hook( __FILE__, 'SupportFlow::action_register_activation_hook' );
-register_deactivation_hook( __FILE__, 'SupportFlow::action_register_deactivation_hook' );
\ No newline at end of file
+register_deactivation_hook( __FILE__, 'SupportFlow::action_register_deactivation_hook' );

From 4a836059748518c5173780f95a4c945f22f28f26 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 16:58:09 +0530
Subject: [PATCH 392/485] Loading all posts when required

By default posts_per_page is 5. This can cause issue in some case when we
want to retrieve all posts. e.g. attachment, predefined replies
---
 classes/class-supportflow-admin.php  | 2 +-
 classes/class-supportflow-emails.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 40811e2..59bc9a1 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -896,7 +896,7 @@ public function meta_box_cc_bcc() {
 	public function meta_box_replies() {
 		global $pagenow;
 
-		$predefined_replies = get_posts( array( 'post_type' => SupportFlow()->predefinded_replies_type ) );
+		$predefined_replies = get_posts( array( 'post_type' => SupportFlow()->predefinded_replies_type, 'posts_per_page' => -1 ) );
 		$pre_defs           = array( array( 'title' => __( 'Pre-defined Replies', 'supportflow' ), 'content' => '' ) );
 
 		foreach ( $predefined_replies as $predefined_reply ) {
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 6bce326..05fc9de 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -71,7 +71,7 @@ public function notify_agents_ticket_replies( $reply_id ) {
 		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $ticket->ID, 'agent' );
 
 		$attachments = array();
-		if ( $ticket_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply->ID ) ) ) {
+		if ( $ticket_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply->ID, 'posts_per_page' => -1 ) ) ) {
 			foreach ( $ticket_attachments as $attachment ) {
 				$attachments[] = get_attached_file( $attachment->ID );
 			}
@@ -125,7 +125,7 @@ public function notify_customers_ticket_replies( $reply_id, $cc = array(), $bcc
 		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $ticket->ID, 'customer' );
 
 		$attachments = array();
-		if ( $ticket_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply->ID ) ) ) {
+		if ( $ticket_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply->ID, 'posts_per_page' => -1 ) ) ) {
 			foreach ( $ticket_attachments as $attachment ) {
 				$attachments[] = get_attached_file( $attachment->ID );
 			}
@@ -186,7 +186,7 @@ public function email_conversation( $ticket_id, $to ) {
 			$msg .= esc_html( $ticket_reply->post_content );
 			$msg .= '<br><br>';
 
-			if ( $ticket_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $ticket_reply->ID ) ) ) {
+			if ( $ticket_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $ticket_reply->ID, 'posts_per_page' => -1 ) ) ) {
 				foreach ( $ticket_attachments as $attachment ) {
 					$attachments[] = get_attached_file( $attachment->ID );
 				}

From 63748340c499123693a043dbddae58a4ee564fed Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 12 Aug 2014 17:06:37 +0530
Subject: [PATCH 393/485] Showing 10 tickets per type in my recent ticket
 widget

---
 classes/class-supportflow-dashboard.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/class-supportflow-dashboard.php b/classes/class-supportflow-dashboard.php
index 81ac4fc..53f84b4 100644
--- a/classes/class-supportflow-dashboard.php
+++ b/classes/class-supportflow-dashboard.php
@@ -133,6 +133,7 @@ function action_sf_my_tickets() {
 			$args = array(
 				'post_type'   => SupportFlow()->post_type,
 				'post_parent' => 0,
+				'posts_per_page' => 10,
 				'post_status' => $status_slug,
 				'author'      => $user_id,
 			);

From 22713a18659a1ed1eaef46cfe6181bbf45b4b658 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 14 Aug 2014 18:57:14 +0530
Subject: [PATCH 394/485] Refactored code

---
 classes/class-supportflow-emails.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index d343e62..7e0ab63 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -61,7 +61,7 @@ public function notify_agents_ticket_replies( $reply_id ) {
 		// Don't email the person adding the reply, unless that's desired behavior
 		if ( ! apply_filters( 'supportflow_emails_notify_creator', false, 'reply' ) ) {
 			$key = array_search( get_post_meta( $reply->ID, 'reply_author_email', true ), $agent_emails );
-			if ( false !== ( $key ) ) {
+			if ( false !== $key ) {
 				unset( $agent_emails[$key] );
 			}
 		}

From 73960dfd091073699622453c72d859c188c07d10 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 14 Aug 2014 22:59:41 +0530
Subject: [PATCH 395/485] Sanitizing ticket reply before sending in E-Mail

---
 classes/class-supportflow-emails.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 7e0ab63..65597fc 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -74,7 +74,7 @@ public function notify_agents_ticket_replies( $reply_id ) {
 		$post_status    = SupportFlow()->post_statuses[$ticket->post_status]['label'];
 		$assigned_agent = ( $ticket->post_author ) ? get_user_by( 'id', $ticket->post_author )->display_name : __( 'None assigned', 'supportflow' );
 
-		$message = stripslashes( $reply->post_content );
+		$message = sanitize_ticket_reply( stripslashes( $reply->post_content ) );
 		$message .= "\n\n-------";
 		$message .= "\n" . __( "Status: ", 'supportflow' ) . $post_status;
 		$message .= "\n" . __( "Agent: ", 'supportflow' ) . $assigned_agent;
@@ -121,7 +121,7 @@ public function notify_customers_ticket_replies( $reply_id, $cc = array(), $bcc
 		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $ticket->ID );
 		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $ticket->ID, 'customer' );
 
-		$message = stripslashes( $reply->post_content );
+		$message = sanitize_ticket_reply( stripslashes( $reply->post_content ) );
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $ticket->ID, 'customer' );
 		$messge .= "\n\n" . $this->get_quoted_text( $ticket );
 		$message = wpautop( $message );
@@ -165,7 +165,7 @@ public function email_conversation( $ticket_id, $to ) {
 
 			$msg .= '<b>' . sprintf( __( 'On %s, %s wrote:', 'supportflow' ), $date_time, esc_html( $reply_author ) ) . '</b>';
 			$msg .= '<br>';
-			$msg .= esc_html( $ticket_reply->post_content );
+			$msg .= sanitize_ticket_reply( $ticket_reply->post_content );
 			$msg .= '<br><br>';
 
 			if ( $ticket_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $ticket_reply->ID ) ) ) {
@@ -236,7 +236,8 @@ public function get_quoted_text( $ticket ) {
 			}
 			$time_stamp = $ticket->post_date_gmt;
 			$heading    = sprintf( "On %s GMT, %s wrote:", $time_stamp, $reply_author );
-			$content    = '> ' . stripslashes( $quoted_reply->post_content );
+			$content    = SupportFlow()->sanitize_ticket_reply( stripslashes( $quoted_reply->post_content ) );
+			$content    = "> $content";
 			$content    = str_replace( "\n", "\n> ", $content );
 
 			return "$heading\n$content";

From b78f2b47c8e432ea17aaa5d681da57de35fd4334 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 14 Aug 2014 23:49:36 +0530
Subject: [PATCH 396/485] Using update_count_callback to update count of
 tickets using a tag

---
 supportflow.php | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index e69fc1e..7161057 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -262,7 +262,6 @@ private function setup_actions() {
 		add_action( 'init', array( $this, 'action_init_register_taxonomies' ) );
 		add_action( 'init', array( $this, 'action_init_register_post_statuses' ) );
 		add_action( 'init', array( $this, 'action_init_upgrade' ) );
-		add_action( 'edited_term_taxonomy', array( $this, 'action_edited_term_taxonomy' ), 10, 2 );
 
 		add_filter( 'wp_insert_post_data', array( $this, 'filter_wp_insert_post_data' ), 10, 2 );
 
@@ -337,6 +336,7 @@ public function action_init_register_taxonomies() {
 			'show_in_nav_menus' => true,
 			'rewrite'           => false,
 			'capabilities'      => $capabilities,
+			'update_count_callback' => array($this, 'callback_update_count_callback_tags' ),
 		);
 
 		register_taxonomy( $this->customers_tax, $this->post_type, $args_customers_tax );
@@ -401,16 +401,12 @@ public function action_init_upgrade() {
 	}
 
 	/**
-	 * Update count of tickets using a particular tag.
-	 * WP include only post with `published` status when evaluating count. So it is causing problems since SF use different post_stasuses
+	 * Updated count of tickets using a tag
+	 * WP include only post with `published` status when evaluating count. So it is causing problems as SF use different post_stasuses
 	 */
-	public function action_edited_term_taxonomy( $term, $taxonomy ) {
+	public function callback_update_count_callback_tags( $terms, $taxonomy ) {
 		global $wpdb;
 
-		if ( $taxonomy->name != $this->tags_tax ) {
-			return;
-		}
-
 		$post_type = $this->post_type;
 
 		$statuses = $this->post_statuses;
@@ -422,12 +418,15 @@ public function action_edited_term_taxonomy( $term, $taxonomy ) {
 
 		$status_slugs = implode( "', '", $status_slugs );
 
-		$count = $wpdb->get_var(
-			"SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE "
-			. "$wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_type = '$post_type' AND post_status IN ('$status_slugs') AND term_taxonomy_id = $term"
-		);
+		foreach ( $terms as $term ) {
+			$count = $wpdb->get_var( $wpdb->prepare(
+				"SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE "
+				. "$wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_type = '$post_type' AND post_status IN ('$status_slugs') AND term_taxonomy_id = %d",
+				$term
+			) );
 
-		$wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
+			$wpdb->update( $wpdb->term_taxonomy, compact( 'count' ), array( 'term_taxonomy_id' => $term ) );
+		}
 	}
 
 	public function filter_wp_insert_post_data( $data, $postarr ) {

From 30bd8c67ab36160558a7d81158e59818970fcb1d Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 14 Aug 2014 20:37:46 +0530
Subject: [PATCH 397/485] Loading cron schedule and registering cron after
 `init` action

At this moment both WP and plugin are initialized so it can now access
plugin data if required
---
 supportflow.php | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index 88adb2d..501a615 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -261,8 +261,13 @@ private function setup_actions() {
 		add_action( 'init', array( $this, 'action_init_register_post_type' ) );
 		add_action( 'init', array( $this, 'action_init_register_taxonomies' ) );
 		add_action( 'init', array( $this, 'action_init_register_post_statuses' ) );
+
 		add_action( 'init', array( $this, 'action_init_upgrade' ) );
 
+		add_filter( 'cron_schedules', array( $this, 'action_cron_schedules' ) );
+		add_action( 'init', array( $this, 'action_init_wp_schedule_event' ) );
+
+
 		add_filter( 'wp_insert_post_data', array( $this, 'filter_wp_insert_post_data' ), 10, 2 );
 
 		do_action_ref_array( 'supportflow_after_setup_actions', array( &$this ) );
@@ -949,7 +954,7 @@ public function sanitize_ticket_reply( $reply ) {
 		return $reply;
 	}
 
-	public static function action_cron_schedules( $schedules ) {
+	public function action_cron_schedules( $schedules ) {
 		$schedules['five_minutes'] = array(
 			'interval' => 5 * MINUTE_IN_SECONDS,
 			'display'  => __( 'Five Minutes', 'supportflow' )
@@ -958,8 +963,10 @@ public static function action_cron_schedules( $schedules ) {
 		return $schedules;
 	}
 
-	public static function action_register_activation_hook() {
-		wp_schedule_event( time(), 'five_minutes', 'sf_cron_retrieve_email_replies' );
+	public function action_init_wp_schedule_event() {
+		if ( ! wp_next_scheduled( 'sf_cron_retrieve_email_replies' ) ) {
+			wp_schedule_event( time(), 'five_minutes', 'sf_cron_retrieve_email_replies' );
+		}
 	}
 
 	public static function action_register_deactivation_hook() {
@@ -984,7 +991,5 @@ function SupportFlow() {
 
 add_action( 'plugins_loaded', 'SupportFlow' );
 
-// Related to cron
-add_filter( 'cron_schedules', 'SupportFlow::action_cron_schedules' );
-register_activation_hook( __FILE__, 'SupportFlow::action_register_activation_hook' );
+// Remove SupportFlow cron job on deactivation of plugin
 register_deactivation_hook( __FILE__, 'SupportFlow::action_register_deactivation_hook' );
\ No newline at end of file

From a364cb474cfaae9584a8723260dfcc47abacbe39 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 15 Aug 2014 00:24:44 +0530
Subject: [PATCH 398/485] Allow to change cron interval using a filter

Fixes #195
---
 supportflow.php | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index 501a615..5556046 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -173,6 +173,8 @@ private function setup_globals() {
 
 		$this->ticket_secret_key = 'ticket_secret';
 
+		$this->cron_interval = apply_filters( 'supportflow_cron_interval', 5 * MINUTE_IN_SECONDS );
+
 		$this->post_statuses = apply_filters(
 			'supportflow_ticket_post_statuses', array(
 				'sf_new'     => array(
@@ -267,7 +269,6 @@ private function setup_actions() {
 		add_filter( 'cron_schedules', array( $this, 'action_cron_schedules' ) );
 		add_action( 'init', array( $this, 'action_init_wp_schedule_event' ) );
 
-
 		add_filter( 'wp_insert_post_data', array( $this, 'filter_wp_insert_post_data' ), 10, 2 );
 
 		do_action_ref_array( 'supportflow_after_setup_actions', array( &$this ) );
@@ -955,17 +956,27 @@ public function sanitize_ticket_reply( $reply ) {
 	}
 
 	public function action_cron_schedules( $schedules ) {
-		$schedules['five_minutes'] = array(
-			'interval' => 5 * MINUTE_IN_SECONDS,
-			'display'  => __( 'Five Minutes', 'supportflow' )
+		$cron_interval = $this->cron_interval;
+
+		$schedules["sf_$cron_interval"] = array(
+			'interval' => $cron_interval,
+			'display'  => "sf_$cron_interval",
 		);
 
 		return $schedules;
 	}
 
 	public function action_init_wp_schedule_event() {
+		$cron_interval = $this->cron_interval;
+
 		if ( ! wp_next_scheduled( 'sf_cron_retrieve_email_replies' ) ) {
-			wp_schedule_event( time(), 'five_minutes', 'sf_cron_retrieve_email_replies' );
+			// Set cron if not scheduled yet
+			wp_schedule_event( time(), "sf_$cron_interval", 'sf_cron_retrieve_email_replies' );
+
+		} elseif ( wp_get_schedule( 'sf_cron_retrieve_email_replies' ) != "sf_$cron_interval" ) {
+			// Reschedule cron if interval is changed
+			wp_clear_scheduled_hook( 'sf_cron_retrieve_email_replies' );
+			wp_schedule_event( time(), "sf_$cron_interval", 'sf_cron_retrieve_email_replies' );
 		}
 	}
 

From b5ea6e4e11311c393c0cabd487e93d74fc9d89ed Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 15 Aug 2014 00:33:15 +0530
Subject: [PATCH 399/485] Methods accidentally called as functions

---
 classes/class-supportflow-emails.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 65597fc..94a69ed 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -69,12 +69,12 @@ public function notify_agents_ticket_replies( $reply_id ) {
 		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $ticket->ID );
 		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $ticket->ID, 'agent' );
 
-		$attachments = get_attached_files( $reply->ID );
+		$attachments = $this->get_attached_files( $reply->ID );
 
 		$post_status    = SupportFlow()->post_statuses[$ticket->post_status]['label'];
 		$assigned_agent = ( $ticket->post_author ) ? get_user_by( 'id', $ticket->post_author )->display_name : __( 'None assigned', 'supportflow' );
 
-		$message = sanitize_ticket_reply( stripslashes( $reply->post_content ) );
+		$message = SupportFlow()->sanitize_ticket_reply( stripslashes( $reply->post_content ) );
 		$message .= "\n\n-------";
 		$message .= "\n" . __( "Status: ", 'supportflow' ) . $post_status;
 		$message .= "\n" . __( "Agent: ", 'supportflow' ) . $assigned_agent;
@@ -116,12 +116,12 @@ public function notify_customers_ticket_replies( $reply_id, $cc = array(), $bcc
 			}
 		}
 
-		$attachments = get_attached_files( $reply->ID );
+		$attachments = $this->get_attached_files( $reply->ID );
 
 		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $ticket->ID );
 		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $ticket->ID, 'customer' );
 
-		$message = sanitize_ticket_reply( stripslashes( $reply->post_content ) );
+		$message = SupportFlow()->sanitize_ticket_reply( stripslashes( $reply->post_content ) );
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $ticket->ID, 'customer' );
 		$messge .= "\n\n" . $this->get_quoted_text( $ticket );
 		$message = wpautop( $message );
@@ -165,7 +165,7 @@ public function email_conversation( $ticket_id, $to ) {
 
 			$msg .= '<b>' . sprintf( __( 'On %s, %s wrote:', 'supportflow' ), $date_time, esc_html( $reply_author ) ) . '</b>';
 			$msg .= '<br>';
-			$msg .= sanitize_ticket_reply( $ticket_reply->post_content );
+			$msg .= SupportFlow()->sanitize_ticket_reply( $ticket_reply->post_content );
 			$msg .= '<br><br>';
 
 			if ( $ticket_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $ticket_reply->ID ) ) ) {

From ca13016ffc061eb6322f77df0326e843a24acc24 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 15 Aug 2014 01:05:30 +0530
Subject: [PATCH 400/485] Setting details meta box as high

This is to display it as top sidebar by default

Fixes #199
---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 59bc9a1..3bb7a56 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -551,7 +551,7 @@ public function action_add_meta_boxes() {
 		remove_meta_box( $customers_box, SupportFlow()->post_type, 'side' );
 		remove_meta_box( 'slugdiv', SupportFlow()->post_type, 'normal' );
 
-		add_meta_box( 'supportflow-details', __( 'Details', 'supportflow' ), array( $this, 'meta_box_details' ), SupportFlow()->post_type, 'side' );
+		add_meta_box( 'supportflow-details', __( 'Details', 'supportflow' ), array( $this, 'meta_box_details' ), SupportFlow()->post_type, 'side', 'high' );
 		add_meta_box( 'supportflow-subject', __( 'Subject', 'supportflow' ), array( $this, 'meta_box_subject' ), SupportFlow()->post_type, 'normal' );
 		add_meta_box( 'supportflow-customers', __( 'Customers', 'supportflow' ), array( $this, 'meta_box_customers' ), SupportFlow()->post_type, 'normal' );
 		add_meta_box( 'supportflow-cc-bcc', __( 'CC and BCC', 'supportflow' ), array( $this, 'meta_box_cc_bcc' ), SupportFlow()->post_type, 'normal' );

From 47900dea265abccb45174ae360d23c217918b47f Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 15 Aug 2014 01:16:50 +0530
Subject: [PATCH 401/485] Corrected typo

---
 classes/class-supportflow-emails.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 9d8b498..a5adb13 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -81,7 +81,7 @@ public function notify_agents_ticket_replies( $reply_id ) {
 
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $ticket->ID, 'agent' );
 
-		$messge .= "\n\n" . $this->get_quoted_text( $ticket );
+		$message .= "\n\n" . $this->get_quoted_text( $ticket );
 		$message = wpautop( $message );
 
 		self::mail( $agent_emails, $subject, $message, 'Content-Type: text/html', $attachments, $smtp_account );
@@ -124,7 +124,7 @@ public function notify_customers_ticket_replies( $reply_id, $cc = array(), $bcc
 		$message = SupportFlow()->sanitize_ticket_reply( stripslashes( $reply->post_content ) );
 
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $ticket->ID, 'customer' );
-		$messge .= "\n\n" . $this->get_quoted_text( $ticket );
+		$message .= "\n\n" . $this->get_quoted_text( $ticket );
 		$message = wpautop( $message );
 
 		$headers = "Content-Type: text/html\r\n";

From 3934003bf5f61aa80924d687cd9be491b87dac6a Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 15 Aug 2014 01:45:39 +0530
Subject: [PATCH 402/485] Splitted meta_box_details method into sub-methods

---
 classes/class-supportflow-admin.php | 249 +++++++++++++++-------------
 1 file changed, 136 insertions(+), 113 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 3bb7a56..eceb27b 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -630,6 +630,66 @@ public function meta_box_email_conversation() {
 	 * Show details about the ticket, and allow the post status and agent to be changed
 	 */
 	public function meta_box_details() {
+		echo '<div id="minor-publishing">
+				<div id="misc-publishing-actions">';
+
+		$this->render_meta_box_details_email_account();
+		$this->render_meta_box_details_opened();
+		$this->render_meta_box_details_status();
+		$this->render_meta_box_details_author();
+		$this->render_meta_box_details_notifications();
+		$this->render_meta_box_details_actions();
+
+		echo '</div>
+				</div>';
+
+	}
+
+	public function render_meta_box_details_email_account() {
+		// Get post E-Mail account
+		$email_accounts = SupportFlow()->extend->email_accounts->get_email_accounts( true );
+
+		$user_permissions = SupportFlow()->extend->permissions->get_user_permissions_data( get_current_user_id() );
+		$user_permissions = $user_permissions['email_accounts'];
+
+		$email_account_id = get_post_meta( get_the_id(), 'email_account', true );
+
+		if ( '' == $email_account_id ) {
+			$email_account_dropdown = '<select class="meta-item-dropdown">';
+			foreach ( $email_accounts as $id => $email_account ) {
+				if ( empty( $email_account ) || ( ! current_user_can( 'manage_options' ) && ! in_array( $id, $user_permissions ) ) ) {
+					continue;
+				}
+				$email_account_dropdown .= '<option value="' . esc_attr( $id ) . '" ' . '>' . esc_html( $email_account['username'] ) . '</option>';
+			}
+			$email_account_dropdown .= '</select>';
+
+			$email_account_keys  = array_keys( $email_accounts );
+			$email_account_first = $email_account_keys[0];
+			$email_account_label = $email_accounts[$email_account_first]['username'];
+		}
+
+		if ( '' == $email_account_id ) {
+			?>
+			<div class="misc-pub-section meta-item">
+				<label class="meta-item-toggle-button"><?php _e( 'Account', 'supportflow' ) ?>:</label>
+				<span class="meta-item-label"><?php _e( $email_account_label, 'supportflow' ) ?></span>
+				<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
+					<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
+				</a>
+				<input name="post_email_account" class="meta-item-name" value="<?php echo $email_account_first ?>" type="hidden" />
+
+				<div class="meta-item-toggle-content hide-if-js">
+					<?php echo $email_account_dropdown ?>
+					<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php _e( 'OK' ) ?></a>
+					<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php _e( 'Cancel' ) ?></a>
+				</div>
+			</div>
+		<?php
+		}
+	}
+
+	public function render_meta_box_details_opened() {
 		global $pagenow;
 
 		// Get post creation and last update time
@@ -637,9 +697,22 @@ public function meta_box_details() {
 			$opened        = get_the_date() . ' ' . get_the_time();
 			$modified_gmt  = get_post_modified_time( 'U', true, get_the_ID() );
 			$last_activity = sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
-		}
+			?>
+			<div class="misc-pub-section meta-item">
+				<label><?php _e( 'Opened', 'supportflow' ) ?>:</label>
+				<span class="meta-item-label"><?php esc_html_e( $opened ) ?></span>
+			</div>
 
+			<!--Last ticket update time-->
+			<div class="misc-pub-section meta-item">
+				<label><?php _e( 'Last Activity', 'supportflow' ) ?>:</label>
+				<span class="meta-item-label"><?php esc_html_e( $last_activity ) ?></span>
+			</div>
+		<?php
+		}
+	}
 
+	public function render_meta_box_details_status() {
 		// Get post status
 		$post_statuses     = SupportFlow()->post_statuses;
 		$current_status_id = get_post_status( get_the_ID() );
@@ -650,7 +723,30 @@ public function meta_box_details() {
 		}
 
 		$current_status_label = $post_statuses[$current_status_id]['label'];
+		?>
+		<!--Ticket status box-->
+		<div class="misc-pub-section meta-item">
+			<label class="meta-item-toggle-button"><?php _e( 'Status', 'supportflow' ) ?>:</label>
+			<span class="meta-item-label"><?php esc_html_e( $current_status_label, 'supportflow' ) ?></span>
+			<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
+				<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
+			</a>
+			<input name="post_status" class="meta-item-name" value="<?php esc_attr_e( $current_status_id ) ?>" type="hidden" />
+
+			<div class="meta-item-toggle-content hide-if-js">
+				<select class="meta-item-dropdown">
+					<?php foreach ( $post_statuses as $slug => $post_status ) : ?>
+						<option value="<?php esc_attr_e( $slug ) ?>"<?php selected( $current_status_id, $slug ) ?>><?php esc_html_e( $post_status['label'] ) ?></option>;
+					<?php endforeach; ?>
+				</select>
+				<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php _e( 'OK' ) ?></a>
+				<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php _e( 'Cancel' ) ?></a>
+			</div>
+		</div>
+	<?php
+	}
 
+	public function render_meta_box_details_author() {
 		// Get post authors
 		$post_author_id = get_post( get_the_ID() )->post_author;
 
@@ -674,30 +770,26 @@ public function meta_box_details() {
 			'echo'             => false
 		);
 		$post_authors_dropdown = wp_dropdown_users( $args );
+		?>
+		<div class="misc-pub-section meta-item">
+			<label class="meta-item-toggle-button"><?php _e( 'Owner', 'supportflow' ) ?>:</label>
+			<span class="meta-item-label"><?php _e( $post_author_label, 'supportflow' ) ?></span>
+			<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
+				<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
+			</a>
+			<input name="post_author" class="meta-item-name" value="<?php esc_attr_e( $post_author_id ) ?>" type="hidden" />
+
+			<div class="meta-item-toggle-content hide-if-js">
+				<?php echo $post_authors_dropdown ?>
+				<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php _e( 'OK' ) ?></a>
+				<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php _e( 'Cancel' ) ?></a>
+			</div>
+		</div>
+	<?php
+	}
 
-
-		// Get post E-Mail account
-		$email_accounts = SupportFlow()->extend->email_accounts->get_email_accounts( true );
-
-		$user_permissions = SupportFlow()->extend->permissions->get_user_permissions_data( get_current_user_id() );
-		$user_permissions = $user_permissions['email_accounts'];
-
-		$email_account_id = get_post_meta( get_the_id(), 'email_account', true );
-
-		if ( '' == $email_account_id ) {
-			$email_account_dropdown = '<select class="meta-item-dropdown">';
-			foreach ( $email_accounts as $id => $email_account ) {
-				if ( empty( $email_account ) || ( ! current_user_can( 'manage_options' ) && ! in_array( $id, $user_permissions ) ) ) {
-					continue;
-				}
-				$email_account_dropdown .= '<option value="' . esc_attr( $id ) . '" ' . '>' . esc_html( $email_account['username'] ) . '</option>';
-			}
-			$email_account_dropdown .= '</select>';
-
-			$email_account_keys  = array_keys( $email_accounts );
-			$email_account_first = $email_account_keys[0];
-			$email_account_label = $email_accounts[$email_account_first]['username'];
-		}
+	public function render_meta_box_details_notifications() {
+		global $pagenow;
 
 		// Get E-Mail notification settings
 		$notification_id          = 0;
@@ -731,6 +823,26 @@ public function meta_box_details() {
 		}
 
 		$notification_dropdown .= '</select>';
+		?>
+		<div class="misc-pub-section meta-item">
+			<label class="meta-item-toggle-button" title="<?php _e( $notification_label_title, 'supportflow' ) ?>"><?php _e( 'E-Mail Notifications', 'supportflow' ) ?>:</label>
+			<span class="meta-item-label"><?php esc_html_e( $notification_label, 'supportflow' ) ?></span>
+			<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
+				<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
+			</a>
+			<input name="post_email_notifications_override" class="meta-item-name" value="<?php echo $notification_id ?>" type="hidden" />
+
+			<div class="meta-item-toggle-content hide-if-js">
+				<?php echo $notification_dropdown ?>
+				<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php _e( 'OK' ) ?></a>
+				<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php _e( 'Cancel' ) ?></a>
+			</div>
+		</div>
+	<?php
+	}
+
+	public function render_meta_box_details_actions() {
+		global $pagenow;
 
 		$close_ticket_label = __( 'Close ticket', 'supportflow' );
 
@@ -741,95 +853,6 @@ public function meta_box_details() {
 			$submit_text = __( 'Update Ticket', 'supportflow' );
 		}
 		?>
-
-		<div id="minor-publishing">
-			<div id="misc-publishing-actions">
-
-				<?php if ( '' == $email_account_id ) : ?>
-					<div class="misc-pub-section meta-item">
-						<label class="meta-item-toggle-button"><?php _e( 'Account', 'supportflow' ) ?>:</label>
-						<span class="meta-item-label"><?php _e( $email_account_label, 'supportflow' ) ?></span>
-						<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
-							<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
-						</a>
-						<input name="post_email_account" class="meta-item-name" value="<?php echo $email_account_first ?>" type="hidden" />
-
-						<div class="meta-item-toggle-content hide-if-js">
-							<?php echo $email_account_dropdown ?>
-							<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php _e( 'OK' ) ?></a>
-							<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php _e( 'Cancel' ) ?></a>
-						</div>
-					</div>
-				<?php endif; ?>
-
-				<!--Ticket opening date/time-->
-				<?php if ( 'post.php' == $pagenow ) : ?>
-					<div class="misc-pub-section meta-item">
-						<label><?php _e( 'Opened', 'supportflow' ) ?>:</label>
-						<span class="meta-item-label"><?php esc_html_e( $opened ) ?></span>
-					</div>
-
-					<!--Last ticket update time-->
-					<div class="misc-pub-section meta-item">
-						<label><?php _e( 'Last Activity', 'supportflow' ) ?>:</label>
-						<span class="meta-item-label"><?php esc_html_e( $last_activity ) ?></span>
-					</div>
-				<?php endif; ?>
-
-				<!--Ticket status box-->
-				<div class="misc-pub-section meta-item">
-					<label class="meta-item-toggle-button"><?php _e( 'Status', 'supportflow' ) ?>:</label>
-					<span class="meta-item-label"><?php esc_html_e( $current_status_label, 'supportflow' ) ?></span>
-					<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
-						<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
-					</a>
-					<input name="post_status" class="meta-item-name" value="<?php esc_attr_e( $current_status_id ) ?>" type="hidden" />
-
-					<div class="meta-item-toggle-content hide-if-js">
-						<select class="meta-item-dropdown">
-							<?php foreach ( $post_statuses as $slug => $post_status ) : ?>
-								<option value="<?php esc_attr_e( $slug ) ?>"<?php selected( $current_status_id, $slug ) ?>><?php esc_html_e( $post_status['label'] ) ?></option>;
-							<?php endforeach; ?>
-						</select>
-						<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php _e( 'OK' ) ?></a>
-						<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php _e( 'Cancel' ) ?></a>
-					</div>
-				</div>
-
-				<div class="misc-pub-section meta-item">
-					<label class="meta-item-toggle-button"><?php _e( 'Owner', 'supportflow' ) ?>:</label>
-					<span class="meta-item-label"><?php _e( $post_author_label, 'supportflow' ) ?></span>
-					<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
-						<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
-					</a>
-					<input name="post_author" class="meta-item-name" value="<?php esc_attr_e( $post_author_id ) ?>" type="hidden" />
-
-					<div class="meta-item-toggle-content hide-if-js">
-						<?php echo $post_authors_dropdown ?>
-						<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php _e( 'OK' ) ?></a>
-						<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php _e( 'Cancel' ) ?></a>
-					</div>
-				</div>
-
-				<div class="misc-pub-section meta-item">
-					<label class="meta-item-toggle-button" title="<?php _e( $notification_label_title, 'supportflow' ) ?>"><?php _e( 'E-Mail Notifications', 'supportflow' ) ?>:</label>
-					<span class="meta-item-label"><?php esc_html_e( $notification_label, 'supportflow' ) ?></span>
-					<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
-						<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
-					</a>
-					<input name="post_email_notifications_override" class="meta-item-name" value="<?php echo $notification_id ?>" type="hidden" />
-
-					<div class="meta-item-toggle-content hide-if-js">
-						<?php echo $notification_dropdown ?>
-						<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php _e( 'OK' ) ?></a>
-						<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php _e( 'Cancel' ) ?></a>
-					</div>
-				</div>
-
-			</div>
-			<div class="clear"></div>
-		</div>
-
 		<div id="major-publishing-actions">
 			<?php if ( 'post.php' == $pagenow && $current_status_id != 'sf_closed' ) : ?>
 				<div id="delete-action">

From 4a47f3221c682fd1f56fbb4f75478d98b99966a6 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 15 Aug 2014 02:49:20 +0530
Subject: [PATCH 403/485] Determining $current_status_id before using

---
 classes/class-supportflow-admin.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index eceb27b..c189d03 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -844,6 +844,16 @@ public function render_meta_box_details_notifications() {
 	public function render_meta_box_details_actions() {
 		global $pagenow;
 
+		$post_statuses     = SupportFlow()->post_statuses;
+		$current_status_id = get_post_status( get_the_ID() );
+
+		if ( ! isset( $post_statuses[$current_status_id] ) ) {
+			$post_statuses_key = array_keys( $post_statuses );
+			$current_status_id = $post_statuses_key[0];
+		}
+
+		$current_status_label = $post_statuses[$current_status_id]['label'];
+
 		$close_ticket_label = __( 'Close ticket', 'supportflow' );
 
 		// Get submit button label

From 542b89fd14eede07e142a0a506ba2ab2a6c2a549 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Fri, 15 Aug 2014 02:56:42 +0530
Subject: [PATCH 404/485] Correct reply addition time were not shown

---
 classes/class-supportflow-admin.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index c189d03..38303f2 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -1037,8 +1037,8 @@ public function display_ticket_replies() {
 				}
 				echo '</div>';
 				$reply_author    = get_post_meta( $reply->ID, 'reply_author', true );
-				$reply_timestamp = sprintf( __( 'Noted by %1$s on %2$s at %3$s', 'supportflow' ), $reply_author, get_the_date(), get_the_time() );
-				$modified_gmt    = get_post_modified_time( 'U', true, get_the_ID() );
+				$reply_timestamp = sprintf( __( 'Noted by %1$s on %2$s at %3$s', 'supportflow' ), $reply_author, get_the_date( '', $reply->ID ), get_the_time( '', $reply->ID ) );
+				$modified_gmt    = get_post_modified_time( 'U', true, $reply->ID );
 				$last_activity   = sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
 				echo '<div class="ticket-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . ' (' . $last_activity . ')' . '</span></div>';
 				echo '</li>';
@@ -1071,8 +1071,8 @@ public function display_ticket_replies() {
 					echo '</ul>';
 				}
 				echo '</div>';
-				$reply_timestamp = sprintf( __( '%s at %s', 'supportflow' ), get_the_date(), get_the_time() );
-				$modified_gmt    = get_post_modified_time( 'U', true, get_the_ID() );
+				$reply_timestamp = sprintf( __( '%s at %s', 'supportflow' ), get_the_date( '', $reply->ID ), get_the_time( '', $reply->ID ) );
+				$modified_gmt    = get_post_modified_time( 'U', true, $reply->ID );
 				$last_activity   = sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
 				echo '<div class="ticket-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . ' (' . $last_activity . ')' . '</span></div>';
 				echo '</li>';

From ad3ef97aa36be449b26beec9ee28d3a2e6118b74 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 16 Aug 2014 18:02:40 +0530
Subject: [PATCH 405/485] Declaring `$` variable before using

---
 js/supportflow.min.js | 2 +-
 js/toggle-links.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/supportflow.min.js b/js/supportflow.min.js
index 3c33819..b504280 100644
--- a/js/supportflow.min.js
+++ b/js/supportflow.min.js
@@ -1,2 +1,2 @@
 /*! SupportFlow minified version */
-jQuery(document).ready(function(){$(".toggle-link").click(function(a){var b=$(this).siblings(".toggle-content").css("display");$(".toggle-content").hide(500),$(".toggle-link").prop("title",SFToggleLinks.expand),"none"==b&&($(this).siblings(".toggle-content").show(500),$(this).prop("title",SFToggleLinks.collapse)),a.preventDefault()}),$($(".toggle-content")).each(function(){"none"==$(this).css("display")?$(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):$(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),$(".toggle-content").first().show(500)})}),jQuery(document).ready(function(a){a(".delete_email_account").click(function(b){if(b.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var c=a(this).data("account-id"),d="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,e="";e+='<form method="POST" id="remove_email_account" action="'+d+'">',e+='<input type="hidden" name="action" value="delete" />',e+=SFEmailAccounts.delete_email_account_nonce,e+='<input type="hidden" name="account_id" value='+c+" />",e+="</form>",a("body").append(e),a("#remove_email_account").submit()}}),a("#add_new_email_account #imap_ssl").change(function(){a("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),a("#add_new_email_account #smtp_ssl").change(function(){a("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(a){var b=function(b){b.preventDefault();var c=a("#email_conversation_to").val();a.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:c,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){a("#email_conversation_to").prop("disabled",!0),a("#email_conversation_submit").prop("disabled",!0),a("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(b){a("#email_conversation_status").html(b)},error:function(){a("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){a("#email_conversation_to").prop("disabled",!1),a("#email_conversation_submit").prop("disabled",!1)}})};a("#email_conversation_submit").click(b),a("#email_conversation_to").keyup(function(){10==event.keyCode&&b()})}),jQuery(document).ready(function(a){a(".permission_filters").change(function(){var b=a("#change_user option:selected").data("user-id"),c=a("#change_status option:selected").data("status");a.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:b,status:c,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(b){a("#user_permissions_table").html(b)}})}),a(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("permission-identifier"),e=b.prop("checked"),f=d.user_id,g=d.privilege_type,h=d.privilege_id;c.html(SFPermissions.changing_status),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:f,privilege_type:g,privilege_id:h,allowed:e,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var a=b.prop("checked");c.html(1==a?SFPermissions.allowed:SFPermissions.not_allowed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){a("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=a("#predefs").find("option:selected").data("content"),old_content=a(".predef:nth-child("+this.old_child+")").data("content"),current_content=a("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void a(".predef:nth-child("+this.old_child+")").prop("selected",!0);a("#reply").val(new_content),this.old_child=a("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(a){a(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("email-notfication-identifier"),e=b.prop("checked"),f=d.privilege_type,g=d.privilege_id;c.html(SFPreferences.changing_state),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:f,privilege_id:g,allowed:e,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var a=b.prop("checked");c.html(1==a?SFPreferences.subscribed:SFPreferences.unsubscribed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var b=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return b.on("close",function(){var c=b.state().get("selection").toJSON();a.each(c,function(){var b='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",c='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";a("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+b+"&nbsp;"+c+"</li>"),a("#reply-attachments").val(a("#reply-attachments").val()+_.escape(this.id)+",")})}),b.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(a){a("#supportflow-details .meta-item-ok-button").click(function(b){var c=a(this).siblings(".meta-item-dropdown").children("option:selected"),d=a(this).closest(".meta-item"),e=d.children(".meta-item-name"),f=d.children(".meta-item-label");e.val(c.val()),f.text(c.text()),b.preventDefault()}),a("#supportflow-details .meta-item-toggle-button").click(function(b){a(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),b.preventDefault()}),a(".save-button").click(function(b){return""==a("#subject").val()?(a("#subject").focus(),alert(SFTickets.no_title_msg),void b.preventDefault()):""==a("#customers").val()?(a("#customers").focus(),alert(SFTickets.no_customer_msg),void b.preventDefault()):void 0}),a("#reply").keypress(function(b){!b.ctrlKey||10!=b.keyCode&&13!=b.keyCode||""==a(this).val()||a("#post").submit()}),a("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&a("#insert-reply").val(a("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),a("#close-ticket-submit").click(function(){a("#post .meta-item input[name='post_status']").val("sf_closed")}),a(".sf_toggle_quoted_text").click(function(b){b.preventDefault(),a(this).parent().html(a(this).data("quoted_text"))})}),jQuery(document).ready(function(a){a(".sf_autosave").keyup(function(){var b={};b.ticket_id=SFAutoSave.ticket_id,a(".sf_autosave").each(function(){element_key=a(this).attr("name"),element_value=a(this).val(),b[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",b,!1)})});
\ No newline at end of file
+jQuery(document).ready(function(a){a(".toggle-link").click(function(b){var c=a(this).siblings(".toggle-content").css("display");a(".toggle-content").hide(500),a(".toggle-link").prop("title",SFToggleLinks.expand),"none"==c&&(a(this).siblings(".toggle-content").show(500),a(this).prop("title",SFToggleLinks.collapse)),b.preventDefault()}),a(a(".toggle-content")).each(function(){"none"==a(this).css("display")?a(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):a(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),a(".toggle-content").first().show(500)})}),jQuery(document).ready(function(a){a(".delete_email_account").click(function(b){if(b.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var c=a(this).data("account-id"),d="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,e="";e+='<form method="POST" id="remove_email_account" action="'+d+'">',e+='<input type="hidden" name="action" value="delete" />',e+=SFEmailAccounts.delete_email_account_nonce,e+='<input type="hidden" name="account_id" value='+c+" />",e+="</form>",a("body").append(e),a("#remove_email_account").submit()}}),a("#add_new_email_account #imap_ssl").change(function(){a("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),a("#add_new_email_account #smtp_ssl").change(function(){a("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(a){var b=function(b){b.preventDefault();var c=a("#email_conversation_to").val();a.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:c,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){a("#email_conversation_to").prop("disabled",!0),a("#email_conversation_submit").prop("disabled",!0),a("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(b){a("#email_conversation_status").html(b)},error:function(){a("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){a("#email_conversation_to").prop("disabled",!1),a("#email_conversation_submit").prop("disabled",!1)}})};a("#email_conversation_submit").click(b),a("#email_conversation_to").keyup(function(){10==event.keyCode&&b()})}),jQuery(document).ready(function(a){a(".permission_filters").change(function(){var b=a("#change_user option:selected").data("user-id"),c=a("#change_status option:selected").data("status");a.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:b,status:c,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(b){a("#user_permissions_table").html(b)}})}),a(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("permission-identifier"),e=b.prop("checked"),f=d.user_id,g=d.privilege_type,h=d.privilege_id;c.html(SFPermissions.changing_status),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:f,privilege_type:g,privilege_id:h,allowed:e,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var a=b.prop("checked");c.html(1==a?SFPermissions.allowed:SFPermissions.not_allowed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){a("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=a("#predefs").find("option:selected").data("content"),old_content=a(".predef:nth-child("+this.old_child+")").data("content"),current_content=a("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void a(".predef:nth-child("+this.old_child+")").prop("selected",!0);a("#reply").val(new_content),this.old_child=a("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(a){a(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("email-notfication-identifier"),e=b.prop("checked"),f=d.privilege_type,g=d.privilege_id;c.html(SFPreferences.changing_state),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:f,privilege_id:g,allowed:e,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var a=b.prop("checked");c.html(1==a?SFPreferences.subscribed:SFPreferences.unsubscribed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var b=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return b.on("close",function(){var c=b.state().get("selection").toJSON();a.each(c,function(){var b='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",c='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";a("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+b+"&nbsp;"+c+"</li>"),a("#reply-attachments").val(a("#reply-attachments").val()+_.escape(this.id)+",")})}),b.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(a){a("#supportflow-details .meta-item-ok-button").click(function(b){var c=a(this).siblings(".meta-item-dropdown").children("option:selected"),d=a(this).closest(".meta-item"),e=d.children(".meta-item-name"),f=d.children(".meta-item-label");e.val(c.val()),f.text(c.text()),b.preventDefault()}),a("#supportflow-details .meta-item-toggle-button").click(function(b){a(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),b.preventDefault()}),a(".save-button").click(function(b){return""==a("#subject").val()?(a("#subject").focus(),alert(SFTickets.no_title_msg),void b.preventDefault()):""==a("#customers").val()?(a("#customers").focus(),alert(SFTickets.no_customer_msg),void b.preventDefault()):void 0}),a("#reply").keypress(function(b){!b.ctrlKey||10!=b.keyCode&&13!=b.keyCode||""==a(this).val()||a("#post").submit()}),a("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&a("#insert-reply").val(a("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),a("#close-ticket-submit").click(function(){a("#post .meta-item input[name='post_status']").val("sf_closed")}),a(".sf_toggle_quoted_text").click(function(b){b.preventDefault(),a(this).parent().html(a(this).data("quoted_text"))})}),jQuery(document).ready(function(a){a(".sf_autosave").keyup(function(){var b={};b.ticket_id=SFAutoSave.ticket_id,a(".sf_autosave").each(function(){element_key=a(this).attr("name"),element_value=a(this).val(),b[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",b,!1)})});
\ No newline at end of file
diff --git a/js/toggle-links.js b/js/toggle-links.js
index 1aac58b..3f34ec5 100644
--- a/js/toggle-links.js
+++ b/js/toggle-links.js
@@ -1,4 +1,4 @@
-jQuery(document).ready(function () {
+jQuery(document).ready(function ($) {
 	// Close all the different stat tables and toggle the status of clicked stat table
 	$('.toggle-link').click(function (event) {
 		var current = $(this).siblings('.toggle-content').css('display');

From 3f7554cd29974b46d0240ebc3fcf9cbd071c13db Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 16 Aug 2014 18:35:14 +0530
Subject: [PATCH 406/485] Loading respondents autocomplete code in create/edit
 ticket page only

If it load in other page it try to use `juery-autocomplete` dep. which is
not available cauising errors
---
 js/customers-autocomplete.js | 94 ++++++++++++++++++------------------
 js/supportflow.min.js        |  2 +-
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/js/customers-autocomplete.js b/js/customers-autocomplete.js
index 1baac58..cfff544 100644
--- a/js/customers-autocomplete.js
+++ b/js/customers-autocomplete.js
@@ -1,64 +1,64 @@
 jQuery(document).ready(function ($) {
+	if ('sf_ticket' == pagenow) {
+		var getSearchTerm = function () {
 
-	var getSearchTerm = function () {
+			// Input of the Customers field can contain multiple addresses,
+			// we only want to search on the last address
+			var resps = $('#customers').val().replace(" ", '').split(",");
 
-		// Input of the Customers field can contain multiple addresses,
-		// we only want to search on the last address
-		var resps = $('#customers').val().replace(" ", '').split(",");
+			if ($.isArray(resps) && resps.length > 1) {
+				var search_for = resps.pop();
+			}
+			else {
+				search_for = resps[0];
+			}
 
-		if ($.isArray(resps) && resps.length > 1) {
-			var search_for = resps.pop();
-		}
-		else {
-			search_for = resps[0];
-		}
-
-		return { "customers": search_for, "api-action": 'get-customers' };
+			return { "customers": search_for, "api-action": 'get-customers' };
 
-	}
+		}
 
-	$('#customers').autocomplete({
+		$('#customers').autocomplete({
 
-		source   : function (req, response) {
+			source   : function (req, response) {
 
-			$.ajax({
-				url     : SFCustomersAc.ajax_url,
-				dataType: 'json',
-				data    : getSearchTerm(),
-				success : function (data) {
-					if (data.query == "") {
-						response(false);
-						return false;
-					}
-					response($.map(data.customers, function (item) {
+				$.ajax({
+					url     : SFCustomersAc.ajax_url,
+					dataType: 'json',
+					data    : getSearchTerm(),
+					success : function (data) {
+						if (data.query == "") {
+							response(false);
+							return false;
+						}
+						response($.map(data.customers, function (item) {
 
-						// normaliz input
-						var resps = $('#customers').val().split(' ').join('').split(",");
+							// normaliz input
+							var resps = $('#customers').val().split(' ').join('').split(",");
 
-						// remove partial customer
-						resps.pop();
+							// remove partial customer
+							resps.pop();
 
-						// Check if e-mail id already exists
-						if (-1 == $.inArray(item.name, resps)) {
+							// Check if e-mail id already exists
+							if (-1 == $.inArray(item.name, resps)) {
 
-							// replace with full email
-							resps.push(item.name);
+								// replace with full email
+								resps.push(item.name);
 
-							// make it a string
-							var retval = resps.join(", ") + ", ";
+								// make it a string
+								var retval = resps.join(", ") + ", ";
 
-							// return those customers!
-							return {
-								label: item.name,
-								value: retval
+								// return those customers!
+								return {
+									label: item.name,
+									value: retval
+								}
 							}
-						}
-					}));
-				}
-			});
-
-		},
-		minLength: 2
-	});
+						}));
+					}
+				});
 
+			},
+			minLength: 2
+		});
+	};
 });
\ No newline at end of file
diff --git a/js/supportflow.min.js b/js/supportflow.min.js
index b504280..e028158 100644
--- a/js/supportflow.min.js
+++ b/js/supportflow.min.js
@@ -1,2 +1,2 @@
 /*! SupportFlow minified version */
-jQuery(document).ready(function(a){a(".toggle-link").click(function(b){var c=a(this).siblings(".toggle-content").css("display");a(".toggle-content").hide(500),a(".toggle-link").prop("title",SFToggleLinks.expand),"none"==c&&(a(this).siblings(".toggle-content").show(500),a(this).prop("title",SFToggleLinks.collapse)),b.preventDefault()}),a(a(".toggle-content")).each(function(){"none"==a(this).css("display")?a(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):a(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),a(".toggle-content").first().show(500)})}),jQuery(document).ready(function(a){a(".delete_email_account").click(function(b){if(b.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var c=a(this).data("account-id"),d="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,e="";e+='<form method="POST" id="remove_email_account" action="'+d+'">',e+='<input type="hidden" name="action" value="delete" />',e+=SFEmailAccounts.delete_email_account_nonce,e+='<input type="hidden" name="account_id" value='+c+" />",e+="</form>",a("body").append(e),a("#remove_email_account").submit()}}),a("#add_new_email_account #imap_ssl").change(function(){a("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),a("#add_new_email_account #smtp_ssl").change(function(){a("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(a){var b=function(b){b.preventDefault();var c=a("#email_conversation_to").val();a.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:c,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){a("#email_conversation_to").prop("disabled",!0),a("#email_conversation_submit").prop("disabled",!0),a("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(b){a("#email_conversation_status").html(b)},error:function(){a("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){a("#email_conversation_to").prop("disabled",!1),a("#email_conversation_submit").prop("disabled",!1)}})};a("#email_conversation_submit").click(b),a("#email_conversation_to").keyup(function(){10==event.keyCode&&b()})}),jQuery(document).ready(function(a){a(".permission_filters").change(function(){var b=a("#change_user option:selected").data("user-id"),c=a("#change_status option:selected").data("status");a.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:b,status:c,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(b){a("#user_permissions_table").html(b)}})}),a(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("permission-identifier"),e=b.prop("checked"),f=d.user_id,g=d.privilege_type,h=d.privilege_id;c.html(SFPermissions.changing_status),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:f,privilege_type:g,privilege_id:h,allowed:e,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var a=b.prop("checked");c.html(1==a?SFPermissions.allowed:SFPermissions.not_allowed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){a("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=a("#predefs").find("option:selected").data("content"),old_content=a(".predef:nth-child("+this.old_child+")").data("content"),current_content=a("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void a(".predef:nth-child("+this.old_child+")").prop("selected",!0);a("#reply").val(new_content),this.old_child=a("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(a){a(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("email-notfication-identifier"),e=b.prop("checked"),f=d.privilege_type,g=d.privilege_id;c.html(SFPreferences.changing_state),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:f,privilege_id:g,allowed:e,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var a=b.prop("checked");c.html(1==a?SFPreferences.subscribed:SFPreferences.unsubscribed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var b=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return b.on("close",function(){var c=b.state().get("selection").toJSON();a.each(c,function(){var b='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",c='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";a("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+b+"&nbsp;"+c+"</li>"),a("#reply-attachments").val(a("#reply-attachments").val()+_.escape(this.id)+",")})}),b.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(a){a("#supportflow-details .meta-item-ok-button").click(function(b){var c=a(this).siblings(".meta-item-dropdown").children("option:selected"),d=a(this).closest(".meta-item"),e=d.children(".meta-item-name"),f=d.children(".meta-item-label");e.val(c.val()),f.text(c.text()),b.preventDefault()}),a("#supportflow-details .meta-item-toggle-button").click(function(b){a(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),b.preventDefault()}),a(".save-button").click(function(b){return""==a("#subject").val()?(a("#subject").focus(),alert(SFTickets.no_title_msg),void b.preventDefault()):""==a("#customers").val()?(a("#customers").focus(),alert(SFTickets.no_customer_msg),void b.preventDefault()):void 0}),a("#reply").keypress(function(b){!b.ctrlKey||10!=b.keyCode&&13!=b.keyCode||""==a(this).val()||a("#post").submit()}),a("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&a("#insert-reply").val(a("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),a("#close-ticket-submit").click(function(){a("#post .meta-item input[name='post_status']").val("sf_closed")}),a(".sf_toggle_quoted_text").click(function(b){b.preventDefault(),a(this).parent().html(a(this).data("quoted_text"))})}),jQuery(document).ready(function(a){a(".sf_autosave").keyup(function(){var b={};b.ticket_id=SFAutoSave.ticket_id,a(".sf_autosave").each(function(){element_key=a(this).attr("name"),element_value=a(this).val(),b[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",b,!1)})});
\ No newline at end of file
+jQuery(document).ready(function(a){a(".toggle-link").click(function(b){var c=a(this).siblings(".toggle-content").css("display");a(".toggle-content").hide(500),a(".toggle-link").prop("title",SFToggleLinks.expand),"none"==c&&(a(this).siblings(".toggle-content").show(500),a(this).prop("title",SFToggleLinks.collapse)),b.preventDefault()}),a(a(".toggle-content")).each(function(){"none"==a(this).css("display")?a(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):a(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),a(".toggle-content").first().show(500)})}),jQuery(document).ready(function(a){a(".delete_email_account").click(function(b){if(b.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var c=a(this).data("account-id"),d="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,e="";e+='<form method="POST" id="remove_email_account" action="'+d+'">',e+='<input type="hidden" name="action" value="delete" />',e+=SFEmailAccounts.delete_email_account_nonce,e+='<input type="hidden" name="account_id" value='+c+" />",e+="</form>",a("body").append(e),a("#remove_email_account").submit()}}),a("#add_new_email_account #imap_ssl").change(function(){a("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),a("#add_new_email_account #smtp_ssl").change(function(){a("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(a){var b=function(b){b.preventDefault();var c=a("#email_conversation_to").val();a.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:c,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){a("#email_conversation_to").prop("disabled",!0),a("#email_conversation_submit").prop("disabled",!0),a("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(b){a("#email_conversation_status").html(b)},error:function(){a("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){a("#email_conversation_to").prop("disabled",!1),a("#email_conversation_submit").prop("disabled",!1)}})};a("#email_conversation_submit").click(b),a("#email_conversation_to").keyup(function(){10==event.keyCode&&b()})}),jQuery(document).ready(function(a){a(".permission_filters").change(function(){var b=a("#change_user option:selected").data("user-id"),c=a("#change_status option:selected").data("status");a.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:b,status:c,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(b){a("#user_permissions_table").html(b)}})}),a(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("permission-identifier"),e=b.prop("checked"),f=d.user_id,g=d.privilege_type,h=d.privilege_id;c.html(SFPermissions.changing_status),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:f,privilege_type:g,privilege_id:h,allowed:e,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var a=b.prop("checked");c.html(1==a?SFPermissions.allowed:SFPermissions.not_allowed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){a("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=a("#predefs").find("option:selected").data("content"),old_content=a(".predef:nth-child("+this.old_child+")").data("content"),current_content=a("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void a(".predef:nth-child("+this.old_child+")").prop("selected",!0);a("#reply").val(new_content),this.old_child=a("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(a){a(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("email-notfication-identifier"),e=b.prop("checked"),f=d.privilege_type,g=d.privilege_id;c.html(SFPreferences.changing_state),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:f,privilege_id:g,allowed:e,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var a=b.prop("checked");c.html(1==a?SFPreferences.subscribed:SFPreferences.unsubscribed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){if("sf_ticket"==pagenow){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var b=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return b.on("close",function(){var c=b.state().get("selection").toJSON();a.each(c,function(){var b='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",c='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";a("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+b+"&nbsp;"+c+"</li>"),a("#reply-attachments").val(a("#reply-attachments").val()+_.escape(this.id)+",")})}),b.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(a){a("#supportflow-details .meta-item-ok-button").click(function(b){var c=a(this).siblings(".meta-item-dropdown").children("option:selected"),d=a(this).closest(".meta-item"),e=d.children(".meta-item-name"),f=d.children(".meta-item-label");e.val(c.val()),f.text(c.text()),b.preventDefault()}),a("#supportflow-details .meta-item-toggle-button").click(function(b){a(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),b.preventDefault()}),a(".save-button").click(function(b){return""==a("#subject").val()?(a("#subject").focus(),alert(SFTickets.no_title_msg),void b.preventDefault()):""==a("#customers").val()?(a("#customers").focus(),alert(SFTickets.no_customer_msg),void b.preventDefault()):void 0}),a("#reply").keypress(function(b){!b.ctrlKey||10!=b.keyCode&&13!=b.keyCode||""==a(this).val()||a("#post").submit()}),a("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&a("#insert-reply").val(a("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),a("#close-ticket-submit").click(function(){a("#post .meta-item input[name='post_status']").val("sf_closed")}),a(".sf_toggle_quoted_text").click(function(b){b.preventDefault(),a(this).parent().html(a(this).data("quoted_text"))})}),jQuery(document).ready(function(a){a(".sf_autosave").keyup(function(){var b={};b.ticket_id=SFAutoSave.ticket_id,a(".sf_autosave").each(function(){element_key=a(this).attr("name"),element_value=a(this).val(),b[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",b,!1)})});
\ No newline at end of file

From 59897a1c383f3d966cdb9c72540a816b0900a450 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 16 Aug 2014 20:10:15 +0530
Subject: [PATCH 407/485] Using a static key for cron interval

Using dynamic variables is causing bugs
---
 supportflow.php | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index 5fb3ab0..54842c0 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -985,27 +985,42 @@ public function sanitize_ticket_reply( $reply ) {
 	}
 
 	public function action_cron_schedules( $schedules ) {
-		$cron_interval = $this->cron_interval;
 
-		$schedules["sf_$cron_interval"] = array(
-			'interval' => $cron_interval,
-			'display'  => "sf_$cron_interval",
+		$schedules["sf_cron"] = array(
+			'interval' => $this->cron_interval,
+			'display'  => "sf_cron",
 		);
 
 		return $schedules;
 	}
 
 	public function action_init_wp_schedule_event() {
-		$cron_interval = $this->cron_interval;
+		// Get interval of cron as per database setting
+		$crons_array = _get_cron_array();
+		foreach ( $crons_array as $time => $crons ) {
+			foreach ( $crons as $hook => $cron ) {
+				if ( 'sf_cron_retrieve_email_replies' == $hook ) {
+					$id       = current( $cron );
+					$interval = $id['interval'];
+				}
+			}
+		}
 
+		// Schedule cron if not scheduled earlier (plugin is activated)
 		if ( ! wp_next_scheduled( 'sf_cron_retrieve_email_replies' ) ) {
 			// Set cron if not scheduled yet
-			wp_schedule_event( time(), "sf_$cron_interval", 'sf_cron_retrieve_email_replies' );
+			wp_schedule_event( time(), "sf_cron", 'sf_cron_retrieve_email_replies' );
+
+			return;
+		}
 
-		} elseif ( wp_get_schedule( 'sf_cron_retrieve_email_replies' ) != "sf_$cron_interval" ) {
+		// Check if cron interval is changed via filters. If it is changed, reschedule the cron
+		if ( $interval != $this->cron_interval ) {
 			// Reschedule cron if interval is changed
 			wp_clear_scheduled_hook( 'sf_cron_retrieve_email_replies' );
-			wp_schedule_event( time(), "sf_$cron_interval", 'sf_cron_retrieve_email_replies' );
+			wp_schedule_event( time(), "sf_cron", 'sf_cron_retrieve_email_replies' );
+
+			return;
 		}
 	}
 

From 1868685d2453130b1e05839bf4c38fcbaecceab3 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sat, 16 Aug 2014 22:22:36 +0530
Subject: [PATCH 408/485] Convert E-Mail body encoding to UTF-8

---
 classes/class-supportflow-email-replies.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 2112af4..1053d05 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -113,8 +113,19 @@ public function download_and_process_email_replies( $connection_details ) {
 				continue;
 			}
 
+			// Convert encoding to UTF-8
+			if ( ! empty( $email->structure->parameters ) ) {
+				foreach ( $email->structure->parameters as $parameter ) {
+					if ( 'CHARSET' == $parameter->attribute ) {
+						$email->body = iconv( $parameter->value, 'UTF-8', $email->body );
+						break;
+					}
+				}
+			}
+
 			// @todo Confirm this a message we want to process
 			$ret = $this->process_email( $imap_connection, $email, $i, $connection_details['username'], $connection_details['account_id'] );
+
 			// If it was successful, move the email to the archive
 			if ( $ret ) {
 				$archive_mails[] = $i;

From a6890caa52ed379ab1e886bce5ec835e66399216 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Sun, 17 Aug 2014 15:43:23 +0530
Subject: [PATCH 409/485] Submit button should be clicked on pressing
 ctrl+enter

Currently it just submit the form causing form submission time checks to
not work. e.g. it doesn't check if subject and customer fields are empty
or not
---
 js/tickets.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/tickets.js b/js/tickets.js
index d2bdd62..d9896c3 100644
--- a/js/tickets.js
+++ b/js/tickets.js
@@ -35,7 +35,7 @@ jQuery(document).ready(function ($) {
 	// Submit post if user pressed Ctrl+Enter in reply content box
 	$('#reply').keypress(function (event) {
 		if (event.ctrlKey && ( event.keyCode == 10 || event.keyCode == 13 ) && $(this).val() != '') {
-			$('#post').submit();
+			$('.save-button').first().click();
 		}
 	});
 

From 1bb0c33f30647fb3031333bef72091e68847336b Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Mon, 18 Aug 2014 12:21:02 -0700
Subject: [PATCH 410/485] Bump version to 0.4-alpha1

---
 supportflow.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index 54842c0..ae49591 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -7,7 +7,7 @@
  * Plugin URI:  https://wordpress.org/plugins/supportflow/
  * Description: Reinventing how you support your customers.
  * Author:      Daniel Bachhuber, Varun Agrawal, Alex Mills, Andrew Spittle
- * Version:     0.3
+ * Version:     0.4-alpha1
  *
  * Text Domain: supportflow
  * Domain Path: /languages/
@@ -146,7 +146,7 @@ private function setup_globals() {
 
 		/** Version ***********************************************************/
 
-		$this->version = '0.3'; // SupportFlow version
+		$this->version = '0.4-alpha1'; // SupportFlow version
 
 		/** Paths *************************************************************/
 

From b214d9668d58cb47dbc31a2ab0084f686bda2969 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Tue, 19 Aug 2014 21:18:18 +0530
Subject: [PATCH 411/485] Assume enter if either CR or LF is pressed

Some OS'es use CR, some LF and some both. So it should work in all OS
---
 js/email_conversation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/email_conversation.js b/js/email_conversation.js
index 3d39a19..e6bee27 100644
--- a/js/email_conversation.js
+++ b/js/email_conversation.js
@@ -34,7 +34,7 @@ jQuery(document).ready(function ($) {
 
 	$('#email_conversation_submit').click(email_conversion);
 	$('#email_conversation_to').keyup(function () {
-		if (event.keyCode == 10) {
+		if (event.keyCode == 10 || event.keyCode == 13) {
 			email_conversion();
 		}
 	});

From 159e66cf2fdc41eef94a2cbdbc762476ffd43bc8 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Wed, 20 Aug 2014 23:30:27 +0530
Subject: [PATCH 412/485] Make sure SF attached files are shown as attached in
 media page

---
 classes/class-supportflow-email-replies.php | 3 +++
 supportflow.php                             | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 1053d05..0581ab0 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -274,6 +274,9 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 			// Save the attachment ID as post meta of reply
 			add_post_meta( $new_reply->ID, 'sf_attachments', $new_attachment_id );
 			SupportFlow()->extend->attachments->insert_attachment_secret_key( $new_attachment_id ) ;
+
+			// It doesn't do anything special other than making sure file is not shown as unattached in media page
+			wp_update_post( array( 'ID' => $new_attachment_id, 'post_parent' => $ticket_id ) );
 		}
 
 		// Store the original email ID so we don't accidentally dupe it
diff --git a/supportflow.php b/supportflow.php
index ae49591..f1d7aad 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -821,8 +821,14 @@ public function add_ticket_reply( $ticket_id, $reply_text, $details = array() )
 		// If there are attachment IDs store them as meta
 		if ( is_array( $attachment_ids ) ) {
 			foreach ( $attachment_ids as $attachment_id ) {
+				// Associate attachment with the reply
 				add_post_meta( $reply_id, 'sf_attachments', $attachment_id );
+
 				SupportFlow()->extend->attachments->insert_attachment_secret_key( $attachment_id );
+
+				// It doesn't do anything special other than making sure file is not shown as unattached in media page
+				wp_update_post( array( 'ID' => $attachment_id, 'post_parent' => $ticket_id ) );
+
 			}
 		}
 

From 33bd0e1f2ef6e12217bc95e18502200c9a395a95 Mon Sep 17 00:00:00 2001
From: Varun Agrawal <Varun@VarunAgw.com>
Date: Thu, 21 Aug 2014 00:06:47 +0530
Subject: [PATCH 413/485] Attachments are not attached in outbound mails

Fixes #223
---
 classes/class-supportflow-emails.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index a5adb13..77582f0 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -169,11 +169,7 @@ public function email_conversation( $ticket_id, $to ) {
 			$msg .= SupportFlow()->sanitize_ticket_reply( $ticket_reply->post_content );
 			$msg .= '<br><br>';
 
-			if ( $ticket_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $ticket_reply->ID, 'posts_per_page' => -1 ) ) ) {
-				foreach ( $ticket_attachments as $attachment ) {
-					$attachments[] = get_attached_file( $attachment->ID );
-				}
-			}
+			$attachments[] = $this->get_attached_files( $ticket_reply->ID );
 		}
 		self::mail( $to, $subject, $msg, 'Content-Type: text/html', $attachments );
 	}
@@ -247,9 +243,9 @@ public function get_quoted_text( $ticket ) {
 
 	public function get_attached_files( $reply_id ) {
 		$attachments = array();
-		if ( $ticket_attachments = get_posts( array( 'post_type' => 'attachment', 'post_parent' => $reply_id, 'posts_per_page' => -1 ) ) ) {
+		if ( $ticket_attachments = get_post_meta( $reply_id, 'sf_attachments' ) ) {
 			foreach ( $ticket_attachments as $attachment ) {
-				$attachments[] = get_attached_file( $attachment->ID );
+				$attachments[] = get_attached_file( $attachment );
 			}
 		}
 

From 1df7a4de71757fdeeb50ae2d03f668f514a8e501 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Wed, 5 Nov 2014 13:03:54 -0800
Subject: [PATCH 414/485] Add 'Requires at least' header.

Requires 3.5 because of `wp_kses_allowed_html()`.
---
 readme.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/readme.txt b/readme.txt
index 872e315..e263c80 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,6 +1,7 @@
 === SupportFlow ===
 Contributors: VarunAgw, danielbachhuber, Viper007Bond, andrewspittle
 Tags: Ticket, support, admin, customer, customer support, help desk, helpdesk, IT, support, ticket
+Requires at least: 3.5
 Tested up to: 3.9.2
 Stable tag: 0.3
 License: GPLv2 or later

From 8a75e7962396da5b591e41e7dc7f5c7f4079111d Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Wed, 5 Nov 2014 13:04:28 -0800
Subject: [PATCH 415/485] Tested up to 4.0.

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index e263c80..558f0bb 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: VarunAgw, danielbachhuber, Viper007Bond, andrewspittle
 Tags: Ticket, support, admin, customer, customer support, help desk, helpdesk, IT, support, ticket
 Requires at least: 3.5
-Tested up to: 3.9.2
+Tested up to: 4.0
 Stable tag: 0.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

From 377332804c49ea9aee5cc1155bb427c2b4797c03 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Wed, 5 Nov 2014 13:05:15 -0800
Subject: [PATCH 416/485] Add a basic logger to aid in troubleshooting.

See #180
---
 classes/class-supportflow-logger.php | 123 +++++++++++++++++++++++++++
 supportflow.php                      |   1 +
 2 files changed, 124 insertions(+)
 create mode 100644 classes/class-supportflow-logger.php

diff --git a/classes/class-supportflow-logger.php b/classes/class-supportflow-logger.php
new file mode 100644
index 0000000..b504ea9
--- /dev/null
+++ b/classes/class-supportflow-logger.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Provides a way for SupportFlow to log debugging messages, and for the admin to view them
+ */
+
+defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
+
+class SupportFlow_Logger extends SupportFlow {
+
+	function __construct() {
+		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
+	}
+
+	/**
+	 * Register the notifications to happen on which actions
+	 */
+	public function setup_actions() {
+		add_action( 'admin_menu', array( $this, 'add_admin_menu_items' ) );
+	}
+
+	/**
+	 * Log a message to the database to aid in debugging
+	 *
+	 * @param string $category
+	 * @param string $method The calling function, e.g. __METHOD__ or __FUNCTION__
+	 * @param string $message
+	 * @param array  $data An associative array of relevant variables to provide context and information about the event, e.g. compact( 'foo', 'bar' )
+	 */
+	public static function log( $category, $method, $message, $data = array() ) {
+		$max_number_log_entries = apply_filters( 'supportflow_max_number_log_entries', 30 );
+		$log_entries            = get_option( 'supportflow_log' );
+		$timestamp              = time();
+
+		if ( ! is_array( $log_entries ) ) {
+			$log_entries = array();
+		}
+
+		$log_entries[] = compact( 'timestamp', 'method', 'category', 'message', 'data' );
+
+		$offset      = max( count( $log_entries ) - $max_number_log_entries, 0 );    // The count() - max_number_log_entries can potentially be negative, so max() ensures it's always >= 0
+		$log_entries = array_slice( $log_entries, $offset, $max_number_log_entries );
+
+		update_option( 'supportflow_log', $log_entries );
+		do_action( 'supportflow_log', $timestamp, $method, $category, $message, $data );
+	}
+
+	/**
+	 * Add a page to display log items
+	 *
+	 * Disabled by default to avoid cluttering the menu with something that is rarely used
+	 */
+	public function add_admin_menu_items() {
+		if ( apply_filters( 'supportflow_show_log', false ) ) {
+			add_submenu_page(
+				'edit.php?post_type=' . SupportFlow()->post_type,
+				__( 'Log', 'supportflow' ),
+				__( 'Log', 'supportflow' ),
+				'manage_options',
+				'log',
+				array( $this, 'markup_log_page' )
+			);
+		}
+	}
+
+	/**
+	 * Creates the markup for the Log page
+	 */
+	public static function markup_log_page() {
+		if ( ! current_user_can( 'manage_options' ) ) {
+			wp_die( "Cheatin' uh?" );
+		}
+
+		$log_entries     = get_option( 'supportflow_log', array() );
+		$datetime_format = get_option( 'date_format' ) . ' ' . get_option( 'time_format' );
+
+		?>
+
+		<div class="wrap">
+			<div id="icon-options-general" class="icon32"><br /></div>
+			<h2><?php _e( 'SupportFlow Log', 'supportflow' ); ?></h2>
+
+			<p>
+				<strong><?php _e( 'Warning:', 'supportflow' ); ?></strong>
+				<?php _e( "These logs contain private data, so be very careful if you share them with anyone. Make sure you redact anything that you don't want to share.", 'supportflow' ); ?>
+			</p>
+
+			<table class="widefat">
+				<thead>
+					<tr>
+						<th><?php _e( 'Time', 'supportflow' ); ?></th>
+						<th><?php _e( 'Category', 'supportflow' ); ?></th>
+						<th><?php _e( 'Method', 'supportflow' ); ?></th>
+						<th><?php _e( 'Message', 'supportflow' ); ?></th>
+					</tr>
+				</thead>
+
+				<tbody>
+					<?php foreach ( $log_entries as $entry ) : ?>
+						<tr>
+							<td><?php echo esc_html( get_date_from_gmt( date_i18n( $datetime_format, $entry['timestamp'] ), $datetime_format ) ); ?></td>
+							<td><?php echo esc_html( $entry['category'] ); ?></td>
+							<td><?php echo esc_html( $entry['method'] ); ?></td>
+							<td>
+								<h3><?php echo esc_html( $entry['message'] ); ?></h3>
+
+								<?php if ( $entry['data'] ) : ?>
+									<div>
+										<pre><?php echo esc_html( print_r( $entry['data'], true ) ); ?></pre>
+										<?php // Note that any boolean values in $entry['data'] will be output as an empty string because of PHP's bool->string conversion ?>
+									</div>
+								<?php endif; ?>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+				</tbody>
+			</table>
+		</div> <!-- .wrap -->
+
+		<?php
+	}
+}
+
+SupportFlow()->extend->logger = new SupportFlow_Logger();
diff --git a/supportflow.php b/supportflow.php
index f1d7aad..f28b2ac 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -218,6 +218,7 @@ private function includes() {
 
 		/** Core **************************************************************/
 
+		require_once( $this->plugin_dir . 'classes/class-supportflow-logger.php' );
 		require_once( $this->plugin_dir . 'classes/class-supportflow-json-api.php' );
 		require_once( $this->plugin_dir . 'classes/class-supportflow-attachments.php' );
 		require_once( $this->plugin_dir . 'classes/class-supportflow-emails.php' );

From b3fc299297db93f056801305a53c95a798210167 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Wed, 5 Nov 2014 13:06:16 -0800
Subject: [PATCH 417/485] Add log entries for sending and retreiving messages.

Fixes #180
---
 classes/class-supportflow-email-replies.php | 76 ++++++++++++++++++++-
 classes/class-supportflow-emails.php        | 15 ++++
 readme.txt                                  | 16 ++++-
 3 files changed, 103 insertions(+), 4 deletions(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 0581ab0..c47d3f5 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -28,6 +28,8 @@ public function filter_reply_notify_subject( $subject, $reply_id, $ticket_id ) {
 	}
 
 	function retrieve_email_replies() {
+		SupportFlow()->extend->logger->log( 'email_retrieve', __METHOD__, __( 'Starting to retrieve new e-mail.', 'supportflow' ) );
+		$start_time = time();
 
 		// Opens a temp file
 		$tmp_file = sys_get_temp_dir() . '/sf_cron_lock.txt';
@@ -38,10 +40,18 @@ function retrieve_email_replies() {
 		$file_time = (int) fgets( $fp );
 		if ( 0 != $file_time && $time > $file_time + 2 * HOUR_IN_SECONDS ) {
 			flock( $fp, LOCK_UN );
+
+			SupportFlow()->extend->logger->log(
+				'email_retrieve',
+				__METHOD__,
+				__( "Forcibly released the lock because it's been locked for 2+ hours.", 'supportflow' ),
+				compact( 'time', 'file_time' )
+			);
 		}
 
 		// Die if temp file is locked. i.e. cron is running
 		if ( 6 != fwrite( $fp, 'length' ) ) {
+			SupportFlow()->extend->logger->log( 'email_retrieve', __METHOD__, __( 'Exiting early because another job is already running.', 'supportflow' ) );
 			die;
 		}
 
@@ -51,7 +61,12 @@ function retrieve_email_replies() {
 		fwrite( $fp, (string) $time );
 
 		// Lock the file while running cron
-		flock( $fp, LOCK_EX );
+		$lock_acquired = flock( $fp, LOCK_EX );
+		SupportFlow()->extend->logger->log(
+			'email_retrieve',
+			__METHOD__,
+			$lock_acquired ? __( 'Successfully acquired the lock.', 'supportflow' ) : __( 'Failed to acquire the lock.', 'supportflow' )
+		);
 
 		$email_accounts = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 		foreach ( $email_accounts as $id => $email_account ) {
@@ -65,8 +80,18 @@ function retrieve_email_replies() {
 		}
 
 		// Unlock the file and close it
-		flock( $fp, LOCK_UN );
+		$lock_released = flock( $fp, LOCK_UN );
 		fclose( $fp );
+		SupportFlow()->extend->logger->log(
+			'email_retrieve',
+			__METHOD__,
+			$lock_released ? __( 'Successfully released the lock.', 'supportflow' ) : __( 'Failed to release the lock.', 'supportflow' )
+		);
+
+		SupportFlow()->extend->logger->log(
+			'email_retrieve',
+			__METHOD__,
+			sprintf( __( 'Finished retrieving new e-mail after %d seconds', 'supportflow' ), time() - $start_time ) );
 	}
 
 	/**
@@ -82,6 +107,16 @@ public function download_and_process_email_replies( $connection_details ) {
 		$archive_box = "{$mailbox}{$connection_details['archive']}";
 
 		$imap_connection = imap_open( $mailbox, $connection_details['username'], $connection_details['password'] );
+
+		$redacted_connection_details = $connection_details;
+		$redacted_connection_details['password'] = '[redacted]';  // redact the password to avoid unnecessarily exposing it in logs
+		SupportFlow()->extend->logger->log(
+			'email_retrieve',
+			__METHOD__,
+			$imap_connection ? __( 'Successfully opened IMAP connection.', 'supportflow' ) : __( 'Failed to open IMAP connection.', 'supportflow' ),
+			compact( 'redacted_connection_details', 'mailbox' )
+		);
+
 		if ( ! $imap_connection ) {
 			return new WP_Error( 'connection-error', __( 'Error connecting to mailbox', 'supportflow' ) );
 		}
@@ -95,6 +130,13 @@ public function download_and_process_email_replies( $connection_details ) {
 		// Make sure here are new emails to process
 		$email_count = imap_num_msg( $imap_connection );
 		if ( $email_count < 1 ) {
+			SupportFlow()->extend->logger->log(
+				'email_retrieve',
+				__METHOD__,
+				__( 'No new messages to process.', 'supportflow' ),
+				compact( 'mailboxes' )
+			);
+
 			return false;
 		}
 
@@ -110,6 +152,14 @@ public function download_and_process_email_replies( $connection_details ) {
 			$email->body      = $this->get_body_from_connection( $imap_connection, $i );
 
 			if ( 0 === strcasecmp( $connection_details['username'], $email->headers->from[0]->mailbox . '@' . $email->headers->from[0]->host ) ) {
+				$connection_details['password'] = '[redacted]';  // redact the password to avoid unnecessarily exposing it in logs
+				SupportFlow()->extend->logger->log(
+					'email_retrieve',
+					__METHOD__,
+					__( 'Skipping message because it was sent from a SupportFlow account.', 'supportflow' ),
+					compact( 'email' )
+				);
+
 				continue;
 			}
 
@@ -139,7 +189,13 @@ public function download_and_process_email_replies( $connection_details ) {
 
 		imap_close( $imap_connection, CL_EXPUNGE );
 
-		return sprintf( __( 'Processed %d emails', 'supportflow' ), $success );
+		$status_message = sprintf( __( 'Processed %d emails', 'supportflow' ), $success );
+		SupportFlow()->extend->logger->log(
+			'email_retrieve',
+			__METHOD__,
+			$status_message
+		);
+		return $status_message;
 	}
 
 	/**
@@ -217,6 +273,13 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 			);
 			foreach ( $check_strings as $key => $value ) {
 				if ( What_The_Email()->is_robot( $key, $value ) ) {
+					SupportFlow()->extend->logger->log(
+						'email_retrieve',
+						__METHOD__,
+						__( 'Skipping e-mail because sender is a robot.', 'supportflow' ),
+						compact( 'email' )
+					);
+
 					return true;
 				}
 			}
@@ -285,6 +348,13 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 			update_post_meta( $new_reply->ID, self::email_id_key, $email_id );
 		}
 
+		SupportFlow()->extend->logger->log(
+			'email_retrieve',
+			__METHOD__,
+			// translators: %s is the sender's e-mail address
+			sprintf( __( 'Successfully imported e-mail from %s.', 'supportflow' ), $reply_author_email )
+		);
+
 		return true;
 	}
 
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 77582f0..ed8dcc8 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -191,6 +191,21 @@ public function mail( $to, $subject, $message, $headers = '', $attachments = arr
 			remove_action( 'phpmailer_init', array( $this, 'action_set_smtp_settings' ) );
 		}
 
+		// Log the result, but redact the password to avoid unnecessarily exposing it
+		// translators: %s is the recipients e-mail address
+		$log_message = $result ? __( 'Sending mail to %s succeeded', 'supportflow' ) : __( 'Sending mail to %s failed', 'supportflow' );
+		$log_message = sprintf( $log_message, is_array( $to ) ? implode( ',', $to ) : $to );
+		$redacted_smtp_account = $smtp_account;
+		if ( ! empty( $redacted_smtp_account ) ) {
+			$redacted_smtp_account['password'] = '[redacted]';
+		}
+		SupportFlow()->extend->logger->log(
+			'email_send',
+			__METHOD__,
+			$log_message,
+			compact( 'to', 'subject', 'message', 'headers', 'attachments', 'redacted_smtp_account', 'result' )
+		);
+
 		return $result;
 	}
 
diff --git a/readme.txt b/readme.txt
index 558f0bb..8a66c9b 100644
--- a/readme.txt
+++ b/readme.txt
@@ -42,12 +42,26 @@ To contribute to SupportFlow visit [github] (http://github.com/SupportFlow/suppo
 Now you are ready to use SupportFlow.
 
 == Frequently Asked Questions ==
-###How can I insert a SupportFlow contact form in my site.
+### How can I insert a SupportFlow contact form in my site.
 
 Just add **[supportflow_submissionform]** shortcode to the post you want to add SupportFlow form to.
 
+### Why aren't messages being sent or received? =
+After successfully adding an e-mail account under SupportFlow > E-mail Accounts, make sure you wait for at least 5 minutes because the retrieval script only runs once every 5 minutes.
+
+If it still isn't working, check the log for any error messages or clues. To view the logs, add this line to a
+[functionality plugin](http://wpcandy.com/teaches/how-to-create-a-functionality-plugin/), and then visit the SupportFlow > Log page.
+
+`add_filter( 'supportflow_show_log', '__return_true' );`
+
+**Warning:** The logs will contain private data, so be very careful if you share them with anyone. Make sure you redact anything that you don't want to share.
+
+
 == Changelog ==
 
+= 0.4 =
+* Added some logging to help troubleshoot problems.
+
 = 0.3 =
 * Auto-saving tickets
 * Recently created tickets widget in dashboard

From 6b2be9ab0f23664f15781067f3ed8f7a188d3a97 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Wed, 5 Nov 2014 13:15:14 -0800
Subject: [PATCH 418/485] Regenerate the min.js file.

---
 js/supportflow.min.js | 2 +-
 supportflow.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/supportflow.min.js b/js/supportflow.min.js
index e028158..31b711d 100644
--- a/js/supportflow.min.js
+++ b/js/supportflow.min.js
@@ -1,2 +1,2 @@
 /*! SupportFlow minified version */
-jQuery(document).ready(function(a){a(".toggle-link").click(function(b){var c=a(this).siblings(".toggle-content").css("display");a(".toggle-content").hide(500),a(".toggle-link").prop("title",SFToggleLinks.expand),"none"==c&&(a(this).siblings(".toggle-content").show(500),a(this).prop("title",SFToggleLinks.collapse)),b.preventDefault()}),a(a(".toggle-content")).each(function(){"none"==a(this).css("display")?a(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):a(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),a(".toggle-content").first().show(500)})}),jQuery(document).ready(function(a){a(".delete_email_account").click(function(b){if(b.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var c=a(this).data("account-id"),d="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,e="";e+='<form method="POST" id="remove_email_account" action="'+d+'">',e+='<input type="hidden" name="action" value="delete" />',e+=SFEmailAccounts.delete_email_account_nonce,e+='<input type="hidden" name="account_id" value='+c+" />",e+="</form>",a("body").append(e),a("#remove_email_account").submit()}}),a("#add_new_email_account #imap_ssl").change(function(){a("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),a("#add_new_email_account #smtp_ssl").change(function(){a("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(a){var b=function(b){b.preventDefault();var c=a("#email_conversation_to").val();a.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:c,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){a("#email_conversation_to").prop("disabled",!0),a("#email_conversation_submit").prop("disabled",!0),a("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(b){a("#email_conversation_status").html(b)},error:function(){a("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){a("#email_conversation_to").prop("disabled",!1),a("#email_conversation_submit").prop("disabled",!1)}})};a("#email_conversation_submit").click(b),a("#email_conversation_to").keyup(function(){10==event.keyCode&&b()})}),jQuery(document).ready(function(a){a(".permission_filters").change(function(){var b=a("#change_user option:selected").data("user-id"),c=a("#change_status option:selected").data("status");a.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:b,status:c,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(b){a("#user_permissions_table").html(b)}})}),a(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("permission-identifier"),e=b.prop("checked"),f=d.user_id,g=d.privilege_type,h=d.privilege_id;c.html(SFPermissions.changing_status),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:f,privilege_type:g,privilege_id:h,allowed:e,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var a=b.prop("checked");c.html(1==a?SFPermissions.allowed:SFPermissions.not_allowed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){a("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=a("#predefs").find("option:selected").data("content"),old_content=a(".predef:nth-child("+this.old_child+")").data("content"),current_content=a("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void a(".predef:nth-child("+this.old_child+")").prop("selected",!0);a("#reply").val(new_content),this.old_child=a("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(a){a(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("email-notfication-identifier"),e=b.prop("checked"),f=d.privilege_type,g=d.privilege_id;c.html(SFPreferences.changing_state),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:f,privilege_id:g,allowed:e,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var a=b.prop("checked");c.html(1==a?SFPreferences.subscribed:SFPreferences.unsubscribed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){if("sf_ticket"==pagenow){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var b=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return b.on("close",function(){var c=b.state().get("selection").toJSON();a.each(c,function(){var b='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",c='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";a("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+b+"&nbsp;"+c+"</li>"),a("#reply-attachments").val(a("#reply-attachments").val()+_.escape(this.id)+",")})}),b.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(a){a("#supportflow-details .meta-item-ok-button").click(function(b){var c=a(this).siblings(".meta-item-dropdown").children("option:selected"),d=a(this).closest(".meta-item"),e=d.children(".meta-item-name"),f=d.children(".meta-item-label");e.val(c.val()),f.text(c.text()),b.preventDefault()}),a("#supportflow-details .meta-item-toggle-button").click(function(b){a(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),b.preventDefault()}),a(".save-button").click(function(b){return""==a("#subject").val()?(a("#subject").focus(),alert(SFTickets.no_title_msg),void b.preventDefault()):""==a("#customers").val()?(a("#customers").focus(),alert(SFTickets.no_customer_msg),void b.preventDefault()):void 0}),a("#reply").keypress(function(b){!b.ctrlKey||10!=b.keyCode&&13!=b.keyCode||""==a(this).val()||a("#post").submit()}),a("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&a("#insert-reply").val(a("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),a("#close-ticket-submit").click(function(){a("#post .meta-item input[name='post_status']").val("sf_closed")}),a(".sf_toggle_quoted_text").click(function(b){b.preventDefault(),a(this).parent().html(a(this).data("quoted_text"))})}),jQuery(document).ready(function(a){a(".sf_autosave").keyup(function(){var b={};b.ticket_id=SFAutoSave.ticket_id,a(".sf_autosave").each(function(){element_key=a(this).attr("name"),element_value=a(this).val(),b[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",b,!1)})});
\ No newline at end of file
+jQuery(document).ready(function(a){a(".toggle-link").click(function(b){var c=a(this).siblings(".toggle-content").css("display");a(".toggle-content").hide(500),a(".toggle-link").prop("title",SFToggleLinks.expand),"none"==c&&(a(this).siblings(".toggle-content").show(500),a(this).prop("title",SFToggleLinks.collapse)),b.preventDefault()}),a(a(".toggle-content")).each(function(){"none"==a(this).css("display")?a(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):a(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),a(".toggle-content").first().show(500)})}),jQuery(document).ready(function(a){a(".delete_email_account").click(function(b){if(b.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var c=a(this).data("account-id"),d="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,e="";e+='<form method="POST" id="remove_email_account" action="'+d+'">',e+='<input type="hidden" name="action" value="delete" />',e+=SFEmailAccounts.delete_email_account_nonce,e+='<input type="hidden" name="account_id" value='+c+" />",e+="</form>",a("body").append(e),a("#remove_email_account").submit()}}),a("#add_new_email_account #imap_ssl").change(function(){a("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),a("#add_new_email_account #smtp_ssl").change(function(){a("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(a){var b=function(b){b.preventDefault();var c=a("#email_conversation_to").val();a.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:c,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){a("#email_conversation_to").prop("disabled",!0),a("#email_conversation_submit").prop("disabled",!0),a("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(b){a("#email_conversation_status").html(b)},error:function(){a("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){a("#email_conversation_to").prop("disabled",!1),a("#email_conversation_submit").prop("disabled",!1)}})};a("#email_conversation_submit").click(b),a("#email_conversation_to").keyup(function(){(10==event.keyCode||13==event.keyCode)&&b()})}),jQuery(document).ready(function(a){a(".permission_filters").change(function(){var b=a("#change_user option:selected").data("user-id"),c=a("#change_status option:selected").data("status");a.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:b,status:c,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(b){a("#user_permissions_table").html(b)}})}),a(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("permission-identifier"),e=b.prop("checked"),f=d.user_id,g=d.privilege_type,h=d.privilege_id;c.html(SFPermissions.changing_status),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:f,privilege_type:g,privilege_id:h,allowed:e,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var a=b.prop("checked");c.html(1==a?SFPermissions.allowed:SFPermissions.not_allowed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){a("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=a("#predefs").find("option:selected").data("content"),old_content=a(".predef:nth-child("+this.old_child+")").data("content"),current_content=a("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void a(".predef:nth-child("+this.old_child+")").prop("selected",!0);a("#reply").val(new_content),this.old_child=a("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(a){a(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("email-notfication-identifier"),e=b.prop("checked"),f=d.privilege_type,g=d.privilege_id;c.html(SFPreferences.changing_state),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:f,privilege_id:g,allowed:e,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var a=b.prop("checked");c.html(1==a?SFPreferences.subscribed:SFPreferences.unsubscribed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){if("sf_ticket"==pagenow){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var b=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return b.on("close",function(){var c=b.state().get("selection").toJSON();a.each(c,function(){var b='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",c='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";a("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+b+"&nbsp;"+c+"</li>"),a("#reply-attachments").val(a("#reply-attachments").val()+_.escape(this.id)+",")})}),b.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(a){a("#supportflow-details .meta-item-ok-button").click(function(b){var c=a(this).siblings(".meta-item-dropdown").children("option:selected"),d=a(this).closest(".meta-item"),e=d.children(".meta-item-name"),f=d.children(".meta-item-label");e.val(c.val()),f.text(c.text()),b.preventDefault()}),a("#supportflow-details .meta-item-toggle-button").click(function(b){a(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),b.preventDefault()}),a(".save-button").click(function(b){return""==a("#subject").val()?(a("#subject").focus(),alert(SFTickets.no_title_msg),void b.preventDefault()):""==a("#customers").val()?(a("#customers").focus(),alert(SFTickets.no_customer_msg),void b.preventDefault()):void 0}),a("#reply").keypress(function(b){!b.ctrlKey||10!=b.keyCode&&13!=b.keyCode||""==a(this).val()||a(".save-button").first().click()}),a("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&a("#insert-reply").val(a("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),a("#close-ticket-submit").click(function(){a("#post .meta-item input[name='post_status']").val("sf_closed")}),a(".sf_toggle_quoted_text").click(function(b){b.preventDefault(),a(this).parent().html(a(this).data("quoted_text"))})}),jQuery(document).ready(function(a){a(".sf_autosave").keyup(function(){var b={};b.ticket_id=SFAutoSave.ticket_id,a(".sf_autosave").each(function(){element_key=a(this).attr("name"),element_value=a(this).val(),b[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",b,!1)})});
\ No newline at end of file
diff --git a/supportflow.php b/supportflow.php
index f28b2ac..85f4504 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -146,7 +146,7 @@ private function setup_globals() {
 
 		/** Version ***********************************************************/
 
-		$this->version = '0.4-alpha1'; // SupportFlow version
+		$this->version = '0.4-alpha2'; // SupportFlow version
 
 		/** Paths *************************************************************/
 

From bf2e7b7fce6f5fb2329f627db01a2f28caefc3a6 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Wed, 5 Nov 2014 14:45:47 -0800
Subject: [PATCH 419/485] Don't attempt to send notifications when the `$to`
 address is empty.

We don't send notifications to the creater of a reply unless `supportflow_emails_notify_creator` is set to `true`, which can create a condition where the array of notification recipients is empty. In that case, we should abort instead of attempting to send a message to nobody, which will fail.
---
 classes/class-supportflow-emails.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index ed8dcc8..2aeaf5a 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -66,6 +66,17 @@ public function notify_agents_ticket_replies( $reply_id ) {
 			}
 		}
 
+		if ( empty( $agent_emails ) ) {
+			SupportFlow()->extend->logger->log(
+				'email_send',
+				__METHOD__,
+				__( 'Returning early because no customers to notify.', 'supportflow' ),
+				compact( 'customers' )
+			);
+
+			return;
+		}
+
 		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $ticket->ID );
 		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $ticket->ID, 'agent' );
 
@@ -116,6 +127,17 @@ public function notify_customers_ticket_replies( $reply_id, $cc = array(), $bcc
 			}
 		}
 
+		if ( empty( $customers ) ) {
+			SupportFlow()->extend->logger->log(
+				'email_send',
+				__METHOD__,
+				__( 'Returning early because no customers to notify.', 'supportflow' ),
+				compact( 'customers' )
+			);
+
+			return;
+		}
+
 		$attachments = $this->get_attached_files( $reply->ID );
 
 		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $ticket->ID );

From df2abff36904fb8b37da84c80cb179d915c8a44f Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Tue, 16 Dec 2014 14:13:07 -0800
Subject: [PATCH 420/485] Tested up to 4.1

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 8a66c9b..0bae662 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: VarunAgw, danielbachhuber, Viper007Bond, andrewspittle
 Tags: Ticket, support, admin, customer, customer support, help desk, helpdesk, IT, support, ticket
 Requires at least: 3.5
-Tested up to: 4.0
+Tested up to: 4.1
 Stable tag: 0.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

From 9931c4105d0001dbd90313d50969cc352ec867b5 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Mon, 12 Jan 2015 09:16:19 -0800
Subject: [PATCH 421/485] Use required date format for get_date_from_gmt().

It allows overriding the return format, but requires the date parameter to be in 'Y-m-d H:i:s'.
---
 classes/class-supportflow-logger.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-logger.php b/classes/class-supportflow-logger.php
index b504ea9..fa15e96 100644
--- a/classes/class-supportflow-logger.php
+++ b/classes/class-supportflow-logger.php
@@ -97,7 +97,7 @@ public static function markup_log_page() {
 				<tbody>
 					<?php foreach ( $log_entries as $entry ) : ?>
 						<tr>
-							<td><?php echo esc_html( get_date_from_gmt( date_i18n( $datetime_format, $entry['timestamp'] ), $datetime_format ) ); ?></td>
+							<td><?php echo esc_html( get_date_from_gmt( date_i18n( 'Y-m-d H:i:s', $entry['timestamp'] ), $datetime_format ) ); ?></td>
 							<td><?php echo esc_html( $entry['category'] ); ?></td>
 							<td><?php echo esc_html( $entry['method'] ); ?></td>
 							<td>

From 1b1ae85909ba82a7232365eaa2c269e0c8c71230 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Mon, 12 Jan 2015 09:23:13 -0800
Subject: [PATCH 422/485] Log output of imap_errors() when retrieving new
 messages.

---
 classes/class-supportflow-email-replies.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index c47d3f5..b541b60 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -110,11 +110,12 @@ public function download_and_process_email_replies( $connection_details ) {
 
 		$redacted_connection_details = $connection_details;
 		$redacted_connection_details['password'] = '[redacted]';  // redact the password to avoid unnecessarily exposing it in logs
+		$imap_errors = print_r( imap_errors(), true );
 		SupportFlow()->extend->logger->log(
 			'email_retrieve',
 			__METHOD__,
 			$imap_connection ? __( 'Successfully opened IMAP connection.', 'supportflow' ) : __( 'Failed to open IMAP connection.', 'supportflow' ),
-			compact( 'redacted_connection_details', 'mailbox' )
+			compact( 'redacted_connection_details', 'mailbox', 'imap_errors' )
 		);
 
 		if ( ! $imap_connection ) {

From 8f9cc5e8d7e328b613dd5edb6b6612a23496034a Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Wed, 14 Jan 2015 18:29:15 -0800
Subject: [PATCH 423/485] Remove unnecessary print_r() from logged variable.

---
 classes/class-supportflow-email-replies.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index b541b60..175dcdb 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -110,7 +110,7 @@ public function download_and_process_email_replies( $connection_details ) {
 
 		$redacted_connection_details = $connection_details;
 		$redacted_connection_details['password'] = '[redacted]';  // redact the password to avoid unnecessarily exposing it in logs
-		$imap_errors = print_r( imap_errors(), true );
+		$imap_errors = imap_errors();
 		SupportFlow()->extend->logger->log(
 			'email_retrieve',
 			__METHOD__,

From 5e64808c7c1f9f4669e406405a74d7b09371cf98 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Thu, 15 Jan 2015 14:23:09 -0800
Subject: [PATCH 424/485] Add error logging to e-mail account creation process.

---
 classes/class-supportflow-email-accounts.php | 33 ++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 2437016..32eedf1 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -320,6 +320,13 @@ function add_email_account( $imap_host, $imap_port, $imap_ssl, $smtp_host, $smtp
 		$password       = sanitize_text_field( $password );
 
 		if ( $this->email_account_exists( $imap_host, $smtp_host, $username ) ) {
+			SupportFlow()->extend->logger->log(
+				'email_accounts',
+				__METHOD__,
+				__( 'Account already exists.', 'supportflow' ),
+				compact( 'imap_host', 'imap_port', 'imap_ssl', 'smtp_host', 'smtp_port', 'smtp_ssl', 'username' )
+			);
+
 			return self::ACCOUNT_EXISTS;
 		}
 
@@ -328,10 +335,25 @@ function add_email_account( $imap_host, $imap_port, $imap_ssl, $smtp_host, $smtp
 			$ssl     = $imap_ssl ? '/ssl' : '';
 			$mailbox = '{' . $imap_host . ':' . $imap_port . $ssl . '}';
 			if ( $imap_stream = imap_open( $mailbox, $username, $password, 0, 0 ) ) {
+				SupportFlow()->extend->logger->log(
+					'email_accounts',
+					__METHOD__,
+					__( 'Successfully opened IMAP connection.', 'supportflow' ),
+					compact( 'imap_host', 'imap_port', 'imap_ssl', 'smtp_host', 'smtp_port', 'smtp_ssl', 'username', 'mailbox' )
+				);
+
 				imap_close( $imap_stream );
 			} else {
-				$error = imap_errors();
-				$error = $error[0];
+				$imap_errors = imap_errors();
+				$error       = $imap_errors[0];
+
+				SupportFlow()->extend->logger->log(
+					'email_accounts',
+					__METHOD__,
+					__( 'Failed to open IMAP connection.', 'supportflow' ),
+					compact( 'imap_host', 'imap_port', 'imap_ssl', 'smtp_host', 'smtp_port', 'smtp_ssl', 'username', 'mailbox', 'imap_errors' )
+				);
+
 				if ( (string) strpos( $error, 'Host not found' ) != '' ) {
 					return self::IMAP_HOST_NOT_FOUND;
 				} elseif ( (string) strpos( $error, 'Timed out' ) != '' ) {
@@ -362,6 +384,13 @@ function add_email_account( $imap_host, $imap_port, $imap_ssl, $smtp_host, $smtp
 
 			}
 
+			SupportFlow()->extend->logger->log(
+				'email_accounts',
+				__METHOD__,
+				$smtp_authentication ? __( 'Successfully authenticated with SMTP server.', 'supportflow' ) : __( 'Failed to authenticate with SMTP server.', 'supportflow' ),
+				compact( 'imap_host', 'imap_port', 'imap_ssl', 'smtp_host', 'smtp_port', 'smtp_ssl', 'username', 'mailbox' )
+			);
+
 			if ( ! isset( $smtp_authentication ) || ! $smtp_authentication ) {
 				return self::SMTP_AUTHENTICATION_FAILED;
 			}

From 5675f1d7e2c1dd3e7e8359d409a1e80ca8a8b141 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Thu, 15 Jan 2015 14:24:33 -0800
Subject: [PATCH 425/485] Add error logging to the e-mail sending process.

---
 classes/class-supportflow-emails.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 2aeaf5a..04cf347 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -200,6 +200,7 @@ public function email_conversation( $ticket_id, $to ) {
 	 * Send an email from SupportFlow
 	 */
 	public function mail( $to, $subject, $message, $headers = '', $attachments = array(), $smtp_account = null ) {
+		global $phpmailer;
 
 		if ( ! empty( $smtp_account ) ) {
 			$this->smtp_account = $smtp_account;
@@ -221,11 +222,13 @@ public function mail( $to, $subject, $message, $headers = '', $attachments = arr
 		if ( ! empty( $redacted_smtp_account ) ) {
 			$redacted_smtp_account['password'] = '[redacted]';
 		}
+		$errors = $phpmailer->ErrorInfo;
+
 		SupportFlow()->extend->logger->log(
 			'email_send',
 			__METHOD__,
 			$log_message,
-			compact( 'to', 'subject', 'message', 'headers', 'attachments', 'redacted_smtp_account', 'result' )
+			compact( 'to', 'subject', 'message', 'headers', 'attachments', 'redacted_smtp_account', 'result', 'errors' )
 		);
 
 		return $result;

From 518832bf05df04a5f4af6787b253f99269773bd6 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Thu, 15 Jan 2015 15:56:40 -0800
Subject: [PATCH 426/485] Bump version to 0.4

Fixes #202
---
 readme.txt      | 8 +++++++-
 supportflow.php | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/readme.txt b/readme.txt
index 0bae662..1a30a1e 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: VarunAgw, danielbachhuber, Viper007Bond, andrewspittle
 Tags: Ticket, support, admin, customer, customer support, help desk, helpdesk, IT, support, ticket
 Requires at least: 3.5
 Tested up to: 4.1
-Stable tag: 0.3
+Stable tag: 0.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -60,7 +60,13 @@ If it still isn't working, check the log for any error messages or clues. To vie
 == Changelog ==
 
 = 0.4 =
+* Uploads are now attached when sending a reply.
+* Fix the timestamps on replies.
+* Added ctrl-enter keyboard shortcut to submit replies.
+* The original message is now quoted in replies.
+* Added a filter to modify the IMAP cron interval.
 * Added some logging to help troubleshoot problems.
+* [Full changelog](https://github.com/SupportFlow/supportflow/compare/c1535678da9a8380e42672ceef71174f2d01fc88...5675f1d7e2c1dd3e7e8359d409a1e80ca8a8b141)
 
 = 0.3 =
 * Auto-saving tickets
diff --git a/supportflow.php b/supportflow.php
index 85f4504..123a3c2 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -7,7 +7,7 @@
  * Plugin URI:  https://wordpress.org/plugins/supportflow/
  * Description: Reinventing how you support your customers.
  * Author:      Daniel Bachhuber, Varun Agrawal, Alex Mills, Andrew Spittle
- * Version:     0.4-alpha1
+ * Version:     0.4
  *
  * Text Domain: supportflow
  * Domain Path: /languages/
@@ -146,7 +146,7 @@ private function setup_globals() {
 
 		/** Version ***********************************************************/
 
-		$this->version = '0.4-alpha2'; // SupportFlow version
+		$this->version = '0.4'; // SupportFlow version
 
 		/** Paths *************************************************************/
 

From 89fd8594261a67644c51268f24ac42186d6eadbc Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Fri, 16 Jan 2015 12:11:59 -0800
Subject: [PATCH 427/485] Correct spelling of separated.

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 38303f2..e429a55 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -618,7 +618,7 @@ public function meta_box_other_customers_tickets() {
 
 	public function meta_box_email_conversation() {
 		?>
-		<p class="description"><?php _e( "Please enter E-Mail address seperated by comma to whom you want to send this conversation.", 'supportflow' ) ?></p>
+		<p class="description"><?php _e( "Please enter E-Mail address separated by comma to whom you want to send this conversation.", 'supportflow' ) ?></p>
 		<br />
 		<input type="text" id="email_conversation_to" />
 		<?php submit_button( __( 'Send', 'supportflow' ), '', 'email_conversation_submit', false ); ?>

From aa0e8b9e78b8a664c64d5cd29e5928e0f4cf9ad6 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Fri, 16 Jan 2015 12:17:20 -0800
Subject: [PATCH 428/485] Explicitly declare the visiblity of methods in
 SupportFlow_Table.

The method visibility must be compatible with the parent class, so it's best to be explicit about it as a reminder.

The remaining methods will have different changes in the next commit.
---
 classes/class-supportflow-table.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/class-supportflow-table.php b/classes/class-supportflow-table.php
index 839181f..5bf5b3d 100644
--- a/classes/class-supportflow-table.php
+++ b/classes/class-supportflow-table.php
@@ -47,7 +47,7 @@ public function set_no_items( $msg ) {
 		$this->no_item_message = wp_kses( $msg, $allowed_html );
 	}
 
-	function no_items() {
+	public function no_items() {
 		$no_item_message = $this->no_item_message;
 
 		if ( $no_item_message === null ) {
@@ -57,7 +57,7 @@ function no_items() {
 		}
 	}
 
-	function print_column_headers( $with_id = true ) {
+	public function print_column_headers( $with_id = true ) {
 		if ( $this->display_col_headers ) {
 			parent::print_column_headers( $with_id );
 		}
@@ -74,7 +74,7 @@ function display_tablenav( $which ) {
 	 *
 	 * @param array $columns
 	 */
-	function set_columns( $columns ) {
+	public function set_columns( $columns ) {
 		$this->_column_headers = array( $columns, array(), array() );
 	}
 
@@ -83,7 +83,7 @@ function set_columns( $columns ) {
 	 *
 	 * @param array $data
 	 */
-	function set_data( $data ) {
+	public function set_data( $data ) {
 		$this->items = $data;
 	}
 }

From 9dc1af99fca592b62af28164450bce1cf38ad541 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Fri, 16 Jan 2015 12:25:44 -0800
Subject: [PATCH 429/485] Align SupportFlow_Table method visibility with
 WP_List_Table.

r31210-core introduced a noop method for WP_List_Table::column_default(), with a visibility of public. Since we had declared it protected, SupportFlow crashed with fatal errors.

r31210-core was modified in r31211-core to use protected instead of public, but we're intentionally using public now so that Core can revert to public if they want.

See https://core.trac.wordpress.org/changeset/31210
See https://core.trac.wordpress.org/changeset/31211
Fixes #238
---
 classes/class-supportflow-table.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-table.php b/classes/class-supportflow-table.php
index 5bf5b3d..a13049d 100644
--- a/classes/class-supportflow-table.php
+++ b/classes/class-supportflow-table.php
@@ -29,7 +29,7 @@ function __construct( $table_class = '', $display_nav = true, $display_col_heade
 		$this->display_col_headers = $display_col_headers;
 	}
 
-	protected function column_default( $item, $column_name ) {
+	public function column_default( $item, $column_name ) {
 		return $item[$column_name];
 	}
 
@@ -63,7 +63,7 @@ public function print_column_headers( $with_id = true ) {
 		}
 	}
 
-	function display_tablenav( $which ) {
+	protected function display_tablenav( $which ) {
 		if ( $this->display_nav ) {
 			parent::display_tablenav( $which );
 		}

From 07f8c761f942a3bff3f1760529a5c9215b43db85 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Tue, 3 Feb 2015 10:45:22 -0800
Subject: [PATCH 430/485] Add filter for customers assigned to a new ticket.

---
 classes/class-supportflow-email-replies.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 175dcdb..04fc202 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -306,6 +306,7 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 			}
 		}
 		$customers[] = $reply_author_email;
+		$customers = apply_filters( 'supportflow_new_email_customers', $customers, $email, $ticket_id, $email_account_id );
 
 		$message = SupportFlow()->sanitize_ticket_reply( $message );
 

From fc1ca795add80296bf1b7c1431015c6387bb9528 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Wed, 22 Apr 2015 16:31:39 -0700
Subject: [PATCH 431/485] Add iandunn to contributors list.

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 1a30a1e..439e9f5 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,5 +1,5 @@
 === SupportFlow ===
-Contributors: VarunAgw, danielbachhuber, Viper007Bond, andrewspittle
+Contributors: VarunAgw, danielbachhuber, Viper007Bond, andrewspittle, iandunn
 Tags: Ticket, support, admin, customer, customer support, help desk, helpdesk, IT, support, ticket
 Requires at least: 3.5
 Tested up to: 4.1

From 6386c0e18d58f061da3d0588037de0df2b6eecfe Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Wed, 22 Apr 2015 16:31:58 -0700
Subject: [PATCH 432/485] Tested up to 4.2

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 439e9f5..5e45b05 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,7 +2,7 @@
 Contributors: VarunAgw, danielbachhuber, Viper007Bond, andrewspittle, iandunn
 Tags: Ticket, support, admin, customer, customer support, help desk, helpdesk, IT, support, ticket
 Requires at least: 3.5
-Tested up to: 4.1
+Tested up to: 4.2
 Stable tag: 0.4
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

From 10d4a914f4f20fdd16d1f7243a47f8e3107e6116 Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Tue, 23 Jun 2015 16:06:35 +0300
Subject: [PATCH 433/485] Check for the imap extension before initializing
 anything.

Fixes #246, #239.
---
 supportflow.php | 61 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 58 insertions(+), 3 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index 123a3c2..51fd9e3 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -64,9 +64,12 @@ class SupportFlow {
 	public static function instance() {
 		if ( ! isset( self::$instance ) ) {
 			self::$instance = new SupportFlow;
-			self::$instance->setup_globals();
-			self::$instance->includes();
-			self::$instance->setup_actions();
+
+			if ( self::$instance->requirements_ok() ) {
+				self::$instance->setup_globals();
+				self::$instance->includes();
+				self::$instance->setup_actions();
+			}
 		}
 
 		return self::$instance;
@@ -132,6 +135,26 @@ public function __set( $key, $value ) {
 
 	/** Private Methods *******************************************************/
 
+	/**
+	 * Check SupportFlow Requirements.
+	 *
+	 * @access private
+	 */
+	private function requirements_ok() {
+		$this->data['requirements'] = array();
+
+		// Require the php imap extension.
+		if ( ! function_exists( 'imap_open' ) ) {
+			$this->data['requirements'][] = 'imap';
+		}
+
+		if ( ! has_action( 'admin_notices', array( $this, 'action_requirements_admin_notices' ) ) && ! empty( $this->data['requirements'] ) ) {
+			add_action( 'admin_notices', array( $this, 'action_requirements_admin_notices' ) );
+		}
+
+		return empty( $this->data['requirements'] );
+	}
+
 	/**
 	 * Set some smart defaults to class variables. Allow some of them to be
 	 * filtered to allow for early overriding.
@@ -305,6 +328,38 @@ public function action_init_register_post_type() {
 		);
 	}
 
+	/**
+	 * Print requirements admin notices if any.
+	 */
+	public function action_requirements_admin_notices() {
+		if ( empty( $this->requirements ) ) {
+			return;
+		}
+
+		$message = '';
+		$strings = array(
+			'imap' => __( 'The PHP IMAP extension is required to collect incoming e-mail messages.', 'supportflow' ),
+		);
+
+		foreach ( $this->requirements as $key ) {
+			if ( empty( $strings[ $key ] ) ) {
+				continue;
+			}
+
+			$message .= sprintf( '<br />%s', esc_html( $strings[ $key ] ) );
+		}
+
+		if ( ! empty( $message ) ) {
+			$message = sprintf( '<p>%s%s</p>',
+				esc_html__( 'Your WordPress install did not meet the following requirements for SupportFlow:', 'supportflow' ),
+				$message );
+		} else {
+			$message = '<p>' . esc_html__( 'An unknown SupportFlow error has occurred.', 'supportflow' ) . '</p>';
+		}
+
+		printf( '<div class="error">%s</div>', $message );
+	}
+
 	/**
 	 * Register our custom taxonomies
 	 */

From ddac97c5e40b9d726a9f6583d8601d090339abfb Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Tue, 23 Jun 2015 16:40:56 +0300
Subject: [PATCH 434/485] Don't trigger a PHP warning in `add_ticket_reply`
 when running during cron.

---
 supportflow.php | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index 51fd9e3..f7bb426 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -871,9 +871,16 @@ public function add_ticket_reply( $ticket_id, $reply_text, $details = array() )
 		);
 
 		$reply = apply_filters( 'supportflow_pre_insert_ticket_reply', $reply );
-		remove_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
-		$reply_id = wp_insert_post( $reply );
-		add_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
+
+		// Remove the save_post admin action callback if it exists.
+		if ( ! empty( SupportFlow()->extend->admin ) && is_callable( array( SupportFlow()->extend->admin, 'action_save_post' ) ) ) {
+			remove_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
+			$reply_id = wp_insert_post( $reply );
+			add_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
+		} else {
+			$reply_id = wp_insert_post( $reply );
+		}
+
 		// If there are attachment IDs store them as meta
 		if ( is_array( $attachment_ids ) ) {
 			foreach ( $attachment_ids as $attachment_id ) {
@@ -895,9 +902,14 @@ public function add_ticket_reply( $ticket_id, $reply_text, $details = array() )
 		delete_post_meta( $ticket_id, '_sf_autosave_reply' );
 
 		// Adding a ticket reply updates the post modified time for the ticket
-		remove_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
-		wp_update_post( array( 'ID' => $ticket_id, 'post_modified' => current_time( 'mysql' ) ) );
-		add_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
+		if ( ! empty( SupportFlow()->extend->admin ) && is_callable( array( SupportFlow()->extend->admin, 'action_save_post' ) ) ) {
+			remove_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
+			wp_update_post( array( 'ID' => $ticket_id, 'post_modified' => current_time( 'mysql' ) ) );
+			add_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
+		} else {
+			wp_update_post( array( 'ID' => $ticket_id, 'post_modified' => current_time( 'mysql' ) ) );
+		}
+
 		clean_post_cache( $ticket_id );
 		do_action( 'supportflow_ticket_reply_added', $reply_id, $details['cc'], $details['bcc'] );
 

From 70eaa23f0c9880aa3f324de375836081949c87c7 Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Wed, 24 Jun 2015 15:54:23 +0300
Subject: [PATCH 435/485] Improve processing of and archiving e-mails in an
 IMAP mailbox.

When adding an e-mail account with existing e-mails, SupportFlow
can go in a very long loop to collect all existing messages, and
previously there was no cap, and since e-mails were archived only
after the whole batch was processed, a simple php timeout caused
SupportFlow to go into an endless loop of collecting messages.

This commit places a filterable 20 cap on the number of messages
processed in one single cron run. Additionally, we make sure that
each message is archived right after it's been processed.

Fixes #249
---
 classes/class-supportflow-email-replies.php | 32 ++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 04fc202..9e3e02f 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -142,15 +142,19 @@ public function download_and_process_email_replies( $connection_details ) {
 		}
 
 		$emails        = imap_search( $imap_connection, 'ALL', SE_UID );
-		$archive_mails = array();
+		$email_count   = min( $email_count, apply_filters( 'supportflow_max_email_process_count', 20 ) );
+		$emails        = array_slice( $emails, 0, $email_count );
+		$processed     = 0;
 
-		// Process each new email and put it in the archive mailbox when done
-		$success = 0;
-		for ( $i = 1; $i <= $email_count; $i ++ ) {
+		// Process each new email and put it in the archive mailbox when done.
+		foreach ( $emails as $uid ) {
 			$email            = new stdClass;
-			$email->headers   = imap_headerinfo( $imap_connection, $i );
-			$email->structure = imap_fetchstructure( $imap_connection, $i );
-			$email->body      = $this->get_body_from_connection( $imap_connection, $i );
+			$email->uid       = $uid;
+			$email->msgno     = imap_msgno( $imap_connection, $email->uid );
+
+			$email->headers   = imap_headerinfo( $imap_connection, $email->msgno );
+			$email->structure = imap_fetchstructure( $imap_connection, $email->msgno );
+			$email->body      = $this->get_body_from_connection( $imap_connection, $email->msgno );
 
 			if ( 0 === strcasecmp( $connection_details['username'], $email->headers->from[0]->mailbox . '@' . $email->headers->from[0]->host ) ) {
 				$connection_details['password'] = '[redacted]';  // redact the password to avoid unnecessarily exposing it in logs
@@ -175,22 +179,18 @@ public function download_and_process_email_replies( $connection_details ) {
 			}
 
 			// @todo Confirm this a message we want to process
-			$ret = $this->process_email( $imap_connection, $email, $i, $connection_details['username'], $connection_details['account_id'] );
+			$result = $this->process_email( $imap_connection, $email, $email->msgno, $connection_details['username'], $connection_details['account_id'] );
 
 			// If it was successful, move the email to the archive
-			if ( $ret ) {
-				$archive_mails[] = $i;
+			if ( $result ) {
+				imap_mail_move( $imap_connection, $email->uid, $connection_details['archive'], CP_UID );
+				$processed++;
 			}
 		}
 
-		foreach ( $archive_mails as $msg_number ) {
-			imap_mail_move( $imap_connection, $emails[$msg_number - 1], $connection_details['archive'], CP_UID );
-			$success ++;
-		}
-
 		imap_close( $imap_connection, CL_EXPUNGE );
 
-		$status_message = sprintf( __( 'Processed %d emails', 'supportflow' ), $success );
+		$status_message = sprintf( __( 'Processed %d emails', 'supportflow' ), $processed );
 		SupportFlow()->extend->logger->log(
 			'email_retrieve',
 			__METHOD__,

From 1760861f4997ce04db1e5cd375549f1b474c4587 Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Wed, 24 Jun 2015 16:23:22 +0300
Subject: [PATCH 436/485] Customer e-mail notifications should only be
 triggered by agents.

Besides, when multiple parties are involved in a conversation,
smart people will use reply-to-all anyway.

Fixes #250.
---
 classes/class-supportflow-emails.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 04cf347..8b3d486 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -102,12 +102,17 @@ public function notify_agents_ticket_replies( $reply_id ) {
 	 * When a new reply is added to the ticket, notify all of the customers on the ticket
 	 */
 	public function notify_customers_ticket_replies( $reply_id, $cc = array(), $bcc = array() ) {
-		// Customers shouldn't receive private replies
+		// Customers shouldn't receive private replies.
 		$reply = get_post( $reply_id );
 		if ( ! $reply || 'private' == $reply->post_status ) {
 			return;
 		}
 
+		// Customers shouldn't get replies triggered by non-agents.
+		if ( $reply->post_author < 1 ) {
+			return;
+		}
+
 		$ticket    = SupportFlow()->get_ticket( $reply->post_parent );
 		$customers = SupportFlow()->get_ticket_customers( $ticket->ID, array( 'fields' => 'emails' ) );
 
@@ -293,4 +298,4 @@ public function get_attached_files( $reply_id ) {
 	}
 }
 
-SupportFlow()->extend->emails = new SupportFlow_Emails();
\ No newline at end of file
+SupportFlow()->extend->emails = new SupportFlow_Emails();

From eeaab25c7f59dbcd7b1313a706544a611ed2d8eb Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Wed, 24 Jun 2015 19:21:04 +0300
Subject: [PATCH 437/485] Remove unnecessary inheritance of the SupportFlow
 class.

Fixes #248.
---
 classes/class-supportflow-admin.php               | 2 +-
 classes/class-supportflow-attachments.php         | 4 ++--
 classes/class-supportflow-dashboard.php           | 2 +-
 classes/class-supportflow-email-accounts.php      | 4 ++--
 classes/class-supportflow-email-notifications.php | 2 +-
 classes/class-supportflow-email-replies.php       | 2 +-
 classes/class-supportflow-emails.php              | 4 +++-
 classes/class-supportflow-json-api.php            | 4 ++--
 classes/class-supportflow-logger.php              | 2 +-
 classes/class-supportflow-permissions.php         | 2 +-
 classes/class-supportflow-predefined-replies.php  | 4 ++--
 classes/class-supportflow-preferences.php         | 2 +-
 classes/class-supportflow-statistics.php          | 2 +-
 classes/class-supportflow-ui-submissionform.php   | 4 ++--
 classes/class-supportflow-ui-widget.php           | 4 ++--
 15 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index e429a55..2f3ba52 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -5,7 +5,7 @@
 
 defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
-class SupportFlow_Admin extends SupportFlow {
+class SupportFlow_Admin {
 
 	function __construct() {
 		add_action( 'wp_ajax_sf_forward_conversation', array( $this, 'action_wp_ajax_sf_email_conversation' ) );
diff --git a/classes/class-supportflow-attachments.php b/classes/class-supportflow-attachments.php
index 718f282..b132f41 100644
--- a/classes/class-supportflow-attachments.php
+++ b/classes/class-supportflow-attachments.php
@@ -5,7 +5,7 @@
 
 defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
-class SupportFlow_Attachments extends SupportFlow {
+class SupportFlow_Attachments {
 
 	function __construct() {
 		add_action( 'init', array( $this, 'action_init_download_attachment' ) );
@@ -109,4 +109,4 @@ public function secure_attachment_file( $attachment_id ) {
 	}
 }
 
-SupportFlow()->extend->attachments = new SupportFlow_Attachments();
\ No newline at end of file
+SupportFlow()->extend->attachments = new SupportFlow_Attachments();
diff --git a/classes/class-supportflow-dashboard.php b/classes/class-supportflow-dashboard.php
index 53f84b4..45981d4 100644
--- a/classes/class-supportflow-dashboard.php
+++ b/classes/class-supportflow-dashboard.php
@@ -5,7 +5,7 @@
 
 defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
-class SupportFlow_Dashboard extends SupportFlow {
+class SupportFlow_Dashboard {
 
 	function __construct() {
 		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 32eedf1..77f68bd 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -8,7 +8,7 @@
 /**
  * Setting page to add/remove new E-Mail accounts to get replies
  */
-class SupportFlow_Email_Accounts extends SupportFlow {
+class SupportFlow_Email_Accounts {
 	var $email_accounts;
 	var $existing_email_accounts;
 
@@ -454,4 +454,4 @@ function email_account_exists( $imap_host, $smtp_host, $username ) {
 	}
 }
 
-SupportFlow()->extend->email_accounts = new SupportFlow_Email_Accounts();
\ No newline at end of file
+SupportFlow()->extend->email_accounts = new SupportFlow_Email_Accounts();
diff --git a/classes/class-supportflow-email-notifications.php b/classes/class-supportflow-email-notifications.php
index 665d882..c53cd43 100644
--- a/classes/class-supportflow-email-notifications.php
+++ b/classes/class-supportflow-email-notifications.php
@@ -11,7 +11,7 @@
 	require_once( ABSPATH . 'wp-admin/includes/class-wp-list-table.php' );
 }
 
-class SupportFlow_Email_Notifications extends SupportFlow {
+class SupportFlow_Email_Notifications {
 
 	/**
 	 * Return an array containing tag/E-Mail account user opted to receive E-Mail notifications.
diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 9e3e02f..6643362 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -5,7 +5,7 @@
 
 defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
-class SupportFlow_Email_Replies extends SupportFlow {
+class SupportFlow_Email_Replies {
 
 	const email_id_key = 'orig_email_id';
 
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 8b3d486..de7345b 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -5,7 +5,9 @@
 
 defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
-class SupportFlow_Emails extends SupportFlow {
+class SupportFlow_Emails {
+
+	public $from_address = null;
 
 	function __construct() {
 		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
diff --git a/classes/class-supportflow-json-api.php b/classes/class-supportflow-json-api.php
index 3849c48..b1d31c1 100644
--- a/classes/class-supportflow-json-api.php
+++ b/classes/class-supportflow-json-api.php
@@ -2,7 +2,7 @@
 
 defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
-class SupportFlow_JSON_API extends SupportFlow {
+class SupportFlow_JSON_API {
 
 	public $action = 'supportflow_json';
 
@@ -48,4 +48,4 @@ public function action_wp_ajax_supportflow_json() {
 	}
 }
 
-SupportFlow()->extend->jsonapi = new SupportFlow_JSON_API();
\ No newline at end of file
+SupportFlow()->extend->jsonapi = new SupportFlow_JSON_API();
diff --git a/classes/class-supportflow-logger.php b/classes/class-supportflow-logger.php
index fa15e96..b0ae259 100644
--- a/classes/class-supportflow-logger.php
+++ b/classes/class-supportflow-logger.php
@@ -5,7 +5,7 @@
 
 defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
-class SupportFlow_Logger extends SupportFlow {
+class SupportFlow_Logger {
 
 	function __construct() {
 		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 75f13e8..df15e58 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -7,7 +7,7 @@
 
 defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
-class SupportFlow_Permissions extends SupportFlow {
+class SupportFlow_Permissions {
 
 	/**
 	 * Holds all of the capabilities managed by SupportFlow.
diff --git a/classes/class-supportflow-predefined-replies.php b/classes/class-supportflow-predefined-replies.php
index 0fe8859..e08ee1e 100644
--- a/classes/class-supportflow-predefined-replies.php
+++ b/classes/class-supportflow-predefined-replies.php
@@ -5,7 +5,7 @@
 
 defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
-class SupportFlow_Predefined_Replies extends SupportFlow {
+class SupportFlow_Predefined_Replies {
 
 	function __construct() {
 		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
@@ -93,4 +93,4 @@ public function action_admin_menu_predefined_replies() {
 	}
 }
 
-SupportFlow()->extend->predefined_replies = new SupportFlow_Predefined_Replies();
\ No newline at end of file
+SupportFlow()->extend->predefined_replies = new SupportFlow_Predefined_Replies();
diff --git a/classes/class-supportflow-preferences.php b/classes/class-supportflow-preferences.php
index 756f65e..6cd8946 100644
--- a/classes/class-supportflow-preferences.php
+++ b/classes/class-supportflow-preferences.php
@@ -6,7 +6,7 @@
 
 defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
-class SupportFlow_Preferences extends SupportFlow {
+class SupportFlow_Preferences {
 
 	public function __construct() {
 		add_action( 'admin_menu', array( $this, 'action_admin_menu' ) );
diff --git a/classes/class-supportflow-statistics.php b/classes/class-supportflow-statistics.php
index ea8b9c8..c51c8a5 100644
--- a/classes/class-supportflow-statistics.php
+++ b/classes/class-supportflow-statistics.php
@@ -7,7 +7,7 @@
 
 defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
-class SupportFlow_Statistics extends SupportFlow {
+class SupportFlow_Statistics {
 
 	public function __construct() {
 		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
diff --git a/classes/class-supportflow-ui-submissionform.php b/classes/class-supportflow-ui-submissionform.php
index 6b672c9..f4da26c 100644
--- a/classes/class-supportflow-ui-submissionform.php
+++ b/classes/class-supportflow-ui-submissionform.php
@@ -2,7 +2,7 @@
 
 defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
-class SupportFlow_UI_SubmissionForm extends SupportFlow {
+class SupportFlow_UI_SubmissionForm {
 
 	public $messages = array();
 
@@ -129,4 +129,4 @@ public function action_init_handle_form_submission() {
 	}
 }
 
-SupportFlow()->extend->ui->submissionform = new SupportFlow_UI_SubmissionForm();
\ No newline at end of file
+SupportFlow()->extend->ui->submissionform = new SupportFlow_UI_SubmissionForm();
diff --git a/classes/class-supportflow-ui-widget.php b/classes/class-supportflow-ui-widget.php
index 86a51b7..5c095f9 100644
--- a/classes/class-supportflow-ui-widget.php
+++ b/classes/class-supportflow-ui-widget.php
@@ -2,7 +2,7 @@
 
 defined( 'ABSPATH' ) or die( "Cheatin' uh?" );
 
-class SupportFlow_UI_Widget extends SupportFlow {
+class SupportFlow_UI_Widget {
 
 	public $script_slug = 'supportflow-user-widget';
 
@@ -177,4 +177,4 @@ public function action_template_redirect() {
 	}
 }
 
-SupportFlow()->extend->ui->widget = new SupportFlow_UI_Widget();
\ No newline at end of file
+SupportFlow()->extend->ui->widget = new SupportFlow_UI_Widget();

From 6a0bbff47213f4f0dd3738c9265924bffd5af631 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Thu, 25 Jun 2015 07:54:45 -0700
Subject: [PATCH 438/485] Add kovshenin to contributor list.

---
 readme.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/readme.txt b/readme.txt
index 5e45b05..64d88c8 100644
--- a/readme.txt
+++ b/readme.txt
@@ -1,5 +1,5 @@
 === SupportFlow ===
-Contributors: VarunAgw, danielbachhuber, Viper007Bond, andrewspittle, iandunn
+Contributors: VarunAgw, danielbachhuber, Viper007Bond, andrewspittle, iandunn, kovshenin
 Tags: Ticket, support, admin, customer, customer support, help desk, helpdesk, IT, support, ticket
 Requires at least: 3.5
 Tested up to: 4.2

From b65c2010320a7dbddca9568a11c6c370a170470b Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Fri, 26 Jun 2015 17:35:16 +0300
Subject: [PATCH 439/485] Add a new `supportflow_imap_ssl` filter.

This allows us to pass additional SSL-related flags to IMAP, such
as /novalidate-cert, /tls and others.
---
 classes/class-supportflow-email-accounts.php | 1 +
 classes/class-supportflow-email-replies.php  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 77f68bd..193ddc2 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -333,6 +333,7 @@ function add_email_account( $imap_host, $imap_port, $imap_ssl, $smtp_host, $smtp
 		if ( $test_login ) {
 			imap_timeout( IMAP_OPENTIMEOUT, apply_filters( 'supportflow_imap_open_timeout', 5 ) );
 			$ssl     = $imap_ssl ? '/ssl' : '';
+			$ssl     = apply_filters( 'supportflow_imap_ssl', $ssl, $imap_host );
 			$mailbox = '{' . $imap_host . ':' . $imap_port . $ssl . '}';
 			if ( $imap_stream = imap_open( $mailbox, $username, $password, 0, 0 ) ) {
 				SupportFlow()->extend->logger->log(
diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 6643362..2ec7247 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -101,6 +101,7 @@ public function download_and_process_email_replies( $connection_details ) {
 		imap_timeout( IMAP_OPENTIMEOUT, apply_filters( 'supportflow_imap_open_timeout', 5 ) );
 
 		$ssl = $connection_details['imap_ssl'] ? '/ssl' : '';
+		$ssl = apply_filters( 'supportflow_imap_ssl', $ssl, $connection_details['imap_host'] );
 
 		$mailbox     = "{{$connection_details['imap_host']}:{$connection_details['imap_port']}{$ssl}}";
 		$inbox       = "{$mailbox}{$connection_details['inbox']}";

From b120f7542286a0736452e4814835a921bcf498fa Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Fri, 26 Jun 2015 18:18:53 +0300
Subject: [PATCH 440/485] Add a new `supportflow_imap_folders` filter.

A lot of IMAP accounts are configured to namespace any mailboxes
with `INBOX.` and attempting to move to `ARCHIVE` or creating it
fails silently, causing the e-mails to be fetched over and over
again. With this filter, one is able to change the name of the
archive box.

This is a temporary solution until more user-friendly archive
mailbox picker is in place, and/or #245 is implemented.
---
 classes/class-supportflow-email-replies.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 2ec7247..eca6841 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -70,11 +70,13 @@ function retrieve_email_replies() {
 
 		$email_accounts = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 		foreach ( $email_accounts as $id => $email_account ) {
-			$imap_account = array_merge( $email_account, array(
-				'inbox'      => 'INBOX',
-				'archive'    => 'ARCHIVE',
-				'account_id' => $id,
-			) );
+			$imap_account = array_merge( $email_account,
+				apply_filters( 'supportflow_imap_folders', array(
+					'inbox'      => 'INBOX',
+					'archive'    => 'ARCHIVE',
+					'account_id' => $id,
+				), $email_account )
+			);
 
 			$this->download_and_process_email_replies( $imap_account );
 		}

From 1afb15b4449116ef7cb0f881f7c982c9aa654105 Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Mon, 29 Jun 2015 20:50:14 +0300
Subject: [PATCH 441/485] Fix a typo.

---
 classes/class-supportflow-emails.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index de7345b..7b223d0 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -177,7 +177,7 @@ public function email_conversation( $ticket_id, $to ) {
 
 		$attachments = array();
 		$msg         = '';
-		$subject     = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $ticket->ID ) . ' ' . __( 'Conversation summery', 'supportflow' );
+		$subject     = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $ticket->ID ) . ' ' . __( 'Conversation summary', 'supportflow' );
 
 		$msg .= '<b>' . __( 'Title', 'supportflow' ) . ':</b> ' . esc_html( $ticket->post_title ) . '<br>';
 		$msg .= '<b>' . __( 'Status', 'supportflow' ) . ':</b> ' . SupportFlow()->post_statuses[$ticket->post_status]['label'] . '<br>';

From 4cf0af48b1e9334f2071227c5d6ea99bfa72a193 Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Mon, 29 Jun 2015 21:46:08 +0300
Subject: [PATCH 442/485] Let agents know when their e-mail delivery failed.

With bad SMTP settings outgoing e-mails can fail silently. With this
commit we look at the result from `wp_mail()` and let the agent
know if it failed so they can try resending, or contact the site
administrator.

Fixes #237.
---
 classes/class-supportflow-admin.php  | 6 ++++++
 classes/class-supportflow-emails.php | 3 ++-
 css/admin.css                        | 5 +++++
 css/supportflow.min.css              | 2 +-
 js/supportflow.min.js                | 2 +-
 5 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 2f3ba52..e3280ca 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -1057,6 +1057,12 @@ public function display_ticket_replies() {
 				echo '<p class="reply-author">' . esc_html( $reply_author ) . '</p>';
 				echo '</div>';
 				echo '<div class="ticket-reply">';
+
+				$mail_status = get_post_meta( $reply->ID, '_sf_mail_status', true );
+				if ( isset( $mail_status['result'] ) && $mail_status['result'] === false ) {
+					printf( '<span class="sf-delivery-failed"><span class="dashicons dashicons-info"></span> %s</span>', esc_html__( 'Delivery failed! Please check your SMTP settings and try again.' ) );
+				}
+
 				$post_content = wpautop( stripslashes( $reply->post_content ) );
 				// Make link clickable
 				$post_content = make_clickable( $post_content );
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 7b223d0..5a980c9 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -160,7 +160,8 @@ public function notify_customers_ticket_replies( $reply_id, $cc = array(), $bcc
 		$headers .= $this->get_cc_header( $cc );
 		$headers .= $this->get_bcc_header( $bcc );
 
-		self::mail( $customers, $subject, $message, $headers, $attachments, $smtp_account );
+		$result = self::mail( $customers, $subject, $message, $headers, $attachments, $smtp_account );
+		add_post_meta( $reply->ID, '_sf_mail_status', array( 'result' => $result ) );
 	}
 
 	/**
diff --git a/css/admin.css b/css/admin.css
index 66b1b12..b7071cb 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -214,6 +214,11 @@
 	width: 200px;
 }
 
+.sf-delivery-failed {
+	font-size: 0.9em;
+	line-height: 20px;
+}
+
 .metabox-holder .postbox-container .empty-container {
 	border: none;
 }
diff --git a/css/supportflow.min.css b/css/supportflow.min.css
index 08c709b..7668ebb 100644
--- a/css/supportflow.min.css
+++ b/css/supportflow.min.css
@@ -1,3 +1,3 @@
 /*! SupportFlow minified version */
 
-.subsubsub li.trash a{color:#BC0B0B}.customer_link{white-space:pre;vertical-align:top}#poststuff{padding-top:0}#side-sortables{margin-top:34px}#change_user_label{display:inline;font-weight:700;font-size:16px}#update_signature{width:30em}#supportflow-details .meta-item-label{font-weight:600}#supportflow-customers.postbox,#supportflow-subject.postbox{border:none;background:0 0}#supportflow-customers.postbox .inside,#supportflow-subject.postbox .inside{padding:0}#supportflow-customers .handlediv,#supportflow-customers h3.hndle,#supportflow-details .handlediv,#supportflow-details h3.hndle,#supportflow-replies .handlediv,#supportflow-replies h3.hndle,#supportflow-subject .handlediv,#supportflow-subject h3.hndle{display:none}#supportflow-details .handlediv,#supportflow-details h3.hndle{display:block}#supportflow-details #misc-publishing-actions label{display:inline-block}#supportflow-details #misc-publishing-actions select#post_status{width:100px}#supportflow-details #misc-publishing-actions span.the-date{font-weight:700}#supportflow-details #misc-publishing-actions div.last-activity{font-size:11px}#supportflow-customers h4,#supportflow-replies h4,#supportflow-subject h4{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:13px;font-weight:400;margin:10px 0 6px}#supportflow-subject.postbox input{width:100%;font-size:1.7em;padding-left:8px;padding-right:8px;line-height:100%;height:1.7em}#supportflow-customers.postbox input{width:100%;padding:8px;font-size:1.2em;height:2.6em}#supportflow-cc-bcc.postbox input{width:100%;font-size:1.2em}#supportflow-replies.postbox #ticket-reply-box{width:100%}#supportflow-replies.postbox textarea{width:100%;padding:8px;font-size:1.1em;font-size:1.2em}#supportflow-replies.postbox .inside #message-tools #submit-action{padding:0;margin-top:5px;float:right}#supportflow-replies.postbox .inside #message-tools #replies-attachments-wrap{float:left}#supportflow-replies #replies-attachments-list,#supportflow-replies #upload-messages{margin-top:9px;margin-left:2px;color:#666}#supportflow-replies.postbox .inside #message-tools #submit-action input[type=checkbox]{margin-top:-1px}#supportflow-replies.postbox .inside #message-tools #submit-action label{padding-top:2px;padding-left:5px;padding-right:25px}#supportflow-replies.postbox ul.private-replies{background-color:#FFFFE0;border:1px solid #E6DB55;padding:5px 10px}#supportflow-replies.postbox ul.private-replies li{border-top:1px solid #DFDFDF;margin-top:10px}#supportflow-replies.postbox ul.private-replies li:first-child{border-top:none;margin-top:0}#supportflow-replies.postbox ul.private-replies li .ticket-meta{color:#BBB;font-size:.9em;text-align:right}#supportflow-replies.postbox ul.ticket-replies li{clear:left;margin-top:20px;margin-bottom:20px}#supportflow-replies.postbox ul.private-replies li .ticket-reply-attachments li,#supportflow-replies.postbox ul.ticket-replies li .ticket-reply-attachments li{margin-top:3px;margin-bottom:3px;font-size:.9em}#supportflow-replies.postbox ul.ticket-replies li .reply-avatar{float:left;width:100px;word-wrap:break-word}#supportflow-replies.postbox ul.ticket-replies li .reply-author{margin:0;font-size:.9em;color:#666}#supportflow-replies.postbox ul.ticket-replies li .ticket-reply{background-color:#FFF;margin-left:105px;min-height:80px;padding:10px;font-size:1.1em;border:1px solid #DFDFDF;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;word-wrap:break-word}#supportflow-replies.postbox ul.ticket-replies li .ticket-meta{margin-left:105px;font-size:.9em;color:#666;margin-top:5px}#supportflow-replies.postbox .predefined_replies_dropdown{width:200px}.metabox-holder .postbox-container .empty-container{border:none}input::-webkit-input-placeholder{color:#BBB}input:-moz-placeholder{color:#BBB}textarea::-webkit-input-placeholder{color:#BBB}textarea:-moz-placeholder{color:#BBB}#sf_my_tickets .toggle-content{display:none}#sf_my_tickets .tablenav{height:10px}#sf_last_updated_tickets .tablenav{height:0}#sf_last_updated_tickets .two_day_old{color:#DF1111}#sf_last_updated_tickets .one_two_day_old{color:#BD8A2C}
\ No newline at end of file
+.subsubsub li.trash a{color:#BC0B0B}.customer_link{white-space:pre;vertical-align:top}#poststuff{padding-top:0}#side-sortables{margin-top:34px}#change_user_label{display:inline;font-weight:700;font-size:16px}#update_signature{width:30em}#supportflow-details .meta-item-label{font-weight:600}#supportflow-customers.postbox,#supportflow-subject.postbox{border:none;background:0 0}#supportflow-customers.postbox .inside,#supportflow-subject.postbox .inside{padding:0}#supportflow-customers .handlediv,#supportflow-customers h3.hndle,#supportflow-details .handlediv,#supportflow-details h3.hndle,#supportflow-replies .handlediv,#supportflow-replies h3.hndle,#supportflow-subject .handlediv,#supportflow-subject h3.hndle{display:none}#supportflow-details .handlediv,#supportflow-details h3.hndle{display:block}#supportflow-details #misc-publishing-actions label{display:inline-block}#supportflow-details #misc-publishing-actions select#post_status{width:100px}#supportflow-details #misc-publishing-actions span.the-date{font-weight:700}#supportflow-details #misc-publishing-actions div.last-activity{font-size:11px}#supportflow-customers h4,#supportflow-replies h4,#supportflow-subject h4{font-family:Georgia,"Times New Roman","Bitstream Charter",Times,serif;font-size:13px;font-weight:400;margin:10px 0 6px}#supportflow-subject.postbox input{width:100%;font-size:1.7em;padding-left:8px;padding-right:8px;line-height:100%;height:1.7em}#supportflow-customers.postbox input{width:100%;padding:8px;font-size:1.2em;height:2.6em}#supportflow-cc-bcc.postbox input{width:100%;font-size:1.2em}#supportflow-replies.postbox #ticket-reply-box{width:100%}#supportflow-replies.postbox textarea{width:100%;padding:8px;font-size:1.1em;font-size:1.2em}#supportflow-replies.postbox .inside #message-tools #submit-action{padding:0;margin-top:5px;float:right}#supportflow-replies.postbox .inside #message-tools #replies-attachments-wrap{float:left}#supportflow-replies #replies-attachments-list,#supportflow-replies #upload-messages{margin-top:9px;margin-left:2px;color:#666}#supportflow-replies.postbox .inside #message-tools #submit-action input[type=checkbox]{margin-top:-1px}#supportflow-replies.postbox .inside #message-tools #submit-action label{padding-top:2px;padding-left:5px;padding-right:25px}#supportflow-replies.postbox ul.private-replies{background-color:#FFFFE0;border:1px solid #E6DB55;padding:5px 10px}#supportflow-replies.postbox ul.private-replies li{border-top:1px solid #DFDFDF;margin-top:10px}#supportflow-replies.postbox ul.private-replies li:first-child{border-top:none;margin-top:0}#supportflow-replies.postbox ul.private-replies li .ticket-meta{color:#BBB;font-size:.9em;text-align:right}#supportflow-replies.postbox ul.ticket-replies li{clear:left;margin-top:20px;margin-bottom:20px}#supportflow-replies.postbox ul.private-replies li .ticket-reply-attachments li,#supportflow-replies.postbox ul.ticket-replies li .ticket-reply-attachments li{margin-top:3px;margin-bottom:3px;font-size:.9em}#supportflow-replies.postbox ul.ticket-replies li .reply-avatar{float:left;width:100px;word-wrap:break-word}#supportflow-replies.postbox ul.ticket-replies li .reply-author{margin:0;font-size:.9em;color:#666}#supportflow-replies.postbox ul.ticket-replies li .ticket-reply{background-color:#FFF;margin-left:105px;min-height:80px;padding:10px;font-size:1.1em;border:1px solid #DFDFDF;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;word-wrap:break-word}#supportflow-replies.postbox ul.ticket-replies li .ticket-meta{margin-left:105px;font-size:.9em;color:#666;margin-top:5px}#supportflow-replies.postbox .predefined_replies_dropdown{width:200px}.sf-delivery-failed{font-size:.9em;line-height:20px}.metabox-holder .postbox-container .empty-container{border:none}input::-webkit-input-placeholder{color:#BBB}input:-moz-placeholder{color:#BBB}textarea::-webkit-input-placeholder{color:#BBB}textarea:-moz-placeholder{color:#BBB}#sf_my_tickets .toggle-content{display:none}#sf_my_tickets .tablenav{height:10px}#sf_last_updated_tickets .tablenav{height:0}#sf_last_updated_tickets .two_day_old{color:#DF1111}#sf_last_updated_tickets .one_two_day_old{color:#BD8A2C}
\ No newline at end of file
diff --git a/js/supportflow.min.js b/js/supportflow.min.js
index 31b711d..ad31886 100644
--- a/js/supportflow.min.js
+++ b/js/supportflow.min.js
@@ -1,2 +1,2 @@
 /*! SupportFlow minified version */
-jQuery(document).ready(function(a){a(".toggle-link").click(function(b){var c=a(this).siblings(".toggle-content").css("display");a(".toggle-content").hide(500),a(".toggle-link").prop("title",SFToggleLinks.expand),"none"==c&&(a(this).siblings(".toggle-content").show(500),a(this).prop("title",SFToggleLinks.collapse)),b.preventDefault()}),a(a(".toggle-content")).each(function(){"none"==a(this).css("display")?a(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):a(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),a(".toggle-content").first().show(500)})}),jQuery(document).ready(function(a){a(".delete_email_account").click(function(b){if(b.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var c=a(this).data("account-id"),d="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,e="";e+='<form method="POST" id="remove_email_account" action="'+d+'">',e+='<input type="hidden" name="action" value="delete" />',e+=SFEmailAccounts.delete_email_account_nonce,e+='<input type="hidden" name="account_id" value='+c+" />",e+="</form>",a("body").append(e),a("#remove_email_account").submit()}}),a("#add_new_email_account #imap_ssl").change(function(){a("#add_new_email_account #imap_port").val(this.checked?"993":"143")}),a("#add_new_email_account #smtp_ssl").change(function(){a("#add_new_email_account #smtp_port").val(this.checked?"465":"25")})}),jQuery(document).ready(function(a){var b=function(b){b.preventDefault();var c=a("#email_conversation_to").val();a.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:c,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){a("#email_conversation_to").prop("disabled",!0),a("#email_conversation_submit").prop("disabled",!0),a("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(b){a("#email_conversation_status").html(b)},error:function(){a("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){a("#email_conversation_to").prop("disabled",!1),a("#email_conversation_submit").prop("disabled",!1)}})};a("#email_conversation_submit").click(b),a("#email_conversation_to").keyup(function(){(10==event.keyCode||13==event.keyCode)&&b()})}),jQuery(document).ready(function(a){a(".permission_filters").change(function(){var b=a("#change_user option:selected").data("user-id"),c=a("#change_status option:selected").data("status");a.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:b,status:c,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(b){a("#user_permissions_table").html(b)}})}),a(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("permission-identifier"),e=b.prop("checked"),f=d.user_id,g=d.privilege_type,h=d.privilege_id;c.html(SFPermissions.changing_status),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:f,privilege_type:g,privilege_id:h,allowed:e,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var a=b.prop("checked");c.html(1==a?SFPermissions.allowed:SFPermissions.not_allowed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){a("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=a("#predefs").find("option:selected").data("content"),old_content=a(".predef:nth-child("+this.old_child+")").data("content"),current_content=a("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void a(".predef:nth-child("+this.old_child+")").prop("selected",!0);a("#reply").val(new_content),this.old_child=a("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(a){a(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("email-notfication-identifier"),e=b.prop("checked"),f=d.privilege_type,g=d.privilege_id;c.html(SFPreferences.changing_state),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:f,privilege_id:g,allowed:e,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var a=b.prop("checked");c.html(1==a?SFPreferences.subscribed:SFPreferences.unsubscribed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){if("sf_ticket"==pagenow){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(){var b=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return b.on("close",function(){var c=b.state().get("selection").toJSON();a.each(c,function(){var b='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",c='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";a("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+b+"&nbsp;"+c+"</li>"),a("#reply-attachments").val(a("#reply-attachments").val()+_.escape(this.id)+",")})}),b.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(a){a("#supportflow-details .meta-item-ok-button").click(function(b){var c=a(this).siblings(".meta-item-dropdown").children("option:selected"),d=a(this).closest(".meta-item"),e=d.children(".meta-item-name"),f=d.children(".meta-item-label");e.val(c.val()),f.text(c.text()),b.preventDefault()}),a("#supportflow-details .meta-item-toggle-button").click(function(b){a(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),b.preventDefault()}),a(".save-button").click(function(b){return""==a("#subject").val()?(a("#subject").focus(),alert(SFTickets.no_title_msg),void b.preventDefault()):""==a("#customers").val()?(a("#customers").focus(),alert(SFTickets.no_customer_msg),void b.preventDefault()):void 0}),a("#reply").keypress(function(b){!b.ctrlKey||10!=b.keyCode&&13!=b.keyCode||""==a(this).val()||a(".save-button").first().click()}),a("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&a("#insert-reply").val(a("#mark-private").prop("checked")?SFTickets.add_private_note:SFTickets.send_msg)}),a("#close-ticket-submit").click(function(){a("#post .meta-item input[name='post_status']").val("sf_closed")}),a(".sf_toggle_quoted_text").click(function(b){b.preventDefault(),a(this).parent().html(a(this).data("quoted_text"))})}),jQuery(document).ready(function(a){a(".sf_autosave").keyup(function(){var b={};b.ticket_id=SFAutoSave.ticket_id,a(".sf_autosave").each(function(){element_key=a(this).attr("name"),element_value=a(this).val(),b[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",b,!1)})});
\ No newline at end of file
+jQuery(document).ready(function(a){a(".toggle-link").click(function(b){var c=a(this).siblings(".toggle-content").css("display");a(".toggle-content").hide(500),a(".toggle-link").prop("title",SFToggleLinks.expand),"none"==c&&(a(this).siblings(".toggle-content").show(500),a(this).prop("title",SFToggleLinks.collapse)),b.preventDefault()}),a(a(".toggle-content")).each(function(){"none"==a(this).css("display")?a(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):a(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),a(".toggle-content").first().show(500)})}),jQuery(document).ready(function(a){a(".delete_email_account").click(function(b){if(b.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var c=a(this).data("account-id"),d="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,e="";e+='<form method="POST" id="remove_email_account" action="'+d+'">',e+='<input type="hidden" name="action" value="delete" />',e+=SFEmailAccounts.delete_email_account_nonce,e+='<input type="hidden" name="account_id" value='+c+" />",e+="</form>",a("body").append(e),a("#remove_email_account").submit()}}),a("#add_new_email_account #imap_ssl").change(function(){this.checked?a("#add_new_email_account #imap_port").val("993"):a("#add_new_email_account #imap_port").val("143")}),a("#add_new_email_account #smtp_ssl").change(function(){this.checked?a("#add_new_email_account #smtp_port").val("465"):a("#add_new_email_account #smtp_port").val("25")})}),jQuery(document).ready(function(a){var b=function(b){b.preventDefault();var c=a("#email_conversation_to").val();a.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:c,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){a("#email_conversation_to").prop("disabled",!0),a("#email_conversation_submit").prop("disabled",!0),a("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(b){a("#email_conversation_status").html(b)},error:function(){a("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){a("#email_conversation_to").prop("disabled",!1),a("#email_conversation_submit").prop("disabled",!1)}})};a("#email_conversation_submit").click(b),a("#email_conversation_to").keyup(function(){(10==event.keyCode||13==event.keyCode)&&b()})}),jQuery(document).ready(function(a){a(".permission_filters").change(function(){var b=a("#change_user option:selected").data("user-id"),c=a("#change_status option:selected").data("status");a.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:b,status:c,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(b){a("#user_permissions_table").html(b)}})}),a(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("permission-identifier"),e=b.prop("checked"),f=d.user_id,g=d.privilege_type,h=d.privilege_id;c.html(SFPermissions.changing_status),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:f,privilege_type:g,privilege_id:h,allowed:e,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var a=b.prop("checked");1==a?c.html(SFPermissions.allowed):c.html(SFPermissions.not_allowed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){a("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=a("#predefs").find("option:selected").data("content"),old_content=a(".predef:nth-child("+this.old_child+")").data("content"),current_content=a("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void a(".predef:nth-child("+this.old_child+")").prop("selected",!0);a("#reply").val(new_content),this.old_child=a("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(a){a(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("email-notfication-identifier"),e=b.prop("checked"),f=d.privilege_type,g=d.privilege_id;c.html(SFPreferences.changing_state),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:f,privilege_id:g,allowed:e,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var a=b.prop("checked");1==a?c.html(SFPreferences.subscribed):c.html(SFPreferences.unsubscribed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){if("sf_ticket"==pagenow){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(b){var c=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return c.on("close",function(){var b=c.state().get("selection").toJSON();a.each(b,function(){var b='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",c='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";a("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+b+"&nbsp;"+c+"</li>"),a("#reply-attachments").val(a("#reply-attachments").val()+_.escape(this.id)+",")})}),c.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(a){a("#supportflow-details .meta-item-ok-button").click(function(b){var c=a(this).siblings(".meta-item-dropdown").children("option:selected"),d=a(this).closest(".meta-item"),e=d.children(".meta-item-name"),f=d.children(".meta-item-label");e.val(c.val()),f.text(c.text()),b.preventDefault()}),a("#supportflow-details .meta-item-toggle-button").click(function(b){a(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),b.preventDefault()}),a(".save-button").click(function(b){return""==a("#subject").val()?(a("#subject").focus(),alert(SFTickets.no_title_msg),void b.preventDefault()):""==a("#customers").val()?(a("#customers").focus(),alert(SFTickets.no_customer_msg),void b.preventDefault()):void 0}),a("#reply").keypress(function(b){!b.ctrlKey||10!=b.keyCode&&13!=b.keyCode||""==a(this).val()||a(".save-button").first().click()}),a("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&(a("#mark-private").prop("checked")?a("#insert-reply").val(SFTickets.add_private_note):a("#insert-reply").val(SFTickets.send_msg))}),a("#close-ticket-submit").click(function(b){a("#post .meta-item input[name='post_status']").val("sf_closed")}),a(".sf_toggle_quoted_text").click(function(b){b.preventDefault(),a(this).parent().html(a(this).data("quoted_text"))})}),jQuery(document).ready(function(a){a(".sf_autosave").keyup(function(){var b={};b.ticket_id=SFAutoSave.ticket_id,a(".sf_autosave").each(function(){element_key=a(this).attr("name"),element_value=a(this).val(),b[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",b,!1)})});
\ No newline at end of file

From f6b07e78204c85478e1b6575006bbc015aa5c61f Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Mon, 29 Jun 2015 21:59:37 +0300
Subject: [PATCH 443/485] Add a text domain to the new string in
 4cf0af48b1e9334f2071227c5d6ea99bfa72a193.

---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index e3280ca..1531eeb 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -1060,7 +1060,7 @@ public function display_ticket_replies() {
 
 				$mail_status = get_post_meta( $reply->ID, '_sf_mail_status', true );
 				if ( isset( $mail_status['result'] ) && $mail_status['result'] === false ) {
-					printf( '<span class="sf-delivery-failed"><span class="dashicons dashicons-info"></span> %s</span>', esc_html__( 'Delivery failed! Please check your SMTP settings and try again.' ) );
+					printf( '<span class="sf-delivery-failed"><span class="dashicons dashicons-info"></span> %s</span>', esc_html__( 'Delivery failed! Please check your SMTP settings and try again.', 'supportflow' ) );
 				}
 
 				$post_content = wpautop( stripslashes( $reply->post_content ) );

From b3c6429758087e8fef48486f939946851698b92a Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Mon, 29 Jun 2015 22:00:12 +0300
Subject: [PATCH 444/485] Prefix outgoing replies with Re:.

Fixes #234.
---
 classes/class-supportflow-emails.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 5a980c9..4a9c4d8 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -146,8 +146,15 @@ public function notify_customers_ticket_replies( $reply_id, $cc = array(), $bcc
 		}
 
 		$attachments = $this->get_attached_files( $reply->ID );
+		$num_replies = SupportFlow()->get_ticket_replies_count( $ticket->ID );
 
 		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $ticket->ID );
+
+		// Prefix with Re: if it's a reply.
+		if ( $num_replies > 1 ) {
+			$subject = sprintf( _x( 'Re: %s', 'A prefix for outgoing e-mail replies.', 'supportflow' ), $subject );
+		}
+
 		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $ticket->ID, 'customer' );
 
 		$message = SupportFlow()->sanitize_ticket_reply( stripslashes( $reply->post_content ) );

From ecdad4d5efb30403fd233acecb4c746684eecb8e Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Fri, 3 Jul 2015 22:39:42 +0300
Subject: [PATCH 445/485] Use numeric topic tags rather than 8-character random
 strings.

For all outgoing messages prepend the subject with a thread ID,
which can later be used to stick replies back to the thread. Keep
support for older 8-character random strings for backwards
compatibility.

See #251.
---
 classes/class-supportflow-email-replies.php | 25 ++++++++++++---------
 classes/class-supportflow-emails.php        |  5 ++---
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index eca6841..5410cf9 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -14,17 +14,7 @@ function __construct() {
 	}
 
 	public function setup_actions() {
-
-		add_filter( 'supportflow_emails_reply_notify_subject', array( $this, 'filter_reply_notify_subject' ), 10, 3 );
 		add_action( 'sf_cron_retrieve_email_replies', array( $this, 'retrieve_email_replies' ) );
-
-	}
-
-	public function filter_reply_notify_subject( $subject, $reply_id, $ticket_id ) {
-
-		$subject = rtrim( $subject ) . ' [' . SupportFlow()->get_secret_for_ticket( $ticket_id ) . ']';
-
-		return $subject;
 	}
 
 	function retrieve_email_replies() {
@@ -291,7 +281,20 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 
 		// Check to see if this message was in response to an existing ticket
 		$ticket_id = false;
-		if ( preg_match( '#\[([a-zA-Z0-9]{8})\]$#', $subject, $matches ) ) {
+
+		if ( preg_match( '/#(\d+):/', $subject, $matches ) ) {
+			$ticket_id = $matches[1];
+			$ticket = get_post( $ticket_id );
+
+			// Make sure the ticket ID is a SupportFlow ticket with a valid status.
+			if ( $ticket->post_type != SupportFlow()->post_type
+				 || ! array_key_exists( $ticket->post_status, SupportFlow()->post_statuses ) ) {
+				$ticket_id = false;
+			}
+		}
+
+		// Back-compat with old-style secrets.
+		if ( ! $ticket_id && preg_match( '#\[([a-zA-Z0-9]{8})\]$#', $subject, $matches ) ) {
 			$ticket_id = SupportFlow()->get_ticket_from_secret( $matches[1] );
 		}
 
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 4a9c4d8..37a4f64 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -79,7 +79,7 @@ public function notify_agents_ticket_replies( $reply_id ) {
 			return;
 		}
 
-		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $ticket->ID );
+		$subject = sprintf( '#%d: %s', $ticket->ID, get_the_title( $ticket->ID ) );
 		$subject = apply_filters( 'supportflow_emails_reply_notify_subject', $subject, $reply_id, $ticket->ID, 'agent' );
 
 		$attachments = $this->get_attached_files( $reply->ID );
@@ -147,8 +147,7 @@ public function notify_customers_ticket_replies( $reply_id, $cc = array(), $bcc
 
 		$attachments = $this->get_attached_files( $reply->ID );
 		$num_replies = SupportFlow()->get_ticket_replies_count( $ticket->ID );
-
-		$subject = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $ticket->ID );
+		$subject = sprintf( '#%d: %s', $ticket->ID, get_the_title( $ticket->ID ) );
 
 		// Prefix with Re: if it's a reply.
 		if ( $num_replies > 1 ) {

From cf032f8a1d886536993658aa0444c1d037806ffd Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Fri, 3 Jul 2015 22:42:39 +0300
Subject: [PATCH 446/485] Change the default From name to the blog name.

See #251.
---
 classes/class-supportflow-emails.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 37a4f64..35b5b06 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -256,6 +256,7 @@ public function action_set_smtp_settings( $phpmailer ) {
 		$phpmailer->Username   = $this->smtp_account['username'];
 		$phpmailer->Password   = $this->smtp_account['password'];
 		$phpmailer->SMTPAuth   = true;
+		$phpmailer->FromName   = get_bloginfo( 'name' );
 	}
 
 	public function get_cc_header( $cc ) {

From cf2c150ef52ed8a17693598a20b415241170a991 Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Fri, 3 Jul 2015 22:59:40 +0300
Subject: [PATCH 447/485] Reopen tickets when they receive new replies.

See #235.
---
 supportflow.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index f7bb426..1f4c768 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -900,14 +900,19 @@ public function add_ticket_reply( $ticket_id, $reply_text, $details = array() )
 
 		// Empty autosaved reply
 		delete_post_meta( $ticket_id, '_sf_autosave_reply' );
+		$update_args = array(
+			'ID' => $ticket_id,
+			'post_modified' => current_time( 'mysql' ),
+			'post_status' => 'sf_open',
+		);
 
 		// Adding a ticket reply updates the post modified time for the ticket
 		if ( ! empty( SupportFlow()->extend->admin ) && is_callable( array( SupportFlow()->extend->admin, 'action_save_post' ) ) ) {
 			remove_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
-			wp_update_post( array( 'ID' => $ticket_id, 'post_modified' => current_time( 'mysql' ) ) );
+			wp_update_post( $update_args );
 			add_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );
 		} else {
-			wp_update_post( array( 'ID' => $ticket_id, 'post_modified' => current_time( 'mysql' ) ) );
+			wp_update_post( $update_args );
 		}
 
 		clean_post_cache( $ticket_id );

From cb1932c9fa0d23fe7d212b946a4e14b686c89377 Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Fri, 3 Jul 2015 23:06:58 +0300
Subject: [PATCH 448/485] Allow plugins to disable reopening a ticket upon
 reply with a filter.

See #240.
---
 supportflow.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index 1f4c768..a418a97 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -903,9 +903,13 @@ public function add_ticket_reply( $ticket_id, $reply_text, $details = array() )
 		$update_args = array(
 			'ID' => $ticket_id,
 			'post_modified' => current_time( 'mysql' ),
-			'post_status' => 'sf_open',
 		);
 
+		// Allow plugins to override this behavior.
+		if ( add_filter( 'supportflow_reopen_ticket_on_reply', true, $reply_id, $ticket_id ) ) {
+			$update_args['post_status'] = 'sf_open';
+		}
+
 		// Adding a ticket reply updates the post modified time for the ticket
 		if ( ! empty( SupportFlow()->extend->admin ) && is_callable( array( SupportFlow()->extend->admin, 'action_save_post' ) ) ) {
 			remove_action( 'save_post', array( SupportFlow()->extend->admin, 'action_save_post' ) );

From 9f93df73480d4a72426ec3f0e1c485cbb1fde4ed Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Fri, 3 Jul 2015 23:15:53 +0300
Subject: [PATCH 449/485] Only re-open closed tickets when a new reply is
 added.

---
 supportflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index a418a97..d82dd35 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -906,7 +906,7 @@ public function add_ticket_reply( $ticket_id, $reply_text, $details = array() )
 		);
 
 		// Allow plugins to override this behavior.
-		if ( add_filter( 'supportflow_reopen_ticket_on_reply', true, $reply_id, $ticket_id ) ) {
+		if ( get_post_status( $ticket_id ) == 'sf_closed' && add_filter( 'supportflow_reopen_ticket_on_reply', true, $reply_id, $ticket_id ) ) {
 			$update_args['post_status'] = 'sf_open';
 		}
 

From 89a32f74cd928c0876c68782bc8a458e0f04354c Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Fri, 3 Jul 2015 23:20:29 +0300
Subject: [PATCH 450/485] Don't create duplicate tickets when replying to
 non-new tickets.

When fetching tickets by the 8-char secret, don't restrict the
search to new tickets only. Note that this is a back-compat fix only,
since tickets and replies are now paired by numeric ids.

Fixes #241.
---
 supportflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index d82dd35..8fd721e 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -951,7 +951,7 @@ public function get_ticket_from_secret( $secret ) {
 
 		$posts = get_posts( array(
 			'post_type'   => SupportFlow()->post_type,
-			'post_status' => key( $post_statuses ),
+			'post_status' => array_keys( $post_statuses ),
 			'meta_query'  => array(
 				array(
 					'key'   => $this->ticket_secret_key,

From ad7d4ce6145db984f1d2f7e11deac009bfbce36c Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Mon, 6 Jul 2015 22:02:23 +0300
Subject: [PATCH 451/485] Do not allow users to edit replies outside of a
 ticket context.

Fixes #225 and #228.
---
 classes/class-supportflow-admin.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 1531eeb..515d6f5 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -20,6 +20,7 @@ public function setup_actions() {
 		// Creating or updating a ticket
 		add_action( 'add_meta_boxes', array( $this, 'action_add_meta_boxes' ) );
 		add_action( 'save_post', array( $this, 'action_save_post' ) );
+		add_action( 'map_meta_cap', array( $this, 'filter_map_meta_cap' ), 10, 4 );
 
 		if ( ! $this->is_edit_screen() ) {
 			return;
@@ -58,6 +59,20 @@ function action_admin_init() {
 		}
 	}
 
+	/**
+	 * Do not allow users to view/edit replies outside of a ticket context.
+	 */
+	public function filter_map_meta_cap( $caps, $cap, $user_id, $args ) {
+		if ( $cap == 'edit_post' && ! empty( $args[0] ) ) {
+			$post = get_post( absint( $args[0] ) );
+			if ( $post->post_type == SupportFlow()->reply_type && $post->post_parent > 0 ) {
+				$caps[] = 'do_not_allow';
+			}
+		}
+
+		return $caps;
+	}
+
 	/**
 	 * Add any CSS or JS we need for the admin
 	 */

From aacce39a8fc6ce1c37d4e728a7270b84ae708227 Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Thu, 9 Jul 2015 23:25:15 +0300
Subject: [PATCH 452/485] Change post type menu icon to dashicons-sos.

Fixes #58.
---
 supportflow.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/supportflow.php b/supportflow.php
index 8fd721e..7d0bdc9 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -324,6 +324,7 @@ public function action_init_register_post_type() {
 				'menu_position'      => 3,
 				'publicly_queryable' => false,
 				'supports'           => false,
+				'menu_icon'          => 'dashicons-sos',
 			)
 		);
 	}

From fae4ece89eb0f90bace9e059646b8077dd95eaa7 Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Thu, 9 Jul 2015 23:35:43 +0300
Subject: [PATCH 453/485] Decode the subject line and save it as a simple UTF8
 string.

Some non-ascii e-mail subject lines come in an encoded form of
`=?iso-8859-1?b?subject`. Make sure we decode such subject lines
and store them in regular UTF8 versus abrakadabra.

See: #226
See: http://www.faqs.org/rfcs/rfc2047.html
---
 classes/class-supportflow-email-replies.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 5410cf9..bf0d74e 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -243,7 +243,7 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 		}
 
 		if ( ! empty( $email->headers->subject ) ) {
-			$subject = $email->headers->subject;
+			$subject = imap_utf8( $email->headers->subject );
 		} else {
 			$subject = sprintf( __( 'New ticket from %s', 'supportflow' ), $email->headers->fromaddress );
 		}

From 97c1e077c0a48cf3caf9b46d960663254dc176ce Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Fri, 10 Jul 2015 00:10:14 +0300
Subject: [PATCH 454/485] Handle base64 encoded messages and quoted messages.

See: #226
---
 classes/class-supportflow-email-replies.php | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index bf0d74e..820769c 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -147,7 +147,13 @@ public function download_and_process_email_replies( $connection_details ) {
 
 			$email->headers   = imap_headerinfo( $imap_connection, $email->msgno );
 			$email->structure = imap_fetchstructure( $imap_connection, $email->msgno );
-			$email->body      = $this->get_body_from_connection( $imap_connection, $email->msgno );
+			$email->body      = imap_qprint( imap_body( $imap_connection, $email->msgno ) );
+
+			if ( imap_base64( $email->body ) ) {
+				$email->body = imap_base64( $email->body );
+			}
+
+			$email->body = imap_utf8( $email->body );
 
 			if ( 0 === strcasecmp( $connection_details['username'], $email->headers->from[0]->mailbox . '@' . $email->headers->from[0]->host ) ) {
 				$connection_details['password'] = '[redacted]';  // redact the password to avoid unnecessarily exposing it in logs
@@ -161,16 +167,6 @@ public function download_and_process_email_replies( $connection_details ) {
 				continue;
 			}
 
-			// Convert encoding to UTF-8
-			if ( ! empty( $email->structure->parameters ) ) {
-				foreach ( $email->structure->parameters as $parameter ) {
-					if ( 'CHARSET' == $parameter->attribute ) {
-						$email->body = iconv( $parameter->value, 'UTF-8', $email->body );
-						break;
-					}
-				}
-			}
-
 			// @todo Confirm this a message we want to process
 			$result = $this->process_email( $imap_connection, $email, $email->msgno, $connection_details['username'], $connection_details['account_id'] );
 

From ff9d04a9f6acb8cd01f25ff926695a6460fab118 Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Fri, 10 Jul 2015 00:31:06 +0300
Subject: [PATCH 455/485] Move body decoding logic into
 `get_body_from_connection()`.

See: #226
---
 classes/class-supportflow-email-replies.php | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 820769c..cf38595 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -147,13 +147,7 @@ public function download_and_process_email_replies( $connection_details ) {
 
 			$email->headers   = imap_headerinfo( $imap_connection, $email->msgno );
 			$email->structure = imap_fetchstructure( $imap_connection, $email->msgno );
-			$email->body      = imap_qprint( imap_body( $imap_connection, $email->msgno ) );
-
-			if ( imap_base64( $email->body ) ) {
-				$email->body = imap_base64( $email->body );
-			}
-
-			$email->body = imap_utf8( $email->body );
+			$email->body      = $this->get_body_from_connection( $imap_connection, $email->msgno );
 
 			if ( 0 === strcasecmp( $connection_details['username'], $email->headers->from[0]->mailbox . '@' . $email->headers->from[0]->host ) ) {
 				$connection_details['password'] = '[redacted]';  // redact the password to avoid unnecessarily exposing it in logs
@@ -367,11 +361,16 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 	 */
 	public function get_body_from_connection( $connection, $num, $type = 'text/plain' ) {
 		// Hacky way to get the email body. We should support more MIME types in the future
-		$body = imap_fetchbody( $connection, $num, 1.1 );
+		$body = imap_fetchbody( $connection, $num, '1.1' );
 		if ( empty( $body ) ) {
-			$body = imap_fetchbody( $connection, $num, 1 );
+			$body = imap_fetchbody( $connection, $num, '1' );
 		}
 
+		$body = imap_qprint( $body );
+		if ( imap_base64( $body ) )
+			$body = imap_base64( $body );
+
+		$body = imap_utf8( $body );
 		return $body;
 	}
 

From fcee84a1813c50652119398a31e2893e966422ac Mon Sep 17 00:00:00 2001
From: Konstantin Kovshenin <kovshenin@gmail.com>
Date: Fri, 10 Jul 2015 00:51:40 +0300
Subject: [PATCH 456/485] Simplify and improve hiding of quoted text in a
 plain/text e-mail.

---
 classes/class-supportflow-admin.php | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 515d6f5..ce4aedb 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -1037,10 +1037,9 @@ public function display_ticket_replies() {
 			foreach ( $private_replies as $reply ) {
 				echo '<li>';
 				echo '<div class="ticket-reply">';
-				$post_content = wpautop( stripslashes( $reply->post_content ) );
-				// Make link clickable
-				$post_content = make_clickable( $post_content );
+				$post_content = stripslashes( $reply->post_content );
 				$post_content = $this->hide_quoted_text( $post_content );
+				$post_content = wpautop( make_clickable( $post_content ) );
 				echo $post_content;
 				if ( $attachment_ids = get_post_meta( $reply->ID, 'sf_attachments' ) ) {
 					echo '<ul class="ticket-reply-attachments">';
@@ -1078,10 +1077,10 @@ public function display_ticket_replies() {
 					printf( '<span class="sf-delivery-failed"><span class="dashicons dashicons-info"></span> %s</span>', esc_html__( 'Delivery failed! Please check your SMTP settings and try again.', 'supportflow' ) );
 				}
 
-				$post_content = wpautop( stripslashes( $reply->post_content ) );
-				// Make link clickable
-				$post_content = make_clickable( $post_content );
+				$post_content = stripslashes( $reply->post_content );
 				$post_content = $this->hide_quoted_text( $post_content );
+				$post_content = wpautop( make_clickable( $post_content ) );
+
 				echo $post_content;
 				if ( $attachment_ids = get_post_meta( $reply->ID, 'sf_attachments' ) ) {
 					echo '<ul class="ticket-reply-attachments">';
@@ -1321,16 +1320,7 @@ public function action_save_post( $ticket_id ) {
 	 * Line startings with ">" sign are considered quoted content
 	 */
 	public function hide_quoted_text( $text ) {
-
-		$ws     = '\s'; // Whitespace ( matches \r\n\t\f )
-		$gt     = '&gt;'; // Greater than sign
-		$br     = "<{$ws}*br[^>]*>"; // BR tag
-		$non_br = "<(\s|/)*(?:(?!br( |>)).)*[^>]>"; // Any tag other than BR
-
-		$regex = "(^|$br)($non_br|$ws)*$gt(.*?)($br(?!($non_br|$ws)*$gt)|$)";
-
-		$res = preg_replace_callback( "~$regex~is", array( $this, 'hide_quoted_text_regex_callback' ), $text );
-
+		$res = preg_replace_callback( "#(?:^(?:&gt;)+\s.+$\s*)+#im", array( $this, 'hide_quoted_text_regex_callback' ), $text );
 		return $res;
 	}
 

From 1121af87f55107e8039a0879f82190f71a587ce3 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Thu, 30 Jul 2015 13:51:38 -0700
Subject: [PATCH 457/485] Add required `get_columns()` method to list tables to
 prevent dying.

`Supportflow_Table` was introduced in 0064f68aba557302691583f2f0bc1ccdb7592a83, but was missing several required methods. There weren't any visible consequences to that until [wordpress 32644], which is slated for the upcoming 4.3 release.

`get_columns()` is now called whenever a table is displayed, and `WP_List_Table::get_columns()` will `die()` if it's not overwritten.
---
 classes/class-supportflow-table.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/classes/class-supportflow-table.php b/classes/class-supportflow-table.php
index a13049d..1015902 100644
--- a/classes/class-supportflow-table.php
+++ b/classes/class-supportflow-table.php
@@ -57,6 +57,18 @@ public function no_items() {
 		}
 	}
 
+	/**
+	 * Get the table's column keys and labels
+	 *
+	 * Normally the columns would be hardcoded in this function, but since this is a generic table class, the
+	 * columns are set dynamically via set_columns().
+	 *
+	 * @return array
+	 */
+	public function get_columns() {
+		return $this->_column_headers[0];
+	}
+
 	public function print_column_headers( $with_id = true ) {
 		if ( $this->display_col_headers ) {
 			parent::print_column_headers( $with_id );

From a93947b597d5c5a14ec35ef15ec2ca38af60253e Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Thu, 6 Aug 2015 09:52:08 -0700
Subject: [PATCH 458/485] Change wp-admin page headers to `h1` for
 accessibility.

See https://make.wordpress.org/plugins/2015/08/03/4-3-change-to-plugin-dashboard-pages/
---
 classes/class-supportflow-email-accounts.php | 2 +-
 classes/class-supportflow-logger.php         | 2 +-
 classes/class-supportflow-permissions.php    | 2 +-
 classes/class-supportflow-preferences.php    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 193ddc2..c1d7e86 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -84,7 +84,7 @@ function get_email_account( $id ) {
 	 */
 	function settings_page() {
 		echo '<div class="wrap">
-			<h2>' . __( 'E-Mail Accounts', 'supportflow' ) . '</h2>';
+			<h1>' . __( 'E-Mail Accounts', 'supportflow' ) . '</h1>';
 
 		// Add/remove E-Mail accounts if submitted by user
 		$this->process_form_submission();
diff --git a/classes/class-supportflow-logger.php b/classes/class-supportflow-logger.php
index b0ae259..9f69906 100644
--- a/classes/class-supportflow-logger.php
+++ b/classes/class-supportflow-logger.php
@@ -77,7 +77,7 @@ public static function markup_log_page() {
 
 		<div class="wrap">
 			<div id="icon-options-general" class="icon32"><br /></div>
-			<h2><?php _e( 'SupportFlow Log', 'supportflow' ); ?></h2>
+			<h1><?php _e( 'SupportFlow Log', 'supportflow' ); ?></h1>
 
 			<p>
 				<strong><?php _e( 'Warning:', 'supportflow' ); ?></strong>
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index df15e58..e545b52 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -75,7 +75,7 @@ public function permissions_page() {
 		$this->insert_script();
 		?>
 		<div class="wrap">
-		<h2><?php _e( 'Permissions', 'supportflow' ) ?></h2>
+		<h1><?php _e( 'Permissions', 'supportflow' ) ?></h1>
 
 		<table class="form-table">
 			<tr valign="top">
diff --git a/classes/class-supportflow-preferences.php b/classes/class-supportflow-preferences.php
index 6cd8946..4f89fd3 100644
--- a/classes/class-supportflow-preferences.php
+++ b/classes/class-supportflow-preferences.php
@@ -71,7 +71,7 @@ public function user_ticket_signature_page() {
 		}
 
 		?>
-		<h2><?php _e( 'My signature', 'supportflow' ) ?></h2>
+		<h1><?php _e( 'My signature', 'supportflow' ) ?></h1>
 		<p><?php _e( 'Please enter your signature you wish to add to your ticket reply. To remove signature clear the text box and then update it. Note: It will be automatically appended at the end of your ticket replies', 'supportflow' ) ?></p>
 		<?php if ( ! empty( $sign_updated ) ) {
 			echo '<h3>' . __( 'Signature updated successfully.', 'supportflow' ) . '</h3>';
@@ -122,7 +122,7 @@ public function notification_setting_page() {
 		$email_notifications_table->set_no_items( $no_items );
 		$email_notifications_table->set_data( $data );
 
-		echo '<h2>' . __( 'E-Mail Notifications', 'supportflow' ) . '</h2>';
+		echo '<h1>' . __( 'E-Mail Notifications', 'supportflow' ) . '</h1>';
 		echo '<p>' . __( 'Please check the tags/E-Mail accounts for which you want to receive E-Mail notifications of replies. You will be able to override E-Mail notifications settings for individual tickets.', 'supportflow' ) . '</p>';
 		echo '<div id="email_notification_table">';
 		$email_notifications_table->display();

From 30f164d238daad24644f99b56501fe44f4464c19 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Fri, 14 Aug 2015 14:27:15 -0700
Subject: [PATCH 459/485] Bump version to 0.5

---
 readme.txt      | 13 +++++++++++--
 supportflow.php |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/readme.txt b/readme.txt
index 64d88c8..4fe1692 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,8 +2,8 @@
 Contributors: VarunAgw, danielbachhuber, Viper007Bond, andrewspittle, iandunn, kovshenin
 Tags: Ticket, support, admin, customer, customer support, help desk, helpdesk, IT, support, ticket
 Requires at least: 3.5
-Tested up to: 4.2
-Stable tag: 0.4
+Tested up to: 4.3
+Stable tag: 0.5
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -59,6 +59,15 @@ If it still isn't working, check the log for any error messages or clues. To vie
 
 == Changelog ==
 
+= 0.5 =
+* Improved handling of large mailboxes during initial message download.
+* Tickets are now re-opened when new replies are added.
+* Better handling of non-ASCII messages.
+* Outgoing messages are now prefixed with a sequential ticket number instead of a random code.
+* Agents are now notified if a message failed to send.
+* Several minor bug fixes.
+* [Full changelog](https://github.com/SupportFlow/supportflow/compare/518832bf05df04a5f4af6787b253f99269773bd6...a93947b597d5c5a14ec35ef15ec2ca38af60253e)
+
 = 0.4 =
 * Uploads are now attached when sending a reply.
 * Fix the timestamps on replies.
diff --git a/supportflow.php b/supportflow.php
index 7d0bdc9..e819bdd 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -7,7 +7,7 @@
  * Plugin URI:  https://wordpress.org/plugins/supportflow/
  * Description: Reinventing how you support your customers.
  * Author:      Daniel Bachhuber, Varun Agrawal, Alex Mills, Andrew Spittle
- * Version:     0.4
+ * Version:     0.5
  *
  * Text Domain: supportflow
  * Domain Path: /languages/
@@ -169,7 +169,7 @@ private function setup_globals() {
 
 		/** Version ***********************************************************/
 
-		$this->version = '0.4'; // SupportFlow version
+		$this->version = '0.5'; // SupportFlow version
 
 		/** Paths *************************************************************/
 

From 113415ae275c1b987c8115de38885499cca8fb94 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Fri, 28 Aug 2015 11:33:23 -0700
Subject: [PATCH 460/485] Log exceptions thrown by PHPMailer when testing new
 accounts.

---
 classes/class-supportflow-email-accounts.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index c1d7e86..6f0ca28 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -383,6 +383,12 @@ function add_email_account( $imap_host, $imap_port, $imap_ssl, $smtp_host, $smtp
 				$smtp_authentication = $phpmailer->smtpConnect();
 			} catch ( Exception $e ) {
 
+				SupportFlow()->extend->logger->log(
+					'email_accounts',
+					__METHOD__,
+					sprintf( __( 'PHPMailer exception: %s.', 'supportflow' ), $e->getMessage() ),
+					compact( 'smtp_host', 'smtp_port', 'smtp_ssl', 'username' )
+				);
 			}
 
 			SupportFlow()->extend->logger->log(

From eec243f3172b7fce34677bcbe0ee80bf43b5da8a Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Fri, 28 Aug 2015 11:35:02 -0700
Subject: [PATCH 461/485] Ensure `$smtp_authentication` always exists, to avoid
 notices.

5e64808 added a second place where the variable is accessed, but failed to check if it existed or not. Since it's now being used in two locations, it's simpler to make sure it always exists than to check if it exists each time it's used.
---
 classes/class-supportflow-email-accounts.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 6f0ca28..80a3cd2 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -382,6 +382,7 @@ function add_email_account( $imap_host, $imap_port, $imap_ssl, $smtp_host, $smtp
 			try {
 				$smtp_authentication = $phpmailer->smtpConnect();
 			} catch ( Exception $e ) {
+				$smtp_authentication = false;
 
 				SupportFlow()->extend->logger->log(
 					'email_accounts',
@@ -398,7 +399,7 @@ function add_email_account( $imap_host, $imap_port, $imap_ssl, $smtp_host, $smtp
 				compact( 'imap_host', 'imap_port', 'imap_ssl', 'smtp_host', 'smtp_port', 'smtp_ssl', 'username', 'mailbox' )
 			);
 
-			if ( ! isset( $smtp_authentication ) || ! $smtp_authentication ) {
+			if ( ! $smtp_authentication ) {
 				return self::SMTP_AUTHENTICATION_FAILED;
 			}
 		}

From bcf78fab0fef0b500b8582400e6d46ac88a6e650 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Fri, 28 Aug 2015 12:26:57 -0700
Subject: [PATCH 462/485] Set PHPMailer `SMTPAutoTLS` to `false` when server
 doesn't support SSL.

PHPMailer 5.2.10 added a feature that automatically enables TLS under certain circumstances, even when `SMTPSecure` is explicitly set to `false`. This prevented SupportFlow from connecting to servers that don't support SSL.

See https://github.com/PHPMailer/PHPMailer/commit/9da56fc1328a72aa124b35b738966315c41ef5c6
See https://core.trac.wordpress.org/changeset/33124/
---
 classes/class-supportflow-email-accounts.php | 1 +
 classes/class-supportflow-emails.php         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 80a3cd2..92c8bba 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -374,6 +374,7 @@ function add_email_account( $imap_host, $imap_port, $imap_ssl, $smtp_host, $smtp
 			$phpmailer->Host       = $smtp_host;
 			$phpmailer->Port       = $smtp_port;
 			$phpmailer->SMTPSecure = $smtp_ssl ? 'ssl' : '';
+			$phpmailer->SMTPAutoTLS = $smtp_ssl;
 			$phpmailer->Username   = $username;
 			$phpmailer->Password   = $password;
 			$phpmailer->SMTPAuth   = true;
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 35b5b06..a88034f 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -253,6 +253,7 @@ public function action_set_smtp_settings( $phpmailer ) {
 		$phpmailer->Host       = $this->smtp_account['smtp_host'];
 		$phpmailer->Port       = (int) $this->smtp_account['smtp_port'];
 		$phpmailer->SMTPSecure = $this->smtp_account['smtp_ssl'] ? 'ssl' : '';
+		$phpmailer->SMTPAutoTLS = $this->smtp_account['smtp_ssl'];
 		$phpmailer->Username   = $this->smtp_account['username'];
 		$phpmailer->Password   = $this->smtp_account['password'];
 		$phpmailer->SMTPAuth   = true;

From c74e4c488776982b10a855aff955f216200e93c1 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Fri, 28 Aug 2015 12:31:30 -0700
Subject: [PATCH 463/485] Re-align assignment operators.

---
 classes/class-supportflow-email-accounts.php | 12 ++++++------
 classes/class-supportflow-emails.php         | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 92c8bba..75a7b48 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -371,13 +371,13 @@ function add_email_account( $imap_host, $imap_port, $imap_ssl, $smtp_host, $smtp
 
 			// Set PHPMailer SMTP settings
 			$phpmailer->IsSMTP();
-			$phpmailer->Host       = $smtp_host;
-			$phpmailer->Port       = $smtp_port;
-			$phpmailer->SMTPSecure = $smtp_ssl ? 'ssl' : '';
+			$phpmailer->Host        = $smtp_host;
+			$phpmailer->Port        = $smtp_port;
+			$phpmailer->SMTPSecure  = $smtp_ssl ? 'ssl' : '';
 			$phpmailer->SMTPAutoTLS = $smtp_ssl;
-			$phpmailer->Username   = $username;
-			$phpmailer->Password   = $password;
-			$phpmailer->SMTPAuth   = true;
+			$phpmailer->Username    = $username;
+			$phpmailer->Password    = $password;
+			$phpmailer->SMTPAuth    = true;
 
 			// $phpmail raise fatal error on SMTP connect failure
 			try {
diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index a88034f..16b78a3 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -250,14 +250,14 @@ public function mail( $to, $subject, $message, $headers = '', $attachments = arr
 
 	public function action_set_smtp_settings( $phpmailer ) {
 		$phpmailer->IsSMTP();
-		$phpmailer->Host       = $this->smtp_account['smtp_host'];
-		$phpmailer->Port       = (int) $this->smtp_account['smtp_port'];
-		$phpmailer->SMTPSecure = $this->smtp_account['smtp_ssl'] ? 'ssl' : '';
+		$phpmailer->Host        = $this->smtp_account['smtp_host'];
+		$phpmailer->Port        = (int) $this->smtp_account['smtp_port'];
+		$phpmailer->SMTPSecure  = $this->smtp_account['smtp_ssl'] ? 'ssl' : '';
 		$phpmailer->SMTPAutoTLS = $this->smtp_account['smtp_ssl'];
-		$phpmailer->Username   = $this->smtp_account['username'];
-		$phpmailer->Password   = $this->smtp_account['password'];
-		$phpmailer->SMTPAuth   = true;
-		$phpmailer->FromName   = get_bloginfo( 'name' );
+		$phpmailer->Username    = $this->smtp_account['username'];
+		$phpmailer->Password    = $this->smtp_account['password'];
+		$phpmailer->SMTPAuth    = true;
+		$phpmailer->FromName    = get_bloginfo( 'name' );
 	}
 
 	public function get_cc_header( $cc ) {

From 451f666a3f1c45f45d83a990653ed43f7b321309 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Thu, 22 Oct 2015 13:00:30 -0700
Subject: [PATCH 464/485] Set threads to private to prevent titles being leaked
 in search results.

Fixes https://meta.trac.wordpress.org/ticket/1341
---
 supportflow.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/supportflow.php b/supportflow.php
index e819bdd..53e8d8f 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -320,9 +320,9 @@ public function action_init_register_post_type() {
 					'not_found'          => __( 'No tickets found', 'supportflow' ),
 					'not_found_in_trash' => __( 'No tickets found in trash', 'supportflow' ),
 				),
-				'public'             => true,
+				'public'             => false,
 				'menu_position'      => 3,
-				'publicly_queryable' => false,
+				'show_ui'            => true,
 				'supports'           => false,
 				'menu_icon'          => 'dashicons-sos',
 			)

From 97b61b3792168e1c8994c544c23c8b70541e8786 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Thu, 22 Oct 2015 13:19:50 -0700
Subject: [PATCH 465/485] Remove `ticket_attachment_upload` callback because no
 handler exists.

---
 classes/class-supportflow-admin.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index ce4aedb..8b7a162 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -10,7 +10,6 @@ class SupportFlow_Admin {
 	function __construct() {
 		add_action( 'wp_ajax_sf_forward_conversation', array( $this, 'action_wp_ajax_sf_email_conversation' ) );
 		add_filter( 'heartbeat_received', array( $this, 'filter_heartbeat_received' ), 10, 2 );
-		add_action( 'wp_ajax_ticket_attachment_upload', array( $this, 'action_wp_ajax_ticket_attachment_upload' ) );
 		add_action( 'supportflow_after_setup_actions', array( $this, 'setup_actions' ) );
 		add_action( 'add_attachment', array( $this, 'action_add_attachment' ) );
 	}

From b0aaad801e9c5e8327e8df313bc269e1a38052cf Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Thu, 22 Oct 2015 14:02:08 -0700
Subject: [PATCH 466/485] Check if user is authorized to get/set permissions.

---
 classes/class-supportflow-permissions.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index e545b52..bb467d0 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -133,6 +133,10 @@ public function insert_script() {
 	public function action_wp_ajax_get_user_permissions() {
 		check_ajax_referer( 'get_user_permissions', '_get_user_permissions_nonce' );
 
+		if ( ! current_user_can( 'manage_options' ) ) {
+			wp_send_json_error( __( 'Access denied.', 'supportflow' ) );
+		}
+
 		if (
 			! isset( $_POST['user_id'], $_POST['status'] ) ||
 			! is_numeric( $_POST['user_id'] ) ||
@@ -255,6 +259,10 @@ public function get_user_permissions( $user_id, $return_allowed = true, $return_
 	public function action_wp_ajax_set_user_permission() {
 		check_ajax_referer( 'set_user_permission', '_set_user_permission_nonce' );
 
+		if ( ! current_user_can( 'manage_options' ) ) {
+			wp_send_json_error( __( 'Access denied.', 'supportflow' ) );
+		}
+
 		if ( ! isset( $_POST['user_id'] )
 			|| ! isset( $_POST['privilege_type'] )
 			|| ! isset( $_POST['privilege_id'] )

From 96ad6f7a6f27481e38a09618d4d87bb289fcdd74 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Fri, 30 Oct 2015 11:57:52 -0700
Subject: [PATCH 467/485] Restructure check for returning early to improve
 maintainability.

This is functionally equivalent to the previous version, but much easier to read and understand.
---
 classes/class-supportflow-permissions.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index bb467d0..7c84c1e 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -324,16 +324,12 @@ function limit_user_permissions( $allcaps, $cap, $args ) {
 			}
 		}
 
-		if (
-			// Return if required capability is not one of them
-			! in_array( $args[0], array( 'edit_post', 'edit_posts', 'delete_post' ) ) ||
-
-			// Return if user is admin
-			( ! empty( $allcaps['manage_options'] ) && true == $allcaps['manage_options'] ) ||
+		// Return early in some cases
+		$relevant_capability   = in_array( $args[0], array( 'edit_post', 'edit_posts', 'delete_post' ), true );
+		$user_is_admin         = ! empty( $allcaps['manage_options'] ) && true === $allcaps['manage_options'];
+		$is_supportflow_ticket = SupportFlow()->post_type === $post_type;
 
-			// Return if posts are not supportflow tickets
-			SupportFlow()->post_type != $post_type
-		) {
+		if ( ! $relevant_capability || $user_is_admin || ! $is_supportflow_ticket ) {
 			return $allcaps;
 		}
 

From 53e2e36f47e9cf40feff5801e907a6cd915c8549 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Fri, 30 Oct 2015 15:20:20 -0700
Subject: [PATCH 468/485] Protect the `get-customers` endpoint with nonce and
 capability checks.

---
 classes/class-supportflow-admin.php       |  3 ++-
 classes/class-supportflow-json-api.php    | 13 ++++++++++---
 classes/class-supportflow-permissions.php | 12 ++++++++++--
 js/customers-autocomplete.js              |  7 +++++--
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 8b7a162..eeabea5 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -89,7 +89,8 @@ public function action_admin_enqueue_scripts() {
 			$auto_save_handle                = SupportFlow()->enqueue_script( 'supportflow-auto-save', 'auto_save.js', array( 'jquery', 'heartbeat' ) );
 
 			wp_localize_script( $customers_autocomplete_handle, 'SFCustomersAc', array(
-				'ajax_url' => add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) )
+				'ajax_url'            => add_query_arg( 'action', SupportFlow()->extend->jsonapi->action, admin_url( 'admin-ajax.php' ) ),
+				'get_customers_nonce' => wp_create_nonce( 'get_customers' ),
 			) );
 
 			wp_localize_script( $ticket_attachment_handle, 'SFTicketAttachments', array(
diff --git a/classes/class-supportflow-json-api.php b/classes/class-supportflow-json-api.php
index b1d31c1..6eee026 100644
--- a/classes/class-supportflow-json-api.php
+++ b/classes/class-supportflow-json-api.php
@@ -15,17 +15,24 @@ public function setup_actions() {
 	}
 
 	public function action_wp_ajax_supportflow_json() {
-
 		$response = array(
 			'api-action' => ( ! empty( $_REQUEST['api-action'] ) ) ? sanitize_key( $_REQUEST['api-action'] ) : '',
 			'status'     => 'error',
 			'message'    => '',
 			'html'       => '',
 		);
+
 		switch ( $response['api-action'] ) {
 			case 'get-customers':
-				$search_for         = sanitize_text_field( isset( $_REQUEST['customers'] ) ? $_REQUEST['customers'] : '' );
-				$customer_matches = SupportFlow()->get_customers( array( 'search' => $search_for ) );
+				check_ajax_referer( 'get_customers', 'get_customers_nonce' );
+
+				if ( current_user_can( 'sf_get_customers' ) ) {
+					$search_for       = sanitize_text_field( isset( $_REQUEST['customers'] ) ? $_REQUEST['customers'] : '' );
+					$customer_matches = SupportFlow()->get_customers( array( 'search' => $search_for ) );
+				} else {
+					$customer_matches = new WP_Error( 'sf_access_denied', __( 'Access denied.', 'supportflow' ) );
+				}
+
 				if ( is_wp_error( $customer_matches ) ) {
 					$response['message'] = $customer_matches->get_error_message();
 				} else {
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 7c84c1e..f1bf2fc 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -325,11 +325,12 @@ function limit_user_permissions( $allcaps, $cap, $args ) {
 		}
 
 		// Return early in some cases
-		$relevant_capability   = in_array( $args[0], array( 'edit_post', 'edit_posts', 'delete_post' ), true );
+		$relevant_capability   = in_array( $args[0], array( 'edit_post', 'edit_posts', 'delete_post', 'sf_get_customers' ), true );
 		$user_is_admin         = ! empty( $allcaps['manage_options'] ) && true === $allcaps['manage_options'];
 		$is_supportflow_ticket = SupportFlow()->post_type === $post_type;
+		$is_api_call           = isset( $_REQUEST['action'] ) && SupportFlow()->extend->jsonapi->action === $_REQUEST['action'];
 
-		if ( ! $relevant_capability || $user_is_admin || ! $is_supportflow_ticket ) {
+		if ( ! $relevant_capability || $user_is_admin || ( ! $is_supportflow_ticket && ! $is_api_call ) ) {
 			return $allcaps;
 		}
 
@@ -385,6 +386,13 @@ function limit_user_permissions( $allcaps, $cap, $args ) {
 			}
 		}
 
+		// Allow users with access to at least one e-mail account or tag to get the full customer list
+		if ( 'sf_get_customers' == $args[0] ) {
+			if ( ! empty ( $user_permissions['email_accounts'] ) || ! empty ( $user_permissions['tags'] ) ) {
+				$allcaps['sf_get_customers'] = true;
+			}
+		}
+
 		return $allcaps;
 	}
 
diff --git a/js/customers-autocomplete.js b/js/customers-autocomplete.js
index cfff544..4661c7b 100644
--- a/js/customers-autocomplete.js
+++ b/js/customers-autocomplete.js
@@ -13,8 +13,11 @@ jQuery(document).ready(function ($) {
 				search_for = resps[0];
 			}
 
-			return { "customers": search_for, "api-action": 'get-customers' };
-
+			return {
+				"customers"           : search_for,
+				"api-action"          : 'get-customers',
+				"get_customers_nonce" : SFCustomersAc.get_customers_nonce
+			};
 		}
 
 		$('#customers').autocomplete({

From aec8370ef7549aa9efb38ae1cdbccde63061cff8 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Fri, 30 Oct 2015 15:21:58 -0700
Subject: [PATCH 469/485] Correct `access` and `at least` typos.

---
 classes/class-supportflow-permissions.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index f1bf2fc..6e05310 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -305,12 +305,12 @@ public function set_user_permission( $user_id, $privilege_type, $privilege_id, $
 	}
 
 	/*
-	 * Limited under-privileged user acces to only allowed E-Mail accounts
+	 * Limited under-privileged user access to only allowed E-Mail accounts
 	 */
 	function limit_user_permissions( $allcaps, $cap, $args ) {
 		global $pagenow, $post_type;
 
-		// Check if atleast one E-Mail account exists before showing ticket creation page
+		// Check if at least one E-Mail account exists before showing ticket creation page
 		if (
 			'post-new.php' == $pagenow &&
 			SupportFlow()->post_type == $post_type
@@ -318,7 +318,7 @@ function limit_user_permissions( $allcaps, $cap, $args ) {
 			$email_accounts = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 			if ( empty( $email_accounts ) ) {
 				$link = "edit.php?post_type=$post_type&page=sf_accounts";
-				$msg  = 'Please add atleast one E-Mail account before creating a ticket.';
+				$msg  = 'Please add at least one E-Mail account before creating a ticket.';
 
 				wp_die( "<a href='$link'>" . __( $msg, 'supportflow' ) . "</a>" );
 			}

From 46b476e49494428d21bde0a7031635df88d50d6f Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Fri, 30 Oct 2015 15:22:25 -0700
Subject: [PATCH 470/485] Correct semicolon usage.

---
 js/customers-autocomplete.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/customers-autocomplete.js b/js/customers-autocomplete.js
index 4661c7b..8455a9c 100644
--- a/js/customers-autocomplete.js
+++ b/js/customers-autocomplete.js
@@ -18,7 +18,7 @@ jQuery(document).ready(function ($) {
 				"api-action"          : 'get-customers',
 				"get_customers_nonce" : SFCustomersAc.get_customers_nonce
 			};
-		}
+		};
 
 		$('#customers').autocomplete({
 
@@ -63,5 +63,5 @@ jQuery(document).ready(function ($) {
 			},
 			minLength: 2
 		});
-	};
+	}
 });
\ No newline at end of file

From bb204abf5e48d0b3f6d12ebf4435613622ba10bd Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Fri, 30 Oct 2015 15:31:57 -0700
Subject: [PATCH 471/485] Bump version to `0.6`.

---
 js/supportflow.min.js | 2 +-
 readme.txt            | 7 ++++++-
 supportflow.php       | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/js/supportflow.min.js b/js/supportflow.min.js
index ad31886..d47fcc3 100644
--- a/js/supportflow.min.js
+++ b/js/supportflow.min.js
@@ -1,2 +1,2 @@
 /*! SupportFlow minified version */
-jQuery(document).ready(function(a){a(".toggle-link").click(function(b){var c=a(this).siblings(".toggle-content").css("display");a(".toggle-content").hide(500),a(".toggle-link").prop("title",SFToggleLinks.expand),"none"==c&&(a(this).siblings(".toggle-content").show(500),a(this).prop("title",SFToggleLinks.collapse)),b.preventDefault()}),a(a(".toggle-content")).each(function(){"none"==a(this).css("display")?a(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):a(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),a(".toggle-content").first().show(500)})}),jQuery(document).ready(function(a){a(".delete_email_account").click(function(b){if(b.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var c=a(this).data("account-id"),d="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,e="";e+='<form method="POST" id="remove_email_account" action="'+d+'">',e+='<input type="hidden" name="action" value="delete" />',e+=SFEmailAccounts.delete_email_account_nonce,e+='<input type="hidden" name="account_id" value='+c+" />",e+="</form>",a("body").append(e),a("#remove_email_account").submit()}}),a("#add_new_email_account #imap_ssl").change(function(){this.checked?a("#add_new_email_account #imap_port").val("993"):a("#add_new_email_account #imap_port").val("143")}),a("#add_new_email_account #smtp_ssl").change(function(){this.checked?a("#add_new_email_account #smtp_port").val("465"):a("#add_new_email_account #smtp_port").val("25")})}),jQuery(document).ready(function(a){var b=function(b){b.preventDefault();var c=a("#email_conversation_to").val();a.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:c,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){a("#email_conversation_to").prop("disabled",!0),a("#email_conversation_submit").prop("disabled",!0),a("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(b){a("#email_conversation_status").html(b)},error:function(){a("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){a("#email_conversation_to").prop("disabled",!1),a("#email_conversation_submit").prop("disabled",!1)}})};a("#email_conversation_submit").click(b),a("#email_conversation_to").keyup(function(){(10==event.keyCode||13==event.keyCode)&&b()})}),jQuery(document).ready(function(a){a(".permission_filters").change(function(){var b=a("#change_user option:selected").data("user-id"),c=a("#change_status option:selected").data("status");a.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:b,status:c,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(b){a("#user_permissions_table").html(b)}})}),a(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("permission-identifier"),e=b.prop("checked"),f=d.user_id,g=d.privilege_type,h=d.privilege_id;c.html(SFPermissions.changing_status),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:f,privilege_type:g,privilege_id:h,allowed:e,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var a=b.prop("checked");1==a?c.html(SFPermissions.allowed):c.html(SFPermissions.not_allowed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){a("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=a("#predefs").find("option:selected").data("content"),old_content=a(".predef:nth-child("+this.old_child+")").data("content"),current_content=a("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void a(".predef:nth-child("+this.old_child+")").prop("selected",!0);a("#reply").val(new_content),this.old_child=a("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(a){a(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("email-notfication-identifier"),e=b.prop("checked"),f=d.privilege_type,g=d.privilege_id;c.html(SFPreferences.changing_state),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:f,privilege_id:g,allowed:e,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var a=b.prop("checked");1==a?c.html(SFPreferences.subscribed):c.html(SFPreferences.unsubscribed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){if("sf_ticket"==pagenow){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers"}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(b){var c=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return c.on("close",function(){var b=c.state().get("selection").toJSON();a.each(b,function(){var b='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",c='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";a("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+b+"&nbsp;"+c+"</li>"),a("#reply-attachments").val(a("#reply-attachments").val()+_.escape(this.id)+",")})}),c.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(a){a("#supportflow-details .meta-item-ok-button").click(function(b){var c=a(this).siblings(".meta-item-dropdown").children("option:selected"),d=a(this).closest(".meta-item"),e=d.children(".meta-item-name"),f=d.children(".meta-item-label");e.val(c.val()),f.text(c.text()),b.preventDefault()}),a("#supportflow-details .meta-item-toggle-button").click(function(b){a(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),b.preventDefault()}),a(".save-button").click(function(b){return""==a("#subject").val()?(a("#subject").focus(),alert(SFTickets.no_title_msg),void b.preventDefault()):""==a("#customers").val()?(a("#customers").focus(),alert(SFTickets.no_customer_msg),void b.preventDefault()):void 0}),a("#reply").keypress(function(b){!b.ctrlKey||10!=b.keyCode&&13!=b.keyCode||""==a(this).val()||a(".save-button").first().click()}),a("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&(a("#mark-private").prop("checked")?a("#insert-reply").val(SFTickets.add_private_note):a("#insert-reply").val(SFTickets.send_msg))}),a("#close-ticket-submit").click(function(b){a("#post .meta-item input[name='post_status']").val("sf_closed")}),a(".sf_toggle_quoted_text").click(function(b){b.preventDefault(),a(this).parent().html(a(this).data("quoted_text"))})}),jQuery(document).ready(function(a){a(".sf_autosave").keyup(function(){var b={};b.ticket_id=SFAutoSave.ticket_id,a(".sf_autosave").each(function(){element_key=a(this).attr("name"),element_value=a(this).val(),b[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",b,!1)})});
\ No newline at end of file
+jQuery(document).ready(function(a){a(".toggle-link").click(function(b){var c=a(this).siblings(".toggle-content").css("display");a(".toggle-content").hide(500),a(".toggle-link").prop("title",SFToggleLinks.expand),"none"==c&&(a(this).siblings(".toggle-content").show(500),a(this).prop("title",SFToggleLinks.collapse)),b.preventDefault()}),a(a(".toggle-content")).each(function(){"none"==a(this).css("display")?a(this).siblings(".toggle-link").prop("title",SFToggleLinks.expand):a(this).siblings(".toggle-link").prop("title",SFToggleLinks.collapse),a(".toggle-content").first().show(500)})}),jQuery(document).ready(function(a){a(".delete_email_account").click(function(b){if(b.preventDefault(),confirm(SFEmailAccounts.sure_delete_account)){var c=a(this).data("account-id"),d="edit.php?post_type="+SFEmailAccounts.post_type+"&page="+SFEmailAccounts.slug,e="";e+='<form method="POST" id="remove_email_account" action="'+d+'">',e+='<input type="hidden" name="action" value="delete" />',e+=SFEmailAccounts.delete_email_account_nonce,e+='<input type="hidden" name="account_id" value='+c+" />",e+="</form>",a("body").append(e),a("#remove_email_account").submit()}}),a("#add_new_email_account #imap_ssl").change(function(){this.checked?a("#add_new_email_account #imap_port").val("993"):a("#add_new_email_account #imap_port").val("143")}),a("#add_new_email_account #smtp_ssl").change(function(){this.checked?a("#add_new_email_account #smtp_port").val("465"):a("#add_new_email_account #smtp_port").val("25")})}),jQuery(document).ready(function(a){var b=function(b){b.preventDefault();var c=a("#email_conversation_to").val();a.ajax(ajaxurl,{type:"post",data:{action:"sf_forward_conversation",email_ids:c,post_id:SFEmailConversation.post_id,_email_conversation_nonce:SFEmailConversation._email_conversation_nonce},beforeSend:function(){a("#email_conversation_to").prop("disabled",!0),a("#email_conversation_submit").prop("disabled",!0),a("#email_conversation_status").text(SFEmailConversation.sending_emails)},success:function(b){a("#email_conversation_status").html(b)},error:function(){a("#email_conversation_status").text(SFEmailConversation.failed_sending)},complete:function(){a("#email_conversation_to").prop("disabled",!1),a("#email_conversation_submit").prop("disabled",!1)}})};a("#email_conversation_submit").click(b),a("#email_conversation_to").keyup(function(){(10==event.keyCode||13==event.keyCode)&&b()})}),jQuery(document).ready(function(a){a(".permission_filters").change(function(){var b=a("#change_user option:selected").data("user-id"),c=a("#change_status option:selected").data("status");a.ajax(ajaxurl,{type:"post",data:{action:"get_user_permissions",user_id:b,status:c,_get_user_permissions_nonce:SFPermissions._get_user_permissions_nonce},success:function(b){a("#user_permissions_table").html(b)}})}),a(document).on("change",".sf_user_permissions_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("permission-identifier"),e=b.prop("checked"),f=d.user_id,g=d.privilege_type,h=d.privilege_id;c.html(SFPermissions.changing_status),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_user_permission",user_id:f,privilege_type:g,privilege_id:h,allowed:e,_set_user_permission_nonce:SFPermissions._set_user_permission_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPermissions.failed_changing_status)},complete:function(){var a=b.prop("checked");1==a?c.html(SFPermissions.allowed):c.html(SFPermissions.not_allowed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){a("#predefs").change(function(){if(void 0==this.old_child&&(this.old_child=1),new_content=a("#predefs").find("option:selected").data("content"),old_content=a(".predef:nth-child("+this.old_child+")").data("content"),current_content=a("#reply").val(),0!=new_content.length){if(current_content!=old_content&&0==window.confirm(SFPredefinedReplies.message))return void a(".predef:nth-child("+this.old_child+")").prop("selected",!0);a("#reply").val(new_content),this.old_child=a("#predefs").find("option:selected").index()+1}})}),jQuery(document).ready(function(a){a(document).on("change",".sf_email_accounts_table .toggle_privilege",function(){var b=a(this),c=b.siblings(".privilege_status"),d=b.data("email-notfication-identifier"),e=b.prop("checked"),f=d.privilege_type,g=d.privilege_id;c.html(SFPreferences.changing_state),b.prop("disabled",!0),a.ajax(ajaxurl,{type:"post",data:{action:"set_email_notfication",privilege_type:f,privilege_id:g,allowed:e,_set_email_notfication_nonce:SFPreferences.set_email_notfication_nonce},success:function(a){1!=a&&(b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state))},error:function(){b.prop("checked",!b.prop("checked")),alert(SFPreferences.failed_changing_state)},complete:function(){var a=b.prop("checked");1==a?c.html(SFPreferences.subscribed):c.html(SFPreferences.unsubscribed),b.prop("disabled",!1)}})})}),jQuery(document).ready(function(a){if("sf_ticket"==pagenow){var b=function(){var b=a("#customers").val().replace(" ","").split(",");if(a.isArray(b)&&b.length>1)var c=b.pop();else c=b[0];return{customers:c,"api-action":"get-customers",get_customers_nonce:SFCustomersAc.get_customers_nonce}};a("#customers").autocomplete({source:function(c,d){a.ajax({url:SFCustomersAc.ajax_url,dataType:"json",data:b(),success:function(b){return""==b.query?(d(!1),!1):void d(a.map(b.customers,function(b){var c=a("#customers").val().split(" ").join("").split(",");if(c.pop(),-1==a.inArray(b.name,c)){c.push(b.name);var d=c.join(", ")+", ";return{label:b.name,value:d}}}))}})},minLength:2})}}),jQuery(document).ready(function(a){attachment_uploader={init:function(){a(document).on("click","#reply-attachment-browse-button",{},attachment_uploader.uploader),a(document).on("click",".reply-attachment-remove",attachment_uploader.remove)},uploader:function(b){var c=wp.media({title:SFTicketAttachments.frame_title,multiple:!0,button:{text:SFTicketAttachments.button_title}});return c.on("close",function(){var b=c.state().get("selection").toJSON();a.each(b,function(){var b='<a class="reply-attachment-link" target="_blank" href="'+_.escape(this.url)+'">'+_.escape(this.filename)+"</a>",c='<a class="reply-attachment-remove delete" href="#" data-attachment-id='+_.escape(this.id)+" >"+SFTicketAttachments.remove_attachment+"</a>";a("#replies-attachments-list").append('<li id="media-items" class="reply-attachment">'+b+"&nbsp;"+c+"</li>"),a("#reply-attachments").val(a("#reply-attachments").val()+_.escape(this.id)+",")})}),c.open(),!1},remove:function(b){if(confirm(SFTicketAttachments.sure_remove)){var c=a(this).data("attachment-id"),d=a("#reply-attachments").val();d=d.replace(","+c+",",","),a("#reply-attachments").val(d),a(this).closest(".reply-attachment").remove()}b.preventDefault()}},attachment_uploader.init()}),jQuery(document).ready(function(a){a("#supportflow-details .meta-item-ok-button").click(function(b){var c=a(this).siblings(".meta-item-dropdown").children("option:selected"),d=a(this).closest(".meta-item"),e=d.children(".meta-item-name"),f=d.children(".meta-item-label");e.val(c.val()),f.text(c.text()),b.preventDefault()}),a("#supportflow-details .meta-item-toggle-button").click(function(b){a(this).closest(".meta-item").children(".meta-item-toggle-content").toggle(250),b.preventDefault()}),a(".save-button").click(function(b){return""==a("#subject").val()?(a("#subject").focus(),alert(SFTickets.no_title_msg),void b.preventDefault()):""==a("#customers").val()?(a("#customers").focus(),alert(SFTickets.no_customer_msg),void b.preventDefault()):void 0}),a("#reply").keypress(function(b){!b.ctrlKey||10!=b.keyCode&&13!=b.keyCode||""==a(this).val()||a(".save-button").first().click()}),a("#mark-private").change(function(){"post.php"==SFTickets.pagenow&&(a("#mark-private").prop("checked")?a("#insert-reply").val(SFTickets.add_private_note):a("#insert-reply").val(SFTickets.send_msg))}),a("#close-ticket-submit").click(function(b){a("#post .meta-item input[name='post_status']").val("sf_closed")}),a(".sf_toggle_quoted_text").click(function(b){b.preventDefault(),a(this).parent().html(a(this).data("quoted_text"))})}),jQuery(document).ready(function(a){a(".sf_autosave").keyup(function(){var b={};b.ticket_id=SFAutoSave.ticket_id,a(".sf_autosave").each(function(){element_key=a(this).attr("name"),element_value=a(this).val(),b[element_key]=element_value}),wp.heartbeat.enqueue("supportflow-autosave",b,!1)})});
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
index 4fe1692..47a01b8 100644
--- a/readme.txt
+++ b/readme.txt
@@ -3,7 +3,7 @@ Contributors: VarunAgw, danielbachhuber, Viper007Bond, andrewspittle, iandunn, k
 Tags: Ticket, support, admin, customer, customer support, help desk, helpdesk, IT, support, ticket
 Requires at least: 3.5
 Tested up to: 4.3
-Stable tag: 0.5
+Stable tag: 0.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -59,6 +59,11 @@ If it still isn't working, check the log for any error messages or clues. To vie
 
 == Changelog ==
 
+= 0.6 =
+* Security: Tightened access controls to read and set SupportFlow permissions.
+* Privacy: Prevented leaking e-mail subject lines in search results.
+* Privacy: Prevented leaking customer e-mail addresses to WordPress users that lacked SupportFlow permissions.
+
 = 0.5 =
 * Improved handling of large mailboxes during initial message download.
 * Tickets are now re-opened when new replies are added.
diff --git a/supportflow.php b/supportflow.php
index 53e8d8f..50c5822 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -7,7 +7,7 @@
  * Plugin URI:  https://wordpress.org/plugins/supportflow/
  * Description: Reinventing how you support your customers.
  * Author:      Daniel Bachhuber, Varun Agrawal, Alex Mills, Andrew Spittle
- * Version:     0.5
+ * Version:     0.6
  *
  * Text Domain: supportflow
  * Domain Path: /languages/
@@ -169,7 +169,7 @@ private function setup_globals() {
 
 		/** Version ***********************************************************/
 
-		$this->version = '0.5'; // SupportFlow version
+		$this->version = '0.6'; // SupportFlow version
 
 		/** Paths *************************************************************/
 

From 7cdbe80097c760ed47a61c5c2f79b67ce6f6a4c4 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Mon, 9 Nov 2015 12:09:37 -0800
Subject: [PATCH 472/485] Cast term ID to integer to avoid it being treated as
 the term slug.

It was being passed to wp_set_object_terms() and term_exists() as a string, so term_exists() thought it was the slug, and the query returned 0 results, so wp_set_object_terms() created a new term using the first term's ID as the name/slug of the new term.

Fixes #252
---
 supportflow.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index 50c5822..c9809ec 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -740,7 +740,7 @@ public function update_ticket_customers( $ticket_id, $customers, $append = false
 			} else {
 				$term       = wp_insert_term( $email, $this->customers_tax, array( 'slug' => $this->get_email_hash( $email ) ) );
 				if ( ! is_wp_error( $term ) ) {
-					$term_ids[] = $term['term_id'];
+					$term_ids[] = (int) $term['term_id'];
 				}
 
 			}

From 19fa51cc9ec97db18112e5090455f39532b7f31d Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Thu, 19 Nov 2015 16:12:31 -0800
Subject: [PATCH 473/485] Remove special menu position.

There's no reason for SupportFlow to be ranked higher than normal.
---
 supportflow.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/supportflow.php b/supportflow.php
index c9809ec..8f0a89f 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -321,7 +321,6 @@ public function action_init_register_post_type() {
 					'not_found_in_trash' => __( 'No tickets found in trash', 'supportflow' ),
 				),
 				'public'             => false,
-				'menu_position'      => 3,
 				'show_ui'            => true,
 				'supports'           => false,
 				'menu_icon'          => 'dashicons-sos',

From 596fd7bb4c642fbe6419a4246fd737c3766662a3 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Fri, 20 Nov 2015 11:38:39 -0800
Subject: [PATCH 474/485] Set cron interval to 10 minutes if using Gmail.

Fixes #253
---
 classes/class-supportflow-email-accounts.php | 22 ++++++++++++++++++++
 supportflow.php                              | 15 +++++++++++--
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/classes/class-supportflow-email-accounts.php b/classes/class-supportflow-email-accounts.php
index 75a7b48..cc38f27 100644
--- a/classes/class-supportflow-email-accounts.php
+++ b/classes/class-supportflow-email-accounts.php
@@ -461,6 +461,28 @@ function email_account_exists( $imap_host, $smtp_host, $username ) {
 
 		return false;
 	}
+
+	/**
+	 * Determines if any active account is using Gmail
+	 *
+	 * @return bool
+	 */
+	public function has_gmail_account() {
+		$gmail    = false;
+		$accounts = $this->get_email_accounts( true );
+
+		foreach( $accounts as $account ) {
+			$gmail_imap = false !== strpos( $account['imap_host'], 'gmail.com' );
+			$gmail_smtp = false !== strpos( $account['smtp_host'], 'gmail.com' );
+
+			if ( $gmail_imap || $gmail_smtp ) {
+				$gmail = true;
+				break;
+			}
+		}
+
+		return $gmail;
+	}
 }
 
 SupportFlow()->extend->email_accounts = new SupportFlow_Email_Accounts();
diff --git a/supportflow.php b/supportflow.php
index 8f0a89f..b6c43d8 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -69,6 +69,7 @@ public static function instance() {
 				self::$instance->setup_globals();
 				self::$instance->includes();
 				self::$instance->setup_actions();
+				self::$instance->setup_late_globals();
 			}
 		}
 
@@ -195,8 +196,6 @@ private function setup_globals() {
 
 		$this->ticket_secret_key = 'ticket_secret';
 
-		$this->cron_interval = apply_filters( 'supportflow_cron_interval', 5 * MINUTE_IN_SECONDS );
-
 		$this->post_statuses = apply_filters(
 			'supportflow_ticket_post_statuses', array(
 				'sf_new'     => array(
@@ -1110,6 +1109,18 @@ public function action_init_wp_schedule_event() {
 	public static function action_register_deactivation_hook() {
 		wp_clear_scheduled_hook( 'sf_cron_retrieve_email_replies' );
 	}
+
+	/**
+	 * Setup globals that require some of the other classes to be loaded
+	 */
+	protected function setup_late_globals() {
+		/*
+		 * Gmail might block access if a client checks more than every 10 minutes.
+		 * https://support.google.com/mail/answer/14257?p=client_login&rd=1
+		 */
+		$this->cron_interval = SupportFlow()->extend->email_accounts->has_gmail_account() ? 10 * MINUTE_IN_SECONDS : 5 * MINUTE_IN_SECONDS;
+		$this->cron_interval = apply_filters( 'supportflow_cron_interval', $this->cron_interval );
+	}
 }
 
 /**

From d76d1168d556eca850b40f8fcaa20fb2a396f5c1 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Thu, 10 Dec 2015 11:40:58 -0800
Subject: [PATCH 475/485] Treat the Reply-To header as the customer address if
 it exists.

This ensures that responses to the message will be sent to the requested address, rather than the From address, which is necessary when the messages are sent via contact forms, etc.

Fixes https://meta.trac.wordpress.org/ticket/1440
---
 classes/class-supportflow-email-replies.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index cf38595..66493ad 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -239,7 +239,12 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 		}
 
 		$reply_author       = isset( $email->headers->from[0]->personal ) ? $email->headers->from[0]->personal : '';
-		$reply_author_email = $email->headers->from[0]->mailbox . '@' . $email->headers->from[0]->host;
+
+		if ( empty( $email->headers->reply_to ) ) {
+			$reply_author_email = $email->headers->from[0]->mailbox     . '@' . $email->headers->from[0]->host;
+		} else {
+			$reply_author_email = $email->headers->reply_to[0]->mailbox . '@' . $email->headers->reply_to[0]->host;
+		}
 
 		// Parse out the reply body
 		if ( function_exists( 'What_The_Email' ) ) {

From 71a6053848c523f7b50b61a1f3770013badc76c0 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Wed, 20 Jan 2016 13:38:08 -0800
Subject: [PATCH 476/485] Check if query parameter exists before using it.

---
 classes/class-supportflow-admin.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index eeabea5..9387cdd 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -175,7 +175,10 @@ function action_add_attachment( $attachment_id ) {
 
 		$url  = parse_url( $referer );
 		$path = $url['scheme'] . '://' . $url['host'] . $url['path'];
-		parse_str( $url['query'], $query );
+
+		if ( isset( $url['query'] ) ) {
+			parse_str( $url['query'], $query );
+		}
 
 		// Check if referred by SupportFlow ticket page
 		if ( admin_url( 'post-new.php' ) == $path ) {

From c08d376072f093b650c49dcb44124f43ea0177b1 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Mon, 20 Jun 2016 16:25:37 +0000
Subject: [PATCH 477/485] Admin: Escape ticket title on Discussion screen to
 avoid XSS.

If `run_wptexturize` is disabled, the following subject title would allow an attacker to perform cross-site scripting:

`"><script>alert('hi');</script>`

That attack has a CVSS score of 4.7 - https://www.first.org/cvss/calculator/3.0#CVSS:3.0/AV:N/AC:H/PR:N/UI:R/S:C/C:L/I:L/A:N

The rest of the output was reformatted to improve readability and make it easier to spot missing escaping functions or other problems.

Props https://hackerone.com/whitehatter for discovering and disclosing responsibly.

Fixes https://hackerone.com/reports/145086
---
 classes/class-supportflow-admin.php | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index 9387cdd..e4ff6b4 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -899,12 +899,25 @@ public function render_meta_box_details_actions() {
 	 * A box that appears at the top
 	 */
 	public function meta_box_subject() {
+		?>
+
+		<h4><?php _e( 'Subject', 'supportflow' ); ?></h4>
 
-		$placeholder = __( 'What is your conversation about?', 'supportflow' );
-		echo '<h4>' . __( 'Subject', 'supportflow' ) . '</h4>';
-		echo '<input type="text" id="subject" name="post_title" class="sf_autosave" placeholder="' . $placeholder . '" value="' . get_the_title() . '" autocomplete="off" />';
-		echo '<p class="description">' . __( 'Please describe what this ticket is about in several words', 'supportflow' ) . '</p>';
+		<input
+			type="text"
+			id="subject"
+			name="post_title"
+			class="sf_autosave"
+			placeholder="<?php _e( 'What is your conversation about?', 'supportflow' ); ?>"
+			value="<?php echo esc_attr( get_the_title() ); ?>"
+			autocomplete="off"
+		/>
 
+		<p class="description">
+			<?php _e( 'Please describe what this ticket is about in several words', 'supportflow' ) ?>
+		</p>
+
+		<?php
 	}
 
 	/**

From c507cc863d161f87c28d0682714bf188ffac1a67 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Mon, 20 Jun 2016 16:34:45 +0000
Subject: [PATCH 478/485] Admin: Escape ticket excerpt on Tickets screen to
 avoid XSS.

An attacker could submit the following payload via `[supportflow_submissionform]` to perform cross-site-scripting:

`<script>alert('XSS');</script>`

That attack has a CVSS score of 6.1 - https://www.first.org/cvss/calculator/3.0#CVSS:3.0/AV:N/AC:L/PR:N/UI:R/S:C/C:L/I:L/A:N

Props https://hackerone.com/whitehatter for discovering and disclosing responsibly.

Fixes https://hackerone.com/reports/145091
---
 classes/class-supportflow-admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index e4ff6b4..c6dac90 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -1185,7 +1185,7 @@ function action_manage_posts_custom_column( $column_name, $ticket_id ) {
 				if ( strlen( $first_reply ) > 50 ) {
 					$first_reply = substr( $first_reply, 0, 50 );
 				}
-				echo $first_reply;
+				echo esc_html( $first_reply );
 				break;
 			case 'customers':
 				$customers = SupportFlow()->get_ticket_customers( $ticket_id, array( 'fields' => 'emails' ) );

From 7a4b3d5ab3d67370f0f5cfbdc94e46dd0799761a Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Mon, 20 Jun 2016 17:00:08 +0000
Subject: [PATCH 479/485] UI Widget: Get single post meta row for
 `$reply_author`.

Later in the function we're treating it as a string, so fetching an array leads to PHP notices.
---
 classes/class-supportflow-ui-widget.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/class-supportflow-ui-widget.php b/classes/class-supportflow-ui-widget.php
index 5c095f9..6629dd5 100644
--- a/classes/class-supportflow-ui-widget.php
+++ b/classes/class-supportflow-ui-widget.php
@@ -57,7 +57,7 @@ public function render_single_ticket_replies_html( $ticket_id ) {
 
 	public function render_single_reply_html( $reply ) {
 		$reply_timestamp = mysql2date( 'M. n', $reply->post_date_gmt );
-		$reply_author    = get_post_meta( $reply->ID, 'reply_author' );
+		$reply_author    = get_post_meta( $reply->ID, 'reply_author', true );
 		$output          = '<div class="ticket-reply-body">'
 			. wpautop( stripslashes( $reply->post_content ) )
 			. '</div>'

From fe706ccdb9859af32dddfff1c94c4c7048d794ea Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Mon, 20 Jun 2016 20:02:46 +0000
Subject: [PATCH 480/485] Add extra output escaping.

---
 classes/class-supportflow-admin.php       | 114 ++++++++++++----------
 classes/class-supportflow-dashboard.php   |   2 +-
 classes/class-supportflow-permissions.php |  18 +++-
 classes/class-supportflow-preferences.php |   2 +-
 classes/class-supportflow-table.php       |   2 +-
 classes/class-supportflow-ui-widget.php   |  72 ++++++++------
 supportflow.php                           |   2 +-
 7 files changed, 125 insertions(+), 87 deletions(-)

diff --git a/classes/class-supportflow-admin.php b/classes/class-supportflow-admin.php
index c6dac90..ac35570 100644
--- a/classes/class-supportflow-admin.php
+++ b/classes/class-supportflow-admin.php
@@ -240,7 +240,7 @@ public function filter_heartbeat_received( $response, $data ) {
 				update_post_meta( $ticket_id, "_sf_autosave_$element_id", $element_value );
 			}
 
-			echo $data['supportflow-autosave']['post_title'];
+			echo esc_html( $data['supportflow-autosave']['post_title'] );
 			if ( ! empty( $data['supportflow-autosave']['post_title'] ) ) {
 				wp_update_post( array( 'ID' => $ticket_id, 'post_title' => $data['supportflow-autosave']['post_title'] ) );
 			}
@@ -345,7 +345,7 @@ public function action_restrict_manage_posts() {
 		echo "<option value=''>" . __( 'Show All tags', 'supportflow' ) . "</option>";
 		foreach ( $terms as $term ) {
 			$selected = selected( isset( $_REQUEST[$tax_slug] ) && ( $_REQUEST[$tax_slug] == $term->slug ), true, false );
-			echo "<option value='" . esc_attr( $term->slug ) . "' $selected>" . esc_html( $term->name ) . '</option>';
+			echo "<option value='" . esc_attr( $term->slug ) . "' ". esc_attr( $selected ) .">" . esc_html( $term->name ) . '</option>';
 		}
 		echo "</select>";
 
@@ -356,7 +356,7 @@ public function action_restrict_manage_posts() {
 		echo "<option value=''>" . __( 'Show All Accounts', 'supportflow' ) . "</option>";
 		foreach ( $email_accounts as $id => $email_account ) {
 			$selected = selected( isset( $_REQUEST['email_account'] ) && ( $_REQUEST['email_account'] == $id ), true, false );
-			echo "<option value='" . esc_attr( $id ) . "'$selected>" . esc_html( $email_account['username'] ) . '</option>';
+			echo "<option value='" . esc_attr( $id ) . "'". esc_attr( $selected ) .">" . esc_html( $email_account['username'] ) . '</option>';
 		}
 		echo "</select>";
 
@@ -691,16 +691,16 @@ public function render_meta_box_details_email_account() {
 			?>
 			<div class="misc-pub-section meta-item">
 				<label class="meta-item-toggle-button"><?php _e( 'Account', 'supportflow' ) ?>:</label>
-				<span class="meta-item-label"><?php _e( $email_account_label, 'supportflow' ) ?></span>
+				<span class="meta-item-label"><?php esc_html_e( $email_account_label, 'supportflow' ) ?></span>
 				<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
 					<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
 				</a>
-				<input name="post_email_account" class="meta-item-name" value="<?php echo $email_account_first ?>" type="hidden" />
+				<input name="post_email_account" class="meta-item-name" value="<?php echo esc_attr( $email_account_first ); ?>" type="hidden" />
 
 				<div class="meta-item-toggle-content hide-if-js">
-					<?php echo $email_account_dropdown ?>
-					<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php _e( 'OK' ) ?></a>
-					<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php _e( 'Cancel' ) ?></a>
+					<?php echo esc_html( $email_account_dropdown ); ?>
+					<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php esc_html_e( 'OK', 'supportflow' ) ?></a>
+					<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php esc_html_e( 'Cancel', 'supportflow' ) ?></a>
 				</div>
 			</div>
 		<?php
@@ -717,13 +717,13 @@ public function render_meta_box_details_opened() {
 			$last_activity = sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
 			?>
 			<div class="misc-pub-section meta-item">
-				<label><?php _e( 'Opened', 'supportflow' ) ?>:</label>
+				<label><?php esc_html_e( 'Opened', 'supportflow' ) ?>:</label>
 				<span class="meta-item-label"><?php esc_html_e( $opened ) ?></span>
 			</div>
 
 			<!--Last ticket update time-->
 			<div class="misc-pub-section meta-item">
-				<label><?php _e( 'Last Activity', 'supportflow' ) ?>:</label>
+				<label><?php esc_html_e( 'Last Activity', 'supportflow' ) ?>:</label>
 				<span class="meta-item-label"><?php esc_html_e( $last_activity ) ?></span>
 			</div>
 		<?php
@@ -744,10 +744,10 @@ public function render_meta_box_details_status() {
 		?>
 		<!--Ticket status box-->
 		<div class="misc-pub-section meta-item">
-			<label class="meta-item-toggle-button"><?php _e( 'Status', 'supportflow' ) ?>:</label>
+			<label class="meta-item-toggle-button"><?php esc_html_e( 'Status', 'supportflow' ) ?>:</label>
 			<span class="meta-item-label"><?php esc_html_e( $current_status_label, 'supportflow' ) ?></span>
 			<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
-				<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
+				<span aria-hidden="true"><?php esc_html_e( 'Edit', 'supportflow' ) ?></span>
 			</a>
 			<input name="post_status" class="meta-item-name" value="<?php esc_attr_e( $current_status_id ) ?>" type="hidden" />
 
@@ -757,8 +757,8 @@ public function render_meta_box_details_status() {
 						<option value="<?php esc_attr_e( $slug ) ?>"<?php selected( $current_status_id, $slug ) ?>><?php esc_html_e( $post_status['label'] ) ?></option>;
 					<?php endforeach; ?>
 				</select>
-				<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php _e( 'OK' ) ?></a>
-				<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php _e( 'Cancel' ) ?></a>
+				<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php esc_html_e( 'OK', 'supportflow' ) ?></a>
+				<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php esc_html_e( 'Cancel', 'supportflow' ) ?></a>
 			</div>
 		</div>
 	<?php
@@ -785,22 +785,21 @@ public function render_meta_box_details_author() {
 			'name'             => '',
 			'who'              => 'author',
 			'class'            => 'meta-item-dropdown',
-			'echo'             => false
+			'echo'             => true
 		);
-		$post_authors_dropdown = wp_dropdown_users( $args );
 		?>
 		<div class="misc-pub-section meta-item">
-			<label class="meta-item-toggle-button"><?php _e( 'Owner', 'supportflow' ) ?>:</label>
-			<span class="meta-item-label"><?php _e( $post_author_label, 'supportflow' ) ?></span>
+			<label class="meta-item-toggle-button"><?php esc_html_e( 'Owner', 'supportflow' ) ?>:</label>
+			<span class="meta-item-label"><?php esc_html_e( $post_author_label, 'supportflow' ) ?></span>
 			<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
-				<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
+				<span aria-hidden="true"><?php esc_html_e( 'Edit', 'supportflow' ) ?></span>
 			</a>
 			<input name="post_author" class="meta-item-name" value="<?php esc_attr_e( $post_author_id ) ?>" type="hidden" />
 
 			<div class="meta-item-toggle-content hide-if-js">
-				<?php echo $post_authors_dropdown ?>
-				<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php _e( 'OK' ) ?></a>
-				<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php _e( 'Cancel' ) ?></a>
+				<?php wp_dropdown_users( $args ); ?>
+				<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php esc_html_e( 'OK', 'supportflow' ) ?></a>
+				<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php esc_html_e( 'Cancel', 'supportflow' ) ?></a>
 			</div>
 		</div>
 	<?php
@@ -813,14 +812,8 @@ public function render_meta_box_details_notifications() {
 		$notification_id          = 0;
 		$notification_label       = 'Default';
 		$notification_label_title = 'Choose default if you want to receive E-Mail notifications based on what you set in `E-Mail notification` page. Choose Enable/Disable if you want to override those settings';
-		$notification_dropdown    = '';
-		$notification_dropdown .= '<select class="meta-item-dropdown">';
 
-		if ( 'post-new.php' == $pagenow ) {
-			$notification_dropdown .= '<option value="default">' . __( 'Default', 'supportflow' ) . '</option>';
-			$notification_dropdown .= '<option value="enable">' . __( 'Subscribed', 'supportflow' ) . '</option>';
-			$notification_dropdown .= '<option value="disable">' . __( 'Unsubscribed', 'supportflow' ) . '</option>';
-		} elseif ( 'post.php' == $pagenow ) {
+		if ( 'post.php' == $pagenow ) {
 			$email_notifications_override = get_post_meta( get_the_ID(), 'email_notifications_override', true );
 			$current_user_id              = get_current_user_id();
 
@@ -834,24 +827,43 @@ public function render_meta_box_details_notifications() {
 					$notification_id    = 2;
 				}
 			}
-
-			$notification_dropdown .= '<option value="default"' . selected( $notification_id, 0, false ) . '>' . __( 'Default', 'supportflow' ) . '</option>';
-			$notification_dropdown .= '<option value="enable"' . selected( $notification_id, 1, false ) . '>' . __( 'Subscribed', 'supportflow' ) . '</option>';
-			$notification_dropdown .= '<option value="disable"' . selected( $notification_id, 2, false ) . '>' . __( 'Unsubscribed', 'supportflow' ) . '</option>';
 		}
 
-		$notification_dropdown .= '</select>';
 		?>
+
 		<div class="misc-pub-section meta-item">
 			<label class="meta-item-toggle-button" title="<?php _e( $notification_label_title, 'supportflow' ) ?>"><?php _e( 'E-Mail Notifications', 'supportflow' ) ?>:</label>
 			<span class="meta-item-label"><?php esc_html_e( $notification_label, 'supportflow' ) ?></span>
 			<a href="#" class="meta-item-toggle-button meta-item-toggle-content hide-if-no-js">
 				<span aria-hidden="true"><?php _e( 'Edit' ) ?></span>
 			</a>
-			<input name="post_email_notifications_override" class="meta-item-name" value="<?php echo $notification_id ?>" type="hidden" />
+			<input name="post_email_notifications_override" class="meta-item-name" value="<?php echo esc_attr( $notification_id ); ?>" type="hidden" />
 
 			<div class="meta-item-toggle-content hide-if-js">
-				<?php echo $notification_dropdown ?>
+				<select class="meta-item-dropdown">
+					<?php if ( 'post-new.php' == $pagenow ) : ?>
+
+						<option value="default"><?php esc_html_e( 'Default',      'supportflow' ); ?></option>
+						<option value="enable" ><?php esc_html_e( 'Subscribed',   'supportflow' ); ?></option>
+						<option value="disable"><?php esc_html_e( 'Unsubscribed', 'supportflow' ); ?></option>
+
+					<?php elseif ( 'post.php' == $pagenow ) : ?>
+
+						<option value="default" <?php selected( $notification_id, 0 ); ?> >
+							<?php esc_html_e( 'Default', 'supportflow' ); ?>
+						</option>
+
+						<option value="enable" <?php selected( $notification_id, 1 ); ?> >
+							<?php esc_html_e( 'Subscribed', 'supportflow' ); ?>
+						</option>
+
+						<option value="disable" <?php selected( $notification_id, 2 ); ?> >
+							<?php esc_html_e( 'Unsubscribed', 'supportflow' ); ?>
+						</option>
+
+					<?php endif; ?>
+				</select>
+
 				<a href="#" class="hide-if-no-js button meta-item-ok-button meta-item-toggle-button"><?php _e( 'OK' ) ?></a>
 				<a href="#" class="hide-if-no-js button-cancel meta-item-cancel-button meta-item-toggle-button"><?php _e( 'Cancel' ) ?></a>
 			</div>
@@ -925,7 +937,7 @@ class="sf_autosave"
 	 */
 	public function meta_box_customers() {
 
-		$placeholder = __( 'Who are you starting a conversation with?', 'supportflow' );
+		$placeholder = 'Who are you starting a conversation with?';
 		if ( 'draft' == get_post_status( get_the_ID() ) ) {
 			$customers_string = get_post_meta( get_the_ID(), '_sf_autosave_customers', true );
 		} else {
@@ -934,7 +946,7 @@ public function meta_box_customers() {
 			$customers_string .= empty( $customers_string ) ? '' : ', ';
 		}
 		echo '<h4>' . __( 'Customer(s)', 'supportflow' ) . '</h4>';
-		echo '<input type="text" id="customers" name="customers" class="sf_autosave" placeholder="' . $placeholder . '" value="' . esc_attr( $customers_string ) . '" autocomplete="off" />';
+		echo '<input type="text" id="customers" name="customers" class="sf_autosave" placeholder="' . esc_attr__( $placeholder, 'supportflow' ) . '" value="' . esc_attr( $customers_string ) . '" autocomplete="off" />';
 		echo '<p class="description">' . __( 'Enter each customer email address, separated with a comma', 'supportflow' ) . '</p>';
 	}
 
@@ -942,14 +954,14 @@ public function meta_box_customers() {
 	 * Add a form element where you can choose cc and bcc receiver of reply
 	 */
 	public function meta_box_cc_bcc() {
-		$cc_value = esc_attr( get_post_meta( get_the_ID(), '_sf_autosave_cc', true ) );
-		$bcc      = esc_attr( get_post_meta( get_the_ID(), '_sf_autosave_bcc', true ) );
+		$cc_value = get_post_meta( get_the_ID(), '_sf_autosave_cc', true );
+		$bcc      = get_post_meta( get_the_ID(), '_sf_autosave_bcc', true );
 		?>
 		<p class="description"> <?php _e( "Please add all the E-Mail ID's seperated by comma.", 'supportflow' ) ?></p>
 		<h4 class="inline"><?php _e( "CC: ", 'supportflow' ) ?></h4>
-		<input type="text" class="sf_autosave" id="cc" name="cc" value="<?php echo $cc_value ?>" />
+		<input type="text" class="sf_autosave" id="cc" name="cc" value="<?php echo esc_attr( $cc_value ); ?>" />
 		<h4 class="inline"> <?php _e( "BCC: ", 'supportflow' ) ?></h4>
-		<input type="text" class="sf_autosave" id="bcc" name="bcc" value="<?php echo $bcc ?>" />
+		<input type="text" class="sf_autosave" id="bcc" name="bcc" value="<?php echo esc_attr( $bcc ); ?>" />
 	<?php
 	}
 
@@ -1026,7 +1038,7 @@ public function meta_box_replies() {
 		$signature_label_title = __( 'Append your signature at the bottom of the reply. Signature can be removed or changed in preferences page', 'supportflow' );
 		$insert_signature_default = (boolean) get_user_meta( get_current_user_id(), 'sf_insert_signature_default', true );
 		echo '<input type="checkbox" ' . $disabled_attr . checked( $insert_signature_default, true, false ) . ' id="insert-signature" name="insert-signature" />';
-		echo "<label for='insert-signature' title='$signature_label_title'>" . __( 'Insert signature', 'supportflow' ) . '</label>';
+		echo "<label for='insert-signature' title='". esc_attr( $signature_label_title ) ."'>" . __( 'Insert signature', 'supportflow' ) . '</label>';
 		echo '<input type="checkbox" ' . $disabled_attr . ' id="mark-private" name="mark-private" />';
 		echo '<label for="mark-private">' . __( 'Mark private', 'supportflow' ) . '</label>';
 		if ( 'post-new.php' == $pagenow ) {
@@ -1056,7 +1068,7 @@ public function display_ticket_replies() {
 				$post_content = stripslashes( $reply->post_content );
 				$post_content = $this->hide_quoted_text( $post_content );
 				$post_content = wpautop( make_clickable( $post_content ) );
-				echo $post_content;
+				echo wp_kses( $post_content, 'post' );
 				if ( $attachment_ids = get_post_meta( $reply->ID, 'sf_attachments' ) ) {
 					echo '<ul class="ticket-reply-attachments">';
 					foreach ( $attachment_ids as $attachment_id ) {
@@ -1070,7 +1082,7 @@ public function display_ticket_replies() {
 				$reply_timestamp = sprintf( __( 'Noted by %1$s on %2$s at %3$s', 'supportflow' ), $reply_author, get_the_date( '', $reply->ID ), get_the_time( '', $reply->ID ) );
 				$modified_gmt    = get_post_modified_time( 'U', true, $reply->ID );
 				$last_activity   = sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
-				echo '<div class="ticket-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . ' (' . $last_activity . ')' . '</span></div>';
+				echo '<div class="ticket-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . ' (' . esc_html( $last_activity ) . ')' . '</span></div>';
 				echo '</li>';
 			}
 			echo '</ul>';
@@ -1097,7 +1109,7 @@ public function display_ticket_replies() {
 				$post_content = $this->hide_quoted_text( $post_content );
 				$post_content = wpautop( make_clickable( $post_content ) );
 
-				echo $post_content;
+				echo wp_kses( $post_content, 'post' );
 				if ( $attachment_ids = get_post_meta( $reply->ID, 'sf_attachments' ) ) {
 					echo '<ul class="ticket-reply-attachments">';
 					foreach ( $attachment_ids as $attachment_id ) {
@@ -1110,7 +1122,7 @@ public function display_ticket_replies() {
 				$reply_timestamp = sprintf( __( '%s at %s', 'supportflow' ), get_the_date( '', $reply->ID ), get_the_time( '', $reply->ID ) );
 				$modified_gmt    = get_post_modified_time( 'U', true, $reply->ID );
 				$last_activity   = sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
-				echo '<div class="ticket-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . ' (' . $last_activity . ')' . '</span></div>';
+				echo '<div class="ticket-meta"><span class="reply-timestamp">' . esc_html( $reply_timestamp ) . ' (' . esc_html( $last_activity ) . ')' . '</span></div>';
 				echo '</li>';
 			}
 			echo '</ul>';
@@ -1173,7 +1185,7 @@ function action_manage_posts_custom_column( $column_name, $ticket_id ) {
 		switch ( $column_name ) {
 			case 'updated':
 				$modified_gmt = get_post_modified_time( 'U', true, $ticket_id );
-				echo sprintf( __( '%s ago', 'supportflow' ), human_time_diff( $modified_gmt ) );
+				echo sprintf( __( '%s ago', 'supportflow' ), esc_html( human_time_diff( $modified_gmt ) ) );
 				break;
 			case 'sf_excerpt':
 				$replies = SupportFlow()->get_ticket_replies( $ticket_id, array( 'posts_per_page' => 1, 'order' => 'ASC' ) );
@@ -1202,7 +1214,7 @@ function action_manage_posts_custom_column( $column_name, $ticket_id ) {
 					$customer_link   = '<a class="customer_link" href="' . esc_url( add_query_arg( $args, admin_url( 'edit.php' ) ) ) . '">' . $customer_email . '</a>';
 					$customers[$key] = $customer_photo . '&nbsp;' . $customer_link;
 				}
-				echo implode( '<br />', $customers );
+				echo wp_kses( implode( '<br />', $customers ), 'comment' );
 				break;
 			case 'status':
 				$post_status = get_post_status( $ticket_id );
@@ -1232,13 +1244,13 @@ function action_manage_posts_custom_column( $column_name, $ticket_id ) {
 			case 'sf_replies':
 				$replies = SupportFlow()->get_ticket_replies_count( $ticket_id );
 				echo '<div class="post-com-count-wrapper">';
-				echo "<span class='replies-count'>{$replies}</span>";
+				echo "<span class='replies-count'>". esc_html( $replies ) ."</span>";
 				echo '</div>';
 				break;
 			case 'created':
 				$created_time = get_the_time( get_option( 'time_format' ) . ' T', $ticket_id );
 				$created_date = get_the_time( get_option( 'date_format' ), $ticket_id );
-				echo sprintf( __( '%s<br />%s', 'supportflow' ), $created_time, $created_date );
+				echo sprintf( __( '%s<br />%s', 'supportflow' ), esc_html( $created_time ), esc_html( $created_date ) );
 				break;
 		}
 	}
diff --git a/classes/class-supportflow-dashboard.php b/classes/class-supportflow-dashboard.php
index 45981d4..73dd128 100644
--- a/classes/class-supportflow-dashboard.php
+++ b/classes/class-supportflow-dashboard.php
@@ -166,7 +166,7 @@ function action_sf_my_tickets() {
 			$table->set_data( $data );
 
 			echo '<div class="container">';
-			echo "<h3 class='toggle-link'>" . $statuses[$status_slug]['label'] . "</h3>";
+			echo "<h3 class='toggle-link'>" . esc_html( $statuses[$status_slug]['label'] ) . "</h3>";
 
 			echo "<div class='toggle-content'>";
 			$table->display();
diff --git a/classes/class-supportflow-permissions.php b/classes/class-supportflow-permissions.php
index 6e05310..6d5faf5 100644
--- a/classes/class-supportflow-permissions.php
+++ b/classes/class-supportflow-permissions.php
@@ -89,7 +89,14 @@ public function permissions_page() {
 								$user_id       = $user->data->ID;
 								$user_nicename = esc_html( $user->data->user_nicename );
 								$user_email    = esc_html( $user->data->user_email );
-								echo "<option data-user-id=$user_id>$user_nicename ($user_email)</option>";
+								?>
+
+								<option data-user-id="<?php echo esc_attr( $user_id ); ?>">
+									<?php echo esc_html( $user_nicename ); ?>
+									(<?php echo esc_html( $user_email ); ?>)
+								</option>
+
+								<?php
 							}
 						}
 						?>
@@ -277,7 +284,7 @@ public function action_wp_ajax_set_user_permission() {
 		$privilege_id   = $_POST['privilege_id'];
 		$allowed        = 'true' == $_POST['allowed'] ? true : false;
 
-		echo $this->set_user_permission( $user_id, $privilege_type, $privilege_id, $allowed );
+		echo absint( $this->set_user_permission( $user_id, $privilege_type, $privilege_id, $allowed ) );
 		exit;
 	}
 
@@ -318,9 +325,12 @@ function limit_user_permissions( $allcaps, $cap, $args ) {
 			$email_accounts = SupportFlow()->extend->email_accounts->get_email_accounts( true );
 			if ( empty( $email_accounts ) ) {
 				$link = "edit.php?post_type=$post_type&page=sf_accounts";
-				$msg  = 'Please add at least one E-Mail account before creating a ticket.';
 
-				wp_die( "<a href='$link'>" . __( $msg, 'supportflow' ) . "</a>" );
+				wp_die( sprintf(
+					"<a href='%s'>%s</a>",
+					esc_html( $link ),
+					__( 'Please add at least one E-Mail account before creating a ticket.', 'supportflow' )
+				) );
 			}
 		}
 
diff --git a/classes/class-supportflow-preferences.php b/classes/class-supportflow-preferences.php
index 4f89fd3..f64f03b 100644
--- a/classes/class-supportflow-preferences.php
+++ b/classes/class-supportflow-preferences.php
@@ -147,7 +147,7 @@ public function action_wp_ajax_set_email_notfication() {
 		$privilege_id   = $_POST['privilege_id'];
 		$allowed        = 'true' == $_POST['allowed'] ? true : false;
 
-		echo SupportFlow()->extend->email_notifications->set_notfication_settings( $privilege_type, $privilege_id, $allowed );
+		echo absint( SupportFlow()->extend->email_notifications->set_notfication_settings( $privilege_type, $privilege_id, $allowed ) );
 		exit;
 	}
 
diff --git a/classes/class-supportflow-table.php b/classes/class-supportflow-table.php
index 1015902..4ebf5b4 100644
--- a/classes/class-supportflow-table.php
+++ b/classes/class-supportflow-table.php
@@ -53,7 +53,7 @@ public function no_items() {
 		if ( $no_item_message === null ) {
 			parent::no_items();
 		} else {
-			echo $no_item_message;
+			echo esc_html( $no_item_message );
 		}
 	}
 
diff --git a/classes/class-supportflow-ui-widget.php b/classes/class-supportflow-ui-widget.php
index 6629dd5..2ad137b 100644
--- a/classes/class-supportflow-ui-widget.php
+++ b/classes/class-supportflow-ui-widget.php
@@ -58,41 +58,57 @@ public function render_single_ticket_replies_html( $ticket_id ) {
 	public function render_single_reply_html( $reply ) {
 		$reply_timestamp = mysql2date( 'M. n', $reply->post_date_gmt );
 		$reply_author    = get_post_meta( $reply->ID, 'reply_author', true );
-		$output          = '<div class="ticket-reply-body">'
-			. wpautop( stripslashes( $reply->post_content ) )
-			. '</div>'
-			. '<div class="ticket-reply-meta">'
-			. '<span class="ticket-reply-author">' . esc_html( $reply_author ) . '</span>'
-			. '<span class="ticket-reply-timestamp">' . esc_html( $reply_timestamp ) . '</span>'
-			. '</div>';
 
-		return $output;
+		?>
+
+		<div class="ticket-reply-body">
+			<?php echo wp_kses( wpautop( stripslashes( $reply->post_content ) ), 'post' ); ?>
+		</div>
+
+		<div class="ticket-reply-meta">
+			<span class="ticket-reply-author"><?php echo esc_html( $reply_author ); ?></span>
+			<span class="ticket-reply-timestamp"><?php echo esc_html( $reply_timestamp ); ?></span>
+		</div>
+
+		<?php
 	}
 
 	public function render_all_tickets_html() {
 		$user = wp_get_current_user();
-
 		$tickets = SupportFlow()->get_tickets( array( 'customer_email' => $user->user_email ) );
 
-		if ( empty( $tickets ) ) {
-			$output = '<div class="ticket notickets">' . __( 'No open tickets.', 'supportflow' ) . '</div>';
-		} else {
-			$output = '<ul id="customer-tickets">';
-			foreach ( $tickets as $ticket ) {
-				$output .= '<li id="ticket-' . $ticket->ID . '">';
-				$output .= '<h4 class="ticket-title">' . get_the_title( $ticket->ID ) . '</h4>';
-				$output .= '<div class="ticket-replies">';
-				$replies    = SupportFlow()->get_ticket_replies( $ticket->ID, array( 'status' => 'public' ) );
-				$last_reply = array_shift( $replies );
-				$output .= $this->render_single_reply_html( $last_reply );
-				$output .= '</div>';
-				$output .= '</li>';
-			}
-			$output .= '</ul>';
-		}
+		?>
 
-		return $output;
+		<?php if ( empty( $tickets ) ) : ?>
+
+			<div class="ticket notickets">
+				<?php esc_html_e( 'No open tickets.', 'supportflow' ); ?>
+			</div>
+
+		<?php else : ?>
+
+			<ul id="customer-tickets">
+				<?php foreach ( $tickets as $ticket ) : ?>
+					<?php
+						$replies    = SupportFlow()->get_ticket_replies( $ticket->ID, array( 'status' => 'public' ) );
+						$last_reply = array_shift( $replies );
+					?>
 
+					<li id="ticket-<?php echo esc_attr( $ticket->ID ); ?>">
+						<h4 class="ticket-title">
+							<?php echo esc_html( get_the_title( $ticket->ID ) ); ?>
+						</h4>
+
+						<div class="ticket-replies">
+							<?php $this->render_single_reply_html( $last_reply ); ?>
+						</div>
+					</li>
+				<?php endforeach; ?>
+			</ul>
+
+		<?php endif; ?>
+
+		<?php
 	}
 
 	// @todo: Pretty URLs
@@ -143,7 +159,7 @@ public function action_template_redirect() {
 
 		<div id="supportflow-widget">
 			<button id="supportflow-back"><?php _e( 'All Tickets', 'supportflow' ); ?></button>
-			<h1 id="widget-title"><?php echo $widget_title; ?></h1>
+			<h1 id="widget-title"><?php echo esc_html( $widget_title ); ?></h1>
 
 			<div id="supportflow-newticket-box">
 				<button id="supportflow-newticket"><?php _e( 'Start a new ticket', 'supportflow' ); ?></button>
@@ -155,7 +171,7 @@ public function action_template_redirect() {
 			</div>
 
 			<div id="supportflow-all-tickets">
-				<?php echo $this->render_all_tickets_html(); ?>
+				<?php $this->render_all_tickets_html(); ?>
 			</div>
 
 			<div id="supportflow-single-ticket">
diff --git a/supportflow.php b/supportflow.php
index b6c43d8..edff31f 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -356,7 +356,7 @@ public function action_requirements_admin_notices() {
 			$message = '<p>' . esc_html__( 'An unknown SupportFlow error has occurred.', 'supportflow' ) . '</p>';
 		}
 
-		printf( '<div class="error">%s</div>', $message );
+		printf( '<div class="error">%s</div>', wp_kses( $message, 'post' ) );
 	}
 
 	/**

From a9d68d265eb272acfca827491bc89f22699d845d Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Mon, 20 Jun 2016 20:26:23 +0000
Subject: [PATCH 481/485] Bump version to 0.7

---
 readme.txt      | 16 ++++++++++++++--
 supportflow.php |  4 ++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/readme.txt b/readme.txt
index 47a01b8..3f7a735 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,8 +2,8 @@
 Contributors: VarunAgw, danielbachhuber, Viper007Bond, andrewspittle, iandunn, kovshenin
 Tags: Ticket, support, admin, customer, customer support, help desk, helpdesk, IT, support, ticket
 Requires at least: 3.5
-Tested up to: 4.3
-Stable tag: 0.6
+Tested up to: 4.5
+Stable tag: 0.7
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -59,6 +59,13 @@ If it still isn't working, check the log for any error messages or clues. To vie
 
 == Changelog ==
 
+= 0.7 (2016-06-28) =
+* Security: Fix two XSS vulnerabilities: [#145091-h1](https://hackerone.com/reports/145091) with CVSS score [6.1 (Medium)](https://www.first.org/cvss/calculator/3.0#CVSS:3.0/AV:N/AC:L/PR:N/UI:R/S:C/C:L/I:L/A:N), and [#145086-h1](https://hackerone.com/reports/145086) with CVSS score [4.7 (Medium)](https://www.first.org/cvss/calculator/3.0#CVSS:3.0/AV:N/AC:H/PR:N/UI:R/S:C/C:L/I:L/A:N). Thanks to [whitehatter](https://hackerone.com/whitehatter) for discovering and disclosing them responsibly.
+* Security: Add extra output escaping throughout plugin.
+* Fix: Respect the Reply-To header.
+* Update: Increase Gmail synchronization interval to 10 minutes.
+* [Full changelog](https://github.com/SupportFlow/supportflow/compare/bb204abf5e48d0b3f6d12ebf4435613622ba10bd...fe706ccdb9859af32dddfff1c94c4c7048d794ea)
+
 = 0.6 =
 * Security: Tightened access controls to read and set SupportFlow permissions.
 * Privacy: Prevented leaking e-mail subject lines in search results.
@@ -102,3 +109,8 @@ If it still isn't working, check the log for any error messages or clues. To vie
 
 = 0.1 =
 * Initial release.
+
+== Upgrade Notice ==
+
+= 0.7 =
+Version 0.7 contains fixes for two medium-severity security bugs. We strongly recommend that you upgrade.
diff --git a/supportflow.php b/supportflow.php
index edff31f..cee0888 100644
--- a/supportflow.php
+++ b/supportflow.php
@@ -7,7 +7,7 @@
  * Plugin URI:  https://wordpress.org/plugins/supportflow/
  * Description: Reinventing how you support your customers.
  * Author:      Daniel Bachhuber, Varun Agrawal, Alex Mills, Andrew Spittle
- * Version:     0.6
+ * Version:     0.7
  *
  * Text Domain: supportflow
  * Domain Path: /languages/
@@ -170,7 +170,7 @@ private function setup_globals() {
 
 		/** Version ***********************************************************/
 
-		$this->version = '0.6'; // SupportFlow version
+		$this->version = '0.7'; // SupportFlow version
 
 		/** Paths *************************************************************/
 

From f5e7bf193b7cfe568b21301e6a24009ad155b8aa Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Tue, 16 Aug 2016 08:23:30 -0700
Subject: [PATCH 482/485] Email Replies: Log warning instead of directing to
 `STDOUT`.

Previously this assumed the function would only run in a WP-CLI context, but that is no longer the case. Calling this in a web context would lead to errors.
---
 classes/class-supportflow-email-replies.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-email-replies.php b/classes/class-supportflow-email-replies.php
index 66493ad..137add4 100644
--- a/classes/class-supportflow-email-replies.php
+++ b/classes/class-supportflow-email-replies.php
@@ -221,7 +221,12 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
 					$upload_result = media_handle_sideload( $file_array, null );
 
 					if ( is_wp_error( $upload_result ) ) {
-						WP_CLI::warning( $upload_result->get_error_message() );
+						SupportFlow()->extend->logger->log(
+							'email_retrieve',
+							__METHOD__,
+							__( 'Error sideloading attachment.', 'supportflow' ),
+							compact( 'file_array', 'upload_result', 'email' )
+						);
 					} else {
 						SupportFlow()->extend->attachments->secure_attachment_file( $upload_result );
 						$new_attachment_ids[] = $upload_result;

From 918e089bd640a1a98250567e75f4a16ac1cb9974 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Tue, 16 Aug 2016 08:25:28 -0700
Subject: [PATCH 483/485] Table: Removing unwanted escaping from sanitized
 message.

The data is already passed through `wp_kses()`, so escaping it leads to the raw HTML being output.
---
 classes/class-supportflow-table.php | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/classes/class-supportflow-table.php b/classes/class-supportflow-table.php
index 4ebf5b4..cd5b1e0 100644
--- a/classes/class-supportflow-table.php
+++ b/classes/class-supportflow-table.php
@@ -39,21 +39,19 @@ public function column_default( $item, $column_name ) {
 	 * @param string $msg
 	 */
 	public function set_no_items( $msg ) {
+		$this->no_item_message = $msg;
+	}
+
+	public function no_items() {
 		$allowed_html = array_merge(
 			wp_kses_allowed_html( 'data' ),
 			array( 'br' => array() )
 		);
 
-		$this->no_item_message = wp_kses( $msg, $allowed_html );
-	}
-
-	public function no_items() {
-		$no_item_message = $this->no_item_message;
-
-		if ( $no_item_message === null ) {
+		if ( null === $this->no_item_message ) {
 			parent::no_items();
 		} else {
-			echo esc_html( $no_item_message );
+			echo wp_kses( $this->no_item_message, $allowed_html );
 		}
 	}
 

From c8761c1880d0c614c068492088bf2b067403b109 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Wed, 17 Aug 2016 13:59:14 -0700
Subject: [PATCH 484/485] Add correct SMTP address to the From header.

Without this, the default address is used, which is an invalid address like wordpress@example.com. That can lead result in replies to messages sent via SupportFlow going to an invalid address.

That doesn't usually happen in real-world scenarios, because the sending MTA will correct the `From` header, but we should be setting it correctly anyway.
---
 classes/class-supportflow-emails.php | 35 +++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index 16b78a3..ca70766 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -219,6 +219,8 @@ public function mail( $to, $subject, $message, $headers = '', $attachments = arr
 		if ( ! empty( $smtp_account ) ) {
 			$this->smtp_account = $smtp_account;
 			add_action( 'phpmailer_init', array( $this, 'action_set_smtp_settings' ) );
+			add_action( 'wp_mail_from',      array( $this, 'action_set_smtp_from_address' ) );
+			add_action( 'wp_mail_from_name', array( $this, 'action_set_smtp_from_name' ) );
 		}
 
 		$result = wp_mail( $to, $subject, $message, $headers, $attachments );
@@ -226,6 +228,8 @@ public function mail( $to, $subject, $message, $headers = '', $attachments = arr
 		if ( ! empty( $smtp_account ) ) {
 			$this->smtp_account = null;
 			remove_action( 'phpmailer_init', array( $this, 'action_set_smtp_settings' ) );
+			remove_action( 'wp_mail_from',      array( $this, 'action_set_smtp_from_address' ) );
+			remove_action( 'wp_mail_from_name', array( $this, 'action_set_smtp_from_name' ) );
 		}
 
 		// Log the result, but redact the password to avoid unnecessarily exposing it
@@ -248,6 +252,11 @@ public function mail( $to, $subject, $message, $headers = '', $attachments = arr
 		return $result;
 	}
 
+	/**
+	 * Configure PHPMailer to send the message via the configured SMTP account
+	 *
+	 * @param PHPMailer $phpmailer
+	 */
 	public function action_set_smtp_settings( $phpmailer ) {
 		$phpmailer->IsSMTP();
 		$phpmailer->Host        = $this->smtp_account['smtp_host'];
@@ -257,7 +266,31 @@ public function action_set_smtp_settings( $phpmailer ) {
 		$phpmailer->Username    = $this->smtp_account['username'];
 		$phpmailer->Password    = $this->smtp_account['password'];
 		$phpmailer->SMTPAuth    = true;
-		$phpmailer->FromName    = get_bloginfo( 'name' );
+	}
+
+	/**
+	 * Override the default address in the From header
+	 *
+	 * We want to display the actual SMTP account rather than wordpress@siteurl
+	 *
+	 * @param string $from_address
+	 *
+	 * @return string
+	 */
+	public function action_set_smtp_from_address( $from_address ) {
+		return $this->smtp_account['username'];
+
+	}
+
+	/**
+	 * Override the default name in the From header
+	 *
+	 * @param string $from_name
+	 *
+	 * @return string
+	 */
+	public function action_set_smtp_from_name( $from_name ) {
+		return get_bloginfo( 'name' );
 	}
 
 	public function get_cc_header( $cc ) {

From 3505f3e9c60c3d5f02ee570941be4138891c4e67 Mon Sep 17 00:00:00 2001
From: Ian Dunn <ian@iandunn.name>
Date: Wed, 17 Aug 2016 14:16:12 -0700
Subject: [PATCH 485/485] Align markers to improve readability

---
 classes/class-supportflow-emails.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/classes/class-supportflow-emails.php b/classes/class-supportflow-emails.php
index ca70766..b1c9bf3 100644
--- a/classes/class-supportflow-emails.php
+++ b/classes/class-supportflow-emails.php
@@ -90,7 +90,7 @@ public function notify_agents_ticket_replies( $reply_id ) {
 		$message = SupportFlow()->sanitize_ticket_reply( stripslashes( $reply->post_content ) );
 		$message .= "\n\n-------";
 		$message .= "\n" . __( "Status: ", 'supportflow' ) . $post_status;
-		$message .= "\n" . __( "Agent: ", 'supportflow' ) . $assigned_agent;
+		$message .= "\n" . __( "Agent: ",  'supportflow' ) . $assigned_agent;
 
 		$message = apply_filters( 'supportflow_emails_reply_notify_message', $message, $reply_id, $ticket->ID, 'agent' );
 
@@ -186,10 +186,10 @@ public function email_conversation( $ticket_id, $to ) {
 		$msg         = '';
 		$subject     = '[' . get_bloginfo( 'name' ) . '] ' . get_the_title( $ticket->ID ) . ' ' . __( 'Conversation summary', 'supportflow' );
 
-		$msg .= '<b>' . __( 'Title', 'supportflow' ) . ':</b> ' . esc_html( $ticket->post_title ) . '<br>';
-		$msg .= '<b>' . __( 'Status', 'supportflow' ) . ':</b> ' . SupportFlow()->post_statuses[$ticket->post_status]['label'] . '<br>';
-		$msg .= '<b>' . __( 'Owner', 'supportflow' ) . ':</b> ' . esc_html( $ticket_owner ) . '<br>';
-		$msg .= '<b>' . __( 'Created on', 'supportflow' ) . ':</b> ' . $ticket->post_date_gmt . ' GMT<br>';
+		$msg .= '<b>' . __( 'Title',           'supportflow' ) . ':</b> ' . esc_html( $ticket->post_title ) . '<br>';
+		$msg .= '<b>' . __( 'Status',          'supportflow' ) . ':</b> ' . SupportFlow()->post_statuses[$ticket->post_status]['label'] . '<br>';
+		$msg .= '<b>' . __( 'Owner',           'supportflow' ) . ':</b> ' . esc_html( $ticket_owner ) . '<br>';
+		$msg .= '<b>' . __( 'Created on',      'supportflow' ) . ':</b> ' . $ticket->post_date_gmt . ' GMT<br>';
 		$msg .= '<b>' . __( 'Last Updated on', 'supportflow' ) . ':</b> ' . $ticket->post_modified_gmt . ' GMT<br>';
 		$msg .= '<br><br>';
 
@@ -218,7 +218,8 @@ public function mail( $to, $subject, $message, $headers = '', $attachments = arr
 
 		if ( ! empty( $smtp_account ) ) {
 			$this->smtp_account = $smtp_account;
-			add_action( 'phpmailer_init', array( $this, 'action_set_smtp_settings' ) );
+
+			add_action( 'phpmailer_init',    array( $this, 'action_set_smtp_settings' ) );
 			add_action( 'wp_mail_from',      array( $this, 'action_set_smtp_from_address' ) );
 			add_action( 'wp_mail_from_name', array( $this, 'action_set_smtp_from_name' ) );
 		}
@@ -227,7 +228,8 @@ public function mail( $to, $subject, $message, $headers = '', $attachments = arr
 
 		if ( ! empty( $smtp_account ) ) {
 			$this->smtp_account = null;
-			remove_action( 'phpmailer_init', array( $this, 'action_set_smtp_settings' ) );
+
+			remove_action( 'phpmailer_init',    array( $this, 'action_set_smtp_settings' ) );
 			remove_action( 'wp_mail_from',      array( $this, 'action_set_smtp_from_address' ) );
 			remove_action( 'wp_mail_from_name', array( $this, 'action_set_smtp_from_name' ) );
 		}
@@ -237,6 +239,7 @@ public function mail( $to, $subject, $message, $headers = '', $attachments = arr
 		$log_message = $result ? __( 'Sending mail to %s succeeded', 'supportflow' ) : __( 'Sending mail to %s failed', 'supportflow' );
 		$log_message = sprintf( $log_message, is_array( $to ) ? implode( ',', $to ) : $to );
 		$redacted_smtp_account = $smtp_account;
+
 		if ( ! empty( $redacted_smtp_account ) ) {
 			$redacted_smtp_account['password'] = '[redacted]';
 		}
@@ -259,6 +262,7 @@ public function mail( $to, $subject, $message, $headers = '', $attachments = arr
 	 */
 	public function action_set_smtp_settings( $phpmailer ) {
 		$phpmailer->IsSMTP();
+
 		$phpmailer->Host        = $this->smtp_account['smtp_host'];
 		$phpmailer->Port        = (int) $this->smtp_account['smtp_port'];
 		$phpmailer->SMTPSecure  = $this->smtp_account['smtp_ssl'] ? 'ssl' : '';