Permalink
Browse files

Changes for language strings

  • Loading branch information...
1 parent 42cc44d commit 10604909ea8604189922542564e5b05159c19104 ikawhero committed Oct 2, 2004
Showing with 21 additions and 5 deletions.
  1. +21 −5 lib/phpmailer/class.phpmailer.php
@@ -119,7 +119,7 @@ class PHPMailer
* is in a different directory than the PHP include path.
* @var string
*/
- var $PluginDir = "";
+ var $PluginDir = '';
/**
* Holds PHPMailer version.
@@ -228,6 +228,20 @@ class PHPMailer
/////////////////////////////////////////////////
/**
+ * Constructor
+ * Hack for Moodle as class may be included from various locations
+ * SE 20041001
+ * @param void
+ * @return void
+ */
+ function PHPMailer () {
+ global $CFG;
+ $this->PluginDir = $CFG->libdir.'/phpmailer/';
+ }
+
+
+
+ /**
* Sets message type to HTML.
* @param bool $bool
* @return void
@@ -457,7 +471,7 @@ function MailSend($header, $body) {
* @return bool
*/
function SmtpSend($header, $body) {
- include_once($this->PluginDir . "class.smtp.php");
+ include_once("class.smtp.php");
$error = "";
$bad_rcpt = array();
@@ -588,16 +602,18 @@ function SmtpClose() {
* Sets the language for all class error messages. Returns false
* if it cannot load the language file. The default language type
* is English.
+ * SE 20041001: Added '$this->PluginDir' for Moodle compatibility
+ *
* @param string $lang_type Type of language (e.g. Portuguese: "br")
* @param string $lang_path Path to the language file directory
* @access public
* @return bool
*/
function SetLanguage($lang_type, $lang_path = "language/") {
- if(file_exists($lang_path.'phpmailer.lang-'.$lang_type.'.php'))
- include($lang_path.'phpmailer.lang-'.$lang_type.'.php');
+ if(file_exists($this->PluginDir.$lang_path.'phpmailer.lang-'.$lang_type.'.php'))
+ include($this->PluginDir.$lang_path.'phpmailer.lang-'.$lang_type.'.php');
else if(file_exists($lang_path.'phpmailer.lang-en.php'))
- include($lang_path.'phpmailer.lang-en.php');
+ include($this->PluginDir.$lang_path.'phpmailer.lang-en.php');
else
{
$this->SetError("Could not load language file");

0 comments on commit 1060490

Please sign in to comment.