Files left out of merge
This commit is contained in:
@ -461,8 +461,7 @@ class SettingsController extends Controller
|
||||
throw new NotFoundHttpException();
|
||||
}
|
||||
|
||||
switch($choice)
|
||||
{
|
||||
switch ($choice) {
|
||||
case 'google-authenticator':
|
||||
$uri = $this->make(TwoFactorQrCodeUriGeneratorService::class, [$user])->run();
|
||||
return $this->renderAjax('two-factor', ['id' => $id, 'uri' => $uri]);
|
||||
@ -475,7 +474,6 @@ class SettingsController extends Controller
|
||||
$smsCode = $this->make(TwoFactorSmsCodeGeneratorService::class, [$user])->run();
|
||||
return $this->renderAjax('two-factor-sms', ['id' => $id, 'code' => $smsCode, 'mobilePhone' => $mobilePhone]);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public function actionTwoFactorEnable($id)
|
||||
|
||||
@ -67,8 +67,8 @@ class User extends ActiveRecord implements IdentityInterface
|
||||
use ContainerAwareTrait;
|
||||
|
||||
// following constants are used on secured email changing process
|
||||
const OLD_EMAIL_CONFIRMED = 0b01;
|
||||
const NEW_EMAIL_CONFIRMED = 0b10;
|
||||
public const OLD_EMAIL_CONFIRMED = 0b01;
|
||||
public const NEW_EMAIL_CONFIRMED = 0b10;
|
||||
|
||||
/**
|
||||
* @var string Plain password. Used for model validation
|
||||
|
||||
Reference in New Issue
Block a user