Changeset 1075536

Timestamp:

01/26/2015 03:00:32 AM (11 years ago)

Author:

themeavenue

Message:

Push 3.1.1

Location:

awesome-support/trunk

Files:

• awesome-support.php (modified) (2 diffs)
• class-awesome-support.php (modified) (1 diff)
• includes/admin/views/system-status.php (modified) (1 diff)
• includes/class-email-notifications.php (modified) (3 diffs)
• includes/class-product-sync.php (modified) (3 diffs)
• readme.txt (modified) (5 diffs)

awesome-support/trunk/awesome-support.php

@@ -11 +11 @@
  * Plugin URI:        http://getawesomesupport.com
  * Description:       Awesome Support is a great ticketing system that will help you improve your customer satisfaction by providing a unique customer support experience.
- * Version:           3.1.0
+ * Version:           3.1.1
  * Author:            ThemeAvenue
  * Author URI:        http://themeavenue.net
@@ -29 +29 @@
  *----------------------------------------------------------------------------*/
 
-define( 'WPAS_VERSION',           '3.1.0' );
+define( 'WPAS_VERSION',           '3.1.1' );
 define( 'WPAS_DB_VERSION',        '1' );
 define( 'WPAS_URL',               trailingslashit( plugin_dir_url( __FILE__ ) ) );

awesome-support/trunk/class-awesome-support.php

@@ -767 +767 @@
         }
 
-        $filename = explode( '/', $template );
+        $filename      = explode( '/', $template );
+        $template_name = $filename[count($filename)-1];
+        
+        /* Don't change the template if it's already a custom one */
+        if ( 'single-ticket.php' === $template_name ) {
+            return $template;
+        }
+
         unset( $filename[count($filename)-1] ); // Remove the template name
         $filename = implode( '/', $filename );

awesome-support/trunk/includes/admin/views/system-status.php

@@ -211 +211 @@
     </thead>
     <tbody>
+        <tr>
+            <td class="row-title"><?php _e( 'Sender Name', 'wpas' ); ?></td>
+            <td>
+                <?php echo wpas_get_option( 'sender_name', get_bloginfo( 'name' ) ); ?>
+            </td>
+        </tr>
+        <tr>
+            <td class="row-title"><?php _e( 'Sender E-Mail', 'wpas' ); ?></td>
+            <td>
+                <?php echo wpas_get_option( 'sender_email', get_bloginfo( 'admin_email' ) ); ?>
+            </td>
+        </tr>
+        <tr>
+            <td class="row-title"><?php _e( 'Reply-To E-Mail', 'wpas' ); ?></td>
+            <td>
+                <?php echo wpas_get_option( 'reply_email', get_bloginfo( 'admin_email' ) ); ?>
+            </td>
+        </tr>
         <tr>
             <td class="row-title"><?php _e( 'Submission Confirmation', 'wpas' ); ?></td>

awesome-support/trunk/includes/class-email-notifications.php

@@ -49 +49 @@
         }
 
+        /* Set the e-mail content type to HTML */
+        add_filter( 'wp_mail_content_type', array( $this, 'set_html_mime_type' ) );
+
         /* Set the post ID */
         $this->post_id = $post_id;
@@ -491 +494 @@
         return $this->fetch( apply_filters( 'wpas_email_notifications_pre_fetch_' . $part, $value, $this->post_id ) );
 
+    }
+
+    /**
+     * Set the e-mail content type to HTML.
+     *
+     * @since  3.1.1
+     * @param  string $content_type Current e-mail content type
+     * @return string               HTML content type
+     */
+    function set_html_mime_type( $content_type ){
+        return 'text/html';
+    }
+
+    /**
+     * Set the e-mail content type to plain text.
+     * 
+     * @since  3.1.1
+     * @param  string $content_type Current e-mail content type
+     * @return string               Text content type
+     */
+    function set_text_mime_type( $content_type ){
+        return 'text/plain';
     }
 
@@ -570 +595 @@
             'subject'         => $subject,
             'body'            => $body,
-            'header'          => $headers,
+            'headers'         => $headers,
             'attachments'     => ''
             )
         );
 
-        return wp_mail( $email['recipient_email'], $email['subject'], $email['body'], implode( "\r\n", $email['headers'] ) );
+        $mail = wp_mail( $email['recipient_email'], $email['subject'], $email['body'], implode( "\r\n", $email['headers'] ) );
+
+        /**
+         * Reset the e-mail content type to text as recommended by WordPress
+         *
+         * @since  3.1.1
+         * @link   http://codex.wordpress.org/Function_Reference/wp_mail
+         */
+        add_filter( 'wp_mail_content_type', array( $this, 'set_text_mime_type' ) );
+
+        return $mail;
 
     }

awesome-support/trunk/includes/class-product-sync.php

@@ -264 +264 @@
     protected function create_term_object( $post ) {
 
+        /* If the $post is not an object we return false to avoid triggering PHP errors */
+        if ( !is_object( $post ) ) {
+            return false;
+        }
+
         /* Try to get the term data from the post meta */
         $term_data = get_post_meta( $post->ID, '_wpas_product_term', true );
@@ -449 +454 @@
             if ( $this->append ) {
                 foreach ( $terms as $term ) {
-                    if ( !$this->is_synced_term( $term->term_id ) ) {
+                    if ( is_object( $term ) && !$this->is_synced_term( $term->term_id ) ) {
                         $new_terms[] = $term;
                     }
@@ -457 +462 @@
             /* Create the term object for each post */
             foreach ( $query->posts as $key => $post ) {
+
+                if ( !is_a( $post, 'WP_Post' ) ) {
+                    continue;
+                }
 
                 /* Create the term object */

awesome-support/trunk/readme.txt

@@ -6 +6 @@
 Requires at least: 3.5.1
 Tested up to: 4.1
-Stable tag: 3.1.0
+Stable tag: 3.1.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -128 +128 @@
 == Changelog ==
 
+= 3.1.1 =
+
+* Do not override custom templates for the ticket details page
+* Send HTML e-mails more reliably
+* Bugfixes
+
 = 3.1.0 =
 
@@ -135 +141 @@
 * Ask for a password only once on the registration form
 * Add e-mail verification to the registration form (uses MailGun, free account required)
+* Hide about page from the menu
 * Allow e-mail to be used as the login for clients
 * Improve agent assignment function
@@ -146 +153 @@
 * Fixed some notices on the ticket single page
 * Few bugfixes
-
-* Hide about page from the menu
 
 = 3.0.1 =
@@ -162 +167 @@
 == Upgrade Notice ==
 
-This version fixes a few bugs and introduces a lot of new features
+This version fixes a few bugs. If you want to use custom templates for the ticket details page you have to update.