Merge branch 'development'

Author: Vinny Listrani

README.txt

@@ -1,9 +1,9 @@
 === Plugin Name ===
 Contributors: 3five, VincentListrani
 Donate link: 
-Tags: support, helpspot
+Tags: support, help desk, FreshDesk
 Requires at least: 4.1
-Tested up to: 4.1.1
+Tested up to: 4.7.1
 Stable tag: 1.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html

admin/class-threefive-support-admin.php

@@ -4,7 +4,7 @@
  * The dashboard-specific functionality of the plugin.
  *
  * @link       http://3five.com
- * @since      1.0.0
+ * @since      1.1.0
  *
  * @package    Threefive_Support
  * @subpackage Threefive_Support/admin
@@ -27,7 +27,7 @@ class Threefive_Support_Admin {
 	 *
 	 * @since    1.0.0
 	 * @access   private
-	 * @var      string    $threefive_support    The ID of this plugin.
+	 * @var      string $threefive_support The ID of this plugin.
 	 */
 	private $threefive_support;
 
@@ -36,110 +36,166 @@ class Threefive_Support_Admin {
 	 *
 	 * @since    1.0.0
 	 * @access   private
-	 * @var      string    $version    The current version of this plugin.
+	 * @var      string $version The current version of this plugin.
 	 */
 	private $version;
 
 	/**
 	 * Initialize the class and set its properties.
 	 *
 	 * @since    1.0.0
-	 * @param      string    $threefive_support       The name of this plugin.
-	 * @param      string    $version    The version of this plugin.
+	 *
+	 * @param      string $threefive_support The name of this plugin.
+	 * @param      string $version           The version of this plugin.
 	 */
 	public function __construct( $threefive_support, $version ) {
 
 		$this->threefive_support = $threefive_support;
-		$this->version = $version;
-		add_action('wp_dashboard_setup', array($this, 'load_admin_form_widget') );
+		$this->version           = $version;
+		add_action( 'wp_dashboard_setup', array( $this, 'load_admin_form_widget' ) );
 
 	}
 
 	/**
 	 * Create the admin support form widget
 	 *
 	 * @since    1.0.0
-	 * @access public
+	 * @access   public
 	 */
 	public function load_admin_form_widget() {
 
 		/**
 		 * The class responsible for defining all actions that occur in the Dashboard.
 		 */
-		add_meta_box('threefive_support_widget', 'Get 3five Support', array($this, 'threefive_support_dashboard_widget'), 'dashboard', 'normal', 'high' );
+		add_meta_box( 'threefive_support_widget', 'Get 3five Support', array(
+			$this,
+			'threefive_support_dashboard_widget',
+		), 'dashboard', 'normal', 'high' );
 	}
 
 	/**
 	 * Support form callback function
-	 * 
+	 *
 	 *  - Used as a callback function in load_admin_form_widget()
-	 *  
+	 *
 	 * @return void
 	 * @since  1.0.0
 	 * @access public
 	 */
 	public function threefive_support_dashboard_widget() {
 		/**
 		 * Load the dashboard widget form and widget contents.
-		 */		
+		 */
 		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'admin/partials/threefive-support-admin-display.php';
 	}
 
 	/**
 	 * Support form data handling and mail sender
 	 *
 	 * - Used as the form POST handler
-	 * 
+	 *
 	 * @since  1.0.0
 	 * @access public
 	 */
 	public function threefive_support_dashboard_widget_handler() {
 		global $get_updates, $wp_version;
-		
-		// $_POST vars
-		$email = esc_html($_POST['email']);
-		$name = esc_html($_POST['name']);
-		$message_body = esc_html($_POST['message']);
-		
+
+		// $_POST vars.
+		$email        = esc_html( $_POST['email'] ); // @codingStandardsIgnoreStart
+		$name         = esc_html( $_POST['name'] );
+		$message_body = esc_html( $_POST['message'] );
+		$files        = $_FILES['files']; // @codingStandardsIgnoreEnd
+
+		// Must have email parameters.
+		$to          = 'wpsupport@3five.com';
+		$subject     = 'Support Request From ' . $name . ' at ' . get_bloginfo( 'name' ) . '.';
+		$headers[]   = 'Content-Type: text/html; charset=UTF-8';
+		$headers[]   = 'From: ' . $name . ' <' . $email . '>';
+		$attachments = array();
+
 		// Add WP Stats to the message field.
-		$plugins = $get_updates['counts']['plugins'];
-		$themes = $get_updates['counts']['themes'];
+		$plugins   = $get_updates['counts']['plugins'];
+		$themes    = $get_updates['counts']['themes'];
 		$wordpress = $get_updates['counts']['wordpress'];
 
-		// Additional Stats
-		$browser = $_SERVER['HTTP_USER_AGENT'];
-
-		// Build the message body
+		// Build the message body.
 		$message = 'Support Request Details:' . PHP_EOL;
 		$message .= $message_body . PHP_EOL . PHP_EOL;
 		$message .= 'WordPress Site Statistics:' . PHP_EOL;
-		$message .= 'Site URL: ' . get_bloginfo('url') . PHP_EOL;
+		$message .= 'Site URL: ' . get_bloginfo( 'url' ) . PHP_EOL;
 		$message .= 'WordPress Version: ' . $wp_version . PHP_EOL;
 		$message .= 'Core Updates available: ' . $wordpress . PHP_EOL;
 		$message .= 'Plugin Updates available: ' . $plugins . PHP_EOL;
 		$message .= 'Theme Updates available: ' . $themes . PHP_EOL;
-		$message .= 'Using Browser: ' . $browser . PHP_EOL;
 
-		echo $message;
+		if ( ! function_exists( 'wp_handle_upload' ) ) {
+			require_once( ABSPATH . 'wp-admin/includes/file.php' );
+		}
+
+		// Change the upload directory for these files.
+		add_filter( 'upload_dir', array( $this, 'tf_support_upload_dir' ) );
+
+		$uploadedfiles    = $files;
+		$upload_overrides = array( 'test_form' => false );
+
+		foreach ( $uploadedfiles['name'] as $key => $value ) {
+			if ( $uploadedfiles['name'][ $key ] ) {
+				$uploadedfile = array(
+					'name'     => $files['name'][ $key ],
+					'type'     => $files['type'][ $key ],
+					'tmp_name' => $files['tmp_name'][ $key ],
+					'error'    => $files['error'][ $key ],
+					'size'     => $files['size'][ $key ],
+				);
+
+				$movefile = wp_handle_upload( $uploadedfile, $upload_overrides );
+
+				if ( $movefile && ! isset( $movefile['error'] ) ) {
+					$attachments[] = $movefile['file'];
+				} else {
+					echo 'yo';
+				}
+			}
+		}
 
-		// Constants
-		$to = 'support@3five.com';
-		$subject = 'Support Request From ' .$name. ' at ' .get_bloginfo('name'). '.';
-		$headers[] = 'From: '.$name.' <'.$email.'>';
+		// Send the email out.
+		wp_mail( $to, $subject, $message, $headers, $attachments );
 
-		wp_mail($to, $subject, $message, $headers);
+		// Change the upload directory back to the original directory.
+		remove_filter( 'upload_dir', array( $this, 'tf_support_upload_dir' ) );
 
-		die('Great Success!');
+		die( 'Great Success!' );
 	}
 
+	/**
+	 * Get a any available update for this site and add it to the email body.
+	 *
+	 * @return array
+	 */
 	public function get_wp_updates() {
-		if ( function_exists('wp_get_update_data') ) {
+		if ( function_exists( 'wp_get_update_data' ) ) {
 			global $get_updates;
 			$get_updates = wp_get_update_data();
+
 			return $get_updates;
 		}
 	}
 
+	/**
+	 * Change the upload directory for support attachments.
+	 *
+	 * @param array $dirs an array of paths for uploads to go to.
+	 *
+	 * @return mixed
+	 */
+	public function tf_support_upload_dir( $dirs ) {
+		$tf_support_dir = '/tf-support-uploads';
+
+		$dirs['path']   = $dirs['basedir'] . $tf_support_dir;
+		$dirs['url']    = $dirs['baseurl'] . $tf_support_dir;
+
+		return $dirs;
+	}
 	/**
 	 * Register the stylesheets for the Dashboard.
 	 *
@@ -186,5 +242,4 @@ public function enqueue_scripts() {
 		wp_localize_script( $this->threefive_support, 'wpAdminAjax', array( 'ajaxurl' => admin_url( 'admin-ajax.php' ) ) );
 
 	}
-
 }