diff options
Diffstat (limited to 'lib/phpmailer/extras')
| -rw-r--r-- | lib/phpmailer/extras/htmlfilter.php | 11 | ||||
| -rw-r--r-- | lib/phpmailer/extras/ntlm_sasl_client.php | 4 |
2 files changed, 4 insertions, 11 deletions
diff --git a/lib/phpmailer/extras/htmlfilter.php b/lib/phpmailer/extras/htmlfilter.php index 5ac7d13..7727487 100644 --- a/lib/phpmailer/extras/htmlfilter.php +++ b/lib/phpmailer/extras/htmlfilter.php @@ -461,7 +461,6 @@ function tln_deent(&$attvalue, $regex, $hex = false) * checks on them. * * @param string $attvalue A string to run entity check against. - * @return Void, modifies a reference value. */ function tln_defang(&$attvalue) { @@ -488,7 +487,6 @@ function tln_defang(&$attvalue) * be funny to make "java[tab]script" be just as good as "javascript". * * @param string $attvalue The attribute value before extraneous spaces removed. - * @return Void, modifies a reference value. */ function tln_unspace(&$attvalue) { @@ -511,7 +509,7 @@ function tln_unspace(&$attvalue) * @param array $add_attr_to_tag See description for tln_sanitize * @param string $trans_image_path * @param boolean $block_external_images - * @return Array with modified attributes. + * @return array with modified attributes. */ function tln_fixatts( $tagname, @@ -667,9 +665,7 @@ function tln_fixurl($attname, &$attvalue, $trans_image_path, $block_external_ima function tln_fixstyle($body, $pos, $trans_image_path, $block_external_images) { - $me = 'tln_fixstyle'; // workaround for </style> in between comments - $iCurrentPos = $pos; $content = ''; $sToken = ''; $bSucces = false; @@ -740,8 +736,6 @@ function tln_fixstyle($body, $pos, $trans_image_path, $block_external_images) */ $content = preg_replace("|body(\s*\{.*?\})|si", ".bodyclass\\1", $content); - $trans_image_path = $trans_image_path; - /** * Fix url('blah') declarations. */ @@ -796,7 +790,6 @@ function tln_fixstyle($body, $pos, $trans_image_path, $block_external_images) function tln_body2div($attary, $trans_image_path) { - $me = 'tln_body2div'; $divattary = array('class' => "'bodyclass'"); $text = '#000000'; $has_bgc_stl = $has_txt_stl = false; @@ -901,7 +894,7 @@ function tln_sanitize( } $trusted .= tln_tagprint($tagname, $attary, $tagtype); $trusted .= $free_content; - $trusted .= tln_tagprint($tagname, false, 2); + $trusted .= tln_tagprint($tagname, null, 2); } continue; } diff --git a/lib/phpmailer/extras/ntlm_sasl_client.php b/lib/phpmailer/extras/ntlm_sasl_client.php index 4a08561..3fd5392 100644 --- a/lib/phpmailer/extras/ntlm_sasl_client.php +++ b/lib/phpmailer/extras/ntlm_sasl_client.php @@ -160,12 +160,12 @@ class ntlm_sasl_client_class { switch ($this->state) { case SASL_NTLM_STATE_IDENTIFY_DOMAIN: - $message = $this->TypeMsg1($this->credentials["realm"], $this->credentials["workstation"]); + $message = $this->typeMsg1($this->credentials["realm"], $this->credentials["workstation"]); $this->state = SASL_NTLM_STATE_RESPOND_CHALLENGE; break; case SASL_NTLM_STATE_RESPOND_CHALLENGE: $ntlm_response = $this->NTLMResponse(substr($response, 24, 8), $this->credentials["password"]); - $message = $this->TypeMsg3( + $message = $this->typeMsg3( $ntlm_response, $this->credentials["user"], $this->credentials["realm"], |