Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor code #232

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Refactor code #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
33bd0e1
Attachments are not attached in outbound mails
VarunAgw Aug 20, 2014
28476e8
Removed unrequired file
VarunAgw Aug 20, 2014
a158a92
Created a function to generate predefines replie dropdown
VarunAgw Aug 20, 2014
3258e74
Created method get_predefined_replies
VarunAgw Aug 20, 2014
ec48526
Adding support for I18n in missed code
VarunAgw Aug 20, 2014
3d82219
Using get_predefined_replies method in existing code
VarunAgw Aug 20, 2014
45c171f
Refactored SupportFlow_Predefined_Replies::get_dropdown_input
VarunAgw Aug 20, 2014
2a0c4cb
Refactored code
VarunAgw Aug 20, 2014
b3a854b
Using get_reply_author_name & get_reply_author_email methods
VarunAgw Aug 20, 2014
715e2aa
We should not use die; if cron is running
VarunAgw Aug 20, 2014
9bb7ac8
Refactored process_email in E-Mail replies class
VarunAgw Aug 20, 2014
52e5be1
Add comment in method
VarunAgw Aug 20, 2014
1f811c7
Allow getting both email and slug of customer at once
VarunAgw Aug 20, 2014
db10579
Created get_tickets_count() method
VarunAgw Aug 20, 2014
6189a4d
Refactored code to use get_tickets_count()
VarunAgw Aug 20, 2014
aaa96d8
Refactored code
VarunAgw Aug 20, 2014
85b13f6
Top navigation links were not changed to bold on click
VarunAgw Aug 20, 2014
c063ceb
Add comment to filter_post_row_actions callback
VarunAgw Aug 20, 2014
deb7755
Refactor display_ticket_replies()
VarunAgw Aug 20, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
172 changes: 51 additions & 121 deletions classes/class-supportflow-admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,62 +233,28 @@ public function filter_heartbeat_received( $response, $data ) {


/**
*
* Filters links shown over dropdowns in all tickets page
*/
public function filter_views( $views ) {
$post_type = SupportFlow()->post_type;
$statuses = SupportFlow()->post_statuses;
$status_slugs = array();

foreach ( $statuses as $status => $status_data ) {
if ( true == $status_data['show_tickets'] ) {
$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>';

$post_statuses = SupportFlow()->post_statuses;
array_pop( $post_statuses );
$post_statuses = "'" . implode( "','", array_map( 'sanitize_key', array_keys( $post_statuses ) ) ) . "'";

// @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,
) );
$post_type = SupportFlow()->post_type;

$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>';
$total_posts = SupportFlow()->get_tickets_count();
$class = empty( $class ) && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['author'] ) ? ' class="current"' : '';
$view_all_link = add_query_arg( array( 'post_type' => SupportFlow()->post_type), admin_url( 'edit.php' ) );
$view_all_title = sprintf( _nx( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts, 'posts' ), number_format_i18n( $total_posts ) );
$view_all = "<a href='$view_all_link' $class >$view_all_title</a>";

$unassigned_args = array(
'post_type' => SupportFlow()->post_type,
'author' => 0,
);
$wp_query = new WP_Query( array(
'post_type' => SupportFlow()->post_type,
'author' => 0,
'post_status' => $post_statuses,
'posts_per_page' => 1,
) );
$my_posts = SupportFlow()->get_tickets_count( array( 'author' => get_current_user_id() ) );
$class = empty( $class ) && empty( $_REQUEST['post_status'] ) && ! empty( $_REQUEST['author'] ) && get_current_user_id() == $_REQUEST['author'] ? ' class="current"' : '';
$view_mine_link = add_query_arg( array( 'post_type' => SupportFlow()->post_type, 'author' => get_current_user_id() ), admin_url( 'edit.php' ) );
$view_mine_title = sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $my_posts, 'posts' ), number_format_i18n( $my_posts ) );
$view_mine = "<a href='$view_mine_link' $class >$view_mine_title</a>";

$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>';
$unassigned_posts = SupportFlow()->get_tickets_count( array( 'author' => 0 ) );
$class = empty( $class ) && empty( $_REQUEST['post_status'] ) && isset( $_REQUEST['author'] ) && 0 == $_REQUEST['author'] ? ' class="current"' : '';
$view_mine_link = add_query_arg( array( 'post_type' => SupportFlow()->post_type, 'author' => 0 ), admin_url( 'edit.php' ) );
$view_unassigned_title = sprintf( _nx( 'Unassigned <span class="count">(%s)</span>', 'Unassigned <span class="count">(%s)</span>', $unassigned_posts, 'posts' ), number_format_i18n( $unassigned_posts ) );
$view_unassigned = "<a href='$view_mine_link' $class >$view_unassigned_title</a>";

