diff --git a/application/index/model/TwoFactor.php b/application/index/model/TwoFactor.php index 430b0116..0b01334a 100644 --- a/application/index/model/TwoFactor.php +++ b/application/index/model/TwoFactor.php @@ -18,16 +18,17 @@ class TwoFactor extends Model{ $this->ga = new PHPGangsta_GoogleAuthenticator(); } - public function qrcodeRender(){ - ob_end_clean(); - header("content-type: image/png"); - $this->secretKey = $this->ga->createSecret(); - $qrCode = new QrCode(); - session("two_factor_enable",$this->secretKey); - $qrCode->setText(urldecode($this->ga->getQRCodeGoogleUrl(Option::getValue("siteName"), $this->secretKey))) - ->setPadding(5) - ->render(); - } + public function qrcodeRender(){ + ob_end_clean(); + $this->secretKey = $this->ga->createSecret(); + session("two_factor_enable",$this->secretKey); + $qrCode = new QrCode(urldecode($this->ga->getQRCodeGoogleUrl(Option::getValue("siteName"), $this->secretKey))); + $qrCode->setSize(165); + $qrCode->setMargin(0); + header('Content-Type: '.$qrCode->getContentType()); + echo $qrCode->writeString(); + } + public function confirmCode($key,$code){ $this->secretKey = $key; @@ -50,4 +51,4 @@ class TwoFactor extends Model{ } } -?> \ No newline at end of file +?>