Fixed mac address format lookup

xxdqq · Jun 27, 2018 · d22e502 · d22e502
1 parent 3b88497
commit d22e502
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/login/captcha b/app/login/captcha
diff --git a/app/tools/mac-lookup/results.php b/app/tools/mac-lookup/results.php
@@ -18,7 +18,7 @@
 		$Result->show("info", _("No matches found for prefix")." ".$mac, false);
 	}
 	else {
-		$mac = strtoupper($User->reformat_mac_address ($mac, $format = 1));
+		$mac = strtoupper($User->reformat_mac_address ($mac, 1));
 		$mac_partial = explode(":", $mac);
 		// print
 		print "<div style='font-size:16px;'>Vendor: <strong>".$mac_vendor."</strong></div><hr>";

diff --git a/functions/PHPMailer b/functions/PHPMailer
diff --git a/functions/classes/class.Common.php b/functions/classes/class.Common.php
@@ -1474,7 +1474,7 @@ public function get_mac_address_vendor_details ($mac) {
 		if(strlen($mac)<4)				{ return ""; }
 		if(!$this->validate_mac ($mac))	{ return ""; }
 		// reformat mac address
-		$mac = strtoupper($this->reformat_mac_address ($mac, $format = 1));
+		$mac = strtoupper($this->reformat_mac_address ($mac, 1));
 		$mac_partial = explode(":", $mac);
 		// get mac XML database
+3 −3		README.md
+3 −3		README.txt
+4 −3		composer.json
+3 −22		config.inc.php.SAMPLE
+1 −1		example_form.ajax.php
+1 −1		example_form.php
+93 −403		securimage.php
+1 −1		securimage_play.php
+1 −1		securimage_show.php
+4 −5		.gitattributes
+0 −1		.github/ISSUE_TEMPLATE.md
+0 −1		.github/PULL_REQUEST_TEMPLATE.md
+7 −11		.travis.yml
+22 −20		LICENSE
+4 −4		README.md
+0 −4		SECURITY.md
+1 −1		VERSION
+0 −26		changelog.md
+10 −15		class.phpmailer.php
+1 −1		class.pop3.php
+56 −83		class.smtp.php
+2 −19		composer.json
+447 −464		composer.lock
+1 −1		docs/Note_for_SMTP_debugging.md
+67 −74		examples/code_generator.phps
+0 −24		examples/gmail.phps
+2 −2		examples/gmail_xoauth.phps
+4 −4		extras/README.md
+2 −2		extras/htmlfilter.php
+0 −26		language/phpmailer.lang-ba.php
+1 −1		language/phpmailer.lang-cs.php
+16 −16		language/phpmailer.lang-nb.php
+1 −2		language/phpmailer.lang-pt_br.php
+1 −1		language/phpmailer.lang-sr.php
+1 −2		language/phpmailer.lang-tr.php
+3 −4		language/phpmailer.lang-zh_cn.php
+6 −11		test/phpmailerTest.php