Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-10 10:26:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [DEV] Improved notifications

Browse Source 
* [DEV] UI tweaks
This commit is contained in:
nuxsmin
2017-01-09 00:46:03 +01:00
parent b65eb89c4f
commit e7dd1ef0a6
2 changed files with 7 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
ajax/ajax_2fa.php
View File

@@ -1,61 +0,0 @@
<?php
/**
* sysPass
*
* @author nuxsmin
* @link http://syspass.org
* @copyright 2012-2015 Rubén Domínguez nuxsmin@syspass.org
*
* This file is part of sysPass.
*
* sysPass is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* sysPass is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with sysPass. If not, see <http://www.gnu.org/licenses/>.
*
*/
use Plugins\Authenticator\Authenticator;
use SP\Core\Session;
use SP\Core\SessionUtil;
use SP\Http\Request;
use SP\Http\Response;
define('APP_ROOT', '..');
require_once APP_ROOT . DIRECTORY_SEPARATOR . 'inc' . DIRECTORY_SEPARATOR . 'Base.php';
Request::checkReferer('POST');
$sk = Request::analyze('sk', false);
if (!$sk || !SessionUtil::checkSessionKey($sk)) {
Response::printJson(_('CONSULTA INVÁLIDA'));
}
$userId = Request::analyze('itemId', 0);
$pin = Request::analyze('security_pin', 0);
$TwoFa = new Authenticator($userId);
if ($userId
&& $pin
&& $TwoFa->verifyKey($pin)
) {
Session::set2FApassed(true);
$urlParams = Request::importUrlParamsToGet();
Response::printJson(_('Código correcto'), 0);
} else {
Session::set2FApassed(false);
Response::printJson(_('Código incorrecto'));
}

11
inc/themes/material-blue/views/account/account.inc
View File

@@ -185,7 +185,8 @@
<tr>
<td class="descField"><?php echo _('Cuenta Vinculada'); ?></td>
<td class="valField">
<select id="selParentAccount" name="parentAccountId" class="select-box select-box-deselect" <?php echo $disabled; ?>>
<select id="selParentAccount" name="parentAccountId"
class="select-box select-box-deselect" <?php echo $disabled; ?>>
<option value=""><?php echo _('Seleccionar Cuenta'); ?></option>
<?php foreach ($otherAccounts as $otherAccount): ?>
<?php $selected = ($gotData && (int)$otherAccount->account_id === $accountData->getAccountParentId()) ? 'selected' : ''; ?>
@@ -247,9 +248,11 @@
data-icon-up="<?php echo $icons->getIconUp()->getIcon(); ?>"><?php echo $icons->getIconDown()->getIcon(); ?></i>
</legend>
<table id="data-customfields">
<?php include $this->includeTemplate('aux-customfields', 'common'); ?>
</table>
<div id="data-customfields">
<table>
<?php include $this->includeTemplate('aux-customfields', 'common'); ?>
</table>
</div>
</fieldset>
<?php endif; ?>