Migrated phpmailer to vendor via composer, tested by Arnab.

build.xml

@@ -23,6 +23,8 @@
 	<delete dir="${dir.vendor}/adodb/adodb-php/docs" verbose="true"/>
 
 	<delete dir="${dir.vendor}/smarty/smarty/demo" verbose="true"/>
-
+	<delete dir="${dir.vendor}/phpmailer/phpmailer/examples" verbose="true"/>
+	<delete dir="${dir.vendor}/phpmailer/phpmailer/test" verbose="true"/>
+	<delete dir="${dir.vendor}/phpmailer/phpmailer/docs" verbose="true"/>
 </target>
 </project>

ccr/createCCR.php

@@ -48,7 +48,6 @@
 
 require_once(dirname(__FILE__) . "/../interface/globals.php");
 require_once(dirname(__FILE__) . "/../library/sql-ccr.inc");
-require_once(dirname(__FILE__) . "/../library/classes/class.phpmailer.php");
 require_once(dirname(__FILE__) . "/uuid.php");
 require_once(dirname(__FILE__) . "/transmitCCD.php");
 require_once(dirname(__FILE__) . "/../custom/code_types.inc.php");

composer.json

@@ -12,7 +12,8 @@
     "require": {
 
         "smarty/smarty": "2.6.29",
-        "adodb/adodb-php": "5.20.2"
+        "adodb/adodb-php": "5.20.2",
+        "phpmailer/phpmailer": "5.2"
 
     },
     "require-dev": {

controllers/C_Prescription.class.php

@@ -801,9 +801,7 @@ function _email_prescription($p,$email) {
 			$this->assign("process_result","Email could not be sent, the address supplied: '$email' was empty or invalid.");
 			return;
 		}
-		require($GLOBALS['fileroot'] . "/library/classes/class.phpmailer.php");
 		$mail = new PHPMailer();
-		$mail->SetLanguage("en",$GLOBALS['fileroot'] . "/library/" );
 		//this is a temporary config item until the rest of the per practice billing settings make their way in
 		$mail->From = $GLOBALS['practice_return_email_path'];
 		$mail->FromName = $p->provider->get_name_display();

interface/drugs/dispense_drug.php

@@ -13,15 +13,13 @@
  require_once("$srcdir/acl.inc");
  require_once("drugs.inc.php");
  require_once("$srcdir/options.inc.php");
- require_once($GLOBALS['fileroot'] . "/library/classes/class.phpmailer.php");
  require_once($GLOBALS['fileroot'] . "/library/classes/class.ezpdf.php");
  require_once("$srcdir/htmlspecialchars.inc.php");
 
  function send_email($subject, $body) {
   $recipient = $GLOBALS['practice_return_email_path'];
   if (empty($recipient)) return;
   $mail = new PHPMailer();
-  $mail->SetLanguage("en", $GLOBALS['fileroot'] . "/library/" );
   $mail->From = $recipient;
   $mail->FromName = 'In-House Pharmacy';
   $mail->isMail();

interface/drugs/drugs.inc.php

@@ -20,11 +20,9 @@
 $substitute_array = array('', xl('Allowed'), xl('Not Allowed'));
 
 function send_drug_email($subject, $body) {
-  require_once ($GLOBALS['srcdir'] . "/classes/class.phpmailer.php");
   $recipient = $GLOBALS['practice_return_email_path'];
   if (empty($recipient)) return;
   $mail = new PHPMailer();
-  $mail->SetLanguage("en", $GLOBALS['fileroot'] . "/library/" );
   $mail->From = $recipient;
   $mail->FromName = 'In-House Pharmacy';
   $mail->isMail();

interface/usergroup/usergroup_admin.php

@@ -44,7 +44,6 @@
 	$row = sqlFetchArray($res);
 	$uname=$row['username'];
 	$mail = new MyMailer();
-        $mail->SetLanguage("en",$GLOBALS['fileroot'] . "/library/" );
         $mail->From = "admin@".$mail_id[1].".".$mail_id[2];     
         $mail->FromName = "Administrator OpenEMR";
         $text_body  = "Hello Security Admin,\n\n The Emergency Login user ".$uname.