Skip to content

Commit a55b67d

Browse files
corentinheadooSynchro
corentinheadoo
authored andcommitted
Fix: function call is not case-sensitive (PHPMailer#857)
1 parent 0de97ab commit a55b67d

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

class.phpmaileroauth.php

+1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ public function getOAUTHInstance()
8080
* @uses SMTP
8181
* @access public
8282
* @return bool
83+
* @throws phpmailerException
8384
*/
8485
public function smtpConnect($options = array())
8586
{

class.smtp.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ public function authenticate(
477477
$temp = new stdClass;
478478
$ntlm_client = new ntlm_sasl_client_class;
479479
//Check that functions are available
480-
if (!$ntlm_client->Initialize($temp)) {
480+
if (!$ntlm_client->initialize($temp)) {
481481
$this->setError($temp->error);
482482
$this->edebug(
483483
'You need to enable some modules in your php.ini file: '
@@ -487,7 +487,7 @@ public function authenticate(
487487
return false;
488488
}
489489
//msg1
490-
$msg1 = $ntlm_client->TypeMsg1($realm, $workstation); //msg1
490+
$msg1 = $ntlm_client->typeMsg1($realm, $workstation); //msg1
491491

492492
if (!$this->sendCommand(
493493
'AUTH NTLM',
@@ -506,7 +506,7 @@ public function authenticate(
506506
$password
507507
);
508508
//msg3
509-
$msg3 = $ntlm_client->TypeMsg3(
509+
$msg3 = $ntlm_client->typeMsg3(
510510
$ntlm_res,
511511
$username,
512512
$realm,

extras/htmlfilter.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,7 @@ function tln_sanitize(
901901
}
902902
$trusted .= tln_tagprint($tagname, $attary, $tagtype);
903903
$trusted .= $free_content;
904-
$trusted .= tln_tagprint($tagname, false, 2);
904+
$trusted .= tln_tagprint($tagname, null, 2);
905905
}
906906
continue;
907907
}

extras/ntlm_sasl_client.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,12 @@ public function step(&$client, $response, &$message, &$interactions)
160160
{
161161
switch ($this->state) {
162162
case SASL_NTLM_STATE_IDENTIFY_DOMAIN:
163-
$message = $this->TypeMsg1($this->credentials["realm"], $this->credentials["workstation"]);
163+
$message = $this->typeMsg1($this->credentials["realm"], $this->credentials["workstation"]);
164164
$this->state = SASL_NTLM_STATE_RESPOND_CHALLENGE;
165165
break;
166166
case SASL_NTLM_STATE_RESPOND_CHALLENGE:
167167
$ntlm_response = $this->NTLMResponse(substr($response, 24, 8), $this->credentials["password"]);
168-
$message = $this->TypeMsg3(
168+
$message = $this->typeMsg3(
169169
$ntlm_response,
170170
$this->credentials["user"],
171171
$this->credentials["realm"],

test/phpmailerTest.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1264,12 +1264,12 @@ public function testQmailSend()
12641264
//Only run if we have qmail installed
12651265
if (file_exists('/var/qmail/bin/qmail-inject')) {
12661266
$this->Mail->Body = 'Sending via qmail';
1267-
$this->BuildBody();
1267+
$this->buildBody();
12681268
$subject = $this->Mail->Subject;
12691269

12701270
$this->Mail->Subject = $subject . ': qmail';
1271-
$this->Mail->IsQmail();
1272-
$this->assertTrue($this->Mail->Send(), $this->Mail->ErrorInfo);
1271+
$this->Mail->isQmail();
1272+
$this->assertTrue($this->Mail->send(), $this->Mail->ErrorInfo);
12731273
} else {
12741274
$this->markTestSkipped('Qmail is not installed');
12751275
}

0 commit comments

Comments
 (0)