gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2026-02-21 01:58:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2026-02-11 12:40:14 +01:00
commit 18ecce6f17
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@ -65,6 +65,7 @@
"slim/psr7": "^1.7",
"chillerlan/php-qrcode": "^5.0",
"bacon/bacon-qr-code": "^3.0",
"endroid/qr-code": "*",
"seeddms/core": "dev-seeddms-6.0.x",
"seeddms/lucene": "dev-master",
"seeddms/preview": "dev-master",

2
out/out.Setup2Factor.php
View File

@ -24,7 +24,7 @@ require_once("inc/inc.Authentication.php");
$tmp = explode('.', basename($_SERVER['SCRIPT_FILENAME']));
$view = UI::factory($theme, $tmp[1], array('dms'=>$dms, 'user'=>$user));
$accessop = new SeedDMS_AccessOperation($dms, $user, $settings);
$accessop = new SeedDMS_AccessOperation($dms, null, $user, $settings);
if ($user->isGuest()) {
UI::exitError(getMLText("2_factor_auth"),getMLText("access_denied"));

7
views/bootstrap/class.Setup2Factor.php
View File

@ -18,6 +18,7 @@ require "vendor/autoload.php";
use RobThree\Auth\TwoFactorAuth;
use RobThree\Auth\Providers\Qr\BaconQrCodeProvider;
use RobThree\Auth\Providers\Qr\EndroidQrCodeProvider;
/**
* Class which outputs the html page for ForcePasswordChange view
@ -92,8 +93,10 @@ $(document).ready( function() {
$this->columnStart(6);
$this->contentHeading(getMLText('2_factor_auth_new_secret'));
// $tfa = new \RobThree\Auth\TwoFactorAuth('SeedDMS: '.$sitename);
$tfa = new TwoFactorAuth(new BaconQrCodeProvider());
/* BaconQrCodeProvider requires imagick
$tfa = new TwoFactorAuth(new BaconQrCodeProvider());
*/
$tfa = new TwoFactorAuth(new EndroidQrCodeProvider());
$oldsecret = $user->getSecret();
$secret = $tfa->createSecret();
?>