// Put 'All' and 'Mine' at the beginning of the array
array_shift( $views );
Expand All @@ -297,7 +263,6 @@ public function filter_views( $views ) {
$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'] );

Expand Down Expand Up @@ -346,6 +311,7 @@ public function action_restrict_manage_posts() {

/**
* Filter the actions available to the agent on the post type
* They are shown in All tickets page in subject column
*/
function filter_post_row_actions( $row_actions, $post ) {

Expand Down Expand Up @@ -929,28 +895,6 @@ public function meta_box_cc_bcc() {
public function meta_box_replies() {
global $pagenow;

$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 ) {
$content = $predefined_reply->post_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 ) ) {
$pre_defs[] = array( 'title' => $title, 'content' => $content );
}
}

$email_account_id = get_post_meta( get_the_ID(), 'email_account', true );
$email_account = SupportFlow()->extend->email_accounts->get_email_account( $email_account_id );

Expand All @@ -971,11 +915,8 @@ public function meta_box_replies() {

echo '<div class="alignleft"><h4>' . __( 'Conversation', 'supportflow' ) . '</h4></div>';
echo '<div class="alignright">';
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>';
SupportFlow()->extend->predefined_replies->get_dropdown_input();
echo '</div>';

echo '<div id="ticket-reply-box">';
echo "<textarea id='reply' name='reply' $disabled_attr class='ticket-reply sf_autosave' rows='4' placeholder='" . esc_attr( $placeholder ) . "'>";
Expand Down Expand Up @@ -1015,53 +956,36 @@ public function meta_box_replies() {
}

public function display_ticket_replies() {
$private_replies = SupportFlow()->get_ticket_replies( get_the_ID(), array( 'status' => 'private' ) );
$all_replies = array(
'private' => SupportFlow()->get_ticket_replies( get_the_ID(), array( 'status' => 'private' ) ),
'public' => SupportFlow()->get_ticket_replies( get_the_ID(), array( 'status' => 'public' ) ),
);

if ( ! empty( $private_replies ) ) {
echo '<ul class="private-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 = $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">';
foreach ( $attachment_ids as $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>';
}
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( '', $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>';
foreach ( $all_replies as $status => $replies ) {
if ( empty( $replies ) ) {
continue;
}
echo '</ul>';
}

$replies = SupportFlow()->get_ticket_replies( get_the_ID(), array( 'status' => 'public' ) );
if ( ! empty( $replies ) ) {
echo '<ul class="ticket-replies">';
$class = 'private' == $status ? 'private-replies' : 'ticket-replies';
echo "<ul class='$class'>";

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 );
echo '<li>';
echo '<div class="reply-avatar">' . get_avatar( $reply_author_email, 72 );
echo '<p class="reply-author">' . esc_html( $reply_author ) . '</p>';
echo '</div>';

if ( 'public' == $status ) {
$reply_author = get_post_meta( $reply->ID, 'reply_author', true );
$reply_author_email = get_post_meta( $reply->ID, 'reply_author_email', true );
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="ticket-reply">';
$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">';
foreach ( $attachment_ids as $attachment_id ) {
Expand All @@ -1071,17 +995,23 @@ public function display_ticket_replies() {
echo '</ul>';
}
echo '</div>';
$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 ) );

if ( 'private' == $status ) {
$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( '', $reply->ID ), get_the_time( '', $reply->ID ) );
}
if ( 'public' == $status ) {
$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>';
}
echo '</ul>';
}

echo '<div class="clear"></div>';

}

/**
Expand Down
40 changes: 22 additions & 18 deletions classes/class-supportflow-email-replies.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function retrieve_email_replies() {

// Die if temp file is locked. i.e. cron is running
if ( 6 != fwrite( $fp, 'length' ) ) {
die;
return;
}

// Save current time to file
Expand Down Expand Up @@ -201,6 +201,25 @@ 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;


// 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 ) {
$customers[] = $email_address;
}
}
}
}
$customers[] = $reply_author_email;


$message = $email->body;

// Parse out the reply body
if ( function_exists( 'What_The_Email' ) ) {
$message = What_The_Email()->get_message( $email->body );
Expand All @@ -222,29 +241,14 @@ public function process_email( $imap_connection, $email, $i, $to, $email_account
}
}

$message = SupportFlow()->sanitize_ticket_reply( $message );

// 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 ) ) {
$ticket_id = SupportFlow()->get_ticket_from_secret( $matches[1] );
}

// 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 ) {
$customers[] = $email_address;
}
}
}
}
$customers[] = $reply_author_email;

$message = SupportFlow()->sanitize_ticket_reply( $message );

if ( $ticket_id ) {
$reply_args = array(
'reply_author' => $reply_author,
Expand Down
Loading