diff --git a/ajax/ajax_passReset.php b/ajax/ajax_passReset.php deleted file mode 100644 index e067822c..00000000 --- a/ajax/ajax_passReset.php +++ /dev/null @@ -1,109 +0,0 @@ -. - */ - -use SP\Auth\AuthUtil; -use SP\Core\SessionUtil; -use SP\Core\Exceptions\SPException; -use SP\Http\JsonResponse; -use SP\Http\Request; -use SP\Log\Email; -use SP\Log\Log; -use SP\Mgmt\Users\User; -use SP\Mgmt\Users\UserPass; -use SP\Mgmt\Users\UserPassRecover; -use SP\Util\Json; - -define('APP_ROOT', dirname(__DIR__)); - -require APP_ROOT . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'Base.php'; - -Request::checkReferer('POST'); - -$JsonResponse = new JsonResponse(); - -$sk = Request::analyze('sk', false); - -if (!$sk || !SessionUtil::checkSessionKey($sk)) { - $JsonResponse->setDescription(__('CONSULTA INVÁLIDA')); - Json::returnJson($JsonResponse); -} - -$userLogin = Request::analyze('login'); -$userEmail = Request::analyze('email'); -$userPass = Request::analyzeEncrypted('pass'); -$userPassR = Request::analyzeEncrypted('passR'); - -$Log = new Log(); -$LogMessage = $Log->getLogMessage(); - -if ($userLogin && $userEmail) { - $LogMessage->setAction(__('Recuperación de Clave', false)); - $LogMessage->addDetailsHtml(__('Solicitado para'), sprintf('%s (%s)', $userLogin, $userEmail)); - - $UserData = User::getItem()->getByLogin($userLogin); - - if ($UserData->getEmail() === $userEmail - && AuthUtil::mailPassRecover($UserData) - ) { - $LogMessage->addDescription(__('Solicitud enviada', false)); - $Log->writeLog(); - - $JsonResponse->setDescription($LogMessage->getDescription()); - $JsonResponse->addMessage(__('En breve recibirá un correo para completar la solicitud.')); - Json::returnJson($JsonResponse); - } - - $LogMessage->addDescription(__('Solicitud no enviada', false)); - $LogMessage->addDescription(__('Compruebe datos de usuario o consulte con el administrador', false)); - $Log->writeLog(); - - Email::sendEmail($LogMessage); - - $JsonResponse->setDescription($LogMessage->getDescription()); - Json::returnJson($JsonResponse); -} elseif ($userPass && $userPassR && $userPass === $userPassR) { - $LogMessage->setAction(__('Modificar Clave Usuario', false)); - - try { - $UserPassRecover = UserPassRecover::getItem()->getHashUserId(Request::analyze('hash')); - UserPass::getItem()->updateUserPass($UserPassRecover->getItemData()->getUserpassrUserId(), $userPass); - } catch (SPException $e) { - $LogMessage->addDescription($e->getMessage()); - $Log->writeLog(); - - $JsonResponse->setDescription($e->getMessage()); - Json::returnJson($JsonResponse); - } - - $LogMessage->addDescription(__('Clave actualizada', false)); - $LogMessage->addDetailsHtml(__('Login', false), UserPass::getItem()->getItemData()->getUserLogin()); - $Log->writeLog(); - - $JsonResponse->setStatus(0); - $JsonResponse->setDescription($LogMessage->getDescription()); - Json::returnJson($JsonResponse); -} else { - $JsonResponse->setDescription(_('La clave es incorrecta o no coincide')); - Json::returnJson($JsonResponse); -} \ No newline at end of file diff --git a/app/config/strings.js.inc b/app/config/strings.js.inc index 2bb4d3b9..d5cf5528 100644 --- a/app/config/strings.js.inc +++ b/app/config/strings.js.inc @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/api/module.php b/app/modules/api/module.php index a91c7dd0..a03472e5 100644 --- a/app/modules/api/module.php +++ b/app/modules/api/module.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/AccessManagerController.php b/app/modules/web/Controllers/AccessManagerController.php index 1fc183ce..b569ddb3 100644 --- a/app/modules/web/Controllers/AccessManagerController.php +++ b/app/modules/web/Controllers/AccessManagerController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/AccountController.php b/app/modules/web/Controllers/AccountController.php index f7b58805..b827b4bc 100644 --- a/app/modules/web/Controllers/AccountController.php +++ b/app/modules/web/Controllers/AccountController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/AccountFileController.php b/app/modules/web/Controllers/AccountFileController.php index 6f4f6b3e..abd6c2c8 100644 --- a/app/modules/web/Controllers/AccountFileController.php +++ b/app/modules/web/Controllers/AccountFileController.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/ApiTokenController.php b/app/modules/web/Controllers/ApiTokenController.php index 0edc127f..53d6f4e8 100644 --- a/app/modules/web/Controllers/ApiTokenController.php +++ b/app/modules/web/Controllers/ApiTokenController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/BootstrapController.php b/app/modules/web/Controllers/BootstrapController.php index bbc71e7f..7e02c558 100644 --- a/app/modules/web/Controllers/BootstrapController.php +++ b/app/modules/web/Controllers/BootstrapController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/CategoryController.php b/app/modules/web/Controllers/CategoryController.php index f04d73f9..385b11cc 100644 --- a/app/modules/web/Controllers/CategoryController.php +++ b/app/modules/web/Controllers/CategoryController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/ClientController.php b/app/modules/web/Controllers/ClientController.php index 9af38bee..a98e5473 100644 --- a/app/modules/web/Controllers/ClientController.php +++ b/app/modules/web/Controllers/ClientController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/ConfigAccountController.php b/app/modules/web/Controllers/ConfigAccountController.php index 68d9e19b..828a2ca0 100644 --- a/app/modules/web/Controllers/ConfigAccountController.php +++ b/app/modules/web/Controllers/ConfigAccountController.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/ConfigBackupController.php b/app/modules/web/Controllers/ConfigBackupController.php index a3b36276..2aa77f66 100644 --- a/app/modules/web/Controllers/ConfigBackupController.php +++ b/app/modules/web/Controllers/ConfigBackupController.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/ConfigEncryptionController.php b/app/modules/web/Controllers/ConfigEncryptionController.php index 0afb29b1..3ec8ed34 100644 --- a/app/modules/web/Controllers/ConfigEncryptionController.php +++ b/app/modules/web/Controllers/ConfigEncryptionController.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/ConfigGeneralController.php b/app/modules/web/Controllers/ConfigGeneralController.php index 56d152f1..d17a1a56 100644 --- a/app/modules/web/Controllers/ConfigGeneralController.php +++ b/app/modules/web/Controllers/ConfigGeneralController.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/ConfigImportController.php b/app/modules/web/Controllers/ConfigImportController.php index 528ab1f4..369e0a75 100644 --- a/app/modules/web/Controllers/ConfigImportController.php +++ b/app/modules/web/Controllers/ConfigImportController.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/ConfigLdapController.php b/app/modules/web/Controllers/ConfigLdapController.php index 189c4143..00250aa1 100644 --- a/app/modules/web/Controllers/ConfigLdapController.php +++ b/app/modules/web/Controllers/ConfigLdapController.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/ConfigMailController.php b/app/modules/web/Controllers/ConfigMailController.php index 9a7a5c0e..c981dc94 100644 --- a/app/modules/web/Controllers/ConfigMailController.php +++ b/app/modules/web/Controllers/ConfigMailController.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/ConfigManagerController.php b/app/modules/web/Controllers/ConfigManagerController.php index be491594..0b91bade 100644 --- a/app/modules/web/Controllers/ConfigManagerController.php +++ b/app/modules/web/Controllers/ConfigManagerController.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/ConfigWikiController.php b/app/modules/web/Controllers/ConfigWikiController.php index 5c0a755d..9e5045b6 100644 --- a/app/modules/web/Controllers/ConfigWikiController.php +++ b/app/modules/web/Controllers/ConfigWikiController.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/ControllerBase.php b/app/modules/web/Controllers/ControllerBase.php index bb963b9a..9c79b173 100644 --- a/app/modules/web/Controllers/ControllerBase.php +++ b/app/modules/web/Controllers/ControllerBase.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/CustomFieldController.php b/app/modules/web/Controllers/CustomFieldController.php index 7c71be23..a6284e5e 100644 --- a/app/modules/web/Controllers/CustomFieldController.php +++ b/app/modules/web/Controllers/CustomFieldController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/ErrorController.php b/app/modules/web/Controllers/ErrorController.php index 17ccd15a..31be3c9d 100644 --- a/app/modules/web/Controllers/ErrorController.php +++ b/app/modules/web/Controllers/ErrorController.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/EventlogController.php b/app/modules/web/Controllers/EventlogController.php index a6ba4032..97eb8cb9 100644 --- a/app/modules/web/Controllers/EventlogController.php +++ b/app/modules/web/Controllers/EventlogController.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/Helpers/Account/AccountActionsDto.php b/app/modules/web/Controllers/Helpers/Account/AccountActionsDto.php index 48f71656..10dde341 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountActionsDto.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountActionsDto.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php index 297d0867..dd7bacfd 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountActionsHelper.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/Helpers/Account/AccountHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountHelper.php index 0c7e4e44..026a3f42 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountHelper.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountHelper.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php index d7c6b82b..dbeacb83 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountHistoryHelper.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php index 20c2ae7e..d42eaab5 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountPasswordHelper.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php b/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php index 96856466..efe3603b 100644 --- a/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php +++ b/app/modules/web/Controllers/Helpers/Account/AccountSearchHelper.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/Helpers/HelperBase.php b/app/modules/web/Controllers/Helpers/HelperBase.php index 08af1762..875bc0ed 100644 --- a/app/modules/web/Controllers/Helpers/HelperBase.php +++ b/app/modules/web/Controllers/Helpers/HelperBase.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/Helpers/HelperException.php b/app/modules/web/Controllers/Helpers/HelperException.php index 1ebf97e6..929ef2d2 100644 --- a/app/modules/web/Controllers/Helpers/HelperException.php +++ b/app/modules/web/Controllers/Helpers/HelperException.php @@ -1,4 +1,26 @@ . + */ namespace SP\Modules\Web\Controllers\Helpers; diff --git a/app/modules/web/Controllers/Helpers/ItemsGridHelper.php b/app/modules/web/Controllers/Helpers/ItemsGridHelper.php index a91af35f..c70064ef 100644 --- a/app/modules/web/Controllers/Helpers/ItemsGridHelper.php +++ b/app/modules/web/Controllers/Helpers/ItemsGridHelper.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/Helpers/LayoutHelper.php b/app/modules/web/Controllers/Helpers/LayoutHelper.php index aac03e22..78940074 100644 --- a/app/modules/web/Controllers/Helpers/LayoutHelper.php +++ b/app/modules/web/Controllers/Helpers/LayoutHelper.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/Helpers/TabsGridHelper.php b/app/modules/web/Controllers/Helpers/TabsGridHelper.php index 893ffa13..6eabcd92 100644 --- a/app/modules/web/Controllers/Helpers/TabsGridHelper.php +++ b/app/modules/web/Controllers/Helpers/TabsGridHelper.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/Helpers/TabsHelper.php b/app/modules/web/Controllers/Helpers/TabsHelper.php index 6297558c..ccd5bb14 100644 --- a/app/modules/web/Controllers/Helpers/TabsHelper.php +++ b/app/modules/web/Controllers/Helpers/TabsHelper.php @@ -3,7 +3,7 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/IndexController.php b/app/modules/web/Controllers/IndexController.php index 9c095f8c..23278cb4 100644 --- a/app/modules/web/Controllers/IndexController.php +++ b/app/modules/web/Controllers/IndexController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/InstallController.php b/app/modules/web/Controllers/InstallController.php index 3b07a9f7..27552aa3 100644 --- a/app/modules/web/Controllers/InstallController.php +++ b/app/modules/web/Controllers/InstallController.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/ItemManagerController.php b/app/modules/web/Controllers/ItemManagerController.php index 1c4849d1..94b02384 100644 --- a/app/modules/web/Controllers/ItemManagerController.php +++ b/app/modules/web/Controllers/ItemManagerController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/ItemsController.php b/app/modules/web/Controllers/ItemsController.php index 7cd740e1..d81279c9 100644 --- a/app/modules/web/Controllers/ItemsController.php +++ b/app/modules/web/Controllers/ItemsController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/LoginController.php b/app/modules/web/Controllers/LoginController.php index 0e7edd03..9a94625f 100644 --- a/app/modules/web/Controllers/LoginController.php +++ b/app/modules/web/Controllers/LoginController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/MainController.php b/app/modules/web/Controllers/MainController.php index 4c251671..1623d626 100644 --- a/app/modules/web/Controllers/MainController.php +++ b/app/modules/web/Controllers/MainController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/NotificationController.php b/app/modules/web/Controllers/NotificationController.php index 9fbebedf..848a5742 100644 --- a/app/modules/web/Controllers/NotificationController.php +++ b/app/modules/web/Controllers/NotificationController.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/PassresetController.php b/app/modules/web/Controllers/PassresetController.php deleted file mode 100644 index 21b0f6e5..00000000 --- a/app/modules/web/Controllers/PassresetController.php +++ /dev/null @@ -1,65 +0,0 @@ -. - */ - -namespace SP\Modules\Web\Controllers; - -use SP\Http\Request; -use SP\Modules\Web\Controllers\Helpers\LayoutHelper; -use SP\Util\ErrorUtil; - -/** - * Class PassresetController - * - * @package SP\Modules\Web\Controllers - */ -class PassresetController extends ControllerBase -{ - /** - * Password reset action - * - * @throws \Psr\Container\ContainerExceptionInterface - * @throws \Psr\Container\NotFoundExceptionInterface - * @throws \SP\Core\Dic\ContainerException - */ - public function indexAction() - { - $LayoutHelper = $this->dic->get(LayoutHelper::class); - $LayoutHelper->getPublicLayout('passreset', 'passreset'); - - if ($this->configData->isMailEnabled() || Request::analyze('f', 0) === 1) { - $this->view->assign('login', Request::analyze('login')); - $this->view->assign('email', Request::analyze('email')); - - $this->view->assign('action', Request::analyze('a')); - $this->view->assign('hash', Request::analyze('h')); - $this->view->assign('time', Request::analyze('t')); - - $this->view->assign('passReset', $this->view->action === 'passreset' && !empty($this->view->hash) && !empty($this->view->time)); - } else { - ErrorUtil::showErrorInView($this->view, self::ERR_UNAVAILABLE); - } - - $this->view(); - } -} \ No newline at end of file diff --git a/app/modules/web/Controllers/PublicLinkController.php b/app/modules/web/Controllers/PublicLinkController.php index 48220fc8..3afb1278 100644 --- a/app/modules/web/Controllers/PublicLinkController.php +++ b/app/modules/web/Controllers/PublicLinkController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/ResourceController.php b/app/modules/web/Controllers/ResourceController.php index aeb1cda0..8e2718ff 100644 --- a/app/modules/web/Controllers/ResourceController.php +++ b/app/modules/web/Controllers/ResourceController.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/SimpleControllerBase.php b/app/modules/web/Controllers/SimpleControllerBase.php index 1ff950cb..c86196a5 100644 --- a/app/modules/web/Controllers/SimpleControllerBase.php +++ b/app/modules/web/Controllers/SimpleControllerBase.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/TagController.php b/app/modules/web/Controllers/TagController.php index afa0adb3..a6caab11 100644 --- a/app/modules/web/Controllers/TagController.php +++ b/app/modules/web/Controllers/TagController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/Traits/ConfigTrait.php b/app/modules/web/Controllers/Traits/ConfigTrait.php index 6fbb0224..85dee11b 100644 --- a/app/modules/web/Controllers/Traits/ConfigTrait.php +++ b/app/modules/web/Controllers/Traits/ConfigTrait.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/app/modules/web/Controllers/Traits/ItemTrait.php b/app/modules/web/Controllers/Traits/ItemTrait.php index a4ec9606..984b8fad 100644 --- a/app/modules/web/Controllers/Traits/ItemTrait.php +++ b/app/modules/web/Controllers/Traits/ItemTrait.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/Traits/JsonTrait.php b/app/modules/web/Controllers/Traits/JsonTrait.php index be249b5d..7a6e5daa 100644 --- a/app/modules/web/Controllers/Traits/JsonTrait.php +++ b/app/modules/web/Controllers/Traits/JsonTrait.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/UserController.php b/app/modules/web/Controllers/UserController.php index 88164741..051f0f6c 100644 --- a/app/modules/web/Controllers/UserController.php +++ b/app/modules/web/Controllers/UserController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -39,9 +39,10 @@ use SP\Modules\Web\Controllers\Traits\ItemTrait; use SP\Modules\Web\Controllers\Traits\JsonTrait; use SP\Mvc\Controller\CrudControllerInterface; use SP\Mvc\View\Components\SelectItemAdapter; -use SP\Providers\Auth\AuthUtil; +use SP\Providers\Mail\Mailer; use SP\Services\User\UserService; use SP\Services\UserGroup\UserGroupService; +use SP\Services\UserPassRecover\UserPassRecoverService; use SP\Services\UserProfile\UserProfileService; /** @@ -267,22 +268,19 @@ class UserController extends ControllerBase implements CrudControllerInterface $form = new UserForm(); $form->validate(ActionsInterface::USER_CREATE); - $id = $this->userService->create($form->getItemData()); -// $this->userService->logAction($id, ActionsInterface::USER_CREATE); + $itemData = $form->getItemData(); + + $id = $this->userService->create($itemData); $this->addCustomFieldsForItem(ActionsInterface::USER, $id); - $this->eventDispatcher->notifyEvent('create.user', new Event($this)); + $this->eventDispatcher->notifyEvent('create.user', + new Event($this, EventMessage::factory() + ->addDescription(__u('Usuario creado')) + ->addDetail(__u('Usuario'), $itemData->getName())) + ); - if ($form->getItemData()->isIsChangePass() - && !AuthUtil::mailPassRecover($form->getItemData()) - ) { - $this->returnJsonResponse( - JsonResponse::JSON_WARNING, - __u('Usuario creado'), - [__('No se pudo realizar la petición de cambio de clave.')] - ); - } + $this->checkChangeUserPass($itemData); $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Usuario creado')); } catch (ValidationException $e) { @@ -294,6 +292,28 @@ class UserController extends ControllerBase implements CrudControllerInterface } } + /** + * @param UserData $userData + * @throws \Defuse\Crypto\Exception\EnvironmentIsBrokenException + * @throws \SP\Core\Exceptions\ConstraintException + * @throws \SP\Core\Exceptions\QueryException + * @throws \SP\Providers\Mail\MailerException + * @throws \SP\Services\ServiceException + */ + protected function checkChangeUserPass(UserData $userData) + { + if ($userData->isChangePass()) { + $hash = $this->dic->get(UserPassRecoverService::class)->requestForUserId($userData->getId()); + $this->dic->get(Mailer::class)->send(__('Cambio de Clave'), $userData->getEmail(), UserPassRecoverService::getMailMessage($hash)); + +// $this->returnJsonResponse( +// JsonResponse::JSON_WARNING, +// __u('Usuario creado'), +// [__('No se pudo realizar la petición de cambio de clave.')] +// ); + } + } + /** * Saves edit action * @@ -312,22 +332,19 @@ class UserController extends ControllerBase implements CrudControllerInterface $form->setIsLdap(Request::analyze('isLdap', 0)); $form->validate(ActionsInterface::USER_EDIT); - $this->userService->update($form->getItemData()); -// $this->userService->logAction($id, ActionsInterface::USER_EDIT); + $itemData = $form->getItemData(); + + $this->userService->update($itemData); $this->updateCustomFieldsForItem(ActionsInterface::USER, $id); - $this->eventDispatcher->notifyEvent('edit.user', new Event($this)); + $this->eventDispatcher->notifyEvent('edit.user', + new Event($this, EventMessage::factory() + ->addDescription(__u('Usuario actualizado')) + ->addDetail(__u('Usuario'), $itemData->getName())) + ); - if ($form->getItemData()->isIsChangePass() - && !AuthUtil::mailPassRecover($form->getItemData()) - ) { - $this->returnJsonResponse( - JsonResponse::JSON_WARNING, - __u('Usuario actualizado'), - [__('No se pudo realizar la petición de cambio de clave.')] - ); - } + $this->checkChangeUserPass($itemData); $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Usuario actualizado')); } catch (ValidationException $e) { @@ -354,10 +371,15 @@ class UserController extends ControllerBase implements CrudControllerInterface $form = new UserForm($id); $form->validate(ActionsInterface::USER_EDIT_PASS); - $this->userService->updatePass($form->getItemData()); -// $this->userService->logAction($id, ActionsInterface::USER_EDIT_PASS); + $itemData = $form->getItemData(); - $this->eventDispatcher->notifyEvent('edit.user.pass', new Event($this)); + $this->userService->updatePass($id, $itemData->getPass()); + + $this->eventDispatcher->notifyEvent('edit.user.pass', + new Event($this, EventMessage::factory() + ->addDescription(__u('Clave actualizada')) + ->addDetail(__u('Usuario'), $id)) + ); $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Clave actualizada')); } catch (ValidationException $e) { diff --git a/app/modules/web/Controllers/UserGroupController.php b/app/modules/web/Controllers/UserGroupController.php index 9b200b19..4003d12c 100644 --- a/app/modules/web/Controllers/UserGroupController.php +++ b/app/modules/web/Controllers/UserGroupController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/Controllers/UserPassResetController.php b/app/modules/web/Controllers/UserPassResetController.php new file mode 100644 index 00000000..361fc20b --- /dev/null +++ b/app/modules/web/Controllers/UserPassResetController.php @@ -0,0 +1,209 @@ +. + */ + +namespace SP\Modules\Web\Controllers; + +use SP\Core\Events\Event; +use SP\Core\Events\EventMessage; +use SP\Core\Exceptions\SPException; +use SP\Core\Exceptions\ValidationException; +use SP\Http\JsonResponse; +use SP\Http\Request; +use SP\Modules\Web\Controllers\Helpers\LayoutHelper; +use SP\Modules\Web\Controllers\Traits\JsonTrait; +use SP\Providers\Mail\Mailer; +use SP\Repositories\Track\TrackRequest; +use SP\Services\Track\TrackService; +use SP\Services\User\UserService; +use SP\Services\UserPassRecover\UserPassRecoverService; +use SP\Util\ErrorUtil; + +/** + * Class PassresetController + * + * @package SP\Modules\Web\Controllers + */ +class UserPassResetController extends ControllerBase +{ + use JsonTrait; + /** + * @var TrackService + */ + protected $trackService; + /** + * @var TrackRequest + */ + protected $trackRequest; + + /** + * Password reset action + * + * @throws \Psr\Container\ContainerExceptionInterface + * @throws \Psr\Container\NotFoundExceptionInterface + * @throws \SP\Core\Dic\ContainerException + */ + public function indexAction() + { + $this->dic->get(LayoutHelper::class)->getPublicLayout('request', 'passreset'); + + if (!$this->configData->isMailEnabled()) { + ErrorUtil::showErrorInView($this->view, self::ERR_UNAVAILABLE); + } + + $this->view(); + } + + /** + * requestAction + */ + public function saveRequestAction() + { + try { + $this->checkTracking(); + + $login = Request::analyze('login'); + $email = Request::analyze('email'); + + $userLoginResponse = $this->dic->get(UserService::class)->getByLogin($login); + + if ($userLoginResponse->getEmail() !== $email) { + throw new SPException(__u('Datos incorrectos'), SPException::WARNING); + } + + if ($userLoginResponse->getIsDisabled() || $userLoginResponse->getIsLdap()) { + throw new SPException(__u('No es posible recuperar la clave'), SPException::WARNING, __u('Consulte con el administrador')); + } + + $hash = $this->dic->get(UserPassRecoverService::class)->requestForUserId($userLoginResponse->getId()); + + $this->eventDispatcher->notifyEvent('userPassReset.request', + new Event($this, EventMessage::factory() + ->addDescription(__u('Recuperación de Clave')) + ->addDetail(__u('Solicitado para'), sprintf('%s (%s)', $login, $email))) + ); + + $this->dic->get(Mailer::class)->send(__('Cambio de Clave'), $email, UserPassRecoverService::getMailMessage($hash)); + + $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Solicitud enviada'), [__u('En breve recibirá un correo para completar la solicitud.')]); + } catch (\Exception $e) { + processException($e); + + $this->addTracking(); + + $this->returnJsonResponseException($e); + } + } + + /** + * @throws SPException + * @throws \Exception + */ + protected function checkTracking() + { + if ($this->trackService->checkTracking($this->trackRequest)) { + throw new SPException(__u('Intentos excedidos'), SPException::INFO); + } + } + + /** + * Añadir un seguimiento + */ + private function addTracking() + { + try { + $this->trackService->add($this->trackRequest); + } catch (\Exception $e) { + processException($e); + } + } + + /** + * @param null $hash + * @throws \SP\Core\Dic\ContainerException + */ + public function resetAction($hash = null) + { + $this->dic->get(LayoutHelper::class)->getPublicLayout('reset', 'passreset'); + + if ($hash && $this->configData->isMailEnabled()) { + $this->view->assign('hash', $hash); + } else { + ErrorUtil::showErrorInView($this->view, self::ERR_UNAVAILABLE); + } + + $this->view(); + } + + /** + * saveResetAction + */ + public function saveResetAction() + { + try { + $this->checkTracking(); + + $pass = Request::analyzeEncrypted('pass'); + $passR = Request::analyzeEncrypted('passR'); + + if (!$pass || !$passR) { + throw new ValidationException(__u('La clave no puede estar en blanco')); + } + + if ($pass !== $passR) { + throw new ValidationException(__u('Las claves no coinciden')); + } + + $hash = Request::analyze('hash'); + + $userPassRecoverService = $this->dic->get(UserPassRecoverService::class); + $userId = $userPassRecoverService->getUserIdForHash($hash); + $userPassRecoverService->toggleUsedByHash($hash); + + $this->dic->get(UserService::class)->updatePass($userId, $pass); + + $this->eventDispatcher->notifyEvent('edit.user.pass', + new Event($this, EventMessage::factory() + ->addDescription(__u('Clave actualizada')) + ->addDetail(__u('Usuario'), $userId)) + ); + + $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Clave actualizada')); + } catch (\Exception $e) { + processException($e); + + $this->addTracking(); + + $this->returnJsonResponseException($e); + } + } + + /** + * @throws \SP\Core\Exceptions\InvalidArgumentException + */ + protected function initialize() + { + $this->trackService = $this->dic->get(TrackService::class); + $this->trackRequest = TrackService::getTrackRequest('userPassReset'); + } +} \ No newline at end of file diff --git a/app/modules/web/Controllers/UserProfileController.php b/app/modules/web/Controllers/UserProfileController.php index 34e067c3..7d02b6c6 100644 --- a/app/modules/web/Controllers/UserProfileController.php +++ b/app/modules/web/Controllers/UserProfileController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/module.php b/app/modules/web/module.php index 9977044a..aec42b76 100644 --- a/app/modules/web/module.php +++ b/app/modules/web/module.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/app/modules/web/themes/material-blue/css/styles.css b/app/modules/web/themes/material-blue/css/styles.css index 6d755b90..76106a7e 100644 --- a/app/modules/web/themes/material-blue/css/styles.css +++ b/app/modules/web/themes/material-blue/css/styles.css @@ -782,6 +782,10 @@ footer { .tab-actions > ul > li.datagrid-action-search form { width: 100%; } +h5.datagrid-header-title { + padding: .7em; + border-bottom: 1px solid #d9d9d9; } + .fullWidth { max-width: 100% !important; } diff --git a/app/modules/web/themes/material-blue/css/styles.css.map b/app/modules/web/themes/material-blue/css/styles.css.map index 2d2fb8ed..ea9121c1 100644 --- a/app/modules/web/themes/material-blue/css/styles.css.map +++ b/app/modules/web/themes/material-blue/css/styles.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "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", +"mappings": "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", "sources": ["_elements.scss","_base.scss","styles.scss","_login.scss"], "names": [], "file": "styles.css" diff --git a/app/modules/web/themes/material-blue/css/styles.min.css b/app/modules/web/themes/material-blue/css/styles.min.css index 3b8cdffb..88903ebd 100644 --- a/app/modules/web/themes/material-blue/css/styles.min.css +++ b/app/modules/web/themes/material-blue/css/styles.min.css @@ -1 +1 @@ -html,body{margin:0;padding:0;text-align:left;background-color:#f5f5f5;color:#555;font-size:12px;font-weight:normal;box-sizing:border-box}*{font-family:"Roboto Regular",Verdana,Tahoma,sans-serif;box-sizing:inherit}*:before,*:after{box-sizing:inherit}table{font-size:11px;border-spacing:0}table th{border-bottom:2px solid transparent;vertical-align:middle}table th .icon{width:24px;height:24px}table tr{height:20px}table tr.odd{background-color:#f9f9f9}table tr.even>td,table tr.odd>td{border-bottom:1px solid #d9d9d9!important}table tr.even:hover,table tr.odd:hover{background-color:#e8ff99}table td{padding:3px}table td.txtCliente{font-weight:bold;text-align:center}form{font-size:11px;margin:0}input.inputImg,img.inputImg{background-color:transparent!important;width:24px!important;height:24px!important;border:0;vertical-align:middle;margin:0 .5em}input.txtFile{width:200px}input.txtLong{width:300px}textarea{width:350px}select.files{width:250px}input.spinner{width:5em}img{margin:0;padding:0;border:0;cursor:pointer}img.inputImgMini{background-color:transparent!important;width:16px!important;height:16px!important;margin:0 5px 0 5px;border:0;vertical-align:middle}i{cursor:pointer}form .form-field{display:flex;justify-content:space-between}form .form-field>label{min-width:12em;padding:.5em 0;font-size:16px;align-self:center}form .form-field>div{width:100%;align-self:center}a{text-decoration:none;color:#536dfe}a:visited{text-decoration:none;color:#536dfe}a:hover,a:active,a:focus{text-decoration:none;cursor:pointer}pre,code,samp,kbd{font-family:Consolas,"Andale Mono WT","Andale Mono","Bitstream Vera Sans Mono","Nimbus Mono L",Monaco,"Courier New",monospace;font-size:1em;direction:ltr;text-align:left;background-color:#fbfaf9;color:#333;box-shadow:inset 0 0 .3em #ccc;border-radius:2px}#nojs{width:80%;text-align:center;vertical-align:middle;margin:10px auto;padding:3px;background-color:#ef5350;color:white;font-weight:bold;font-size:14px}#wrap{height:auto!important;min-height:100%;width:100%;background-color:#f5f5f5}#wrap-loading{position:fixed;z-index:9999;top:50%;left:50%;padding:1em;background-color:rgba(255,255,255,0.8);display:none;border-radius:5px!important;-moz-border-radius:5px!important;-webkit-border-radius:5px!important}#wrap-loading.overlay-full{top:0;left:0;width:100%;height:100%;background-color:rgba(255,255,255,0.5)}#wrap-loading.overlay-full #loading{position:absolute;top:50%;left:50%}#wrap-loading.overlay-full #taskStatus{display:block}#wrap-loading #taskStatus{display:none;position:absolute;left:0;top:55%;width:100%;text-align:center;color:white;background-color:rgba(0,0,0,0.5);padding:1em 0}#container{margin:auto;width:100%}#container.login{padding-top:5%}#container.error,#container.install,#container.passreset{width:100%}#container .logo{height:64px}#container #actions-bar{z-index:100;display:flex;justify-content:space-between;position:fixed;border:0 none;top:0;left:0;width:100%;padding:1em 0;background-color:transparent}#container #actions-bar-icons{flex-grow:1;text-align:center}#container #actions-bar-logo{display:none;padding:0 .5em}#container #actions-bar-logo img{display:inline-block;width:50px;opacity:.75}#container #content{width:95%;margin:2em auto 8em auto}#container #content.public-link{width:70%;min-height:0;margin:5em auto}#content td.descField,#box-popup td.descField{text-align:right;padding-right:20px;width:25%;border-right:1px solid #d9d9d9;color:#999;font-size:12px;font-weight:bold}#content td.valField,#box-popup td.valField{padding-left:1em;width:100%}#content td.valField .lowres-title,#box-popup td.valField .lowres-title{display:none;width:100%;color:#607d8b;font-size:12px}#content .pager{width:100%;margin-top:15px;padding:.5em;vertical-align:middle;font-size:11px;color:#999;background-color:#fcfcfc}#content .pager img{margin-left:5px;vertical-align:middle}#content .pager a{margin-left:5px;font-size:12px;color:#999}#content .pager>div{display:inline-block;width:49%}#content .pager .pager-left{text-align:left}#content .pager .pager-right{text-align:right}#content #title{width:50%;padding:7px;margin:auto;background-color:#d9d9d9;color:#fff;font-size:17px;letter-spacing:.3em;text-align:center}#content #title.titleNormal{background-color:#607d8b;color:#fff}#content .data-container{width:75%;margin:0 auto}#content fieldset.data{margin:2em auto}#content fieldset.data>legend{color:#607d8b;padding:0 .5em;font-size:1.5em}#content fieldset.data>div{display:none}#content fieldset.data>div table{width:100%}#content .data{width:100%;padding:10px;margin:0 auto;background-color:#fff;-webkit-box-shadow:2px 2px 3px -3px rgba(0,0,0,0.14);-moz-box-shadow:2px 2px 3px -3px rgba(0,0,0,0.14);box-shadow:1px 1px 2px rgba(0,0,0,0.14)}#content .data #history-icon{position:relative;top:5em;right:2em}#content .data td{text-align:left}#content .data td.descField{text-align:right}#content .data select{min-width:210px}#content .data .list-wrap{max-height:10em;overflow:auto;padding:.5em;margin:1em 0}#content .data .dropzone{width:30em;padding:1em;border:2px dashed #26a69a;text-align:center}#content .data .dropzone img{vertical-align:middle}#content .data .file-upload{display:none}#content .data .account-permissions{width:100%}#content .data .account-permissions fieldset{border:1px solid #c9c9c9;padding:1em}#content .data .account-permissions legend{font-weight:bold;color:#999;padding:.2em 0}#content .data .account-permissions fieldset>span{font-weight:bold;color:#999;padding:.2em 0;display:inline-block;width:100px;text-align:right}#content span.tag{margin:0 3px 3px 0;padding:.2em;background:#5c6bc0;color:#fff;border:0 solid transparent;border-radius:3px!important;-moz-border-radius:3px!important;-webkit-border-radius:3px!important}#content .extra-info{margin-top:20px}#content #tabs fieldset{border:1px solid #c9c9c9}#content #tabs #frmConfig label{float:left}#content .tblConfig{margin-bottom:2em}#content .tblConfig td.descField{width:35%;font-size:11px;font-weight:bold}#content .tblConfig td.rowHeader{padding:5px 0 5px 0;background-color:#f5f5f5;text-align:center;font-weight:bold;border-top:15px solid #f9f9f9;border-bottom:3px solid #a9c1d7;letter-spacing:.5em;color:#696969}#content .tblConfig input.checkbox{width:15px;text-align:left;padding:0}#content .tblConfig .option-disabled{text-align:center;background-color:#fff8e1;color:#ffca28;font-weight:bold}#content h2{width:100%;height:1.5em;font-size:18px;color:white;background-color:#a9c1d7;margin:0;padding-top:.1em}#content .section{margin-top:2.5em;border-bottom:1px solid #d9d9d9;text-align:left;font-size:14px;font-weight:bold;color:#5c6bc0}#content .row_even>td{background-color:#f5f5f5}#content .row_odd>td{background-color:white}#content .data-header ul{list-style:none;width:100%;margin:0 0 10px 0;padding:0}#content .data-header li{display:inline-block;padding:.2em .5em;font-weight:bold;letter-spacing:.2em;color:#fff;text-align:center}#content .data-header li a{color:#777}#content .data-header li img{float:right;width:24px;height:24px;vertical-align:middle}#content .data-header-minimal{border-bottom:1px solid #dfdfdf}#content .data-header-minimal ul{display:flex;flex-wrap:wrap;justify-content:flex-start;margin:0}#content .data-header-minimal li{display:inline-flex;min-width:10em;font-weight:normal;letter-spacing:normal}#content .data-header-minimal li a{color:#b9b9b9;padding:.3em .8em}#content .data-table{width:100%}#content .data-table td:first-of-type,#content .data-table th:first-of-type{width:5em}#content .data-table thead th{background-color:#607d8b;color:#fff}#content .data-table tbody td.cell-data{text-align:left}#content .data-table tbody td.cell-nodata{padding:0 .5em;text-align:left}#content .data-table tbody td.cell-actions{text-align:right}#content .data-table tbody td.cell-actions i{opacity:.5}#content .data-table tbody td.cell-actions i:hover{opacity:1}#content .data-rows ul{display:table;list-style:none;width:100%;margin:0 0 10px 0;padding:0;background-color:#fcfcfc}#content .data-rows li{float:left;display:block;padding:1em;color:#696969;text-align:center;min-height:2em}#content .data-rows li.cell-nodata{padding:1em 0;min-height:2em;text-align:left}#content .data-rows li.cell-actions{float:right;min-height:2em;padding:1em 0;text-align:left;background-color:#fcfcfc;width:15em}#content .data-rows li.cell-nodata img,#content .data-rows li.cell-actions img{width:24px;height:24px;margin:0 .5em}#content #resEventLog .data{width:100%}#content #resEventLog thead{text-align:center}#content #resEventLog tbody{width:100%;height:500px;overflow:auto}#content #resEventLog td{border-bottom:1px solid #d9d9d9}#content #resEventLog .cell{text-align:center}#content #resEventLog .cell-description{width:60%}#content #searchbox{background-color:#fcfcfc;vertical-align:middle;position:relative;height:auto;padding:.5em 1em;margin-bottom:2em}#content #searchbox form{display:flex;flex-wrap:wrap;justify-content:flex-start;align-items:center;text-align:left}#content #searchbox .search-filters>*{margin:0 .5em}#content #searchbox .search-filters .filter-buttons{display:inline-block}#content #searchbox .search-filters .filter-slider{width:10em}#content #searchbox .search-filters-tags{display:none;flex-grow:2}#content .btn-clear{opacity:.35;filter:alpha(opacity=35)}#content .btn-clear:hover{opacity:1;filter:alpha(opacity=100)}#content .actions-optional{display:none}#content .error{width:350px;padding:15px;margin:0 auto;text-align:center;font-size:16px;line-height:1.5em;color:#ffca28;background-color:#fff8e1;border:1px solid #ffca28}#box-popup .list-wrap{max-height:10em;overflow:auto;padding:.5em;margin:1em 0}#content .data .list-wrap ul,#box-popup .list-wrap ul{list-style-type:none;margin:0;padding:0}#content .data .list-wrap li,#box-popup .list-wrap li{display:flex;background:#f2f2f2;padding:.5em;font-size:1em;margin-bottom:.5em}#content .data .list-wrap li:hover,#box-popup .list-wrap li:hover{background:#e8eaf6;color:#000}#content .data .list-wrap div.files-item-info,#box-popup .list-wrap div.files-item-info{flex-grow:2}#content .data .list-wrap div.files-item-info img,#box-popup .list-wrap div.files-item-info img{margin:0 .5em}#content .data .list-wrap div.files-item-actions,#box-popup .list-wrap div.files-item-actions{padding:.3em 0}#box-popup{width:-webkit-min-content;width:-moz-min-content;width:min-content;min-width:50em;margin:5em auto;padding:0;background-color:#fff}#box-popup.box-password-view{width:-webkit-min-content;width:-moz-min-content;width:min-content;min-width:30em}#box-popup>h2{position:relative;width:100%;font-size:18px;color:#fff;background-color:#607d8b;margin:0;padding:.5em 0;line-height:1em}#box-popup>h2 .btn-popup-close{display:none;position:absolute;right:.5em;top:.2em}#box-popup>table{width:100%;padding-bottom:1em}#box-popup select{width:220px}#box-popup #resFancyAccion{display:none}#box-popup #resCheck{display:inline-block;width:80%;height:4em;padding:1em 0}#box-popup.image{background-color:transparent;max-width:100%;margin:0 auto;border-radius:0!important;-moz-border-radius:0!important;-webkit-border-radius:0!important}#box-popup.image img{width:auto;margin:0 auto}#box-popup.image>div.title{background-color:#607d8b;color:#fff;padding:.5em}#box-popup.help{min-height:100px;background-color:#f5f5f5}#box-popup.help p{font-size:14px;text-align:justify;line-height:2em}#box-complexity>div{text-align:justify;line-height:1.5em;margin-top:1em}#debug{float:left;text-align:left}#debuginfo{width:100%;min-height:10em;padding:1em;background-color:#fff8e1;text-align:left;line-height:1.5em}#debuginfo H3{text-align:center}.popup-data{width:100%;min-width:400px;border:0;text-align:left;margin:0;padding:1em .5em}.popup-data .descField{min-width:100px}footer{display:flex;justify-content:space-between;position:fixed;bottom:0;z-index:100;width:100%;padding:.5em 0;background-color:#f5f5f5;color:#b9b9b9;font-size:1em;-webkit-box-shadow:0 -3px 2px -2px rgba(0,0,0,0.14);-moz-box-shadow:0 -3px 2px -2px rgba(0,0,0,0.14);box-shadow:0 -3px 2px -2px rgba(0,0,0,0.14)}footer .footer-parts{display:flex;justify-content:space-between}footer #footer-left{width:50%;margin:0 1em}footer #footer-right{width:50%;margin:0 1em;justify-content:flex-end;text-align:right}footer #updates{min-width:10em;text-align:center;cursor:pointer}footer #status{margin:0 1em}footer #status>div{display:inline-block}footer #status .status-info{padding:.5em}footer #session{text-align:left;color:#999;font-size:.8em}footer a{color:#b9b9b9}footer a:visited{color:#b9b9b9}footer #project a:hover{color:#a9c1d7;border-bottom:1px solid #a9c1d7}footer #updates a:hover{color:#a9c1d7}footer img{border:0;width:16px;height:16px;vertical-align:middle}.round,.round5{border-radius:5px!important;-moz-border-radius:5px!important;-webkit-border-radius:5px!important}.midround{border-radius:0 0 10px 10px!important;-moz-border-radius:0 0 10px 10px!important;-webkit-border-radius:0 0 10px 10px!important}.midroundup{border-radius:10px 10px 0 0!important;-moz-border-radius:10px 10px 0 0!important;-webkit-border-radius:10px 10px 0 0!important}.fullround{border-radius:50%!important;-moz-border-radius:50%!important;-webkit-border-radius:50%!important}.iconMini{width:16px!important;height:16px!important;vertical-align:middle}.hide{display:none!important}.btn-checks{padding:5px;margin:.2em 0;width:30em;border-bottom:1px solid #c9c9c9}.shadow{-webkit-box-shadow:2px 2px 3px -3px rgba(0,0,0,0.14);-moz-box-shadow:2px 2px 3px -3px rgba(0,0,0,0.14);box-shadow:1px 1px 2px rgba(0,0,0,0.14)}.noRes{width:60%;padding:15px;background-color:#f9f9f9;color:#a9a9a9;border:#c9c9c9 1px solid;margin:20px auto;text-align:center;font-size:16px}.header-grey{background-color:#607d8b;color:#fff;min-height:2em}.no-background{background:none!important}.action-in-box{padding:1em;text-align:right}.action-in-box ul{list-style:none;margin:0;padding:0}.tab-data{margin:2em auto 0;width:75%}.item-actions{margin:1em auto}.tab-actions{margin:2em 0}.item-actions>ul,.tab-actions>ul{display:flex;flex-wrap:wrap;justify-content:flex-end;align-items:center;list-style:none;margin:0;padding:0}.item-actions>ul>li,.tab-actions>ul>li{width:auto;min-width:2em;margin-left:.5em}.item-actions>ul>li.datagrid-action-search,.tab-actions>ul>li.datagrid-action-search{min-width:5em}.item-actions>ul>li.datagrid-action-search form,.tab-actions>ul>li.datagrid-action-search form{width:100%}.fullWidth{max-width:100%!important}.filter-on{color:#26a69a;background-color:#e0f2f1;border:1px solid #26a69a;padding:.3em 1em}.global-on{color:#ffca28;background-color:#fff8e1;border:1px solid #ffca28;padding:.3em 1em}.opacity50{filter:alpha(opacity=50);opacity:.5}.custom-combobox{position:relative;display:inline-block}.custom-combobox input{width:80%}.custom-combobox-toggle{position:absolute;top:0;bottom:0;margin-left:-1px;padding:0;*height:1.7em;*top:.1em}.custom-combobox-input{margin:0;padding:.3em}.passLevel{width:20px;height:20px;display:inline-block;position:relative;top:2px}.passLevel.strongest{color:#26a69a;background-color:#e0f2f1;border:1px solid #26a69a;font-weight:bold}.passLevel.strongest:hover{color:#26a69a;background-color:#e0f2f1;border:1px solid #26a69a;font-weight:bold}.passLevel.strong{color:#2196f3;background-color:#e3f2fd;border:1px solid #2196f3;font-weight:bold}.passLevel.strong:hover{color:#2196f3;background-color:#e3f2fd;border:1px solid #2196f3;font-weight:bold}.passLevel.good{color:#ffca28;background-color:#fff8e1;border:1px solid #ffca28;font-weight:bold}.passLevel.good:hover{color:#ffca28;background-color:#fff8e1;border:1px solid #ffca28;font-weight:bold}.passLevel.weak{color:#ef5350;background-color:#ffebee;border:1px solid #ef5350;font-weight:bold}.passLevel.weak:hover{color:#ef5350;background-color:#ffebee;border:1px solid #ef5350;font-weight:bold}#alert #alert-text{margin:15px auto;font-size:14px;font-weight:bold}#alert #alert-pass{width:50%;padding:10px;margin:15px auto;border:1px solid #c9c9c9;color:#555;font-weight:bold}.dialog-text,.dialog-user-text,.dialog-pass-text{font-family:Consolas,"Andale Mono WT","Andale Mono","Bitstream Vera Sans Mono","Nimbus Mono L",Monaco,"Courier New",monospace;padding:.5em;text-align:center;min-width:200px}.dialog-user-text{border-bottom:#d9d9d9 1px solid;color:#a9a9a9}.dialog-pass-text{border:transparent 1px solid;letter-spacing:.2em}.dialog-buttons{text-align:center;padding:.5em;border-top:1px solid #c9c9c9;line-height:2.5em}.dialog-clip-copy{color:#26a69a;background-color:#e0f2f1}.help-box{display:none;background-color:#fff!important;color:#607d8b}.help-box>*{font-weight:bold}.help-text{text-align:justify;line-height:1.5em;margin-top:1em}.tooltip{width:300px;max-width:300px;background-color:#777;color:#fff;z-index:101}.cursor-pointer{cursor:pointer}.password-actions{display:inline-block;width:12em}.password-actions>span,.password-actions i{margin-right:.6em}.custom-input-color{width:3em;height:1em;display:inline-block}.account-pass-image{height:32px;width:auto}.select-box{min-width:20em}fieldset.warning{padding:8px;border-radius:5px;color:#ef5350;background-color:#ffebee;border:1px solid #ef5350}fieldset.warning legend{color:#ef5350!important}fieldset.warning a{color:#ef5350!important;font-weight:bold}#actions{width:100%;line-height:2em;margin-bottom:5em}#actions #logo{display:flex;width:100%;margin-bottom:30px;color:#607d8b;align-items:center;background:url("../../../../../../public/images/logo_full_bg.png") left no-repeat;background-size:auto 150px;height:150px}#actions #page-title{width:100%;color:#607d8b;text-align:center}#actions #page-title h1{font-weight:bold;font-size:24px;letter-spacing:3px}#actions ul.errors{max-width:40vw;margin:0 auto;list-style:none;font-size:14px;text-align:left}#actions ul.errors>li{margin:1.5em auto;border-radius:3px;padding:1em .5em}#actions ul.errors>li.msg-critical{color:#ef5350;background-color:#ffebee;border:1px solid #ef5350}#actions ul.errors>li.msg-warning{color:#ffca28;background-color:#fff8e1;border:1px solid #ffca28;color:#555}#actions ul.errors>li.msg-ok{color:#26a69a;background-color:#e0f2f1;border:1px solid #26a69a}#actions ul.errors>li>p.hint{color:#555;font-size:12px}#actions ul.errors>li>p.hint i{margin-right:.5em}#actions form{width:450px;margin:0 auto;text-align:left}#actions form fieldset{margin-bottom:2em}#actions form fieldset legend{width:100%;color:#fff;font-size:14px;font-weight:bold;text-align:center;background-color:#607d8b;margin:1em 0;letter-spacing:.2em;padding:.2em 0}#actions div.buttons{margin-top:2em;text-align:center}.center{text-align:center!important}.right{text-align:right!important}.left{text-align:left!important}.opacity50{opacity:.5!important}#login-container{width:40em;margin:0 auto;background:transparent url("../../../../public/images/logo_full_bg.png") no-repeat top left;background-size:auto 10em}#login-container #boxSpacer{height:11em;background-color:transparent}#login-container #boxLogin{position:relative;margin:0 auto;width:100%;min-height:14em;padding:1em;background-color:#fff}#login-container #boxLogin #boxData{height:100%;min-height:14em;text-align:left;background-color:transparent}#login-container #boxLogin #boxData i{margin-right:.5em;opacity:.5}#login-container #boxLogin #boxData .extra-hidden{display:none}#login-container #boxLogin #boxButton{position:absolute;top:2em;right:2em}#login-container #boxLogin #boxActions{width:100%;text-align:right}#login-container #boxLogin #boxActions a{color:#c9c9c9}#login-container #boxLogout{margin-top:4em;width:100%}#login-container #boxLogout>div{margin:0 auto;width:250px;font-size:14px;padding:.5em;text-align:center;color:#ffca28;background-color:#fff8e1;border:1px solid #ffca28}#login-container #boxUpdated{width:350px;margin:3em auto;font-size:14px;text-align:center;padding:.5em;color:#26a69a;background-color:#e0f2f1;border:1px solid #26a69a}#login-container #demo-info{margin:3em auto;color:#c9c9c9;border-top:1px solid #d9d9d9;border-bottom:1px solid #d9d9d9;padding:.5em}#login-container #demo-info ul{display:flex;justify-content:space-around;list-style:none}#login-container #demo-info ul li span{margin:0 2em}@media screen and (max-width:1000px){#content #searchbox .search-filters>*{margin:.5em 1em .5em 0}#content .data-container #title,#content .tab-data #title{width:90%}footer{display:none;justify-content:space-between;flex-wrap:wrap}footer .footer-parts{justify-content:space-between;flex-wrap:wrap}footer #footer-left,footer #footer-right{width:100%}footer .footer-parts>div{width:100%;padding:.5em 0}}@media screen and (max-width:600px){#content input,#box-popup input{width:100%}#content .mdl-textfield,#box-popup .mdl-textfield{width:100%}#content td.descField,#box-popup td.descField{display:none}#content td.valField .lowres-title,#box-popup td.valField .lowres-title{display:block}#content #searchbox .mdl-textfield{width:90%}#content #searchbox .search-text{width:90%}#content #searchbox .search-filters .selectize-control{width:100%}#content .data-container,#content .tab-data{width:100%}#content .data-container #title,#content .tab-data #title{width:90%}#content .data-container .selectize-control,#content .tab-data .selectize-control{width:100%}#box-popup h2>.btn-popup-close{display:inline-block}.mdl-data-table{table-layout:fixed;width:100%}.table-responsive td,.table-responsive th{width:100%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis}.table-responsive .cell-actions i{display:block!important}} \ No newline at end of file +html,body{margin:0;padding:0;text-align:left;background-color:#f5f5f5;color:#555;font-size:12px;font-weight:normal;box-sizing:border-box}*{font-family:"Roboto Regular",Verdana,Tahoma,sans-serif;box-sizing:inherit}*:before,*:after{box-sizing:inherit}table{font-size:11px;border-spacing:0}table th{border-bottom:2px solid transparent;vertical-align:middle}table th .icon{width:24px;height:24px}table tr{height:20px}table tr.odd{background-color:#f9f9f9}table tr.even>td,table tr.odd>td{border-bottom:1px solid #d9d9d9 !important}table tr.even:hover,table tr.odd:hover{background-color:#e8ff99}table td{padding:3px}table td.txtCliente{font-weight:bold;text-align:center}form{font-size:11px;margin:0}input.inputImg,img.inputImg{background-color:transparent !important;width:24px !important;height:24px !important;border:0;vertical-align:middle;margin:0 .5em}input.txtFile{width:200px}input.txtLong{width:300px}textarea{width:350px}select.files{width:250px}input.spinner{width:5em}img{margin:0;padding:0;border:0;cursor:pointer}img.inputImgMini{background-color:transparent !important;width:16px !important;height:16px !important;margin:0 5px 0 5px;border:0;vertical-align:middle}i{cursor:pointer}form .form-field{display:flex;justify-content:space-between}form .form-field>label{min-width:12em;padding:.5em 0;font-size:16px;align-self:center}form .form-field>div{width:100%;align-self:center}a{text-decoration:none;color:#536dfe}a:visited{text-decoration:none;color:#536dfe}a:hover,a:active,a:focus{text-decoration:none;cursor:pointer}pre,code,samp,kbd{font-family:Consolas,"Andale Mono WT","Andale Mono","Bitstream Vera Sans Mono","Nimbus Mono L",Monaco,"Courier New",monospace;font-size:1em;direction:ltr;text-align:left;background-color:#fbfaf9;color:#333;box-shadow:inset 0 0 .3em #ccc;border-radius:2px}#nojs{width:80%;text-align:center;vertical-align:middle;margin:10px auto;padding:3px;background-color:#ef5350;color:white;font-weight:bold;font-size:14px}#wrap{height:auto !important;min-height:100%;width:100%;background-color:#f5f5f5}#wrap-loading{position:fixed;z-index:9999;top:50%;left:50%;padding:1em;background-color:rgba(255,255,255,0.8);display:none;border-radius:5px !important;-moz-border-radius:5px !important;-webkit-border-radius:5px !important}#wrap-loading.overlay-full{top:0;left:0;width:100%;height:100%;background-color:rgba(255,255,255,0.5)}#wrap-loading.overlay-full #loading{position:absolute;top:50%;left:50%}#wrap-loading.overlay-full #taskStatus{display:block}#wrap-loading #taskStatus{display:none;position:absolute;left:0;top:55%;width:100%;text-align:center;color:white;background-color:rgba(0,0,0,0.5);padding:1em 0}#container{margin:auto;width:100%}#container.login{padding-top:5%}#container.error,#container.install,#container.passreset{width:100%}#container .logo{height:64px}#container #actions-bar{z-index:100;display:flex;justify-content:space-between;position:fixed;border:0 none;top:0;left:0;width:100%;padding:1em 0;background-color:transparent}#container #actions-bar-icons{flex-grow:1;text-align:center}#container #actions-bar-logo{display:none;padding:0 .5em}#container #actions-bar-logo img{display:inline-block;width:50px;opacity:.75}#container #content{width:95%;margin:2em auto 8em auto}#container #content.public-link{width:70%;min-height:0;margin:5em auto}#content td.descField,#box-popup td.descField{text-align:right;padding-right:20px;width:25%;border-right:1px solid #d9d9d9;color:#999;font-size:12px;font-weight:bold}#content td.valField,#box-popup td.valField{padding-left:1em;width:100%}#content td.valField .lowres-title,#box-popup td.valField .lowres-title{display:none;width:100%;color:#607d8b;font-size:12px}#content .pager{width:100%;margin-top:15px;padding:.5em;vertical-align:middle;font-size:11px;color:#999;background-color:#fcfcfc}#content .pager img{margin-left:5px;vertical-align:middle}#content .pager a{margin-left:5px;font-size:12px;color:#999}#content .pager>div{display:inline-block;width:49%}#content .pager .pager-left{text-align:left}#content .pager .pager-right{text-align:right}#content #title{width:50%;padding:7px;margin:auto;background-color:#d9d9d9;color:#fff;font-size:17px;letter-spacing:.3em;text-align:center}#content #title.titleNormal{background-color:#607d8b;color:#fff}#content .data-container{width:75%;margin:0 auto}#content fieldset.data{margin:2em auto}#content fieldset.data>legend{color:#607d8b;padding:0 .5em;font-size:1.5em}#content fieldset.data>div{display:none}#content fieldset.data>div table{width:100%}#content .data{width:100%;padding:10px;margin:0 auto;background-color:#fff;-webkit-box-shadow:2px 2px 3px -3px rgba(0,0,0,0.14);-moz-box-shadow:2px 2px 3px -3px rgba(0,0,0,0.14);box-shadow:1px 1px 2px rgba(0,0,0,0.14)}#content .data #history-icon{position:relative;top:5em;right:2em}#content .data td{text-align:left}#content .data td.descField{text-align:right}#content .data select{min-width:210px}#content .data .list-wrap{max-height:10em;overflow:auto;padding:.5em;margin:1em 0}#content .data .dropzone{width:30em;padding:1em;border:2px dashed #26a69a;text-align:center}#content .data .dropzone img{vertical-align:middle}#content .data .file-upload{display:none}#content .data .account-permissions{width:100%}#content .data .account-permissions fieldset{border:1px solid #c9c9c9;padding:1em}#content .data .account-permissions legend{font-weight:bold;color:#999;padding:.2em 0}#content .data .account-permissions fieldset>span{font-weight:bold;color:#999;padding:.2em 0;display:inline-block;width:100px;text-align:right}#content span.tag{margin:0 3px 3px 0;padding:.2em;background:#5c6bc0;color:#fff;border:0 solid transparent;border-radius:3px !important;-moz-border-radius:3px !important;-webkit-border-radius:3px !important}#content .extra-info{margin-top:20px}#content #tabs fieldset{border:1px solid #c9c9c9}#content #tabs #frmConfig label{float:left}#content .tblConfig{margin-bottom:2em}#content .tblConfig td.descField{width:35%;font-size:11px;font-weight:bold}#content .tblConfig td.rowHeader{padding:5px 0 5px 0;background-color:#f5f5f5;text-align:center;font-weight:bold;border-top:15px solid #f9f9f9;border-bottom:3px solid #a9c1d7;letter-spacing:.5em;color:#696969}#content .tblConfig input.checkbox{width:15px;text-align:left;padding:0}#content .tblConfig .option-disabled{text-align:center;background-color:#fff8e1;color:#ffca28;font-weight:bold}#content h2{width:100%;height:1.5em;font-size:18px;color:white;background-color:#a9c1d7;margin:0;padding-top:.1em}#content .section{margin-top:2.5em;border-bottom:1px solid #d9d9d9;text-align:left;font-size:14px;font-weight:bold;color:#5c6bc0}#content .row_even>td{background-color:#f5f5f5}#content .row_odd>td{background-color:white}#content .data-header ul{list-style:none;width:100%;margin:0 0 10px 0;padding:0}#content .data-header li{display:inline-block;padding:.2em .5em;font-weight:bold;letter-spacing:.2em;color:#fff;text-align:center}#content .data-header li a{color:#777}#content .data-header li img{float:right;width:24px;height:24px;vertical-align:middle}#content .data-header-minimal{border-bottom:1px solid #dfdfdf}#content .data-header-minimal ul{display:flex;flex-wrap:wrap;justify-content:flex-start;margin:0}#content .data-header-minimal li{display:inline-flex;min-width:10em;font-weight:normal;letter-spacing:normal}#content .data-header-minimal li a{color:#b9b9b9;padding:.3em .8em}#content .data-table{width:100%}#content .data-table td:first-of-type,#content .data-table th:first-of-type{width:5em}#content .data-table thead th{background-color:#607d8b;color:#fff}#content .data-table tbody td.cell-data{text-align:left}#content .data-table tbody td.cell-nodata{padding:0 .5em;text-align:left}#content .data-table tbody td.cell-actions{text-align:right}#content .data-table tbody td.cell-actions i{opacity:.5}#content .data-table tbody td.cell-actions i:hover{opacity:1}#content .data-rows ul{display:table;list-style:none;width:100%;margin:0 0 10px 0;padding:0;background-color:#fcfcfc}#content .data-rows li{float:left;display:block;padding:1em;color:#696969;text-align:center;min-height:2em}#content .data-rows li.cell-nodata{padding:1em 0;min-height:2em;text-align:left}#content .data-rows li.cell-actions{float:right;min-height:2em;padding:1em 0;text-align:left;background-color:#fcfcfc;width:15em}#content .data-rows li.cell-nodata img,#content .data-rows li.cell-actions img{width:24px;height:24px;margin:0 .5em}#content #resEventLog .data{width:100%}#content #resEventLog thead{text-align:center}#content #resEventLog tbody{width:100%;height:500px;overflow:auto}#content #resEventLog td{border-bottom:1px solid #d9d9d9}#content #resEventLog .cell{text-align:center}#content #resEventLog .cell-description{width:60%}#content #searchbox{background-color:#fcfcfc;vertical-align:middle;position:relative;height:auto;padding:.5em 1em;margin-bottom:2em}#content #searchbox form{display:flex;flex-wrap:wrap;justify-content:flex-start;align-items:center;text-align:left}#content #searchbox .search-filters>*{margin:0 .5em}#content #searchbox .search-filters .filter-buttons{display:inline-block}#content #searchbox .search-filters .filter-slider{width:10em}#content #searchbox .search-filters-tags{display:none;flex-grow:2}#content .btn-clear{opacity:.35;filter:alpha(opacity=35)}#content .btn-clear:hover{opacity:1;filter:alpha(opacity=100)}#content .actions-optional{display:none}#content .error{width:350px;padding:15px;margin:0 auto;text-align:center;font-size:16px;line-height:1.5em;color:#ffca28;background-color:#fff8e1;border:1px solid #ffca28}#box-popup .list-wrap{max-height:10em;overflow:auto;padding:.5em;margin:1em 0}#content .data .list-wrap ul,#box-popup .list-wrap ul{list-style-type:none;margin:0;padding:0}#content .data .list-wrap li,#box-popup .list-wrap li{display:flex;background:#f2f2f2;padding:.5em;font-size:1em;margin-bottom:.5em}#content .data .list-wrap li:hover,#box-popup .list-wrap li:hover{background:#e8eaf6;color:#000}#content .data .list-wrap div.files-item-info,#box-popup .list-wrap div.files-item-info{flex-grow:2}#content .data .list-wrap div.files-item-info img,#box-popup .list-wrap div.files-item-info img{margin:0 .5em}#content .data .list-wrap div.files-item-actions,#box-popup .list-wrap div.files-item-actions{padding:.3em 0}#box-popup{width:-webkit-min-content;width:-moz-min-content;width:min-content;min-width:50em;margin:5em auto;padding:0;background-color:#fff}#box-popup.box-password-view{width:-webkit-min-content;width:-moz-min-content;width:min-content;min-width:30em}#box-popup>h2{position:relative;width:100%;font-size:18px;color:#fff;background-color:#607d8b;margin:0;padding:.5em 0;line-height:1em}#box-popup>h2 .btn-popup-close{display:none;position:absolute;right:.5em;top:.2em}#box-popup>table{width:100%;padding-bottom:1em}#box-popup select{width:220px}#box-popup #resFancyAccion{display:none}#box-popup #resCheck{display:inline-block;width:80%;height:4em;padding:1em 0}#box-popup.image{background-color:transparent;max-width:100%;margin:0 auto;border-radius:0 !important;-moz-border-radius:0 !important;-webkit-border-radius:0 !important}#box-popup.image img{width:auto;margin:0 auto}#box-popup.image>div.title{background-color:#607d8b;color:#fff;padding:.5em}#box-popup.help{min-height:100px;background-color:#f5f5f5}#box-popup.help p{font-size:14px;text-align:justify;line-height:2em}#box-complexity>div{text-align:justify;line-height:1.5em;margin-top:1em}#debug{float:left;text-align:left}#debuginfo{width:100%;min-height:10em;padding:1em;background-color:#fff8e1;text-align:left;line-height:1.5em}#debuginfo H3{text-align:center}.popup-data{width:100%;min-width:400px;border:0;text-align:left;margin:0;padding:1em .5em}.popup-data .descField{min-width:100px}footer{display:flex;justify-content:space-between;position:fixed;bottom:0;z-index:100;width:100%;padding:.5em 0;background-color:#f5f5f5;color:#b9b9b9;font-size:1em;-webkit-box-shadow:0 -3px 2px -2px rgba(0,0,0,0.14);-moz-box-shadow:0 -3px 2px -2px rgba(0,0,0,0.14);box-shadow:0 -3px 2px -2px rgba(0,0,0,0.14)}footer .footer-parts{display:flex;justify-content:space-between}footer #footer-left{width:50%;margin:0 1em}footer #footer-right{width:50%;margin:0 1em;justify-content:flex-end;text-align:right}footer #updates{min-width:10em;text-align:center;cursor:pointer}footer #status{margin:0 1em}footer #status>div{display:inline-block}footer #status .status-info{padding:.5em}footer #session{text-align:left;color:#999;font-size:.8em}footer a{color:#b9b9b9}footer a:visited{color:#b9b9b9}footer #project a:hover{color:#a9c1d7;border-bottom:1px solid #a9c1d7}footer #updates a:hover{color:#a9c1d7}footer img{border:0;width:16px;height:16px;vertical-align:middle}.round,.round5{border-radius:5px !important;-moz-border-radius:5px !important;-webkit-border-radius:5px !important}.midround{border-radius:0 0 10px 10px !important;-moz-border-radius:0 0 10px 10px !important;-webkit-border-radius:0 0 10px 10px !important}.midroundup{border-radius:10px 10px 0 0 !important;-moz-border-radius:10px 10px 0 0 !important;-webkit-border-radius:10px 10px 0 0 !important}.fullround{border-radius:50% !important;-moz-border-radius:50% !important;-webkit-border-radius:50% !important}.iconMini{width:16px !important;height:16px !important;vertical-align:middle}.hide{display:none !important}.btn-checks{padding:5px;margin:.2em 0;width:30em;border-bottom:1px solid #c9c9c9}.shadow{-webkit-box-shadow:2px 2px 3px -3px rgba(0,0,0,0.14);-moz-box-shadow:2px 2px 3px -3px rgba(0,0,0,0.14);box-shadow:1px 1px 2px rgba(0,0,0,0.14)}.noRes{width:60%;padding:15px;background-color:#f9f9f9;color:#a9a9a9;border:#c9c9c9 1px solid;margin:20px auto;text-align:center;font-size:16px}.header-grey{background-color:#607d8b;color:#fff;min-height:2em}.no-background{background:none !important}.action-in-box{padding:1em;text-align:right}.action-in-box ul{list-style:none;margin:0;padding:0}.tab-data{margin:2em auto 0;width:75%}.item-actions{margin:1em auto}.tab-actions{margin:2em 0}.item-actions>ul,.tab-actions>ul{display:flex;flex-wrap:wrap;justify-content:flex-end;align-items:center;list-style:none;margin:0;padding:0}.item-actions>ul>li,.tab-actions>ul>li{width:auto;min-width:2em;margin-left:.5em}.item-actions>ul>li.datagrid-action-search,.tab-actions>ul>li.datagrid-action-search{min-width:5em}.item-actions>ul>li.datagrid-action-search form,.tab-actions>ul>li.datagrid-action-search form{width:100%}h5.datagrid-header-title{padding:.7em;border-bottom:1px solid #d9d9d9}.fullWidth{max-width:100% !important}.filter-on{color:#26a69a;background-color:#e0f2f1;border:1px solid #26a69a;padding:.3em 1em}.global-on{color:#ffca28;background-color:#fff8e1;border:1px solid #ffca28;padding:.3em 1em}.opacity50{filter:alpha(opacity=50);opacity:.5}.custom-combobox{position:relative;display:inline-block}.custom-combobox input{width:80%}.custom-combobox-toggle{position:absolute;top:0;bottom:0;margin-left:-1px;padding:0;*height:1.7em;*top:.1em}.custom-combobox-input{margin:0;padding:.3em}.passLevel{width:20px;height:20px;display:inline-block;position:relative;top:2px}.passLevel.strongest{color:#26a69a;background-color:#e0f2f1;border:1px solid #26a69a;font-weight:bold}.passLevel.strongest:hover{color:#26a69a;background-color:#e0f2f1;border:1px solid #26a69a;font-weight:bold}.passLevel.strong{color:#2196f3;background-color:#e3f2fd;border:1px solid #2196f3;font-weight:bold}.passLevel.strong:hover{color:#2196f3;background-color:#e3f2fd;border:1px solid #2196f3;font-weight:bold}.passLevel.good{color:#ffca28;background-color:#fff8e1;border:1px solid #ffca28;font-weight:bold}.passLevel.good:hover{color:#ffca28;background-color:#fff8e1;border:1px solid #ffca28;font-weight:bold}.passLevel.weak{color:#ef5350;background-color:#ffebee;border:1px solid #ef5350;font-weight:bold}.passLevel.weak:hover{color:#ef5350;background-color:#ffebee;border:1px solid #ef5350;font-weight:bold}#alert #alert-text{margin:15px auto;font-size:14px;font-weight:bold}#alert #alert-pass{width:50%;padding:10px;margin:15px auto;border:1px solid #c9c9c9;color:#555;font-weight:bold}.dialog-text,.dialog-user-text,.dialog-pass-text{font-family:Consolas,"Andale Mono WT","Andale Mono","Bitstream Vera Sans Mono","Nimbus Mono L",Monaco,"Courier New",monospace;padding:.5em;text-align:center;min-width:200px}.dialog-user-text{border-bottom:#d9d9d9 1px solid;color:#a9a9a9}.dialog-pass-text{border:transparent 1px solid;letter-spacing:.2em}.dialog-buttons{text-align:center;padding:.5em;border-top:1px solid #c9c9c9;line-height:2.5em}.dialog-clip-copy{color:#26a69a;background-color:#e0f2f1}.help-box{display:none;background-color:#fff !important;color:#607d8b}.help-box>*{font-weight:bold}.help-text{text-align:justify;line-height:1.5em;margin-top:1em}.tooltip{width:300px;max-width:300px;background-color:#777;color:#fff;z-index:101}.cursor-pointer{cursor:pointer}.password-actions{display:inline-block;width:12em}.password-actions>span,.password-actions i{margin-right:.6em}.custom-input-color{width:3em;height:1em;display:inline-block}.account-pass-image{height:32px;width:auto}.select-box{min-width:20em}fieldset.warning{padding:8px;border-radius:5px;color:#ef5350;background-color:#ffebee;border:1px solid #ef5350}fieldset.warning legend{color:#ef5350 !important}fieldset.warning a{color:#ef5350 !important;font-weight:bold}#actions{width:100%;line-height:2em;margin-bottom:5em}#actions #logo{display:flex;width:100%;margin-bottom:30px;color:#607d8b;align-items:center;background:url("../../../../../../public/images/logo_full_bg.png") left no-repeat;background-size:auto 150px;height:150px}#actions #page-title{width:100%;color:#607d8b;text-align:center}#actions #page-title h1{font-weight:bold;font-size:24px;letter-spacing:3px}#actions ul.errors{max-width:40vw;margin:0 auto;list-style:none;font-size:14px;text-align:left}#actions ul.errors>li{margin:1.5em auto;border-radius:3px;padding:1em .5em}#actions ul.errors>li.msg-critical{color:#ef5350;background-color:#ffebee;border:1px solid #ef5350}#actions ul.errors>li.msg-warning{color:#ffca28;background-color:#fff8e1;border:1px solid #ffca28;color:#555}#actions ul.errors>li.msg-ok{color:#26a69a;background-color:#e0f2f1;border:1px solid #26a69a}#actions ul.errors>li>p.hint{color:#555;font-size:12px}#actions ul.errors>li>p.hint i{margin-right:.5em}#actions form{width:450px;margin:0 auto;text-align:left}#actions form fieldset{margin-bottom:2em}#actions form fieldset legend{width:100%;color:#fff;font-size:14px;font-weight:bold;text-align:center;background-color:#607d8b;margin:1em 0;letter-spacing:.2em;padding:.2em 0}#actions div.buttons{margin-top:2em;text-align:center}.center{text-align:center !important}.right{text-align:right !important}.left{text-align:left !important}.opacity50{opacity:.5 !important}#login-container{width:40em;margin:0 auto;background:transparent url("../../../../public/images/logo_full_bg.png") no-repeat top left;background-size:auto 10em}#login-container #boxSpacer{height:11em;background-color:transparent}#login-container #boxLogin{position:relative;margin:0 auto;width:100%;min-height:14em;padding:1em;background-color:#fff}#login-container #boxLogin #boxData{height:100%;min-height:14em;text-align:left;background-color:transparent}#login-container #boxLogin #boxData i{margin-right:.5em;opacity:.5}#login-container #boxLogin #boxData .extra-hidden{display:none}#login-container #boxLogin #boxButton{position:absolute;top:2em;right:2em}#login-container #boxLogin #boxActions{width:100%;text-align:right}#login-container #boxLogin #boxActions a{color:#c9c9c9}#login-container #boxLogout{margin-top:4em;width:100%}#login-container #boxLogout>div{margin:0 auto;width:250px;font-size:14px;padding:.5em;text-align:center;color:#ffca28;background-color:#fff8e1;border:1px solid #ffca28}#login-container #boxUpdated{width:350px;margin:3em auto;font-size:14px;text-align:center;padding:.5em;color:#26a69a;background-color:#e0f2f1;border:1px solid #26a69a}#login-container #demo-info{margin:3em auto;color:#c9c9c9;border-top:1px solid #d9d9d9;border-bottom:1px solid #d9d9d9;padding:.5em}#login-container #demo-info ul{display:flex;justify-content:space-around;list-style:none}#login-container #demo-info ul li span{margin:0 2em}@media screen and (max-width:1000px){#content #searchbox .search-filters>*{margin:.5em 1em .5em 0}#content .data-container #title,#content .tab-data #title{width:90%}footer{display:none;justify-content:space-between;flex-wrap:wrap}footer .footer-parts{justify-content:space-between;flex-wrap:wrap}footer #footer-left,footer #footer-right{width:100%}footer .footer-parts>div{width:100%;padding:.5em 0}}@media screen and (max-width:600px){#content input,#box-popup input{width:100%}#content .mdl-textfield,#box-popup .mdl-textfield{width:100%}#content td.descField,#box-popup td.descField{display:none}#content td.valField .lowres-title,#box-popup td.valField .lowres-title{display:block}#content #searchbox .mdl-textfield{width:90%}#content #searchbox .search-text{width:90%}#content #searchbox .search-filters .selectize-control{width:100%}#content .data-container,#content .tab-data{width:100%}#content .data-container #title,#content .tab-data #title{width:90%}#content .data-container .selectize-control,#content .tab-data .selectize-control{width:100%}#box-popup h2>.btn-popup-close{display:inline-block}.mdl-data-table{table-layout:fixed;width:100%}.table-responsive td,.table-responsive th{width:100%;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis}.table-responsive .cell-actions i{display:block !important}} \ No newline at end of file diff --git a/app/modules/web/themes/material-blue/css/styles.scss b/app/modules/web/themes/material-blue/css/styles.scss index 24ac66eb..b2f23089 100644 --- a/app/modules/web/themes/material-blue/css/styles.scss +++ b/app/modules/web/themes/material-blue/css/styles.scss @@ -827,6 +827,11 @@ footer { } } +h5.datagrid-header-title { + padding: .7em; + border-bottom: 1px solid #d9d9d9; +} + .fullWidth { max-width: 100% !important; } diff --git a/app/modules/web/themes/material-blue/views/eventlog/index.inc b/app/modules/web/themes/material-blue/views/eventlog/index.inc index 2edd0615..750663e0 100644 --- a/app/modules/web/themes/material-blue/views/eventlog/index.inc +++ b/app/modules/web/themes/material-blue/views/eventlog/index.inc @@ -1,3 +1,4 @@ +
includeTemplate('datagrid-grid', 'grid'); \ No newline at end of file diff --git a/app/modules/web/themes/material-blue/views/itemshow/user.inc b/app/modules/web/themes/material-blue/views/itemshow/user.inc index 419e1dd4..d09d4e06 100644 --- a/app/modules/web/themes/material-blue/views/itemshow/user.inc +++ b/app/modules/web/themes/material-blue/views/itemshow/user.inc @@ -36,11 +36,11 @@ isIsLdap() ? 'readonly' : $readonly; ?>> + maxlength="80" isLdap() ? 'readonly' : $readonly; ?>> - isIsLdap()): ?> + isLdap()): ?> getIconLdapUser()->getIcon(); ?> @@ -158,14 +158,14 @@ @@ -173,14 +173,14 @@ @@ -230,7 +230,7 @@ - + diff --git a/app/modules/web/themes/material-blue/views/login/index.inc b/app/modules/web/themes/material-blue/views/login/index.inc index c0e2377c..0ae7b6fd 100644 --- a/app/modules/web/themes/material-blue/views/login/index.inc +++ b/app/modules/web/themes/material-blue/views/login/index.inc @@ -74,7 +74,7 @@
- +
diff --git a/app/modules/web/themes/material-blue/views/notification/index.inc b/app/modules/web/themes/material-blue/views/notification/index.inc index 2edd0615..0751390f 100644 --- a/app/modules/web/themes/material-blue/views/notification/index.inc +++ b/app/modules/web/themes/material-blue/views/notification/index.inc @@ -1,3 +1,4 @@ +
includeTemplate('datagrid-grid', 'grid'); \ No newline at end of file diff --git a/app/modules/web/themes/material-blue/views/passreset/passreset.inc b/app/modules/web/themes/material-blue/views/passreset/passreset.inc deleted file mode 100644 index 27589c3a..00000000 --- a/app/modules/web/themes/material-blue/views/passreset/passreset.inc +++ /dev/null @@ -1,75 +0,0 @@ - - -
-
-
-
- - - -
- - -
-
-
- - -
- -
- - -
-
- - -
- - - - - -
- -
- - - - - - - -
-
-
-
\ No newline at end of file diff --git a/app/modules/web/themes/material-blue/views/userpassreset/request.inc b/app/modules/web/themes/material-blue/views/userpassreset/request.inc new file mode 100644 index 00000000..8752cb89 --- /dev/null +++ b/app/modules/web/themes/material-blue/views/userpassreset/request.inc @@ -0,0 +1,43 @@ + + +
+
+
+ + +
+ + +
+
+
+ + +
+ + +
+ +
+ + + +
+
+
diff --git a/app/modules/web/themes/material-blue/views/userpassreset/reset.inc b/app/modules/web/themes/material-blue/views/userpassreset/reset.inc new file mode 100644 index 00000000..1a095538 --- /dev/null +++ b/app/modules/web/themes/material-blue/views/userpassreset/reset.inc @@ -0,0 +1,44 @@ + + +
+
+
+ +
+ + +
+
+ + +
+ + + +
+ +
+ + + +
+
+
diff --git a/lib/Definitions.php b/lib/Definitions.php index ed1639f6..44b49d6c 100644 --- a/lib/Definitions.php +++ b/lib/Definitions.php @@ -49,5 +49,7 @@ return [ \SP\Core\UI\Theme::class => object(\SP\Core\UI\Theme::class) ->constructor(APP_MODULE), \SP\Core\Events\EventDispatcher::class => object(\SP\Core\Events\EventDispatcher::class), - \SP\Log\Log::class => object(\SP\Log\Log::class)->scope(\DI\Scope::PROTOTYPE) + \SP\Log\Log::class => object(\SP\Log\Log::class)->scope(\DI\Scope::PROTOTYPE), + \PHPMailer\PHPMailer\PHPMailer::class => object(\PHPMailer\PHPMailer\PHPMailer::class) + ->constructor(true) ]; \ No newline at end of file diff --git a/lib/SP/Account/Account.php b/lib/SP/Account/Account.php index dc96ec78..808ff563 100644 --- a/lib/SP/Account/Account.php +++ b/lib/SP/Account/Account.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Account/AccountAcl.php b/lib/SP/Account/AccountAcl.php index 6e04289a..35ecdd44 100644 --- a/lib/SP/Account/AccountAcl.php +++ b/lib/SP/Account/AccountAcl.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Account/AccountBase.php b/lib/SP/Account/AccountBase.php index b5573faf..ad8f6a67 100644 --- a/lib/SP/Account/AccountBase.php +++ b/lib/SP/Account/AccountBase.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Account/AccountCrypt.php b/lib/SP/Account/AccountCrypt.php index 49d0968e..28f4cdfd 100644 --- a/lib/SP/Account/AccountCrypt.php +++ b/lib/SP/Account/AccountCrypt.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Account/AccountFavorites.php b/lib/SP/Account/AccountFavorites.php index d2419e48..31aa27bb 100644 --- a/lib/SP/Account/AccountFavorites.php +++ b/lib/SP/Account/AccountFavorites.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Account/AccountHistory.php b/lib/SP/Account/AccountHistory.php index 0face786..86a6a3c6 100644 --- a/lib/SP/Account/AccountHistory.php +++ b/lib/SP/Account/AccountHistory.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Account/AccountHistoryCrypt.php b/lib/SP/Account/AccountHistoryCrypt.php index 43c7aea5..9567c968 100644 --- a/lib/SP/Account/AccountHistoryCrypt.php +++ b/lib/SP/Account/AccountHistoryCrypt.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Account/AccountHistoryUtil.php b/lib/SP/Account/AccountHistoryUtil.php index 36bd4390..2aaad896 100644 --- a/lib/SP/Account/AccountHistoryUtil.php +++ b/lib/SP/Account/AccountHistoryUtil.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Account/AccountInterface.php b/lib/SP/Account/AccountInterface.php index ff084266..641bd4d2 100644 --- a/lib/SP/Account/AccountInterface.php +++ b/lib/SP/Account/AccountInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Account/AccountRequest.php b/lib/SP/Account/AccountRequest.php index 0d11ff3d..e23f709e 100644 --- a/lib/SP/Account/AccountRequest.php +++ b/lib/SP/Account/AccountRequest.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Account/AccountSearchFilter.php b/lib/SP/Account/AccountSearchFilter.php index 8c3650f5..315b73d3 100644 --- a/lib/SP/Account/AccountSearchFilter.php +++ b/lib/SP/Account/AccountSearchFilter.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Account/AccountSearchItem.php b/lib/SP/Account/AccountSearchItem.php index dbbedd54..8067b58d 100644 --- a/lib/SP/Account/AccountSearchItem.php +++ b/lib/SP/Account/AccountSearchItem.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Account/AccountTags.php b/lib/SP/Account/AccountTags.php index bef2d0a5..1bbba5e1 100644 --- a/lib/SP/Account/AccountTags.php +++ b/lib/SP/Account/AccountTags.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Account/AccountUtil.php b/lib/SP/Account/AccountUtil.php index 5b83fb2a..9a1f5e37 100644 --- a/lib/SP/Account/AccountUtil.php +++ b/lib/SP/Account/AccountUtil.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Account/UserAccounts.php b/lib/SP/Account/UserAccounts.php index 4f4f2bac..1f7260cf 100644 --- a/lib/SP/Account/UserAccounts.php +++ b/lib/SP/Account/UserAccounts.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Api/ApiBase.php b/lib/SP/Api/ApiBase.php index 8fc804ac..d50dc1fc 100644 --- a/lib/SP/Api/ApiBase.php +++ b/lib/SP/Api/ApiBase.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Api/ApiInterface.php b/lib/SP/Api/ApiInterface.php index 75b4c5f4..bad0e95a 100644 --- a/lib/SP/Api/ApiInterface.php +++ b/lib/SP/Api/ApiInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Api/ApiRequest.php b/lib/SP/Api/ApiRequest.php index 4e39c988..857e148e 100644 --- a/lib/SP/Api/ApiRequest.php +++ b/lib/SP/Api/ApiRequest.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Api/ApiUtil.php b/lib/SP/Api/ApiUtil.php index 778d6b5e..8255dee4 100644 --- a/lib/SP/Api/ApiUtil.php +++ b/lib/SP/Api/ApiUtil.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Api/SyspassApi.php b/lib/SP/Api/SyspassApi.php index 945bb845..d046894f 100644 --- a/lib/SP/Api/SyspassApi.php +++ b/lib/SP/Api/SyspassApi.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Bootstrap.php b/lib/SP/Bootstrap.php index acbaf5ef..397dbd51 100644 --- a/lib/SP/Bootstrap.php +++ b/lib/SP/Bootstrap.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Config/Config.php b/lib/SP/Config/Config.php index d1a5fc39..f8295563 100644 --- a/lib/SP/Config/Config.php +++ b/lib/SP/Config/Config.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Config/ConfigDB.php b/lib/SP/Config/ConfigDB.php index 2cf756de..25494ec8 100644 --- a/lib/SP/Config/ConfigDB.php +++ b/lib/SP/Config/ConfigDB.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Config/ConfigData.php b/lib/SP/Config/ConfigData.php index 66fb662e..b883a589 100644 --- a/lib/SP/Config/ConfigData.php +++ b/lib/SP/Config/ConfigData.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Config/ConfigInterface.php b/lib/SP/Config/ConfigInterface.php index 9b46f332..b05fe32f 100644 --- a/lib/SP/Config/ConfigInterface.php +++ b/lib/SP/Config/ConfigInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Config/ConfigUtil.php b/lib/SP/Config/ConfigUtil.php index d792d225..485b914d 100644 --- a/lib/SP/Config/ConfigUtil.php +++ b/lib/SP/Config/ConfigUtil.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/AccountController.php b/lib/SP/Controller/AccountController.php index 32ed2db9..c5613215 100644 --- a/lib/SP/Controller/AccountController.php +++ b/lib/SP/Controller/AccountController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/AccountSearchController.php b/lib/SP/Controller/AccountSearchController.php index 3f86a262..1452864c 100644 --- a/lib/SP/Controller/AccountSearchController.php +++ b/lib/SP/Controller/AccountSearchController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/ChecksController.php b/lib/SP/Controller/ChecksController.php index e45873fa..624538cf 100644 --- a/lib/SP/Controller/ChecksController.php +++ b/lib/SP/Controller/ChecksController.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/ConfigActionController.php b/lib/SP/Controller/ConfigActionController.php index c726c721..537fb94a 100644 --- a/lib/SP/Controller/ConfigActionController.php +++ b/lib/SP/Controller/ConfigActionController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/ConfigController.php b/lib/SP/Controller/ConfigController.php index a444e10e..57df0f3e 100644 --- a/lib/SP/Controller/ConfigController.php +++ b/lib/SP/Controller/ConfigController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/EventlogController.php b/lib/SP/Controller/EventlogController.php index 4b81e166..b096226b 100644 --- a/lib/SP/Controller/EventlogController.php +++ b/lib/SP/Controller/EventlogController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/GridItemsSearchController.php b/lib/SP/Controller/GridItemsSearchController.php index c6278a2c..fe489de6 100644 --- a/lib/SP/Controller/GridItemsSearchController.php +++ b/lib/SP/Controller/GridItemsSearchController.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/GridTabControllerBase.php b/lib/SP/Controller/GridTabControllerBase.php index 66f7930e..1e19852e 100644 --- a/lib/SP/Controller/GridTabControllerBase.php +++ b/lib/SP/Controller/GridTabControllerBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/Grids/GridBase.php b/lib/SP/Controller/Grids/GridBase.php index 6d822a20..2a328740 100644 --- a/lib/SP/Controller/Grids/GridBase.php +++ b/lib/SP/Controller/Grids/GridBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -24,10 +24,8 @@ namespace SP\Controller\Grids; -use SP\Config\Config; use SP\Config\ConfigData; use SP\Core\ActionsInterface; -use SP\Core\DiFactory; use SP\Core\SessionUtil; use SP\Core\Traits\InjectableTrait; use SP\Core\UI\Theme; diff --git a/lib/SP/Controller/Grids/Items.php b/lib/SP/Controller/Grids/Items.php index cd04fe5e..fe32d1c1 100644 --- a/lib/SP/Controller/Grids/Items.php +++ b/lib/SP/Controller/Grids/Items.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/Grids/Notices.php b/lib/SP/Controller/Grids/Notices.php index d8107a30..e3ecf04e 100644 --- a/lib/SP/Controller/Grids/Notices.php +++ b/lib/SP/Controller/Grids/Notices.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -47,7 +47,7 @@ class Notices extends GridBase */ public function getNoticesGrid() { - $isAdminApp = SessionFactory::getUserData()->isIsAdminApp(); + $isAdminApp = SessionFactory::getUserData()->isAdminApp(); // Grid Header $GridHeaders = new DataGridHeader(); diff --git a/lib/SP/Controller/ItemActionController.php b/lib/SP/Controller/ItemActionController.php index 0d66db42..161354f0 100644 --- a/lib/SP/Controller/ItemActionController.php +++ b/lib/SP/Controller/ItemActionController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -236,7 +236,7 @@ class ItemActionController implements ItemControllerInterface $this->LogMessage->addDetails(__('Nombre', false), $Form->getItemData()->getName()); $this->LogMessage->addDetails(__('Login', false), $Form->getItemData()->getLogin()); - if ($Form->getItemData()->isIsChangePass() + if ($Form->getItemData()->isChangePass() && !AuthUtil::mailPassRecover($Form->getItemData()) ) { $this->LogMessage->addDescription(__('No se pudo realizar la petición de cambio de clave.', false)); diff --git a/lib/SP/Controller/ItemControllerInterface.php b/lib/SP/Controller/ItemControllerInterface.php index c5f14a5a..b2dda4e0 100644 --- a/lib/SP/Controller/ItemControllerInterface.php +++ b/lib/SP/Controller/ItemControllerInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/ItemListController.php b/lib/SP/Controller/ItemListController.php index 00b1af62..28f9a8ed 100644 --- a/lib/SP/Controller/ItemListController.php +++ b/lib/SP/Controller/ItemListController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -28,12 +28,9 @@ defined('APP_ROOT') || die(); use SP\Account\AccountHistoryUtil; use SP\Account\AccountUtil; -use SP\Config\Config; use SP\Controller\Grids\Items; use SP\Core\Acl\ActionsInterface; use SP\Core\Exceptions\SPException; -use SP\Mvc\View\Template; -use SP\Core\Traits\InjectableTrait; use SP\DataModel\ItemSearchData; use SP\Http\Request; use SP\Mgmt\ApiTokens\ApiTokenSearch; @@ -48,7 +45,7 @@ use SP\Mgmt\Profiles\ProfileSearch; use SP\Mgmt\PublicLinks\PublicLinkSearch; use SP\Mgmt\Tags\TagSearch; use SP\Mgmt\Users\UserSearch; -use SP\Util\Checks; +use SP\Mvc\View\Template; /** * Clase encargada de de preparar la presentación de las vistas de gestión de accesos diff --git a/lib/SP/Controller/ItemSearchController.php b/lib/SP/Controller/ItemSearchController.php index 65cdfa5f..ca0c6099 100644 --- a/lib/SP/Controller/ItemSearchController.php +++ b/lib/SP/Controller/ItemSearchController.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -28,11 +28,9 @@ defined('APP_ROOT') || die(); use SP\Account\AccountHistoryUtil; use SP\Account\AccountUtil; -use SP\Config\Config; use SP\Controller\Grids\Items; use SP\Core\Acl\ActionsInterface; use SP\Core\SessionUtil; -use SP\Mvc\View\Template; use SP\DataModel\ItemSearchData; use SP\Http\Request; use SP\Mgmt\ApiTokens\ApiTokenSearch; @@ -46,7 +44,7 @@ use SP\Mgmt\Profiles\ProfileSearch; use SP\Mgmt\PublicLinks\PublicLinkSearch; use SP\Mgmt\Tags\TagSearch; use SP\Mgmt\Users\UserSearch; -use SP\Util\Checks; +use SP\Mvc\View\Template; use SP\Util\Json; /** diff --git a/lib/SP/Controller/ItemShowController.php b/lib/SP/Controller/ItemShowController.php index 4ee669f6..0327dad8 100644 --- a/lib/SP/Controller/ItemShowController.php +++ b/lib/SP/Controller/ItemShowController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/ItemsController.php b/lib/SP/Controller/ItemsController.php index 7a6691d5..55de3e5e 100644 --- a/lib/SP/Controller/ItemsController.php +++ b/lib/SP/Controller/ItemsController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/LoginController.php b/lib/SP/Controller/LoginController.php index 2226b9dc..be72e79f 100644 --- a/lib/SP/Controller/LoginController.php +++ b/lib/SP/Controller/LoginController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/MainActionController.php b/lib/SP/Controller/MainActionController.php index 435d6fba..91c31af9 100644 --- a/lib/SP/Controller/MainActionController.php +++ b/lib/SP/Controller/MainActionController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/NoticeShowController.php b/lib/SP/Controller/NoticeShowController.php index ff864f40..e3ff08e4 100644 --- a/lib/SP/Controller/NoticeShowController.php +++ b/lib/SP/Controller/NoticeShowController.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/NoticesController.php b/lib/SP/Controller/NoticesController.php index ec02daa1..fa31a2fb 100644 --- a/lib/SP/Controller/NoticesController.php +++ b/lib/SP/Controller/NoticesController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/NoticesSearchController.php b/lib/SP/Controller/NoticesSearchController.php index a4b01467..d7ba1872 100644 --- a/lib/SP/Controller/NoticesSearchController.php +++ b/lib/SP/Controller/NoticesSearchController.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/RequestControllerTrait.php b/lib/SP/Controller/RequestControllerTrait.php index bb79efd6..b82b9374 100644 --- a/lib/SP/Controller/RequestControllerTrait.php +++ b/lib/SP/Controller/RequestControllerTrait.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/TabControllerBase.php b/lib/SP/Controller/TabControllerBase.php index c3385d8a..e47742c9 100644 --- a/lib/SP/Controller/TabControllerBase.php +++ b/lib/SP/Controller/TabControllerBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/TabsInterface.php b/lib/SP/Controller/TabsInterface.php index 8a4d5522..24d74615 100644 --- a/lib/SP/Controller/TabsInterface.php +++ b/lib/SP/Controller/TabsInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/TaskController.php b/lib/SP/Controller/TaskController.php index ec10da82..c38328cc 100644 --- a/lib/SP/Controller/TaskController.php +++ b/lib/SP/Controller/TaskController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Controller/UserPreferencesController.php b/lib/SP/Controller/UserPreferencesController.php index 0bfa7c45..16ba3a2a 100644 --- a/lib/SP/Controller/UserPreferencesController.php +++ b/lib/SP/Controller/UserPreferencesController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -26,14 +26,12 @@ namespace SP\Controller; defined('APP_ROOT') || die(); -use SP\Config\Config; use SP\Core\Acl\ActionsInterface; -use SP\Core\DiFactory; use SP\Core\Language; use SP\Core\SessionUtil; -use SP\Mvc\View\Template; use SP\DataModel\UserPreferencesData; use SP\Mgmt\Users\UserPreferences; +use SP\Mvc\View\Template; /** * Class UsersPrefs encargada de mostrar las preferencias de los usuarios diff --git a/lib/SP/Controller/WikiController.php b/lib/SP/Controller/WikiController.php index 6e038c5b..4b9cfffa 100644 --- a/lib/SP/Controller/WikiController.php +++ b/lib/SP/Controller/WikiController.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -57,8 +57,8 @@ class WikiController extends ControllerBase implements ActionsInterface $this->init(); $this->view->assign('sk', SessionUtil::getSessionKey(true)); - $this->view->assign('isDemoMode', $this->configData->isDemoEnabled() && !SessionFactory::getUserData()->isIsAdminApp()); - $this->view->assign('isDisabled', ($this->configData->isDemoEnabled() && !SessionFactory::getUserData()->isIsAdminApp()) ? 'DISABLED' : ''); + $this->view->assign('isDemoMode', $this->configData->isDemoEnabled() && !SessionFactory::getUserData()->isAdminApp()); + $this->view->assign('isDisabled', ($this->configData->isDemoEnabled() && !SessionFactory::getUserData()->isAdminApp()) ? 'DISABLED' : ''); } /** diff --git a/lib/SP/Core/Acl/AccountPermissionException.php b/lib/SP/Core/Acl/AccountPermissionException.php index bc533f5d..965cb5a9 100644 --- a/lib/SP/Core/Acl/AccountPermissionException.php +++ b/lib/SP/Core/Acl/AccountPermissionException.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Core/Acl/Acl.php b/lib/SP/Core/Acl/Acl.php index d1fc2f0a..6f05795f 100644 --- a/lib/SP/Core/Acl/Acl.php +++ b/lib/SP/Core/Acl/Acl.php @@ -3,9 +3,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Acl/ActionNotFoundException.php b/lib/SP/Core/Acl/ActionNotFoundException.php index f6c8b09b..adb0291f 100644 --- a/lib/SP/Core/Acl/ActionNotFoundException.php +++ b/lib/SP/Core/Acl/ActionNotFoundException.php @@ -3,7 +3,7 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Core/Acl/Actions.php b/lib/SP/Core/Acl/Actions.php index abce7f23..79988364 100644 --- a/lib/SP/Core/Acl/Actions.php +++ b/lib/SP/Core/Acl/Actions.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Acl/ActionsInterface.php b/lib/SP/Core/Acl/ActionsInterface.php index f64d67f5..a1ece1d0 100644 --- a/lib/SP/Core/Acl/ActionsInterface.php +++ b/lib/SP/Core/Acl/ActionsInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Acl/UnauthorizedPageException.php b/lib/SP/Core/Acl/UnauthorizedPageException.php index 65e701e9..a887bcc0 100644 --- a/lib/SP/Core/Acl/UnauthorizedPageException.php +++ b/lib/SP/Core/Acl/UnauthorizedPageException.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Core/Backup.php b/lib/SP/Core/Backup.php index 79a9bc2f..11ad57a1 100644 --- a/lib/SP/Core/Backup.php +++ b/lib/SP/Core/Backup.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Crypt/Cookie.php b/lib/SP/Core/Crypt/Cookie.php index bed55f3d..9ee5c8bc 100644 --- a/lib/SP/Core/Crypt/Cookie.php +++ b/lib/SP/Core/Crypt/Cookie.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Crypt/Crypt.php b/lib/SP/Core/Crypt/Crypt.php index 9d605f1f..8f1f88c5 100644 --- a/lib/SP/Core/Crypt/Crypt.php +++ b/lib/SP/Core/Crypt/Crypt.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Crypt/CryptSessionHandler.php b/lib/SP/Core/Crypt/CryptSessionHandler.php index a45e4388..a9d8473c 100644 --- a/lib/SP/Core/Crypt/CryptSessionHandler.php +++ b/lib/SP/Core/Crypt/CryptSessionHandler.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Crypt/Hash.php b/lib/SP/Core/Crypt/Hash.php index 837ade81..929c46de 100644 --- a/lib/SP/Core/Crypt/Hash.php +++ b/lib/SP/Core/Crypt/Hash.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Crypt/SecureKeyCookie.php b/lib/SP/Core/Crypt/SecureKeyCookie.php index 803f481f..13a52229 100644 --- a/lib/SP/Core/Crypt/SecureKeyCookie.php +++ b/lib/SP/Core/Crypt/SecureKeyCookie.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Crypt/Session.php b/lib/SP/Core/Crypt/Session.php index 5bd1a01e..d42ca407 100644 --- a/lib/SP/Core/Crypt/Session.php +++ b/lib/SP/Core/Crypt/Session.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Crypt/Vault.php b/lib/SP/Core/Crypt/Vault.php index c0e35be0..fe496a9b 100644 --- a/lib/SP/Core/Crypt/Vault.php +++ b/lib/SP/Core/Crypt/Vault.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/CryptMasterPass.php b/lib/SP/Core/CryptMasterPass.php index d676bc9a..c6a391db 100644 --- a/lib/SP/Core/CryptMasterPass.php +++ b/lib/SP/Core/CryptMasterPass.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/CryptPKI.php b/lib/SP/Core/CryptPKI.php index c178d217..394b90b4 100644 --- a/lib/SP/Core/CryptPKI.php +++ b/lib/SP/Core/CryptPKI.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/DiFactory.php b/lib/SP/Core/DiFactory.php index 3e50c88b..77002ce8 100644 --- a/lib/SP/Core/DiFactory.php +++ b/lib/SP/Core/DiFactory.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -27,12 +27,11 @@ namespace SP\Core; use SP\Core\Events\EventDispatcher; use SP\Core\Events\EventDispatcherInterface; use SP\Core\Exceptions\InvalidClassException; -use SP\Core\UI\Theme; use SP\Core\UI\ThemeInterface; use SP\Mgmt\ItemBaseInterface; use SP\Storage\DBStorageInterface; -use SP\Storage\XmlFileStorageInterface; use SP\Storage\MySQLHandler; +use SP\Storage\XmlFileStorageInterface; use SP\Storage\XmlHandler; /** diff --git a/lib/SP/Core/Dic/Container.php b/lib/SP/Core/Dic/Container.php index ad35b1f3..11f25d19 100644 --- a/lib/SP/Core/Dic/Container.php +++ b/lib/SP/Core/Dic/Container.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Dic/ContainerException.php b/lib/SP/Core/Dic/ContainerException.php index c3946f70..9472204b 100644 --- a/lib/SP/Core/Dic/ContainerException.php +++ b/lib/SP/Core/Dic/ContainerException.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Dic/DicInterface.php b/lib/SP/Core/Dic/DicInterface.php index b48e6fd0..f33b88d1 100644 --- a/lib/SP/Core/Dic/DicInterface.php +++ b/lib/SP/Core/Dic/DicInterface.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Dic/Injector.php b/lib/SP/Core/Dic/Injector.php index 13730de9..28397ff3 100644 --- a/lib/SP/Core/Dic/Injector.php +++ b/lib/SP/Core/Dic/Injector.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Core/Dic/NotFoundException.php b/lib/SP/Core/Dic/NotFoundException.php index 63f33646..a265bd5c 100644 --- a/lib/SP/Core/Dic/NotFoundException.php +++ b/lib/SP/Core/Dic/NotFoundException.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Events/Event.php b/lib/SP/Core/Events/Event.php index c053d5c2..af4ea8de 100644 --- a/lib/SP/Core/Events/Event.php +++ b/lib/SP/Core/Events/Event.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Core/Events/EventDispatcher.php b/lib/SP/Core/Events/EventDispatcher.php index 3489dea6..782afe17 100644 --- a/lib/SP/Core/Events/EventDispatcher.php +++ b/lib/SP/Core/Events/EventDispatcher.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Events/EventDispatcherBase.php b/lib/SP/Core/Events/EventDispatcherBase.php index 14786714..1ce8b993 100644 --- a/lib/SP/Core/Events/EventDispatcherBase.php +++ b/lib/SP/Core/Events/EventDispatcherBase.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Events/EventDispatcherInterface.php b/lib/SP/Core/Events/EventDispatcherInterface.php index 563e6ed5..4d2f46ef 100644 --- a/lib/SP/Core/Events/EventDispatcherInterface.php +++ b/lib/SP/Core/Events/EventDispatcherInterface.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Events/EventMessage.php b/lib/SP/Core/Events/EventMessage.php index 83dc9fd9..7b5318e7 100644 --- a/lib/SP/Core/Events/EventMessage.php +++ b/lib/SP/Core/Events/EventMessage.php @@ -1,4 +1,26 @@ . + */ namespace SP\Core\Events; diff --git a/lib/SP/Core/Events/EventReceiver.php b/lib/SP/Core/Events/EventReceiver.php index dc62028d..a578244f 100644 --- a/lib/SP/Core/Events/EventReceiver.php +++ b/lib/SP/Core/Events/EventReceiver.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Exceptions/ConfigException.php b/lib/SP/Core/Exceptions/ConfigException.php index 536637ca..1d31d065 100644 --- a/lib/SP/Core/Exceptions/ConfigException.php +++ b/lib/SP/Core/Exceptions/ConfigException.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Exceptions/ConstraintException.php b/lib/SP/Core/Exceptions/ConstraintException.php index 84f3dc07..f92ff658 100644 --- a/lib/SP/Core/Exceptions/ConstraintException.php +++ b/lib/SP/Core/Exceptions/ConstraintException.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Exceptions/FileNotFoundException.php b/lib/SP/Core/Exceptions/FileNotFoundException.php index 6a1c0982..06981423 100644 --- a/lib/SP/Core/Exceptions/FileNotFoundException.php +++ b/lib/SP/Core/Exceptions/FileNotFoundException.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Exceptions/InitializationException.php b/lib/SP/Core/Exceptions/InitializationException.php index 9b101f70..5d6d3eab 100644 --- a/lib/SP/Core/Exceptions/InitializationException.php +++ b/lib/SP/Core/Exceptions/InitializationException.php @@ -3,7 +3,7 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Core/Exceptions/InvalidArgumentException.php b/lib/SP/Core/Exceptions/InvalidArgumentException.php index 49739dad..c4c0644c 100644 --- a/lib/SP/Core/Exceptions/InvalidArgumentException.php +++ b/lib/SP/Core/Exceptions/InvalidArgumentException.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Exceptions/InvalidClassException.php b/lib/SP/Core/Exceptions/InvalidClassException.php index 05b6f7b7..e15a34a1 100644 --- a/lib/SP/Core/Exceptions/InvalidClassException.php +++ b/lib/SP/Core/Exceptions/InvalidClassException.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Exceptions/ItemException.php b/lib/SP/Core/Exceptions/ItemException.php index eaa7399d..849ff8be 100644 --- a/lib/SP/Core/Exceptions/ItemException.php +++ b/lib/SP/Core/Exceptions/ItemException.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Exceptions/QueryException.php b/lib/SP/Core/Exceptions/QueryException.php index b13b0b28..bf03310f 100644 --- a/lib/SP/Core/Exceptions/QueryException.php +++ b/lib/SP/Core/Exceptions/QueryException.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Exceptions/SPException.php b/lib/SP/Core/Exceptions/SPException.php index 3e94ede8..865fa8bf 100644 --- a/lib/SP/Core/Exceptions/SPException.php +++ b/lib/SP/Core/Exceptions/SPException.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Exceptions/ValidationException.php b/lib/SP/Core/Exceptions/ValidationException.php index 75dd90a0..19d34ce7 100644 --- a/lib/SP/Core/Exceptions/ValidationException.php +++ b/lib/SP/Core/Exceptions/ValidationException.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Init.php b/lib/SP/Core/Init.php index 72f0e58e..70eb0c40 100644 --- a/lib/SP/Core/Init.php +++ b/lib/SP/Core/Init.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Install/DatabaseSetupInterface.php b/lib/SP/Core/Install/DatabaseSetupInterface.php index aa40ef9d..a34fb36c 100644 --- a/lib/SP/Core/Install/DatabaseSetupInterface.php +++ b/lib/SP/Core/Install/DatabaseSetupInterface.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Core/Install/Installer.php b/lib/SP/Core/Install/Installer.php index 842c4781..6b870a8b 100644 --- a/lib/SP/Core/Install/Installer.php +++ b/lib/SP/Core/Install/Installer.php @@ -3,8 +3,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Core/Install/MySQL.php b/lib/SP/Core/Install/MySQL.php index 2b19cf19..09585bf6 100644 --- a/lib/SP/Core/Install/MySQL.php +++ b/lib/SP/Core/Install/MySQL.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Core/ItemsTypeInterface.php b/lib/SP/Core/ItemsTypeInterface.php index 0f95f8f4..ad6d6ec3 100644 --- a/lib/SP/Core/ItemsTypeInterface.php +++ b/lib/SP/Core/ItemsTypeInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Language.php b/lib/SP/Core/Language.php index dfd3b667..d9086e36 100644 --- a/lib/SP/Core/Language.php +++ b/lib/SP/Core/Language.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Messages/LogMessage.php b/lib/SP/Core/Messages/LogMessage.php index 25fab365..9f92ba4d 100644 --- a/lib/SP/Core/Messages/LogMessage.php +++ b/lib/SP/Core/Messages/LogMessage.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Messages/MailMessage.php b/lib/SP/Core/Messages/MailMessage.php new file mode 100644 index 00000000..a63b2f71 --- /dev/null +++ b/lib/SP/Core/Messages/MailMessage.php @@ -0,0 +1,67 @@ +. + */ + +namespace SP\Core\Messages; + +/** + * Class MailMessage + * + * @package SP\Core\Messages + */ +class MailMessage extends MessageBase implements MessageInterface +{ + /** + * Adds a blank description line + */ + public function addDescriptionLine() + { + $this->description[] = ''; + } + + /** + * Componer un mensaje en formato HTML + * + * @return string + */ + public function composeHtml() + { + $message[] = '
'; + $message[] = '

' . $this->title . '

'; + $message[] = '
' . implode('
', $this->description) . '
'; + $message[] = ''; + $message[] = '
'; + + return implode('', $message); + } + + /** + * Componer un mensaje en formato texto + * + * @return string + */ + public function composeText() + { + return $this->title . PHP_EOL . implode(PHP_EOL, $this->description) . PHP_EOL . implode(PHP_EOL, $this->footer); + } +} \ No newline at end of file diff --git a/lib/SP/Core/Messages/MessageBase.php b/lib/SP/Core/Messages/MessageBase.php index 57a398b7..d3e2f5b2 100644 --- a/lib/SP/Core/Messages/MessageBase.php +++ b/lib/SP/Core/Messages/MessageBase.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Messages/MessageInterface.php b/lib/SP/Core/Messages/MessageInterface.php index 42b0f541..ecd8cff6 100644 --- a/lib/SP/Core/Messages/MessageInterface.php +++ b/lib/SP/Core/Messages/MessageInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Messages/NoticeMessage.php b/lib/SP/Core/Messages/NoticeMessage.php index 95fc3fc5..2e896da2 100644 --- a/lib/SP/Core/Messages/NoticeMessage.php +++ b/lib/SP/Core/Messages/NoticeMessage.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Messages/TaskMessage.php b/lib/SP/Core/Messages/TaskMessage.php index 996390a3..b1b83cc7 100644 --- a/lib/SP/Core/Messages/TaskMessage.php +++ b/lib/SP/Core/Messages/TaskMessage.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/OldCrypt.php b/lib/SP/Core/OldCrypt.php index d2b5d9f6..814f9856 100644 --- a/lib/SP/Core/OldCrypt.php +++ b/lib/SP/Core/OldCrypt.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Plugin/PluginBase.php b/lib/SP/Core/Plugin/PluginBase.php index 15967b27..0642870c 100644 --- a/lib/SP/Core/Plugin/PluginBase.php +++ b/lib/SP/Core/Plugin/PluginBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Plugin/PluginDataStore.php b/lib/SP/Core/Plugin/PluginDataStore.php index 0c2970be..3c767546 100644 --- a/lib/SP/Core/Plugin/PluginDataStore.php +++ b/lib/SP/Core/Plugin/PluginDataStore.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Plugin/PluginInterface.php b/lib/SP/Core/Plugin/PluginInterface.php index 95dfdd92..0b1abdb6 100644 --- a/lib/SP/Core/Plugin/PluginInterface.php +++ b/lib/SP/Core/Plugin/PluginInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Plugin/PluginUtil.php b/lib/SP/Core/Plugin/PluginUtil.php index d0815dca..78b9c819 100644 --- a/lib/SP/Core/Plugin/PluginUtil.php +++ b/lib/SP/Core/Plugin/PluginUtil.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Session/Session.php b/lib/SP/Core/Session/Session.php index d39886bc..041b7695 100644 --- a/lib/SP/Core/Session/Session.php +++ b/lib/SP/Core/Session/Session.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/SessionFactory.php b/lib/SP/Core/SessionFactory.php index db626d97..f6817d09 100644 --- a/lib/SP/Core/SessionFactory.php +++ b/lib/SP/Core/SessionFactory.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -24,14 +24,8 @@ namespace SP\Core; -use SP\Account\AccountAcl; -use SP\Services\Account\AccountSearchService; -use SP\Config\ConfigData; use SP\Core\Crypt\Vault; -use SP\DataModel\ProfileData; use SP\DataModel\UserData; -use SP\DataModel\UserPreferencesData; -use SP\Mgmt\Users\UserPreferences; defined('APP_ROOT') || die(); diff --git a/lib/SP/Core/SessionUtil.php b/lib/SP/Core/SessionUtil.php index 66764831..6bc6d0b3 100644 --- a/lib/SP/Core/SessionUtil.php +++ b/lib/SP/Core/SessionUtil.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Task.php b/lib/SP/Core/Task.php index 2d8dd49a..d4308ba2 100644 --- a/lib/SP/Core/Task.php +++ b/lib/SP/Core/Task.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/TaskFactory.php b/lib/SP/Core/TaskFactory.php index 7b2a6203..4437dc6b 100644 --- a/lib/SP/Core/TaskFactory.php +++ b/lib/SP/Core/TaskFactory.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Traits/InjectableTrait.php b/lib/SP/Core/Traits/InjectableTrait.php index 2231a237..49fc2797 100644 --- a/lib/SP/Core/Traits/InjectableTrait.php +++ b/lib/SP/Core/Traits/InjectableTrait.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/UI/Theme.php b/lib/SP/Core/UI/Theme.php index b6d5056c..917d1818 100644 --- a/lib/SP/Core/UI/Theme.php +++ b/lib/SP/Core/UI/Theme.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -29,7 +29,6 @@ use SP\Config\Config; use SP\Config\ConfigData; use SP\Core\Init; use SP\Core\Session\Session; -use SP\Core\SessionFactory; use SP\Core\Traits\InjectableTrait; use Theme\Icons; diff --git a/lib/SP/Core/UI/ThemeIconsBase.php b/lib/SP/Core/UI/ThemeIconsBase.php index 68bdd389..b1c6a53f 100644 --- a/lib/SP/Core/UI/ThemeIconsBase.php +++ b/lib/SP/Core/UI/ThemeIconsBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/UI/ThemeIconsInterface.php b/lib/SP/Core/UI/ThemeIconsInterface.php index 78242700..aa20af7d 100644 --- a/lib/SP/Core/UI/ThemeIconsInterface.php +++ b/lib/SP/Core/UI/ThemeIconsInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/UI/ThemeInterface.php b/lib/SP/Core/UI/ThemeInterface.php index de22d818..39ee0ef0 100644 --- a/lib/SP/Core/UI/ThemeInterface.php +++ b/lib/SP/Core/UI/ThemeInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Upgrade/Account.php b/lib/SP/Core/Upgrade/Account.php index b3375987..4ec21fe4 100644 --- a/lib/SP/Core/Upgrade/Account.php +++ b/lib/SP/Core/Upgrade/Account.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Upgrade/Category.php b/lib/SP/Core/Upgrade/Category.php index 2e271b59..d64a9881 100644 --- a/lib/SP/Core/Upgrade/Category.php +++ b/lib/SP/Core/Upgrade/Category.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Upgrade/Check.php b/lib/SP/Core/Upgrade/Check.php index 4be69061..0c28b611 100644 --- a/lib/SP/Core/Upgrade/Check.php +++ b/lib/SP/Core/Upgrade/Check.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Upgrade/Crypt.php b/lib/SP/Core/Upgrade/Crypt.php index 4e77b49b..8328da1c 100644 --- a/lib/SP/Core/Upgrade/Crypt.php +++ b/lib/SP/Core/Upgrade/Crypt.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Upgrade/Customer.php b/lib/SP/Core/Upgrade/Customer.php index 206b0174..9800e059 100644 --- a/lib/SP/Core/Upgrade/Customer.php +++ b/lib/SP/Core/Upgrade/Customer.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Upgrade/Group.php b/lib/SP/Core/Upgrade/Group.php index f755aced..b9cda93a 100644 --- a/lib/SP/Core/Upgrade/Group.php +++ b/lib/SP/Core/Upgrade/Group.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Upgrade/Profile.php b/lib/SP/Core/Upgrade/Profile.php index 83f18d75..018f51c3 100644 --- a/lib/SP/Core/Upgrade/Profile.php +++ b/lib/SP/Core/Upgrade/Profile.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Upgrade/Upgrade.php b/lib/SP/Core/Upgrade/Upgrade.php index a554550e..cad1c7bd 100644 --- a/lib/SP/Core/Upgrade/Upgrade.php +++ b/lib/SP/Core/Upgrade/Upgrade.php @@ -3,9 +3,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/Upgrade/User.php b/lib/SP/Core/Upgrade/User.php index 15c1afda..1c08f27e 100644 --- a/lib/SP/Core/Upgrade/User.php +++ b/lib/SP/Core/Upgrade/User.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Core/XmlExport.php b/lib/SP/Core/XmlExport.php index 4b156efb..4ca8cae1 100644 --- a/lib/SP/Core/XmlExport.php +++ b/lib/SP/Core/XmlExport.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Crypt/TemporaryMasterPass.php b/lib/SP/Crypt/TemporaryMasterPass.php index 57419733..cc85580a 100644 --- a/lib/SP/Crypt/TemporaryMasterPass.php +++ b/lib/SP/Crypt/TemporaryMasterPass.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/DataModel/AccountData.php b/lib/SP/DataModel/AccountData.php index 2710279c..2939f807 100644 --- a/lib/SP/DataModel/AccountData.php +++ b/lib/SP/DataModel/AccountData.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/AccountExtData.php b/lib/SP/DataModel/AccountExtData.php index 8bb5c3cb..0b1cb480 100644 --- a/lib/SP/DataModel/AccountExtData.php +++ b/lib/SP/DataModel/AccountExtData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/AccountHistoryData.php b/lib/SP/DataModel/AccountHistoryData.php index a22b234a..a722071f 100644 --- a/lib/SP/DataModel/AccountHistoryData.php +++ b/lib/SP/DataModel/AccountHistoryData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/AccountPassData.php b/lib/SP/DataModel/AccountPassData.php index 19f1889f..a5a9d02a 100644 --- a/lib/SP/DataModel/AccountPassData.php +++ b/lib/SP/DataModel/AccountPassData.php @@ -1,4 +1,26 @@ . + */ namespace SP\DataModel; diff --git a/lib/SP/DataModel/AccountSearchVData.php b/lib/SP/DataModel/AccountSearchVData.php index 37738e72..a038c0a8 100644 --- a/lib/SP/DataModel/AccountSearchVData.php +++ b/lib/SP/DataModel/AccountSearchVData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/AccountToUserGroupData.php b/lib/SP/DataModel/AccountToUserGroupData.php index 418306dc..ad56cb74 100644 --- a/lib/SP/DataModel/AccountToUserGroupData.php +++ b/lib/SP/DataModel/AccountToUserGroupData.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/AccountVData.php b/lib/SP/DataModel/AccountVData.php index 8287d2ee..e88da3bf 100644 --- a/lib/SP/DataModel/AccountVData.php +++ b/lib/SP/DataModel/AccountVData.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/DataModel/ActionData.php b/lib/SP/DataModel/ActionData.php index 0f5180c5..a761e9ac 100644 --- a/lib/SP/DataModel/ActionData.php +++ b/lib/SP/DataModel/ActionData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/AuthTokenData.php b/lib/SP/DataModel/AuthTokenData.php index 6081ee43..944689dd 100644 --- a/lib/SP/DataModel/AuthTokenData.php +++ b/lib/SP/DataModel/AuthTokenData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/CategoryData.php b/lib/SP/DataModel/CategoryData.php index d8102910..b5440461 100644 --- a/lib/SP/DataModel/CategoryData.php +++ b/lib/SP/DataModel/CategoryData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/ClientData.php b/lib/SP/DataModel/ClientData.php index 89b1dbf1..fc535790 100644 --- a/lib/SP/DataModel/ClientData.php +++ b/lib/SP/DataModel/ClientData.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/ConfigData.php b/lib/SP/DataModel/ConfigData.php index d816c56f..0d92fcc6 100644 --- a/lib/SP/DataModel/ConfigData.php +++ b/lib/SP/DataModel/ConfigData.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/DataModel/CustomFieldBaseData.php b/lib/SP/DataModel/CustomFieldBaseData.php index 4fee532f..ad63c596 100644 --- a/lib/SP/DataModel/CustomFieldBaseData.php +++ b/lib/SP/DataModel/CustomFieldBaseData.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/CustomFieldData.php b/lib/SP/DataModel/CustomFieldData.php index 10d4daa0..c80f3bc5 100644 --- a/lib/SP/DataModel/CustomFieldData.php +++ b/lib/SP/DataModel/CustomFieldData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/CustomFieldDefDataOld.php b/lib/SP/DataModel/CustomFieldDefDataOld.php index ba21e4fa..c2383845 100644 --- a/lib/SP/DataModel/CustomFieldDefDataOld.php +++ b/lib/SP/DataModel/CustomFieldDefDataOld.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/CustomFieldDefinitionData.php b/lib/SP/DataModel/CustomFieldDefinitionData.php index ca93517c..691e9fb4 100644 --- a/lib/SP/DataModel/CustomFieldDefinitionData.php +++ b/lib/SP/DataModel/CustomFieldDefinitionData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/CustomFieldTypeData.php b/lib/SP/DataModel/CustomFieldTypeData.php index 02726b38..d84453dd 100644 --- a/lib/SP/DataModel/CustomFieldTypeData.php +++ b/lib/SP/DataModel/CustomFieldTypeData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/DataModelBase.php b/lib/SP/DataModel/DataModelBase.php index d376f27b..a53f1ffb 100644 --- a/lib/SP/DataModel/DataModelBase.php +++ b/lib/SP/DataModel/DataModelBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/DataModelInterface.php b/lib/SP/DataModel/DataModelInterface.php index 7a2172ec..95e540e9 100644 --- a/lib/SP/DataModel/DataModelInterface.php +++ b/lib/SP/DataModel/DataModelInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/Dto/AccountAclDto.php b/lib/SP/DataModel/Dto/AccountAclDto.php index acfd5c1a..d3d2f51c 100644 --- a/lib/SP/DataModel/Dto/AccountAclDto.php +++ b/lib/SP/DataModel/Dto/AccountAclDto.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/DataModel/Dto/AccountCache.php b/lib/SP/DataModel/Dto/AccountCache.php index 9c96c661..5dcc0995 100644 --- a/lib/SP/DataModel/Dto/AccountCache.php +++ b/lib/SP/DataModel/Dto/AccountCache.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/DataModel/Dto/AccountDetailsResponse.php b/lib/SP/DataModel/Dto/AccountDetailsResponse.php index 74b2f7ad..331f2b37 100644 --- a/lib/SP/DataModel/Dto/AccountDetailsResponse.php +++ b/lib/SP/DataModel/Dto/AccountDetailsResponse.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/DataModel/Dto/AccountSearchResponse.php b/lib/SP/DataModel/Dto/AccountSearchResponse.php index 6213a783..e881efee 100644 --- a/lib/SP/DataModel/Dto/AccountSearchResponse.php +++ b/lib/SP/DataModel/Dto/AccountSearchResponse.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/DataModel/Dto/ConfigRequest.php b/lib/SP/DataModel/Dto/ConfigRequest.php index e38c40a6..56d642d0 100644 --- a/lib/SP/DataModel/Dto/ConfigRequest.php +++ b/lib/SP/DataModel/Dto/ConfigRequest.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/DataModel/FileData.php b/lib/SP/DataModel/FileData.php index 908a7d23..c2bf8d85 100644 --- a/lib/SP/DataModel/FileData.php +++ b/lib/SP/DataModel/FileData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/FileExtData.php b/lib/SP/DataModel/FileExtData.php index 11514016..e89ab3e7 100644 --- a/lib/SP/DataModel/FileExtData.php +++ b/lib/SP/DataModel/FileExtData.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/InstallData.php b/lib/SP/DataModel/InstallData.php index 5b00ae44..c601e108 100644 --- a/lib/SP/DataModel/InstallData.php +++ b/lib/SP/DataModel/InstallData.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/ItemData.php b/lib/SP/DataModel/ItemData.php index 9587880b..bcd6d97d 100644 --- a/lib/SP/DataModel/ItemData.php +++ b/lib/SP/DataModel/ItemData.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/DataModel/ItemSearchData.php b/lib/SP/DataModel/ItemSearchData.php index a405a8a9..da3b44cf 100644 --- a/lib/SP/DataModel/ItemSearchData.php +++ b/lib/SP/DataModel/ItemSearchData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/NotificationData.php b/lib/SP/DataModel/NotificationData.php index 43aeca5a..43434c43 100644 --- a/lib/SP/DataModel/NotificationData.php +++ b/lib/SP/DataModel/NotificationData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/PluginData.php b/lib/SP/DataModel/PluginData.php index 76b518d3..5189a13a 100644 --- a/lib/SP/DataModel/PluginData.php +++ b/lib/SP/DataModel/PluginData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/ProfileData.php b/lib/SP/DataModel/ProfileData.php index 8c17f30a..38df5a3a 100644 --- a/lib/SP/DataModel/ProfileData.php +++ b/lib/SP/DataModel/ProfileData.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/PublicLinkBaseData.php b/lib/SP/DataModel/PublicLinkBaseData.php index 11464e7f..b0660a6a 100644 --- a/lib/SP/DataModel/PublicLinkBaseData.php +++ b/lib/SP/DataModel/PublicLinkBaseData.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/PublicLinkData.php b/lib/SP/DataModel/PublicLinkData.php index 969e94ac..62b93820 100644 --- a/lib/SP/DataModel/PublicLinkData.php +++ b/lib/SP/DataModel/PublicLinkData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/PublicLinkListData.php b/lib/SP/DataModel/PublicLinkListData.php index 5797aebf..bceba9f3 100644 --- a/lib/SP/DataModel/PublicLinkListData.php +++ b/lib/SP/DataModel/PublicLinkListData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/TagData.php b/lib/SP/DataModel/TagData.php index 81e24075..aad3f451 100644 --- a/lib/SP/DataModel/TagData.php +++ b/lib/SP/DataModel/TagData.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/TrackData.php b/lib/SP/DataModel/TrackData.php index 79170206..04d7d0b4 100644 --- a/lib/SP/DataModel/TrackData.php +++ b/lib/SP/DataModel/TrackData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/UserData.php b/lib/SP/DataModel/UserData.php index 42c0d833..fdca7220 100644 --- a/lib/SP/DataModel/UserData.php +++ b/lib/SP/DataModel/UserData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -161,7 +161,7 @@ class UserData extends UserPassData implements DataModelInterface /** * @return boolean */ - public function isIsMigrate() + public function isMigrate() { return (int)$this->isMigrate; } @@ -257,7 +257,7 @@ class UserData extends UserPassData implements DataModelInterface /** * @return boolean */ - public function isIsAdminApp() + public function isAdminApp() { return (int)$this->isAdminApp; } @@ -273,7 +273,7 @@ class UserData extends UserPassData implements DataModelInterface /** * @return boolean */ - public function isIsAdminAcc() + public function isAdminAcc() { return (int)$this->isAdminAcc; } @@ -289,7 +289,7 @@ class UserData extends UserPassData implements DataModelInterface /** * @return boolean */ - public function isIsDisabled() + public function isDisabled() { return (int)$this->isDisabled; } @@ -305,7 +305,7 @@ class UserData extends UserPassData implements DataModelInterface /** * @return boolean */ - public function isIsChangePass() + public function isChangePass() { return (int)$this->isChangePass; } @@ -321,7 +321,7 @@ class UserData extends UserPassData implements DataModelInterface /** * @return boolean */ - public function isIsLdap() + public function isLdap() { return (int)$this->isLdap; } diff --git a/lib/SP/DataModel/UserGroupData.php b/lib/SP/DataModel/UserGroupData.php index 94835e4c..f03283ec 100644 --- a/lib/SP/DataModel/UserGroupData.php +++ b/lib/SP/DataModel/UserGroupData.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/UserLoginData.php b/lib/SP/DataModel/UserLoginData.php index 8e920913..d6fa71b7 100644 --- a/lib/SP/DataModel/UserLoginData.php +++ b/lib/SP/DataModel/UserLoginData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/UserPassData.php b/lib/SP/DataModel/UserPassData.php index 873fb798..dbf06d29 100644 --- a/lib/SP/DataModel/UserPassData.php +++ b/lib/SP/DataModel/UserPassData.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/UserPassRecoverData.php b/lib/SP/DataModel/UserPassRecoverData.php index ca4c74ed..5ed0d577 100644 --- a/lib/SP/DataModel/UserPassRecoverData.php +++ b/lib/SP/DataModel/UserPassRecoverData.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/UserPreferencesData.php b/lib/SP/DataModel/UserPreferencesData.php index ebb1a334..efa0977a 100644 --- a/lib/SP/DataModel/UserPreferencesData.php +++ b/lib/SP/DataModel/UserPreferencesData.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/UserProfileData.php b/lib/SP/DataModel/UserProfileData.php index 801d96e1..c35fa1c5 100644 --- a/lib/SP/DataModel/UserProfileData.php +++ b/lib/SP/DataModel/UserProfileData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/DataModel/UserToUserGroupData.php b/lib/SP/DataModel/UserToUserGroupData.php index 0e21ce05..f653ec63 100644 --- a/lib/SP/DataModel/UserToUserGroupData.php +++ b/lib/SP/DataModel/UserToUserGroupData.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Forms/AccountForm.php b/lib/SP/Forms/AccountForm.php index 062cf300..884ab85b 100644 --- a/lib/SP/Forms/AccountForm.php +++ b/lib/SP/Forms/AccountForm.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Forms/AuthTokenForm.php b/lib/SP/Forms/AuthTokenForm.php index 50ead924..2b5bff99 100644 --- a/lib/SP/Forms/AuthTokenForm.php +++ b/lib/SP/Forms/AuthTokenForm.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Forms/CategoryForm.php b/lib/SP/Forms/CategoryForm.php index b4c13d05..4d5ae25e 100644 --- a/lib/SP/Forms/CategoryForm.php +++ b/lib/SP/Forms/CategoryForm.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Forms/ClientForm.php b/lib/SP/Forms/ClientForm.php index 07d974cd..0845737c 100644 --- a/lib/SP/Forms/ClientForm.php +++ b/lib/SP/Forms/ClientForm.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Forms/CustomFieldDefForm.php b/lib/SP/Forms/CustomFieldDefForm.php index e3f55f67..a3fb705d 100644 --- a/lib/SP/Forms/CustomFieldDefForm.php +++ b/lib/SP/Forms/CustomFieldDefForm.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Forms/FormBase.php b/lib/SP/Forms/FormBase.php index acf41000..9f92f923 100644 --- a/lib/SP/Forms/FormBase.php +++ b/lib/SP/Forms/FormBase.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Forms/FormInterface.php b/lib/SP/Forms/FormInterface.php index 6a8389ac..91695f75 100644 --- a/lib/SP/Forms/FormInterface.php +++ b/lib/SP/Forms/FormInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Forms/NotificationForm.php b/lib/SP/Forms/NotificationForm.php index f3972ef5..4a14bb48 100644 --- a/lib/SP/Forms/NotificationForm.php +++ b/lib/SP/Forms/NotificationForm.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Forms/PublicLinkForm.php b/lib/SP/Forms/PublicLinkForm.php index 7d0e1841..e1155442 100644 --- a/lib/SP/Forms/PublicLinkForm.php +++ b/lib/SP/Forms/PublicLinkForm.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Forms/TagForm.php b/lib/SP/Forms/TagForm.php index 3d874bbc..6fafeeea 100644 --- a/lib/SP/Forms/TagForm.php +++ b/lib/SP/Forms/TagForm.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Forms/UserForm.php b/lib/SP/Forms/UserForm.php index 205df7dc..de7bf0ae 100644 --- a/lib/SP/Forms/UserForm.php +++ b/lib/SP/Forms/UserForm.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -25,13 +25,10 @@ namespace SP\Forms; use SP\Core\Acl\ActionsInterface; -use SP\Core\Crypt\Hash; use SP\Core\Exceptions\ValidationException; use SP\Core\SessionFactory; use SP\DataModel\UserData; use SP\Http\Request; -use SP\Mgmt\Users\UserUtil; -use SP\Util\Checks; /** * Class UserForm @@ -100,7 +97,7 @@ class UserForm extends FormBase implements FormInterface $this->userData->setIsAdminAcc(Request::analyze('adminacc', 0, false, 1)); $this->userData->setIsDisabled(Request::analyze('disabled', 0, false, 1)); $this->userData->setIsChangePass(Request::analyze('changepass', 0, false, 1)); - $this->userData->setPass(Hash::hashKey(Request::analyzeEncrypted('pass'))); + $this->userData->setPass(Request::analyzeEncrypted('pass')); } /** @@ -130,7 +127,7 @@ class UserForm extends FormBase implements FormInterface if ($this->configData->isDemoEnabled() && $this->userData->getLogin() === 'demo' - && !SessionFactory::getUserData()->isIsAdminApp()) { + && !SessionFactory::getUserData()->isAdminApp()) { throw new ValidationException(__u('Ey, esto es una DEMO!!')); } } @@ -142,7 +139,7 @@ class UserForm extends FormBase implements FormInterface { $userPassR = Request::analyzeEncrypted('passR'); - if ($this->configData->isDemoEnabled() && UserUtil::getUserLoginById($this->itemId) === 'demo') { + if ($this->configData->isDemoEnabled()) { throw new ValidationException(__u('Ey, esto es una DEMO!!')); } @@ -150,7 +147,7 @@ class UserForm extends FormBase implements FormInterface throw new ValidationException(__u('La clave no puede estar en blanco')); } - if (!Hash::checkHashKey($userPassR, $this->userData->getPass())) { + if ($userPassR !== $this->userData->getPass()) { throw new ValidationException(__u('Las claves no coinciden')); } } @@ -160,12 +157,14 @@ class UserForm extends FormBase implements FormInterface */ protected function checkDelete() { - if ($this->configData->isDemoEnabled() && UserUtil::getUserLoginById($this->itemId) === 'demo') { + if ($this->configData->isDemoEnabled()) { throw new ValidationException(__u('Ey, esto es una DEMO!!')); } - if ((!is_array($this->itemId) === SessionFactory::getUserData()->getId()) - || (is_array($this->itemId) && in_array(SessionFactory::getUserData()->getId(), $this->itemId)) + $userData = $this->session->getUserData(); + + if ((is_array($this->itemId) && in_array($userData->getId(), $this->itemId)) + || $this->itemId === $userData->getId() ) { throw new ValidationException(__u('No es posible eliminar, usuario en uso')); } diff --git a/lib/SP/Forms/UserGroupForm.php b/lib/SP/Forms/UserGroupForm.php index 923242ac..ab3ae368 100644 --- a/lib/SP/Forms/UserGroupForm.php +++ b/lib/SP/Forms/UserGroupForm.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Forms/UserProfileForm.php b/lib/SP/Forms/UserProfileForm.php index f2818d67..e91a25a5 100644 --- a/lib/SP/Forms/UserProfileForm.php +++ b/lib/SP/Forms/UserProfileForm.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/Assets/FontIcon.php b/lib/SP/Html/Assets/FontIcon.php index 14f18f38..4a78a0c4 100644 --- a/lib/SP/Html/Assets/FontIcon.php +++ b/lib/SP/Html/Assets/FontIcon.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/Assets/IconBase.php b/lib/SP/Html/Assets/IconBase.php index c5f42fa0..3c5583e7 100644 --- a/lib/SP/Html/Assets/IconBase.php +++ b/lib/SP/Html/Assets/IconBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/Assets/IconInterface.php b/lib/SP/Html/Assets/IconInterface.php index 97b5808d..bb1dc625 100644 --- a/lib/SP/Html/Assets/IconInterface.php +++ b/lib/SP/Html/Assets/IconInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/Assets/ImageIcon.php b/lib/SP/Html/Assets/ImageIcon.php index d4afd36e..ee3301ce 100644 --- a/lib/SP/Html/Assets/ImageIcon.php +++ b/lib/SP/Html/Assets/ImageIcon.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGrid.php b/lib/SP/Html/DataGrid/DataGrid.php index 7852fee4..4533ccee 100644 --- a/lib/SP/Html/DataGrid/DataGrid.php +++ b/lib/SP/Html/DataGrid/DataGrid.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridAction.php b/lib/SP/Html/DataGrid/DataGridAction.php index 3e4f4e47..efdadc49 100644 --- a/lib/SP/Html/DataGrid/DataGridAction.php +++ b/lib/SP/Html/DataGrid/DataGridAction.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridActionBase.php b/lib/SP/Html/DataGrid/DataGridActionBase.php index 66841805..2b5796d8 100644 --- a/lib/SP/Html/DataGrid/DataGridActionBase.php +++ b/lib/SP/Html/DataGrid/DataGridActionBase.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridActionInterface.php b/lib/SP/Html/DataGrid/DataGridActionInterface.php index 54886b2a..fb44598c 100644 --- a/lib/SP/Html/DataGrid/DataGridActionInterface.php +++ b/lib/SP/Html/DataGrid/DataGridActionInterface.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridActionSearch.php b/lib/SP/Html/DataGrid/DataGridActionSearch.php index c08caca8..28049ca1 100644 --- a/lib/SP/Html/DataGrid/DataGridActionSearch.php +++ b/lib/SP/Html/DataGrid/DataGridActionSearch.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridActionType.php b/lib/SP/Html/DataGrid/DataGridActionType.php index a653a7cd..f51c87be 100644 --- a/lib/SP/Html/DataGrid/DataGridActionType.php +++ b/lib/SP/Html/DataGrid/DataGridActionType.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridBase.php b/lib/SP/Html/DataGrid/DataGridBase.php index 6746bf3b..d03bb4e4 100644 --- a/lib/SP/Html/DataGrid/DataGridBase.php +++ b/lib/SP/Html/DataGrid/DataGridBase.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridData.php b/lib/SP/Html/DataGrid/DataGridData.php index 3436e9f0..ec106bc6 100644 --- a/lib/SP/Html/DataGrid/DataGridData.php +++ b/lib/SP/Html/DataGrid/DataGridData.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridDataBase.php b/lib/SP/Html/DataGrid/DataGridDataBase.php index bcb00857..8a06a862 100644 --- a/lib/SP/Html/DataGrid/DataGridDataBase.php +++ b/lib/SP/Html/DataGrid/DataGridDataBase.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridDataInterface.php b/lib/SP/Html/DataGrid/DataGridDataInterface.php index 84709fba..47ba1d68 100644 --- a/lib/SP/Html/DataGrid/DataGridDataInterface.php +++ b/lib/SP/Html/DataGrid/DataGridDataInterface.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridHeader.php b/lib/SP/Html/DataGrid/DataGridHeader.php index a2014804..a3a78646 100644 --- a/lib/SP/Html/DataGrid/DataGridHeader.php +++ b/lib/SP/Html/DataGrid/DataGridHeader.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridHeaderBase.php b/lib/SP/Html/DataGrid/DataGridHeaderBase.php index d8addc44..56aca157 100644 --- a/lib/SP/Html/DataGrid/DataGridHeaderBase.php +++ b/lib/SP/Html/DataGrid/DataGridHeaderBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridHeaderInterface.php b/lib/SP/Html/DataGrid/DataGridHeaderInterface.php index d65ef0e7..caa9c6e0 100644 --- a/lib/SP/Html/DataGrid/DataGridHeaderInterface.php +++ b/lib/SP/Html/DataGrid/DataGridHeaderInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridHeaderSort.php b/lib/SP/Html/DataGrid/DataGridHeaderSort.php index 35acac71..95e27ac1 100644 --- a/lib/SP/Html/DataGrid/DataGridHeaderSort.php +++ b/lib/SP/Html/DataGrid/DataGridHeaderSort.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridInterface.php b/lib/SP/Html/DataGrid/DataGridInterface.php index ce3505dd..1a7aaba0 100644 --- a/lib/SP/Html/DataGrid/DataGridInterface.php +++ b/lib/SP/Html/DataGrid/DataGridInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridPager.php b/lib/SP/Html/DataGrid/DataGridPager.php index 28e995e8..9f71c0b2 100644 --- a/lib/SP/Html/DataGrid/DataGridPager.php +++ b/lib/SP/Html/DataGrid/DataGridPager.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridPagerBase.php b/lib/SP/Html/DataGrid/DataGridPagerBase.php index ee037853..160288eb 100644 --- a/lib/SP/Html/DataGrid/DataGridPagerBase.php +++ b/lib/SP/Html/DataGrid/DataGridPagerBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridPagerInterface.php b/lib/SP/Html/DataGrid/DataGridPagerInterface.php index 854e455e..6ff97787 100644 --- a/lib/SP/Html/DataGrid/DataGridPagerInterface.php +++ b/lib/SP/Html/DataGrid/DataGridPagerInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridSort.php b/lib/SP/Html/DataGrid/DataGridSort.php index e60a486f..4719fdb9 100644 --- a/lib/SP/Html/DataGrid/DataGridSort.php +++ b/lib/SP/Html/DataGrid/DataGridSort.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridSortInterface.php b/lib/SP/Html/DataGrid/DataGridSortInterface.php index 850a073d..892c0768 100644 --- a/lib/SP/Html/DataGrid/DataGridSortInterface.php +++ b/lib/SP/Html/DataGrid/DataGridSortInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/DataGrid/DataGridTab.php b/lib/SP/Html/DataGrid/DataGridTab.php index b2887b46..a007f8c3 100644 --- a/lib/SP/Html/DataGrid/DataGridTab.php +++ b/lib/SP/Html/DataGrid/DataGridTab.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/Html.php b/lib/SP/Html/Html.php index ec3b275b..13d646b0 100644 --- a/lib/SP/Html/Html.php +++ b/lib/SP/Html/Html.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Html/Minify.php b/lib/SP/Html/Minify.php index 7992a65b..8a383272 100644 --- a/lib/SP/Html/Minify.php +++ b/lib/SP/Html/Minify.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Http/Cookies.php b/lib/SP/Http/Cookies.php index a67e9eb5..d080b187 100644 --- a/lib/SP/Http/Cookies.php +++ b/lib/SP/Http/Cookies.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Http/JsonResponse.php b/lib/SP/Http/JsonResponse.php index 2657c8e6..f8b4bce3 100644 --- a/lib/SP/Http/JsonResponse.php +++ b/lib/SP/Http/JsonResponse.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Http/Message.php b/lib/SP/Http/Message.php index 022dcfc9..3954293b 100644 --- a/lib/SP/Http/Message.php +++ b/lib/SP/Http/Message.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Http/Request.php b/lib/SP/Http/Request.php index 561e1111..97546502 100644 --- a/lib/SP/Http/Request.php +++ b/lib/SP/Http/Request.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -24,11 +24,9 @@ namespace SP\Http; -use SP\Bootstrap; use SP\Core\CryptPKI; use SP\Core\Init; use SP\Html\Html; -use SP\Util\HttpUtil; /** * Clase Request para la gestión de peticiones HTTP diff --git a/lib/SP/Http/Response.php b/lib/SP/Http/Response.php index c97e9150..0ecea327 100644 --- a/lib/SP/Http/Response.php +++ b/lib/SP/Http/Response.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Http/XMLRPCResponseParse.php b/lib/SP/Http/XMLRPCResponseParse.php index f22d0547..fa22408a 100644 --- a/lib/SP/Http/XMLRPCResponseParse.php +++ b/lib/SP/Http/XMLRPCResponseParse.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Log/AbstractLogger.php b/lib/SP/Log/AbstractLogger.php index 3244db77..1987dfa1 100644 --- a/lib/SP/Log/AbstractLogger.php +++ b/lib/SP/Log/AbstractLogger.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Log/ActionLog.php b/lib/SP/Log/ActionLog.php index f2509a6b..101d6bce 100644 --- a/lib/SP/Log/ActionLog.php +++ b/lib/SP/Log/ActionLog.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Log/Email.php b/lib/SP/Log/Email.php index b6c95694..310eb50e 100644 --- a/lib/SP/Log/Email.php +++ b/lib/SP/Log/Email.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Log/Log.php b/lib/SP/Log/Log.php index 9922546d..73cd9903 100644 --- a/lib/SP/Log/Log.php +++ b/lib/SP/Log/Log.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Log/LogLevel.php b/lib/SP/Log/LogLevel.php index fa84f0f3..6291b84b 100644 --- a/lib/SP/Log/LogLevel.php +++ b/lib/SP/Log/LogLevel.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Log/LogUtil.php b/lib/SP/Log/LogUtil.php index b3f0a980..1372af90 100644 --- a/lib/SP/Log/LogUtil.php +++ b/lib/SP/Log/LogUtil.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Log/LoggerInterface.php b/lib/SP/Log/LoggerInterface.php index e652354a..57a85268 100644 --- a/lib/SP/Log/LoggerInterface.php +++ b/lib/SP/Log/LoggerInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Log/Syslog.php b/lib/SP/Log/Syslog.php index 03e62f81..28529721 100644 --- a/lib/SP/Log/Syslog.php +++ b/lib/SP/Log/Syslog.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/ApiTokens/ApiToken.php b/lib/SP/Mgmt/ApiTokens/ApiToken.php index 07b3a987..f23a43a3 100644 --- a/lib/SP/Mgmt/ApiTokens/ApiToken.php +++ b/lib/SP/Mgmt/ApiTokens/ApiToken.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/ApiTokens/ApiTokenBase.php b/lib/SP/Mgmt/ApiTokens/ApiTokenBase.php index 799a2223..0ec8595d 100644 --- a/lib/SP/Mgmt/ApiTokens/ApiTokenBase.php +++ b/lib/SP/Mgmt/ApiTokens/ApiTokenBase.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/ApiTokens/ApiTokenSearch.php b/lib/SP/Mgmt/ApiTokens/ApiTokenSearch.php index e1f3bb78..7c2562cf 100644 --- a/lib/SP/Mgmt/ApiTokens/ApiTokenSearch.php +++ b/lib/SP/Mgmt/ApiTokens/ApiTokenSearch.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/ApiTokens/ApiTokensUtil.php b/lib/SP/Mgmt/ApiTokens/ApiTokensUtil.php index 862b4714..c941a789 100644 --- a/lib/SP/Mgmt/ApiTokens/ApiTokensUtil.php +++ b/lib/SP/Mgmt/ApiTokens/ApiTokensUtil.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Categories/Category.php b/lib/SP/Mgmt/Categories/Category.php index c16bcc49..e85a10a7 100644 --- a/lib/SP/Mgmt/Categories/Category.php +++ b/lib/SP/Mgmt/Categories/Category.php @@ -3,9 +3,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Categories/CategoryBase.php b/lib/SP/Mgmt/Categories/CategoryBase.php index bc05b703..b6f5cf91 100644 --- a/lib/SP/Mgmt/Categories/CategoryBase.php +++ b/lib/SP/Mgmt/Categories/CategoryBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Categories/CategorySearch.php b/lib/SP/Mgmt/Categories/CategorySearch.php index 5cef0005..1b549e34 100644 --- a/lib/SP/Mgmt/Categories/CategorySearch.php +++ b/lib/SP/Mgmt/Categories/CategorySearch.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/CustomFields/CustomField.php b/lib/SP/Mgmt/CustomFields/CustomField.php index 31edcb87..831702b2 100644 --- a/lib/SP/Mgmt/CustomFields/CustomField.php +++ b/lib/SP/Mgmt/CustomFields/CustomField.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/CustomFields/CustomFieldBase.php b/lib/SP/Mgmt/CustomFields/CustomFieldBase.php index 462bd761..3c8f7691 100644 --- a/lib/SP/Mgmt/CustomFields/CustomFieldBase.php +++ b/lib/SP/Mgmt/CustomFields/CustomFieldBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/CustomFields/CustomFieldDef.php b/lib/SP/Mgmt/CustomFields/CustomFieldDef.php index e6533036..8211648b 100644 --- a/lib/SP/Mgmt/CustomFields/CustomFieldDef.php +++ b/lib/SP/Mgmt/CustomFields/CustomFieldDef.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/CustomFields/CustomFieldDefSearch.php b/lib/SP/Mgmt/CustomFields/CustomFieldDefSearch.php index 83a8a1f3..fdec2caf 100644 --- a/lib/SP/Mgmt/CustomFields/CustomFieldDefSearch.php +++ b/lib/SP/Mgmt/CustomFields/CustomFieldDefSearch.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/CustomFields/CustomFieldTypes.php b/lib/SP/Mgmt/CustomFields/CustomFieldTypes.php index d17bdc7c..b0909b05 100644 --- a/lib/SP/Mgmt/CustomFields/CustomFieldTypes.php +++ b/lib/SP/Mgmt/CustomFields/CustomFieldTypes.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/CustomFields/CustomFieldsUtil.php b/lib/SP/Mgmt/CustomFields/CustomFieldsUtil.php index e13c2309..6f946eaf 100644 --- a/lib/SP/Mgmt/CustomFields/CustomFieldsUtil.php +++ b/lib/SP/Mgmt/CustomFields/CustomFieldsUtil.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Customers/Customer.php b/lib/SP/Mgmt/Customers/Customer.php index 9d0f4d71..27c6fd7d 100644 --- a/lib/SP/Mgmt/Customers/Customer.php +++ b/lib/SP/Mgmt/Customers/Customer.php @@ -3,9 +3,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Customers/CustomerBase.php b/lib/SP/Mgmt/Customers/CustomerBase.php index 45493b00..4ce773b6 100644 --- a/lib/SP/Mgmt/Customers/CustomerBase.php +++ b/lib/SP/Mgmt/Customers/CustomerBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Customers/CustomerSearch.php b/lib/SP/Mgmt/Customers/CustomerSearch.php index 97ecd7b9..5173346d 100644 --- a/lib/SP/Mgmt/Customers/CustomerSearch.php +++ b/lib/SP/Mgmt/Customers/CustomerSearch.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Files/File.php b/lib/SP/Mgmt/Files/File.php index 4a0a58ce..8678641f 100644 --- a/lib/SP/Mgmt/Files/File.php +++ b/lib/SP/Mgmt/Files/File.php @@ -3,9 +3,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Files/FileBase.php b/lib/SP/Mgmt/Files/FileBase.php index 10a100c9..fa34709e 100644 --- a/lib/SP/Mgmt/Files/FileBase.php +++ b/lib/SP/Mgmt/Files/FileBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Files/FileSearch.php b/lib/SP/Mgmt/Files/FileSearch.php index b80a1661..bfbb3f45 100644 --- a/lib/SP/Mgmt/Files/FileSearch.php +++ b/lib/SP/Mgmt/Files/FileSearch.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -24,11 +24,11 @@ namespace SP\Mgmt\Files; +use SP\DataModel\FileExtData; use SP\DataModel\ItemSearchData; use SP\Mgmt\ItemSearchInterface; use SP\Storage\DbWrapper; use SP\Storage\QueryData; -use SP\DataModel\FileExtData; /** * Class FileSearch diff --git a/lib/SP/Mgmt/Files/FileUtil.php b/lib/SP/Mgmt/Files/FileUtil.php index 273dfd3d..cc94a401 100644 --- a/lib/SP/Mgmt/Files/FileUtil.php +++ b/lib/SP/Mgmt/Files/FileUtil.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Groups/Group.php b/lib/SP/Mgmt/Groups/Group.php index f31fec1f..14f515a5 100644 --- a/lib/SP/Mgmt/Groups/Group.php +++ b/lib/SP/Mgmt/Groups/Group.php @@ -3,9 +3,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Groups/GroupAccounts.php b/lib/SP/Mgmt/Groups/GroupAccounts.php index f4439ad5..452561e3 100644 --- a/lib/SP/Mgmt/Groups/GroupAccounts.php +++ b/lib/SP/Mgmt/Groups/GroupAccounts.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Groups/GroupAccountsBase.php b/lib/SP/Mgmt/Groups/GroupAccountsBase.php index 240a9a94..0ba65591 100644 --- a/lib/SP/Mgmt/Groups/GroupAccountsBase.php +++ b/lib/SP/Mgmt/Groups/GroupAccountsBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Groups/GroupAccountsUtil.php b/lib/SP/Mgmt/Groups/GroupAccountsUtil.php index 0212dd71..53765388 100644 --- a/lib/SP/Mgmt/Groups/GroupAccountsUtil.php +++ b/lib/SP/Mgmt/Groups/GroupAccountsUtil.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Groups/GroupBase.php b/lib/SP/Mgmt/Groups/GroupBase.php index affe9c7f..e370134a 100644 --- a/lib/SP/Mgmt/Groups/GroupBase.php +++ b/lib/SP/Mgmt/Groups/GroupBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Groups/GroupSearch.php b/lib/SP/Mgmt/Groups/GroupSearch.php index 396a3f35..3649ffe9 100644 --- a/lib/SP/Mgmt/Groups/GroupSearch.php +++ b/lib/SP/Mgmt/Groups/GroupSearch.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Groups/GroupUsers.php b/lib/SP/Mgmt/Groups/GroupUsers.php index 680311d1..c5ec5dcc 100644 --- a/lib/SP/Mgmt/Groups/GroupUsers.php +++ b/lib/SP/Mgmt/Groups/GroupUsers.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Groups/GroupUsersBase.php b/lib/SP/Mgmt/Groups/GroupUsersBase.php index 79f5f9b0..5a50f9f7 100644 --- a/lib/SP/Mgmt/Groups/GroupUsersBase.php +++ b/lib/SP/Mgmt/Groups/GroupUsersBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Groups/GroupUtil.php b/lib/SP/Mgmt/Groups/GroupUtil.php index 39df6986..e49402cc 100644 --- a/lib/SP/Mgmt/Groups/GroupUtil.php +++ b/lib/SP/Mgmt/Groups/GroupUtil.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/ItemBaseInterface.php b/lib/SP/Mgmt/ItemBaseInterface.php index 38b2d168..c5995e68 100644 --- a/lib/SP/Mgmt/ItemBaseInterface.php +++ b/lib/SP/Mgmt/ItemBaseInterface.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/ItemBaseTrait.php b/lib/SP/Mgmt/ItemBaseTrait.php index 5325eec3..514b410b 100644 --- a/lib/SP/Mgmt/ItemBaseTrait.php +++ b/lib/SP/Mgmt/ItemBaseTrait.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/ItemInterface.php b/lib/SP/Mgmt/ItemInterface.php index 5a27628c..912f280d 100644 --- a/lib/SP/Mgmt/ItemInterface.php +++ b/lib/SP/Mgmt/ItemInterface.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/ItemSearchInterface.php b/lib/SP/Mgmt/ItemSearchInterface.php index 1b3561dc..07679e32 100644 --- a/lib/SP/Mgmt/ItemSearchInterface.php +++ b/lib/SP/Mgmt/ItemSearchInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/ItemSelectInterface.php b/lib/SP/Mgmt/ItemSelectInterface.php index 069a8b4c..1fe7644c 100644 --- a/lib/SP/Mgmt/ItemSelectInterface.php +++ b/lib/SP/Mgmt/ItemSelectInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/ItemTrait.php b/lib/SP/Mgmt/ItemTrait.php index 78fd41bc..c633c555 100644 --- a/lib/SP/Mgmt/ItemTrait.php +++ b/lib/SP/Mgmt/ItemTrait.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Notices/Notice.php b/lib/SP/Mgmt/Notices/Notice.php index 8dea30d3..80cddf8e 100644 --- a/lib/SP/Mgmt/Notices/Notice.php +++ b/lib/SP/Mgmt/Notices/Notice.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -86,7 +86,7 @@ class Notice extends NoticeBase implements ItemInterface { $query = 'DELETE FROM Notification WHERE id = ? AND BIN(sticky) = 0 LIMIT 1'; - if (SessionFactory::getUserData()->isIsAdminApp()) { + if (SessionFactory::getUserData()->isAdminApp()) { $query = 'DELETE FROM Notification WHERE id = ? LIMIT 1'; } diff --git a/lib/SP/Mgmt/Notices/NoticeBase.php b/lib/SP/Mgmt/Notices/NoticeBase.php index 8543b477..daacd336 100644 --- a/lib/SP/Mgmt/Notices/NoticeBase.php +++ b/lib/SP/Mgmt/Notices/NoticeBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Notices/NoticeSearch.php b/lib/SP/Mgmt/Notices/NoticeSearch.php index 423129cb..828d08d4 100644 --- a/lib/SP/Mgmt/Notices/NoticeSearch.php +++ b/lib/SP/Mgmt/Notices/NoticeSearch.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Plugins/Plugin.php b/lib/SP/Mgmt/Plugins/Plugin.php index a839a72d..e0e27a38 100644 --- a/lib/SP/Mgmt/Plugins/Plugin.php +++ b/lib/SP/Mgmt/Plugins/Plugin.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Plugins/PluginBase.php b/lib/SP/Mgmt/Plugins/PluginBase.php index b85981b3..2c959f93 100644 --- a/lib/SP/Mgmt/Plugins/PluginBase.php +++ b/lib/SP/Mgmt/Plugins/PluginBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Plugins/PluginSearch.php b/lib/SP/Mgmt/Plugins/PluginSearch.php index cd5e11fa..f992a2ec 100644 --- a/lib/SP/Mgmt/Plugins/PluginSearch.php +++ b/lib/SP/Mgmt/Plugins/PluginSearch.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Profiles/Profile.php b/lib/SP/Mgmt/Profiles/Profile.php index 4d3824ea..9be173c9 100644 --- a/lib/SP/Mgmt/Profiles/Profile.php +++ b/lib/SP/Mgmt/Profiles/Profile.php @@ -3,9 +3,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Profiles/ProfileBase.php b/lib/SP/Mgmt/Profiles/ProfileBase.php index 20efcd6d..e7029e89 100644 --- a/lib/SP/Mgmt/Profiles/ProfileBase.php +++ b/lib/SP/Mgmt/Profiles/ProfileBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Profiles/ProfileSearch.php b/lib/SP/Mgmt/Profiles/ProfileSearch.php index 4e08ef2d..5311c666 100644 --- a/lib/SP/Mgmt/Profiles/ProfileSearch.php +++ b/lib/SP/Mgmt/Profiles/ProfileSearch.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Profiles/ProfileUtil.php b/lib/SP/Mgmt/Profiles/ProfileUtil.php index 6b4aff2e..8b4bde5a 100644 --- a/lib/SP/Mgmt/Profiles/ProfileUtil.php +++ b/lib/SP/Mgmt/Profiles/ProfileUtil.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/PublicLinks/PublicLink.php b/lib/SP/Mgmt/PublicLinks/PublicLink.php index 315bb0bc..702367d7 100644 --- a/lib/SP/Mgmt/PublicLinks/PublicLink.php +++ b/lib/SP/Mgmt/PublicLinks/PublicLink.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/PublicLinks/PublicLinkBase.php b/lib/SP/Mgmt/PublicLinks/PublicLinkBase.php index d5903d5b..3230b2c6 100644 --- a/lib/SP/Mgmt/PublicLinks/PublicLinkBase.php +++ b/lib/SP/Mgmt/PublicLinks/PublicLinkBase.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -27,7 +27,6 @@ namespace SP\Mgmt\PublicLinks; defined('APP_ROOT') || die(); use SP\Account\Account; -use SP\Config\Config; use SP\Config\ConfigData; use SP\Core\Crypt\Crypt; use SP\Core\Crypt\Session as CryptSession; diff --git a/lib/SP/Mgmt/PublicLinks/PublicLinkSearch.php b/lib/SP/Mgmt/PublicLinks/PublicLinkSearch.php index a4779eb4..f5785f8d 100644 --- a/lib/SP/Mgmt/PublicLinks/PublicLinkSearch.php +++ b/lib/SP/Mgmt/PublicLinks/PublicLinkSearch.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Tags/Tag.php b/lib/SP/Mgmt/Tags/Tag.php index ebd13215..531ee47f 100644 --- a/lib/SP/Mgmt/Tags/Tag.php +++ b/lib/SP/Mgmt/Tags/Tag.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Tags/TagBase.php b/lib/SP/Mgmt/Tags/TagBase.php index adc4a670..84a488f0 100644 --- a/lib/SP/Mgmt/Tags/TagBase.php +++ b/lib/SP/Mgmt/Tags/TagBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Tags/TagSearch.php b/lib/SP/Mgmt/Tags/TagSearch.php index f8404742..c3141a54 100644 --- a/lib/SP/Mgmt/Tags/TagSearch.php +++ b/lib/SP/Mgmt/Tags/TagSearch.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Tracks/Track.php b/lib/SP/Mgmt/Tracks/Track.php index e3bf2b50..8a020fa7 100644 --- a/lib/SP/Mgmt/Tracks/Track.php +++ b/lib/SP/Mgmt/Tracks/Track.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Tracks/TrackBase.php b/lib/SP/Mgmt/Tracks/TrackBase.php index 1ad6a0f5..272c874c 100644 --- a/lib/SP/Mgmt/Tracks/TrackBase.php +++ b/lib/SP/Mgmt/Tracks/TrackBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Users/User.php b/lib/SP/Mgmt/Users/User.php index 785ccf6b..40727ed5 100644 --- a/lib/SP/Mgmt/Users/User.php +++ b/lib/SP/Mgmt/Users/User.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -84,10 +84,10 @@ class User extends UserBase implements ItemInterface, ItemSelectInterface $Data->addParam($this->itemData->getNotes()); $Data->addParam($this->itemData->getUserGroupId()); $Data->addParam($this->itemData->getUserProfileId()); - $Data->addParam($this->itemData->isIsAdminApp()); - $Data->addParam($this->itemData->isIsAdminAcc()); - $Data->addParam($this->itemData->isIsDisabled()); - $Data->addParam($this->itemData->isIsChangePass()); + $Data->addParam($this->itemData->isAdminApp()); + $Data->addParam($this->itemData->isAdminAcc()); + $Data->addParam($this->itemData->isDisabled()); + $Data->addParam($this->itemData->isChangePass()); $Data->addParam(Hash::hashKey($this->itemData->getPass())); $Data->setOnErrorMessage(__('Error al crear el usuario', false)); @@ -180,10 +180,10 @@ class User extends UserBase implements ItemInterface, ItemSelectInterface $Data->addParam($this->itemData->getNotes()); $Data->addParam($this->itemData->getUserGroupId()); $Data->addParam($this->itemData->getUserProfileId()); - $Data->addParam($this->itemData->isIsAdminApp()); - $Data->addParam($this->itemData->isIsAdminAcc()); - $Data->addParam($this->itemData->isIsDisabled()); - $Data->addParam($this->itemData->isIsChangePass()); + $Data->addParam($this->itemData->isAdminApp()); + $Data->addParam($this->itemData->isAdminAcc()); + $Data->addParam($this->itemData->isDisabled()); + $Data->addParam($this->itemData->isChangePass()); $Data->addParam($this->itemData->getId()); $Data->setOnErrorMessage(__('Error al actualizar el usuario', false)); diff --git a/lib/SP/Mgmt/Users/UserBase.php b/lib/SP/Mgmt/Users/UserBase.php index fa1eedc8..599888f6 100644 --- a/lib/SP/Mgmt/Users/UserBase.php +++ b/lib/SP/Mgmt/Users/UserBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -26,7 +26,6 @@ namespace SP\Mgmt\Users; defined('APP_ROOT') || die(); -use SP\Config\Config; use SP\Config\ConfigData; use SP\Core\Exceptions\InvalidClassException; use SP\DataModel\UserData; diff --git a/lib/SP/Mgmt/Users/UserLdap.php b/lib/SP/Mgmt/Users/UserLdap.php index a171e6f9..0438786a 100644 --- a/lib/SP/Mgmt/Users/UserLdap.php +++ b/lib/SP/Mgmt/Users/UserLdap.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Users/UserLdapSync.php b/lib/SP/Mgmt/Users/UserLdapSync.php index 3bf8c88d..34344330 100644 --- a/lib/SP/Mgmt/Users/UserLdapSync.php +++ b/lib/SP/Mgmt/Users/UserLdapSync.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -27,7 +27,6 @@ namespace SP\Mgmt\Users; use SP\Auth\Ldap\LdapMsAds; use SP\Auth\Ldap\LdapStd; use SP\Bootstrap; -use SP\Config\Config; use SP\Core\Exceptions\SPException; use SP\DataModel\UserData; use SP\Log\Log; diff --git a/lib/SP/Mgmt/Users/UserMigrate.php b/lib/SP/Mgmt/Users/UserMigrate.php index f3c0102f..ab6e14b8 100644 --- a/lib/SP/Mgmt/Users/UserMigrate.php +++ b/lib/SP/Mgmt/Users/UserMigrate.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Users/UserPass.php b/lib/SP/Mgmt/Users/UserPass.php index b71e893c..09ac6262 100644 --- a/lib/SP/Mgmt/Users/UserPass.php +++ b/lib/SP/Mgmt/Users/UserPass.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Users/UserPassRecover.php b/lib/SP/Mgmt/Users/UserPassRecover.php index 2c0df93c..d722a42d 100644 --- a/lib/SP/Mgmt/Users/UserPassRecover.php +++ b/lib/SP/Mgmt/Users/UserPassRecover.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Users/UserPassRecoverBase.php b/lib/SP/Mgmt/Users/UserPassRecoverBase.php index c96717f5..56a878af 100644 --- a/lib/SP/Mgmt/Users/UserPassRecoverBase.php +++ b/lib/SP/Mgmt/Users/UserPassRecoverBase.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Users/UserPreferences.php b/lib/SP/Mgmt/Users/UserPreferences.php index 6590695c..f847c951 100644 --- a/lib/SP/Mgmt/Users/UserPreferences.php +++ b/lib/SP/Mgmt/Users/UserPreferences.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Users/UserPreferencesBase.php b/lib/SP/Mgmt/Users/UserPreferencesBase.php index 284e7e67..8c4e420a 100644 --- a/lib/SP/Mgmt/Users/UserPreferencesBase.php +++ b/lib/SP/Mgmt/Users/UserPreferencesBase.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Users/UserPreferencesUtil.php b/lib/SP/Mgmt/Users/UserPreferencesUtil.php index 11399b19..59204bbb 100644 --- a/lib/SP/Mgmt/Users/UserPreferencesUtil.php +++ b/lib/SP/Mgmt/Users/UserPreferencesUtil.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mgmt/Users/UserSSO.php b/lib/SP/Mgmt/Users/UserSSO.php index 9046e572..59041a89 100644 --- a/lib/SP/Mgmt/Users/UserSSO.php +++ b/lib/SP/Mgmt/Users/UserSSO.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -102,7 +102,7 @@ class UserSSO extends User $Data->addParam(__('Usuario de SSO')); $Data->addParam($groupId); $Data->addParam($profileId); - $Data->addParam((int)$this->itemData->isIsDisabled()); + $Data->addParam((int)$this->itemData->isDisabled()); $Data->addParam(Hash::hashKey($this->itemData->getLoginPass())); $Data->setOnErrorMessage(__('Error al guardar los datos de SSO', false)); diff --git a/lib/SP/Mgmt/Users/UserSearch.php b/lib/SP/Mgmt/Users/UserSearch.php index bd805086..51ee9397 100644 --- a/lib/SP/Mgmt/Users/UserSearch.php +++ b/lib/SP/Mgmt/Users/UserSearch.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -58,7 +58,7 @@ class UserSearch extends UserBase implements ItemSearchInterface $Data->setOrder('user_name'); if ($SearchData->getSeachString() !== '') { - if (SessionFactory::getUserData()->isIsAdminApp()) { + if (SessionFactory::getUserData()->isAdminApp()) { $Data->setWhere('user_name LIKE ? OR user_login LIKE ?'); } else { $Data->setWhere('user_name LIKE ? OR user_login LIKE ? AND user_isAdminApp = 0'); @@ -67,7 +67,7 @@ class UserSearch extends UserBase implements ItemSearchInterface $search = '%' . $SearchData->getSeachString() . '%'; $Data->addParam($search); $Data->addParam($search); - } elseif (!SessionFactory::getUserData()->isIsAdminApp()) { + } elseif (!SessionFactory::getUserData()->isAdminApp()) { $Data->setWhere('user_isAdminApp = 0'); } diff --git a/lib/SP/Mgmt/Users/UserUtil.php b/lib/SP/Mgmt/Users/UserUtil.php index d78e5905..56bcc74e 100644 --- a/lib/SP/Mgmt/Users/UserUtil.php +++ b/lib/SP/Mgmt/Users/UserUtil.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mvc/Controller/ControllerTrait.php b/lib/SP/Mvc/Controller/ControllerTrait.php index 52f4522f..25b10b33 100644 --- a/lib/SP/Mvc/Controller/ControllerTrait.php +++ b/lib/SP/Mvc/Controller/ControllerTrait.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Mvc/Controller/CrudControllerInterface.php b/lib/SP/Mvc/Controller/CrudControllerInterface.php index 77856cb3..232f0bcf 100644 --- a/lib/SP/Mvc/Controller/CrudControllerInterface.php +++ b/lib/SP/Mvc/Controller/CrudControllerInterface.php @@ -1,4 +1,26 @@ . + */ namespace SP\Mvc\Controller; diff --git a/lib/SP/Mvc/Model/QueryAssignment.php b/lib/SP/Mvc/Model/QueryAssignment.php index 91ca44ed..335225dd 100644 --- a/lib/SP/Mvc/Model/QueryAssignment.php +++ b/lib/SP/Mvc/Model/QueryAssignment.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Mvc/Model/QueryCondition.php b/lib/SP/Mvc/Model/QueryCondition.php index bc213358..7cfcd910 100644 --- a/lib/SP/Mvc/Model/QueryCondition.php +++ b/lib/SP/Mvc/Model/QueryCondition.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Mvc/View/Components/DataTab.php b/lib/SP/Mvc/View/Components/DataTab.php index 6ed9e0e6..6afd80dc 100644 --- a/lib/SP/Mvc/View/Components/DataTab.php +++ b/lib/SP/Mvc/View/Components/DataTab.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Mvc/View/Components/ItemAdapterInterface.php b/lib/SP/Mvc/View/Components/ItemAdapterInterface.php index 2701012f..6876877c 100644 --- a/lib/SP/Mvc/View/Components/ItemAdapterInterface.php +++ b/lib/SP/Mvc/View/Components/ItemAdapterInterface.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Mvc/View/Components/SelectItem.php b/lib/SP/Mvc/View/Components/SelectItem.php index 96109523..87230a69 100644 --- a/lib/SP/Mvc/View/Components/SelectItem.php +++ b/lib/SP/Mvc/View/Components/SelectItem.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Mvc/View/Components/SelectItemAdapter.php b/lib/SP/Mvc/View/Components/SelectItemAdapter.php index 14c07811..37d539e8 100644 --- a/lib/SP/Mvc/View/Components/SelectItemAdapter.php +++ b/lib/SP/Mvc/View/Components/SelectItemAdapter.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Mvc/View/Template.php b/lib/SP/Mvc/View/Template.php index 385fbd50..a0774adc 100644 --- a/lib/SP/Mvc/View/Template.php +++ b/lib/SP/Mvc/View/Template.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Mvc/View/View.php b/lib/SP/Mvc/View/View.php index c52be2fa..13753062 100644 --- a/lib/SP/Mvc/View/View.php +++ b/lib/SP/Mvc/View/View.php @@ -1,20 +1,25 @@ . + * 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 . */ namespace SP\Lib\Mvc\View; diff --git a/lib/SP/Mvc/View/ViewInterface.php b/lib/SP/Mvc/View/ViewInterface.php index f91b9f17..3729d457 100644 --- a/lib/SP/Mvc/View/ViewInterface.php +++ b/lib/SP/Mvc/View/ViewInterface.php @@ -1,4 +1,26 @@ . + */ namespace SP\Lib\Mvc\View; diff --git a/lib/SP/Providers/Auth/Auth.php b/lib/SP/Providers/Auth/Auth.php index 1460f170..fb74891c 100644 --- a/lib/SP/Providers/Auth/Auth.php +++ b/lib/SP/Providers/Auth/Auth.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Providers/Auth/AuthDataBase.php b/lib/SP/Providers/Auth/AuthDataBase.php index 5b4df034..c6c8539c 100644 --- a/lib/SP/Providers/Auth/AuthDataBase.php +++ b/lib/SP/Providers/Auth/AuthDataBase.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Providers/Auth/AuthInterface.php b/lib/SP/Providers/Auth/AuthInterface.php index c37b1531..c1044778 100644 --- a/lib/SP/Providers/Auth/AuthInterface.php +++ b/lib/SP/Providers/Auth/AuthInterface.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Providers/Auth/AuthResult.php b/lib/SP/Providers/Auth/AuthResult.php index 7115bcd9..b04ff03f 100644 --- a/lib/SP/Providers/Auth/AuthResult.php +++ b/lib/SP/Providers/Auth/AuthResult.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Providers/Auth/AuthUtil.php b/lib/SP/Providers/Auth/AuthUtil.php index 9a4072a7..ef8da124 100644 --- a/lib/SP/Providers/Auth/AuthUtil.php +++ b/lib/SP/Providers/Auth/AuthUtil.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. @@ -24,17 +24,6 @@ namespace SP\Providers\Auth; -use Defuse\Crypto\Exception\EnvironmentIsBrokenException; -use PHPMailer\PHPMailer\Exception; -use SP\Core\Init; -use SP\Core\Messages\LogMessage; -use SP\DataModel\UserData; -use SP\DataModel\UserPassRecoverData; -use SP\Html\Html; -use SP\Log\Email; -use SP\Mgmt\Users\UserPassRecover; -use SP\Util\Util; - /** * Class AuthUtil * @@ -42,47 +31,6 @@ use SP\Util\Util; */ class AuthUtil { - /** - * Proceso para la recuperación de clave. - * - * @param UserData $UserData - * @return bool - * @throws \SP\Core\Exceptions\SPException - */ - public static function mailPassRecover(UserData $UserData) - { - try { - if (!$UserData->isIsDisabled() - && !$UserData->isIsLdap() - && !UserPassRecover::checkPassRecoverLimit($UserData) - ) { - $hash = Util::generateRandomBytes(16); - - $LogMessage = new LogMessage(); - $LogMessage->setAction(__('Cambio de Clave')); - $LogMessage->addDescriptionHtml(__('Se ha solicitado el cambio de su clave de usuario.')); - $LogMessage->addDescriptionLine(); - $LogMessage->addDescription(__('Para completar el proceso es necesario que acceda a la siguiente URL:')); - $LogMessage->addDescriptionLine(); - $LogMessage->addDescription(Html::anchorText(Init::$WEBURI . '/index.php?a=passreset&h=' . $hash . '&t=' . time())); - $LogMessage->addDescriptionLine(); - $LogMessage->addDescription(__('Si no ha solicitado esta acción, ignore este mensaje.')); - - $UserPassRecoverData = new UserPassRecoverData(); - $UserPassRecoverData->setUserId($UserData->getId()); - $UserPassRecoverData->setHash($hash); - - return (Email::sendEmail($LogMessage, $UserData->getEmail(), false) && UserPassRecover::getItem($UserPassRecoverData)->add()); - } - } catch (EnvironmentIsBrokenException $e) { - debugLog($e->getMessage()); - } catch (Exception $e) { - debugLog($e->getMessage()); - } - - return false; - } - /** * Devuelve el typo de autentificación del servidor web * diff --git a/lib/SP/Providers/Auth/Browser/Browser.php b/lib/SP/Providers/Auth/Browser/Browser.php index 02a06f20..9bbecfd4 100644 --- a/lib/SP/Providers/Auth/Browser/Browser.php +++ b/lib/SP/Providers/Auth/Browser/Browser.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Providers/Auth/Browser/BrowserAuthData.php b/lib/SP/Providers/Auth/Browser/BrowserAuthData.php index d42cc15d..d8bae0ac 100644 --- a/lib/SP/Providers/Auth/Browser/BrowserAuthData.php +++ b/lib/SP/Providers/Auth/Browser/BrowserAuthData.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Providers/Auth/Database/Database.php b/lib/SP/Providers/Auth/Database/Database.php index c90f3802..341f9e11 100644 --- a/lib/SP/Providers/Auth/Database/Database.php +++ b/lib/SP/Providers/Auth/Database/Database.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Providers/Auth/Database/DatabaseAuthData.php b/lib/SP/Providers/Auth/Database/DatabaseAuthData.php index c0f9fa91..602b952d 100644 --- a/lib/SP/Providers/Auth/Database/DatabaseAuthData.php +++ b/lib/SP/Providers/Auth/Database/DatabaseAuthData.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Providers/Auth/Ldap/LdapAuthData.php b/lib/SP/Providers/Auth/Ldap/LdapAuthData.php index 61d9504d..2a54224d 100644 --- a/lib/SP/Providers/Auth/Ldap/LdapAuthData.php +++ b/lib/SP/Providers/Auth/Ldap/LdapAuthData.php @@ -3,7 +3,7 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Providers/Auth/Ldap/LdapBase.php b/lib/SP/Providers/Auth/Ldap/LdapBase.php index 60356b8c..dbef4a3c 100644 --- a/lib/SP/Providers/Auth/Ldap/LdapBase.php +++ b/lib/SP/Providers/Auth/Ldap/LdapBase.php @@ -3,7 +3,7 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Providers/Auth/Ldap/LdapInterface.php b/lib/SP/Providers/Auth/Ldap/LdapInterface.php index ef48bbac..cd60298d 100644 --- a/lib/SP/Providers/Auth/Ldap/LdapInterface.php +++ b/lib/SP/Providers/Auth/Ldap/LdapInterface.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Providers/Auth/Ldap/LdapMsAds.php b/lib/SP/Providers/Auth/Ldap/LdapMsAds.php index 6611e73d..f84abdda 100644 --- a/lib/SP/Providers/Auth/Ldap/LdapMsAds.php +++ b/lib/SP/Providers/Auth/Ldap/LdapMsAds.php @@ -3,7 +3,7 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Providers/Auth/Ldap/LdapStd.php b/lib/SP/Providers/Auth/Ldap/LdapStd.php index 271174e9..c3d9bc68 100644 --- a/lib/SP/Providers/Auth/Ldap/LdapStd.php +++ b/lib/SP/Providers/Auth/Ldap/LdapStd.php @@ -3,7 +3,7 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Providers/Auth/Ldap/LdapUtil.php b/lib/SP/Providers/Auth/Ldap/LdapUtil.php index 0f7d7b14..6e13615f 100644 --- a/lib/SP/Providers/Auth/Ldap/LdapUtil.php +++ b/lib/SP/Providers/Auth/Ldap/LdapUtil.php @@ -3,7 +3,7 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Providers/Mail/Mailer.php b/lib/SP/Providers/Mail/Mailer.php new file mode 100644 index 00000000..4f18456e --- /dev/null +++ b/lib/SP/Providers/Mail/Mailer.php @@ -0,0 +1,166 @@ +. + */ + +namespace SP\Providers\Mail; + +use PHPMailer\PHPMailer\Exception; +use PHPMailer\PHPMailer\PHPMailer; +use Psr\Container\ContainerExceptionInterface; +use Psr\Container\NotFoundExceptionInterface; +use SP\Bootstrap; +use SP\Core\Events\Event; +use SP\Core\Events\EventMessage; +use SP\Core\Messages\MailMessage; +use SP\Html\Html; +use SP\Providers\Provider; +use SP\Util\Util; + +/** + * Class Mailer + * + * @package SP\Providers\Mail + */ +class Mailer extends Provider +{ + /** + * @var PHPMailer + */ + private $mailer; + /** + * @var array + */ + private $appInfo; + + /** + * @param string $subject + * @param string $to + * @param MailMessage $mailMessage + * @throws MailerException + */ + public function send($subject, $to, MailMessage $mailMessage) + { + $this->mailer->isHTML(); + $this->mailer->addAddress($to); + $this->mailer->Subject = sprintf('%s - %s', $this->appInfo['appname'], $subject);; + $this->mailer->Body = $mailMessage->setFooter($this->getEmailFooter())->composeHtml(); + + $this->sendMail(); + } + + /** + * Devolver el pie del email con la firma de la aplicación + * + * @return array + */ + protected function getEmailFooter() + { + return [ + '', + '--', + sprintf('%s - %s', $this->appInfo['appname'], $this->appInfo['appdesc']), + Html::anchorText(Bootstrap::$WEBURI) + ]; + } + + /** + * @throws MailerException + */ + private function sendMail() + { + try { + $this->mailer->send(); + + $this->eventDispatcher->notifyEvent('mail.send', new Event($this, + EventMessage::factory() + ->addDescription(__u('Correo enviado')) + ->addDetail(__u('Destinatario'), implode(',', $this->mailer->getToAddresses()))) + ); + } catch (Exception $e) { + processException($e); + + $this->eventDispatcher->notifyEvent('exception', new Event($e)); + + throw new MailerException(__u('Error al enviar correo')); + } + } + + /** + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface + * @throws MailerException + */ + protected function initialize() + { + $this->mailer = $this->getMailer(); + $this->appInfo = Util::getAppInfo(); + } + + /** + * Inicializar la clase PHPMailer. + * + * @return PHPMailer + * @throws ContainerExceptionInterface + * @throws NotFoundExceptionInterface + * @throws MailerException + */ + private function getMailer() + { + try { + $configData = $this->config->getConfigData(); + + $mailer = $this->dic->get(PHPMailer::class); + $mailer->SMTPAutoTLS = false; + $mailer->isSMTP(); + $mailer->CharSet = 'utf-8'; + $mailer->Host = $configData->getMailServer(); + $mailer->Port = $configData->getMailPort(); + + if ($configData->isMailAuthenabled()) { + $mailer->SMTPAuth = true; + $mailer->Username = $configData->getMailUser(); + $mailer->Password = $configData->getMailPass(); + } + + $mailer->SMTPSecure = strtolower($configData->getMailSecurity()); + //$mail->SMTPDebug = 2; + //$mail->Debugoutput = 'error_log'; + + $mailer->setFrom($configData->getMailFrom(), $this->appInfo['appname']); + $mailer->addReplyTo($configData->getMailFrom(), $this->appInfo['appname']); + $mailer->WordWrap = 100; + + return $mailer; + } catch (\Exception $e) { + processException($e); + + throw new MailerException( + __u('No es posible inicializar'), + MailerException::ERROR, + $e->getMessage(), + $e->getCode(), + $e + ); + } + } +} \ No newline at end of file diff --git a/lib/SP/Providers/Mail/MailerException.php b/lib/SP/Providers/Mail/MailerException.php new file mode 100644 index 00000000..508f66ab --- /dev/null +++ b/lib/SP/Providers/Mail/MailerException.php @@ -0,0 +1,37 @@ +. + */ + +namespace SP\Providers\Mail; + +use SP\Core\Exceptions\SPException; + +/** + * Class MailerException + * + * @package SP\Providers\Mail + */ +class MailerException extends SPException +{ + +} \ No newline at end of file diff --git a/lib/SP/Providers/Provider.php b/lib/SP/Providers/Provider.php new file mode 100644 index 00000000..c4021129 --- /dev/null +++ b/lib/SP/Providers/Provider.php @@ -0,0 +1,77 @@ +. + */ + +namespace SP\Providers; + +use Psr\Container\ContainerInterface; +use SP\Bootstrap; +use SP\Config\Config; +use SP\Core\Events\EventDispatcher; +use SP\Core\Session\Session; + +/** + * Class Service + * + * @package SP\Providers + */ +abstract class Provider +{ + const STATUS_INTERNAL_ERROR = 1000; + + /** + * @var Config + */ + protected $config; + /** + * @var Session + */ + protected $session; + /** + * @var EventDispatcher + */ + protected $eventDispatcher; + /** + * @var ContainerInterface + */ + protected $dic; + + /** + * Service constructor. + * + * @throws \Psr\Container\ContainerExceptionInterface + * @throws \Psr\Container\NotFoundExceptionInterface + */ + final public function __construct() + { + $this->dic = Bootstrap::getContainer(); + + $this->config = $this->dic->get(Config::class); + $this->session = $this->dic->get(Session::class); + $this->eventDispatcher = $this->dic->get(EventDispatcher::class); + + if (method_exists($this, 'initialize')) { + $this->initialize(); + } + } +} \ No newline at end of file diff --git a/lib/SP/Repositories/Account/AccountFavoriteRepository.php b/lib/SP/Repositories/Account/AccountFavoriteRepository.php index b9d4b146..00f9a0ff 100644 --- a/lib/SP/Repositories/Account/AccountFavoriteRepository.php +++ b/lib/SP/Repositories/Account/AccountFavoriteRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/Account/AccountFileRepository.php b/lib/SP/Repositories/Account/AccountFileRepository.php index 643de0b0..9c51f022 100644 --- a/lib/SP/Repositories/Account/AccountFileRepository.php +++ b/lib/SP/Repositories/Account/AccountFileRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/Account/AccountHistoryRepository.php b/lib/SP/Repositories/Account/AccountHistoryRepository.php index 7ce8a78f..61e07552 100644 --- a/lib/SP/Repositories/Account/AccountHistoryRepository.php +++ b/lib/SP/Repositories/Account/AccountHistoryRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/Account/AccountRepository.php b/lib/SP/Repositories/Account/AccountRepository.php index 9415fabf..cc3018df 100644 --- a/lib/SP/Repositories/Account/AccountRepository.php +++ b/lib/SP/Repositories/Account/AccountRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/Account/AccountToTagRepository.php b/lib/SP/Repositories/Account/AccountToTagRepository.php index b49b6d1a..d42d067c 100644 --- a/lib/SP/Repositories/Account/AccountToTagRepository.php +++ b/lib/SP/Repositories/Account/AccountToTagRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/Account/AccountToUserGroupRepository.php b/lib/SP/Repositories/Account/AccountToUserGroupRepository.php index 72d27ae7..a1db64cf 100644 --- a/lib/SP/Repositories/Account/AccountToUserGroupRepository.php +++ b/lib/SP/Repositories/Account/AccountToUserGroupRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/Account/AccountToUserRepository.php b/lib/SP/Repositories/Account/AccountToUserRepository.php index f6b70c3b..a117c75a 100644 --- a/lib/SP/Repositories/Account/AccountToUserRepository.php +++ b/lib/SP/Repositories/Account/AccountToUserRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/AuthToken/AuthTokenRepository.php b/lib/SP/Repositories/AuthToken/AuthTokenRepository.php index d0773507..cf1bea9b 100644 --- a/lib/SP/Repositories/AuthToken/AuthTokenRepository.php +++ b/lib/SP/Repositories/AuthToken/AuthTokenRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/Category/CategoryRepository.php b/lib/SP/Repositories/Category/CategoryRepository.php index 1ee0d8d8..2f11a5bf 100644 --- a/lib/SP/Repositories/Category/CategoryRepository.php +++ b/lib/SP/Repositories/Category/CategoryRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/Client/ClientRepository.php b/lib/SP/Repositories/Client/ClientRepository.php index e15404ac..0c70b45c 100644 --- a/lib/SP/Repositories/Client/ClientRepository.php +++ b/lib/SP/Repositories/Client/ClientRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/Config/ConfigRepository.php b/lib/SP/Repositories/Config/ConfigRepository.php index cd639f13..dcead969 100644 --- a/lib/SP/Repositories/Config/ConfigRepository.php +++ b/lib/SP/Repositories/Config/ConfigRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/CustomField/CustomFieldDefRepository.php b/lib/SP/Repositories/CustomField/CustomFieldDefRepository.php index eae7c636..7b909ec1 100644 --- a/lib/SP/Repositories/CustomField/CustomFieldDefRepository.php +++ b/lib/SP/Repositories/CustomField/CustomFieldDefRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/CustomField/CustomFieldRepository.php b/lib/SP/Repositories/CustomField/CustomFieldRepository.php index 84b9e5e8..e9057312 100644 --- a/lib/SP/Repositories/CustomField/CustomFieldRepository.php +++ b/lib/SP/Repositories/CustomField/CustomFieldRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/CustomField/CustomFieldTypeRepository.php b/lib/SP/Repositories/CustomField/CustomFieldTypeRepository.php index e1efe311..93523d4b 100644 --- a/lib/SP/Repositories/CustomField/CustomFieldTypeRepository.php +++ b/lib/SP/Repositories/CustomField/CustomFieldTypeRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/EventLog/EventlogRepository.php b/lib/SP/Repositories/EventLog/EventlogRepository.php index 40437fd3..6704f1e7 100644 --- a/lib/SP/Repositories/EventLog/EventlogRepository.php +++ b/lib/SP/Repositories/EventLog/EventlogRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/NoSuchItemException.php b/lib/SP/Repositories/NoSuchItemException.php index b0c1f621..f035dabd 100644 --- a/lib/SP/Repositories/NoSuchItemException.php +++ b/lib/SP/Repositories/NoSuchItemException.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/Notification/NotificationRepository.php b/lib/SP/Repositories/Notification/NotificationRepository.php index c2a89b70..90f234d9 100644 --- a/lib/SP/Repositories/Notification/NotificationRepository.php +++ b/lib/SP/Repositories/Notification/NotificationRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/Plugin/PluginRepository.php b/lib/SP/Repositories/Plugin/PluginRepository.php index cbc218fc..c0ec003f 100644 --- a/lib/SP/Repositories/Plugin/PluginRepository.php +++ b/lib/SP/Repositories/Plugin/PluginRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/PublicLink/PublicLinkRepository.php b/lib/SP/Repositories/PublicLink/PublicLinkRepository.php index 1465e85c..4317dd50 100644 --- a/lib/SP/Repositories/PublicLink/PublicLinkRepository.php +++ b/lib/SP/Repositories/PublicLink/PublicLinkRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/Repository.php b/lib/SP/Repositories/Repository.php index ac8c3d2a..8966eb4c 100644 --- a/lib/SP/Repositories/Repository.php +++ b/lib/SP/Repositories/Repository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/RepositoryItemInterface.php b/lib/SP/Repositories/RepositoryItemInterface.php index 696436a5..429a5dba 100644 --- a/lib/SP/Repositories/RepositoryItemInterface.php +++ b/lib/SP/Repositories/RepositoryItemInterface.php @@ -3,7 +3,7 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/RepositoryItemTrait.php b/lib/SP/Repositories/RepositoryItemTrait.php index 6eb3962d..fa5f0a8a 100644 --- a/lib/SP/Repositories/RepositoryItemTrait.php +++ b/lib/SP/Repositories/RepositoryItemTrait.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/Tag/TagRepository.php b/lib/SP/Repositories/Tag/TagRepository.php index c65d83d3..587216f4 100644 --- a/lib/SP/Repositories/Tag/TagRepository.php +++ b/lib/SP/Repositories/Tag/TagRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/Track/TrackRepository.php b/lib/SP/Repositories/Track/TrackRepository.php index b60fd5d0..5eb46049 100644 --- a/lib/SP/Repositories/Track/TrackRepository.php +++ b/lib/SP/Repositories/Track/TrackRepository.php @@ -1,4 +1,26 @@ . + */ namespace SP\Repositories\Track; diff --git a/lib/SP/Repositories/Track/TrackRequest.php b/lib/SP/Repositories/Track/TrackRequest.php index 56fa0c4b..35d03ab9 100644 --- a/lib/SP/Repositories/Track/TrackRequest.php +++ b/lib/SP/Repositories/Track/TrackRequest.php @@ -1,4 +1,26 @@ . + */ namespace SP\Repositories\Track; diff --git a/lib/SP/Repositories/User/UserRepository.php b/lib/SP/Repositories/User/UserRepository.php index 1325b4ab..05df72d3 100644 --- a/lib/SP/Repositories/User/UserRepository.php +++ b/lib/SP/Repositories/User/UserRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. @@ -85,11 +85,11 @@ class UserRepository extends Repository implements RepositoryItemInterface $queryData->addParam($itemData->getNotes()); $queryData->addParam($itemData->getUserGroupId()); $queryData->addParam($itemData->getUserProfileId()); - $queryData->addParam($itemData->isIsAdminApp()); - $queryData->addParam($itemData->isIsAdminAcc()); - $queryData->addParam($itemData->isIsDisabled()); - $queryData->addParam($itemData->isIsChangePass()); - $queryData->addParam($itemData->isIsLdap()); + $queryData->addParam($itemData->isAdminApp()); + $queryData->addParam($itemData->isAdminAcc()); + $queryData->addParam($itemData->isDisabled()); + $queryData->addParam($itemData->isChangePass()); + $queryData->addParam($itemData->isLdap()); $queryData->addParam($itemData->getId()); $queryData->setOnErrorMessage(__u('Error al actualizar el usuario')); @@ -452,11 +452,11 @@ class UserRepository extends Repository implements RepositoryItemInterface $queryData->addParam($itemData->getMPass()); $queryData->addParam($itemData->getMKey()); $queryData->addParam($itemData->getLastUpdateMPass()); - $queryData->addParam($itemData->isIsAdminApp()); - $queryData->addParam($itemData->isIsAdminAcc()); - $queryData->addParam($itemData->isIsDisabled()); - $queryData->addParam($itemData->isIsChangePass()); - $queryData->addParam($itemData->isIsLdap()); + $queryData->addParam($itemData->isAdminApp()); + $queryData->addParam($itemData->isAdminAcc()); + $queryData->addParam($itemData->isDisabled()); + $queryData->addParam($itemData->isChangePass()); + $queryData->addParam($itemData->isLdap()); $queryData->addParam($itemData->getPass()); $queryData->setOnErrorMessage(__u('Error al crear el usuario')); @@ -664,7 +664,7 @@ class UserRepository extends Repository implements RepositoryItemInterface $queryData->addParam($itemData->getPass()); $queryData->addParam($itemData->getName()); $queryData->addParam($itemData->getEmail()); - $queryData->addParam($itemData->isIsLdap()); + $queryData->addParam($itemData->isLdap()); $queryData->addParam($itemData->getLogin()); $queryData->addParam($itemData->getLogin()); $queryData->setOnErrorMessage(__u('Error al actualizar el usuario')); diff --git a/lib/SP/Repositories/UserGroup/UserGroupRepository.php b/lib/SP/Repositories/UserGroup/UserGroupRepository.php index 3abbf21a..87318ef9 100644 --- a/lib/SP/Repositories/UserGroup/UserGroupRepository.php +++ b/lib/SP/Repositories/UserGroup/UserGroupRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/UserGroup/UserToUserGroupRepository.php b/lib/SP/Repositories/UserGroup/UserToUserGroupRepository.php index b789159d..0aa2f0fe 100644 --- a/lib/SP/Repositories/UserGroup/UserToUserGroupRepository.php +++ b/lib/SP/Repositories/UserGroup/UserToUserGroupRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Repositories/UserPassRecover/UserPassRecoverRepository.php b/lib/SP/Repositories/UserPassRecover/UserPassRecoverRepository.php index 070eaade..f4760f86 100644 --- a/lib/SP/Repositories/UserPassRecover/UserPassRecoverRepository.php +++ b/lib/SP/Repositories/UserPassRecover/UserPassRecoverRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. @@ -52,16 +52,16 @@ class UserPassRecoverRepository extends Repository FROM UserPassRecover WHERE userId = ? AND used = 0 - AND date >= ?'; + AND `date` >= ?'; - $Data = new QueryData(); - $Data->setQuery($query); - $Data->addParam($userId); - $Data->addParam($time); + $queryData = new QueryData(); + $queryData->setQuery($query); + $queryData->addParam($userId); + $queryData->addParam($time); - DbWrapper::getQuery($Data, $this->db); + DbWrapper::getQuery($queryData, $this->db); - return $Data->getQueryNumRows(); + return $queryData->getQueryNumRows(); } /** @@ -78,17 +78,17 @@ class UserPassRecoverRepository extends Repository $query = /** @lang SQL */ 'INSERT INTO UserPassRecover SET userId = ?, - hash = ?, - date = UNIX_TIMESTAMP(), + `hash` = ?, + `date` = UNIX_TIMESTAMP(), used = 0'; - $Data = new QueryData(); - $Data->setQuery($query); - $Data->addParam($userId); - $Data->addParam($hash); - $Data->setOnErrorMessage(__u('Error al generar el hash de recuperación')); + $queryData = new QueryData(); + $queryData->setQuery($query); + $queryData->addParam($userId); + $queryData->addParam($hash); + $queryData->setOnErrorMessage(__u('Error al generar el hash de recuperación')); - return DbWrapper::getQuery($Data, $this->db); + return DbWrapper::getQuery($queryData, $this->db); } /** @@ -103,29 +103,44 @@ class UserPassRecoverRepository extends Repository { $query = /** @lang SQL */ 'UPDATE UserPassRecover SET used = 1 - WHERE hash = (SELECT userId - FROM UserPassRecover - WHERE hash = ? + WHERE `hash` = ? AND used = 0 - AND date >= ? - ORDER BY date DESC LIMIT 1) LIMIT 1'; + AND `date` >= ? + LIMIT 1'; - $Data = new QueryData(); - $Data->setQuery($query); - $Data->addParam($hash); - $Data->addParam($time); - $Data->setOnErrorMessage(__u('Error interno')); + $queryData = new QueryData(); + $queryData->setQuery($query); + $queryData->addParam($hash); + $queryData->addParam($time); + $queryData->setOnErrorMessage(__u('Error en comprobación de hash')); - $queryRes = DbWrapper::getResults($Data); + DbWrapper::getQuery($queryData, $this->db); - if ($queryRes === false) { - throw new SPException(__u('Error en comprobación de hash'), SPException::ERROR); - } + return $this->db->getNumRows(); + } - if ($Data->getQueryNumRows() === 0) { - throw new SPException(__u('Hash inválido o expirado'), SPException::INFO); - } + /** + * Comprobar el hash de recuperación de clave. + * + * @param $hash + * @param $time + * @return mixed + */ + public function getUserIdForHash($hash, $time) + { + $query = /** @lang SQL */ + 'SELECT userId + FROM UserPassRecover + WHERE `hash` = ? + AND used = 0 + AND `date` >= ? + ORDER BY date DESC LIMIT 1'; - return $queryRes; + $queryData = new QueryData(); + $queryData->setQuery($query); + $queryData->addParam($hash); + $queryData->addParam($time); + + return DbWrapper::getResults($queryData, $this->db); } } \ No newline at end of file diff --git a/lib/SP/Repositories/UserProfile/UserProfileRepository.php b/lib/SP/Repositories/UserProfile/UserProfileRepository.php index 7cecc842..9c8b926c 100644 --- a/lib/SP/Repositories/UserProfile/UserProfileRepository.php +++ b/lib/SP/Repositories/UserProfile/UserProfileRepository.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Account/AccountCryptService.php b/lib/SP/Services/Account/AccountCryptService.php index ff60a16a..327e8fd5 100644 --- a/lib/SP/Services/Account/AccountCryptService.php +++ b/lib/SP/Services/Account/AccountCryptService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Account/AccountFavoriteService.php b/lib/SP/Services/Account/AccountFavoriteService.php index f74d142c..80c68336 100644 --- a/lib/SP/Services/Account/AccountFavoriteService.php +++ b/lib/SP/Services/Account/AccountFavoriteService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Account/AccountFileService.php b/lib/SP/Services/Account/AccountFileService.php index a875a19f..9f82ad8b 100644 --- a/lib/SP/Services/Account/AccountFileService.php +++ b/lib/SP/Services/Account/AccountFileService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Account/AccountHistoryService.php b/lib/SP/Services/Account/AccountHistoryService.php index 964f8c75..5ee9f629 100644 --- a/lib/SP/Services/Account/AccountHistoryService.php +++ b/lib/SP/Services/Account/AccountHistoryService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Account/AccountPasswordRequest.php b/lib/SP/Services/Account/AccountPasswordRequest.php index c9063daa..3490f192 100644 --- a/lib/SP/Services/Account/AccountPasswordRequest.php +++ b/lib/SP/Services/Account/AccountPasswordRequest.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Account/AccountSearchService.php b/lib/SP/Services/Account/AccountSearchService.php index 551dfc7c..54e98982 100644 --- a/lib/SP/Services/Account/AccountSearchService.php +++ b/lib/SP/Services/Account/AccountSearchService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Account/AccountService.php b/lib/SP/Services/Account/AccountService.php index d6c0e81c..99c097dd 100644 --- a/lib/SP/Services/Account/AccountService.php +++ b/lib/SP/Services/Account/AccountService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Account/AccountServiceInterface.php b/lib/SP/Services/Account/AccountServiceInterface.php index dd7c5fc5..7406bace 100644 --- a/lib/SP/Services/Account/AccountServiceInterface.php +++ b/lib/SP/Services/Account/AccountServiceInterface.php @@ -3,7 +3,7 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Account/AccountToTagService.php b/lib/SP/Services/Account/AccountToTagService.php index 9a935a2f..248027d6 100644 --- a/lib/SP/Services/Account/AccountToTagService.php +++ b/lib/SP/Services/Account/AccountToTagService.php @@ -3,7 +3,7 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Auth/AuthException.php b/lib/SP/Services/Auth/AuthException.php index 92b2a788..a2988781 100644 --- a/lib/SP/Services/Auth/AuthException.php +++ b/lib/SP/Services/Auth/AuthException.php @@ -3,7 +3,7 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Auth/LoginResponse.php b/lib/SP/Services/Auth/LoginResponse.php index c37c9c5c..3648273e 100644 --- a/lib/SP/Services/Auth/LoginResponse.php +++ b/lib/SP/Services/Auth/LoginResponse.php @@ -1,4 +1,26 @@ . + */ namespace SP\Services\Auth; diff --git a/lib/SP/Services/Auth/LoginService.php b/lib/SP/Services/Auth/LoginService.php index 1b731a3b..60015ca0 100644 --- a/lib/SP/Services/Auth/LoginService.php +++ b/lib/SP/Services/Auth/LoginService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. @@ -51,7 +51,6 @@ use SP\Services\User\UserPassService; use SP\Services\User\UserService; use SP\Services\UserPassRecover\UserPassRecoverService; use SP\Services\UserProfile\UserProfileService; -use SP\Util\HttpUtil; use SP\Util\Util; /** @@ -130,15 +129,23 @@ class LoginService extends Service * @throws \Psr\Container\NotFoundExceptionInterface * @throws \SP\Core\Exceptions\ConstraintException * @throws \SP\Core\Exceptions\QueryException + * @throws \Exception */ public function doLogin() { $this->userLoginData->setLoginUser(Request::analyze('user')); $this->userLoginData->setLoginPass(Request::analyzeEncrypted('pass')); - $this->trackRequest->userId = $this->userLoginData->getLoginUser(); + if ($this->trackService->checkTracking($this->trackRequest)) { + $this->addTracking(); - $this->checkTracking(); + throw new AuthException( + __u('Intentos excedidos'), + AuthException::INFO, + null, + self::STATUS_MAX_ATTEMPTS_EXCEEDED + ); + } $auth = new Auth($this->userLoginData, $this->configData); @@ -174,43 +181,6 @@ class LoginService extends Service return new LoginResponse(self::STATUS_PASS, 'index.php?r=index'); } - /** - * Comprobar los intentos de login - * - * @throws AuthException - * @throws \Psr\Container\ContainerExceptionInterface - * @throws \Psr\Container\NotFoundExceptionInterface - */ - private function checkTracking() - { - try { - $attempts = count($this->trackService->getTracksForClientFromTime($this->trackRequest)); - } catch (\Exception $e) { - processException($e); - - throw new AuthException(__u('Error interno'), AuthException::ERROR, null, Service::STATUS_INTERNAL_ERROR); - } - - if ($attempts >= TrackService::TIME_TRACKING_MAX_ATTEMPTS) { - $this->addTracking(); - - $this->eventDispatcher->notifyEvent('login.track.delay', - new Event($this, EventMessage::factory() - ->addDescription(sprintf(__('Intentos excedidos (%d/%d)'), $attempts, TrackService::TIME_TRACKING_MAX_ATTEMPTS)) - ->addDetail(__u('Segundos'), 0.3 * $attempts)) - ); - - sleep(TrackService::TIME_SLEEP * $attempts); - - throw new AuthException( - __u('Intentos excedidos'), - AuthException::INFO, - null, - self::STATUS_MAX_ATTEMPTS_EXCEEDED - ); - } - } - /** * Añadir un seguimiento * @@ -220,11 +190,6 @@ class LoginService extends Service { try { $this->trackService->add($this->trackRequest); - - $this->eventDispatcher->notifyEvent('login.track.add', - new Event($this, EventMessage::factory() - ->addDescription(HttpUtil::getClientAddress(true))) - ); } catch (\Exception $e) { throw new AuthException( __u('Error interno'), diff --git a/lib/SP/Services/AuthToken/AuthTokenService.php b/lib/SP/Services/AuthToken/AuthTokenService.php index 7189fe2b..e495bd58 100644 --- a/lib/SP/Services/AuthToken/AuthTokenService.php +++ b/lib/SP/Services/AuthToken/AuthTokenService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Backup/FileBackupService.php b/lib/SP/Services/Backup/FileBackupService.php index dfc1a471..91e194b7 100644 --- a/lib/SP/Services/Backup/FileBackupService.php +++ b/lib/SP/Services/Backup/FileBackupService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Category/CategoryService.php b/lib/SP/Services/Category/CategoryService.php index 6b90a976..db55ab12 100644 --- a/lib/SP/Services/Category/CategoryService.php +++ b/lib/SP/Services/Category/CategoryService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Client/ClientService.php b/lib/SP/Services/Client/ClientService.php index 7fe4d114..4a9a26e7 100644 --- a/lib/SP/Services/Client/ClientService.php +++ b/lib/SP/Services/Client/ClientService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Config/ConfigService.php b/lib/SP/Services/Config/ConfigService.php index 86f6cf5e..28189770 100644 --- a/lib/SP/Services/Config/ConfigService.php +++ b/lib/SP/Services/Config/ConfigService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Config/ParameterNotFoundException.php b/lib/SP/Services/Config/ParameterNotFoundException.php index b9ac047e..57972266 100644 --- a/lib/SP/Services/Config/ParameterNotFoundException.php +++ b/lib/SP/Services/Config/ParameterNotFoundException.php @@ -3,7 +3,7 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Crypt/MasterPassService.php b/lib/SP/Services/Crypt/MasterPassService.php index a4e20e8f..1d0cac13 100644 --- a/lib/SP/Services/Crypt/MasterPassService.php +++ b/lib/SP/Services/Crypt/MasterPassService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Crypt/TemporaryMasterPassService.php b/lib/SP/Services/Crypt/TemporaryMasterPassService.php index 1209d4fa..328392dd 100644 --- a/lib/SP/Services/Crypt/TemporaryMasterPassService.php +++ b/lib/SP/Services/Crypt/TemporaryMasterPassService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Crypt/UpdateMasterPassRequest.php b/lib/SP/Services/Crypt/UpdateMasterPassRequest.php index 6771fc6b..643627cb 100644 --- a/lib/SP/Services/Crypt/UpdateMasterPassRequest.php +++ b/lib/SP/Services/Crypt/UpdateMasterPassRequest.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/CustomField/CustomFieldCryptService.php b/lib/SP/Services/CustomField/CustomFieldCryptService.php index 3765e248..851cd331 100644 --- a/lib/SP/Services/CustomField/CustomFieldCryptService.php +++ b/lib/SP/Services/CustomField/CustomFieldCryptService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/CustomField/CustomFieldDefService.php b/lib/SP/Services/CustomField/CustomFieldDefService.php index 62374670..593f1278 100644 --- a/lib/SP/Services/CustomField/CustomFieldDefService.php +++ b/lib/SP/Services/CustomField/CustomFieldDefService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/CustomField/CustomFieldService.php b/lib/SP/Services/CustomField/CustomFieldService.php index cd3e13b6..551aa8de 100644 --- a/lib/SP/Services/CustomField/CustomFieldService.php +++ b/lib/SP/Services/CustomField/CustomFieldService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/EventLog/EventlogService.php b/lib/SP/Services/EventLog/EventlogService.php index 881e8a9f..033d9e62 100644 --- a/lib/SP/Services/EventLog/EventlogService.php +++ b/lib/SP/Services/EventLog/EventlogService.php @@ -3,7 +3,7 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Export/XmlExportService.php b/lib/SP/Services/Export/XmlExportService.php index 42ae07d0..b3312f64 100644 --- a/lib/SP/Services/Export/XmlExportService.php +++ b/lib/SP/Services/Export/XmlExportService.php @@ -3,7 +3,7 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Import/CsvImport.php b/lib/SP/Services/Import/CsvImport.php index 48538216..3f45e831 100644 --- a/lib/SP/Services/Import/CsvImport.php +++ b/lib/SP/Services/Import/CsvImport.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Services/Import/CsvImportBase.php b/lib/SP/Services/Import/CsvImportBase.php index 770d3ca6..f775710e 100644 --- a/lib/SP/Services/Import/CsvImportBase.php +++ b/lib/SP/Services/Import/CsvImportBase.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Services/Import/FileImport.php b/lib/SP/Services/Import/FileImport.php index c2b775fa..30515051 100644 --- a/lib/SP/Services/Import/FileImport.php +++ b/lib/SP/Services/Import/FileImport.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Services/Import/ImportException.php b/lib/SP/Services/Import/ImportException.php index ad493b68..35b60442 100644 --- a/lib/SP/Services/Import/ImportException.php +++ b/lib/SP/Services/Import/ImportException.php @@ -3,7 +3,7 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Import/ImportInterface.php b/lib/SP/Services/Import/ImportInterface.php index 91cb6890..f22b4044 100644 --- a/lib/SP/Services/Import/ImportInterface.php +++ b/lib/SP/Services/Import/ImportInterface.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Services/Import/ImportParams.php b/lib/SP/Services/Import/ImportParams.php index 19f2a654..e85f50c9 100644 --- a/lib/SP/Services/Import/ImportParams.php +++ b/lib/SP/Services/Import/ImportParams.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Services/Import/ImportService.php b/lib/SP/Services/Import/ImportService.php index a408601e..6ade8840 100644 --- a/lib/SP/Services/Import/ImportService.php +++ b/lib/SP/Services/Import/ImportService.php @@ -3,9 +3,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Services/Import/ImportTrait.php b/lib/SP/Services/Import/ImportTrait.php index 7a85e96a..c5353fcb 100644 --- a/lib/SP/Services/Import/ImportTrait.php +++ b/lib/SP/Services/Import/ImportTrait.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Import/KeepassImport.php b/lib/SP/Services/Import/KeepassImport.php index 172bf218..d24b7e3a 100644 --- a/lib/SP/Services/Import/KeepassImport.php +++ b/lib/SP/Services/Import/KeepassImport.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Services/Import/KeepassXImport.php b/lib/SP/Services/Import/KeepassXImport.php index 7719d4ed..ec0302f6 100644 --- a/lib/SP/Services/Import/KeepassXImport.php +++ b/lib/SP/Services/Import/KeepassXImport.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Services/Import/SyspassImport.php b/lib/SP/Services/Import/SyspassImport.php index e0e1b4c6..61530df4 100644 --- a/lib/SP/Services/Import/SyspassImport.php +++ b/lib/SP/Services/Import/SyspassImport.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Services/Import/XmlFileImport.php b/lib/SP/Services/Import/XmlFileImport.php index f03a27b1..5afd175c 100644 --- a/lib/SP/Services/Import/XmlFileImport.php +++ b/lib/SP/Services/Import/XmlFileImport.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Services/Import/XmlImport.php b/lib/SP/Services/Import/XmlImport.php index 4909e447..ed3b87dd 100644 --- a/lib/SP/Services/Import/XmlImport.php +++ b/lib/SP/Services/Import/XmlImport.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Services/Import/XmlImportBase.php b/lib/SP/Services/Import/XmlImportBase.php index 385e520d..27fd2a22 100644 --- a/lib/SP/Services/Import/XmlImportBase.php +++ b/lib/SP/Services/Import/XmlImportBase.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Import/XmlImportTrait.php b/lib/SP/Services/Import/XmlImportTrait.php index f6343892..b38ea178 100644 --- a/lib/SP/Services/Import/XmlImportTrait.php +++ b/lib/SP/Services/Import/XmlImportTrait.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Services/Notification/NotificationService.php b/lib/SP/Services/Notification/NotificationService.php index 6a5589ed..8b287702 100644 --- a/lib/SP/Services/Notification/NotificationService.php +++ b/lib/SP/Services/Notification/NotificationService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/PublicLink/PublicLinkService.php b/lib/SP/Services/PublicLink/PublicLinkService.php index f3b5340d..d70d6877 100644 --- a/lib/SP/Services/PublicLink/PublicLinkService.php +++ b/lib/SP/Services/PublicLink/PublicLinkService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Service.php b/lib/SP/Services/Service.php index 68b03ee0..36eac5dc 100644 --- a/lib/SP/Services/Service.php +++ b/lib/SP/Services/Service.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/ServiceException.php b/lib/SP/Services/ServiceException.php index cc5f8bdc..4f371d10 100644 --- a/lib/SP/Services/ServiceException.php +++ b/lib/SP/Services/ServiceException.php @@ -3,7 +3,7 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/ServiceItemInterface.php b/lib/SP/Services/ServiceItemInterface.php index 5c7a380a..eb7df583 100644 --- a/lib/SP/Services/ServiceItemInterface.php +++ b/lib/SP/Services/ServiceItemInterface.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/ServiceItemTrait.php b/lib/SP/Services/ServiceItemTrait.php index e2676c71..80fc963f 100644 --- a/lib/SP/Services/ServiceItemTrait.php +++ b/lib/SP/Services/ServiceItemTrait.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Tag/TagService.php b/lib/SP/Services/Tag/TagService.php index 0b5a455b..0a5c4ad2 100644 --- a/lib/SP/Services/Tag/TagService.php +++ b/lib/SP/Services/Tag/TagService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/Track/TrackService.php b/lib/SP/Services/Track/TrackService.php index a48c3f06..5864e5c2 100644 --- a/lib/SP/Services/Track/TrackService.php +++ b/lib/SP/Services/Track/TrackService.php @@ -1,7 +1,31 @@ . + */ namespace SP\Services\Track; +use SP\Core\Events\Event; +use SP\Core\Events\EventMessage; use SP\DataModel\TrackData; use SP\Repositories\Track\TrackRepository; use SP\Repositories\Track\TrackRequest; @@ -10,6 +34,7 @@ use SP\Util\HttpUtil; /** * Class TrackService + * * @package SP\Services */ class TrackService extends Service @@ -18,8 +43,8 @@ class TrackService extends Service * Tiempo para contador de intentos */ const TIME_TRACKING = 600; - const TIME_TRACKING_MAX_ATTEMPTS = 5; - const TIME_SLEEP = 0.3; + const TIME_TRACKING_MAX_ATTEMPTS = 10; + const TIME_SLEEP = 0.5; /** * @var TrackRepository @@ -27,14 +52,18 @@ class TrackService extends Service protected $trackRepository; /** - * @param TrackRequest $trackRequest - * @return mixed - * @throws \SP\Core\Exceptions\ConstraintException - * @throws \SP\Core\Exceptions\QueryException + * @param $source + * @return TrackRequest + * @throws \SP\Core\Exceptions\InvalidArgumentException */ - public function add(TrackRequest $trackRequest) + public static function getTrackRequest($source) { - return $this->trackRepository->add($trackRequest); + $trackRequest = new TrackRequest(); + $trackRequest->time = time() - self::TIME_TRACKING; + $trackRequest->setTrackIp(HttpUtil::getClientAddress()); + $trackRequest->source = $source; + + return $trackRequest; } /** @@ -76,6 +105,51 @@ class TrackService extends Service return $this->trackRepository->getAll(); } + /** + * @throws \Psr\Container\ContainerExceptionInterface + * @throws \Psr\Container\NotFoundExceptionInterface + */ + public function initialize() + { + $this->trackRepository = $this->dic->get(TrackRepository::class); + } + + /** + * Comprobar los intentos de login + * + * @param TrackRequest $trackRequest + * @return bool True if delay is performed, false otherwise + * @throws \Exception + */ + public function checkTracking(TrackRequest $trackRequest) + { + try { + $attempts = count($this->getTracksForClientFromTime($trackRequest)); + } catch (\Exception $e) { + processException($e); + + throw $e; + } + + if ($attempts >= self::TIME_TRACKING_MAX_ATTEMPTS) { +// $this->add($trackRequest); + + $this->eventDispatcher->notifyEvent('track.delay', + new Event($this, EventMessage::factory() + ->addDescription(sprintf(__('Intentos excedidos (%d/%d)'), $attempts, self::TIME_TRACKING_MAX_ATTEMPTS)) + ->addDetail(__u('Segundos'), self::TIME_SLEEP * $attempts)) + ); + + debugLog('Tracking delay: ' . self::TIME_SLEEP * $attempts . 's'); + + sleep(self::TIME_SLEEP * $attempts); + + return true; + } + + return false; + } + /** * Devuelve los tracks de un cliente desde un tiempo y origen determinados * @@ -88,26 +162,17 @@ class TrackService extends Service } /** - * @throws \Psr\Container\ContainerExceptionInterface - * @throws \Psr\Container\NotFoundExceptionInterface + * @param TrackRequest $trackRequest + * @throws \SP\Core\Exceptions\ConstraintException + * @throws \SP\Core\Exceptions\QueryException */ - public function initialize() + public function add(TrackRequest $trackRequest) { - $this->trackRepository = $this->dic->get(TrackRepository::class); - } + $this->trackRepository->add($trackRequest); - /** - * @param $source - * @return TrackRequest - * @throws \SP\Core\Exceptions\InvalidArgumentException - */ - public static function getTrackRequest($source) - { - $trackRequest = new TrackRequest(); - $trackRequest->time = time() - self::TIME_TRACKING; - $trackRequest->setTrackIp(HttpUtil::getClientAddress()); - $trackRequest->source = $source; - - return $trackRequest; + $this->eventDispatcher->notifyEvent('track.add', + new Event($this, EventMessage::factory() + ->addDescription(HttpUtil::getClientAddress(true))) + ); } } \ No newline at end of file diff --git a/lib/SP/Services/User/UpdatePassRequest.php b/lib/SP/Services/User/UpdatePassRequest.php index 18660874..bfd5bd6d 100644 --- a/lib/SP/Services/User/UpdatePassRequest.php +++ b/lib/SP/Services/User/UpdatePassRequest.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/User/UpdatedMasterPassException.php b/lib/SP/Services/User/UpdatedMasterPassException.php index 086489c1..3e2a6fa0 100644 --- a/lib/SP/Services/User/UpdatedMasterPassException.php +++ b/lib/SP/Services/User/UpdatedMasterPassException.php @@ -3,7 +3,7 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/User/UserLoginRequest.php b/lib/SP/Services/User/UserLoginRequest.php index 48160e97..ea129053 100644 --- a/lib/SP/Services/User/UserLoginRequest.php +++ b/lib/SP/Services/User/UserLoginRequest.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/User/UserLoginResponse.php b/lib/SP/Services/User/UserLoginResponse.php index a4cce390..14ebd322 100644 --- a/lib/SP/Services/User/UserLoginResponse.php +++ b/lib/SP/Services/User/UserLoginResponse.php @@ -2,23 +2,23 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, 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 private License as published by + * 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 private License for more details. + * GNU General Public License for more details. * - * You should have received a copy of the GNU General private License + * You should have received a copy of the GNU General Public License * along with sysPass. If not, see . */ diff --git a/lib/SP/Services/User/UserPassResponse.php b/lib/SP/Services/User/UserPassResponse.php index 91649ab3..d3fa1ced 100644 --- a/lib/SP/Services/User/UserPassResponse.php +++ b/lib/SP/Services/User/UserPassResponse.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/User/UserPassService.php b/lib/SP/Services/User/UserPassService.php index d57f2be9..e04aad79 100644 --- a/lib/SP/Services/User/UserPassService.php +++ b/lib/SP/Services/User/UserPassService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/User/UserService.php b/lib/SP/Services/User/UserService.php index c1ca343b..99421e13 100644 --- a/lib/SP/Services/User/UserService.php +++ b/lib/SP/Services/User/UserService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. @@ -53,16 +53,6 @@ class UserService extends Service */ protected $userPassService; - /** - * @throws \Psr\Container\ContainerExceptionInterface - * @throws \Psr\Container\NotFoundExceptionInterface - */ - protected function initialize() - { - $this->userRepository = $this->dic->get(UserRepository::class); - $this->userPassService = $this->dic->get(UserPassService::class); - } - /** * Actualiza el último inicio de sesión del usuario en la BBDD. * @@ -124,13 +114,13 @@ class UserService extends Service ->setUserGroupId($userData->getUserGroupId()) ->setUserProfileId($userData->getUserProfileId()) ->setPreferences(self::getUserPreferences($userData->getPreferences())) - ->setIsLdap($userData->isIsLdap()) - ->setIsAdminAcc($userData->isIsAdminAcc()) - ->setIsAdminApp($userData->isIsAdminApp()) - ->setIsMigrate($userData->isIsMigrate()) + ->setIsLdap($userData->isLdap()) + ->setIsAdminAcc($userData->isAdminAcc()) + ->setIsAdminApp($userData->isAdminApp()) + ->setIsMigrate($userData->isMigrate()) ->setIsChangedPass($userData->isIsChangedPass()) - ->setIsChangePass($userData->isIsChangePass()) - ->setIsDisabled($userData->isIsDisabled()); + ->setIsChangePass($userData->isChangePass()) + ->setIsDisabled($userData->isDisabled()); return $userLoginResponse; } @@ -198,7 +188,7 @@ class UserService extends Service $userData->setName($userLoginRequest->getName()); $userData->setEmail($userLoginRequest->getEmail()); $userData->setIsLdap($userLoginRequest->getisLdap()); - $userData->setPass(Hash::hashKey($userLoginRequest->getPassword())); + $userData->setPass($userLoginRequest->getPassword()); return $this->create($userData); } @@ -212,6 +202,8 @@ class UserService extends Service */ public function create($itemData) { + $itemData->setPass(Hash::hashKey($itemData->getPass())); + return $this->userRepository->create($itemData); } @@ -265,18 +257,19 @@ class UserService extends Service /** * Updates an user's pass * - * @param UserData $itemData + * @param int $userId + * @param string $pass * @return bool * @throws \SP\Core\Exceptions\ConstraintException * @throws \SP\Core\Exceptions\QueryException */ - public function updatePass(UserData $itemData) + public function updatePass($userId, $pass) { - $passRequest = new UpdatePassRequest(Hash::hashKey($itemData->getPass())); + $passRequest = new UpdatePassRequest(Hash::hashKey($pass)); $passRequest->setIsChangePass(0); $passRequest->setIsChangedPass(1); - return $this->userRepository->updatePassById($itemData->getId(), $passRequest); + return $this->userRepository->updatePassById($userId, $passRequest); } /** @@ -306,4 +299,14 @@ class UserService extends Service { return $this->userRepository->getBasicInfo(); } + + /** + * @throws \Psr\Container\ContainerExceptionInterface + * @throws \Psr\Container\NotFoundExceptionInterface + */ + protected function initialize() + { + $this->userRepository = $this->dic->get(UserRepository::class); + $this->userPassService = $this->dic->get(UserPassService::class); + } } \ No newline at end of file diff --git a/lib/SP/Services/UserGroup/UserGroupService.php b/lib/SP/Services/UserGroup/UserGroupService.php index 049b0b1d..2fd28a59 100644 --- a/lib/SP/Services/UserGroup/UserGroupService.php +++ b/lib/SP/Services/UserGroup/UserGroupService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/UserGroup/UserToUserGroupService.php b/lib/SP/Services/UserGroup/UserToUserGroupService.php index e6cafc8e..cd7b4c3d 100644 --- a/lib/SP/Services/UserGroup/UserToUserGroupService.php +++ b/lib/SP/Services/UserGroup/UserToUserGroupService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Services/UserPassRecover/UserPassRecoverService.php b/lib/SP/Services/UserPassRecover/UserPassRecoverService.php index 332bb381..75dd57d7 100644 --- a/lib/SP/Services/UserPassRecover/UserPassRecoverService.php +++ b/lib/SP/Services/UserPassRecover/UserPassRecoverService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. @@ -24,8 +24,13 @@ namespace SP\Services\UserPassRecover; +use SP\Bootstrap; +use SP\Core\Messages\MailMessage; +use SP\Html\Html; use SP\Repositories\UserPassRecover\UserPassRecoverRepository; use SP\Services\Service; +use SP\Services\ServiceException; +use SP\Util\Util; /** * Class UserPassRecoverService @@ -51,12 +56,56 @@ class UserPassRecoverService extends Service protected $userPassRecoverRepository; /** - * @throws \Psr\Container\ContainerExceptionInterface - * @throws \Psr\Container\NotFoundExceptionInterface + * @param $hash + * @return MailMessage */ - protected function initialize() + public static function getMailMessage($hash) { - $this->userPassRecoverRepository = $this->dic->get(UserPassRecoverRepository::class); + $mailMessage = new MailMessage(); + $mailMessage->setTitle(__('Cambio de Clave')); + $mailMessage->addDescription(__('Se ha solicitado el cambio de su clave de usuario.')); + $mailMessage->addDescriptionLine(); + $mailMessage->addDescription(__('Para completar el proceso es necesario que acceda a la siguiente URL:')); + $mailMessage->addDescriptionLine(); + $mailMessage->addDescription(Html::anchorText(Bootstrap::$WEBURI . '/index.php?r=userPassReset/reset/' . $hash)); + $mailMessage->addDescriptionLine(); + $mailMessage->addDescription(__('Si no ha solicitado esta acción, ignore este mensaje.')); + + return $mailMessage; + } + + /** + * @param $hash + * @return void + * @throws ServiceException + * @throws \SP\Core\Exceptions\SPException + */ + public function toggleUsedByHash($hash) + { + if ($this->userPassRecoverRepository->toggleUsedByHash($hash, time() - self::MAX_PASS_RECOVER_TIME) === 0) { + throw new ServiceException(__u('Hash inválido o expirado'), ServiceException::INFO); + } + } + + /** + * @param int $id + * @return string + * @throws \SP\Core\Exceptions\ConstraintException + * @throws \SP\Core\Exceptions\QueryException + * @throws ServiceException + * @throws \Defuse\Crypto\Exception\EnvironmentIsBrokenException + */ + public function requestForUserId($id) + { + if ($this->checkAttemptsByUserId($id)) { + throw new ServiceException(__u('Intentos excedidos'), ServiceException::WARNING); + } + + $hash = Util::generateRandomBytes(16); + + $this->add($id, $hash); + + return $hash; } /** @@ -85,12 +134,29 @@ class UserPassRecoverService extends Service } /** - * @param $hash - * @return bool - * @throws \SP\Core\Exceptions\SPException + * Comprobar el hash de recuperación de clave. + * + * @param string $hash + * @return int + * @throws ServiceException */ - public function toggleUsedByHash($hash) + public function getUserIdForHash($hash) { - return $this->userPassRecoverRepository->toggleUsedByHash($hash, time() - self::MAX_PASS_RECOVER_TIME); + $result = $this->userPassRecoverRepository->getUserIdForHash($hash, time() - self::MAX_PASS_RECOVER_TIME); + + if (!is_object($result)) { + throw new ServiceException(__u('Hash inválido o expirado'), ServiceException::INFO); + } + + return (int)$result->userId; + } + + /** + * @throws \Psr\Container\ContainerExceptionInterface + * @throws \Psr\Container\NotFoundExceptionInterface + */ + protected function initialize() + { + $this->userPassRecoverRepository = $this->dic->get(UserPassRecoverRepository::class); } } \ No newline at end of file diff --git a/lib/SP/Services/UserProfile/UserProfileService.php b/lib/SP/Services/UserProfile/UserProfileService.php index ac21b000..f33551e3 100644 --- a/lib/SP/Services/UserProfile/UserProfileService.php +++ b/lib/SP/Services/UserProfile/UserProfileService.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Storage/CacheableInterface.php b/lib/SP/Storage/CacheableInterface.php index 89e890de..5282bc30 100644 --- a/lib/SP/Storage/CacheableInterface.php +++ b/lib/SP/Storage/CacheableInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Storage/DBStorageInterface.php b/lib/SP/Storage/DBStorageInterface.php index bb730f4b..631f1a39 100644 --- a/lib/SP/Storage/DBStorageInterface.php +++ b/lib/SP/Storage/DBStorageInterface.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Storage/DBUtil.php b/lib/SP/Storage/DBUtil.php index 68e47220..00d2943b 100644 --- a/lib/SP/Storage/DBUtil.php +++ b/lib/SP/Storage/DBUtil.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Storage/Database.php b/lib/SP/Storage/Database.php index 781015b9..4fad3e95 100644 --- a/lib/SP/Storage/Database.php +++ b/lib/SP/Storage/Database.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Storage/DatabaseConnectionData.php b/lib/SP/Storage/DatabaseConnectionData.php index 563fe100..b4ff18c8 100644 --- a/lib/SP/Storage/DatabaseConnectionData.php +++ b/lib/SP/Storage/DatabaseConnectionData.php @@ -2,8 +2,8 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org + * @author nuxsmin + * @link https://syspass.org * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. diff --git a/lib/SP/Storage/DatabaseInterface.php b/lib/SP/Storage/DatabaseInterface.php index 01fac0db..6851ad84 100644 --- a/lib/SP/Storage/DatabaseInterface.php +++ b/lib/SP/Storage/DatabaseInterface.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Storage/DbWrapper.php b/lib/SP/Storage/DbWrapper.php index 719d2a22..18f4a0f5 100644 --- a/lib/SP/Storage/DbWrapper.php +++ b/lib/SP/Storage/DbWrapper.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Storage/FileCache.php b/lib/SP/Storage/FileCache.php index 8691ac94..3d06a129 100644 --- a/lib/SP/Storage/FileCache.php +++ b/lib/SP/Storage/FileCache.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Storage/FileException.php b/lib/SP/Storage/FileException.php index 0aab7edc..af797a5b 100644 --- a/lib/SP/Storage/FileException.php +++ b/lib/SP/Storage/FileException.php @@ -1,4 +1,26 @@ . + */ namespace SP\Storage; diff --git a/lib/SP/Storage/FileHandler.php b/lib/SP/Storage/FileHandler.php index 8b04c1fb..79ea57d0 100644 --- a/lib/SP/Storage/FileHandler.php +++ b/lib/SP/Storage/FileHandler.php @@ -1,4 +1,26 @@ . + */ namespace SP\Storage; diff --git a/lib/SP/Storage/FileStorageInterface.php b/lib/SP/Storage/FileStorageInterface.php index af98d416..67e893dc 100644 --- a/lib/SP/Storage/FileStorageInterface.php +++ b/lib/SP/Storage/FileStorageInterface.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Storage/MySQLHandler.php b/lib/SP/Storage/MySQLHandler.php index f7f6f72d..313ae35b 100644 --- a/lib/SP/Storage/MySQLHandler.php +++ b/lib/SP/Storage/MySQLHandler.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Storage/QueryData.php b/lib/SP/Storage/QueryData.php index 9d285771..e136d370 100644 --- a/lib/SP/Storage/QueryData.php +++ b/lib/SP/Storage/QueryData.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Storage/XmlFileStorageInterface.php b/lib/SP/Storage/XmlFileStorageInterface.php index afad9634..f07ad7ed 100644 --- a/lib/SP/Storage/XmlFileStorageInterface.php +++ b/lib/SP/Storage/XmlFileStorageInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Storage/XmlHandler.php b/lib/SP/Storage/XmlHandler.php index 69bbbb19..e69296a8 100644 --- a/lib/SP/Storage/XmlHandler.php +++ b/lib/SP/Storage/XmlHandler.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Util/ArrayUtil.php b/lib/SP/Util/ArrayUtil.php index 067a402f..e70c2f91 100644 --- a/lib/SP/Util/ArrayUtil.php +++ b/lib/SP/Util/ArrayUtil.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Util/Checks.php b/lib/SP/Util/Checks.php index d6d28ab4..19a9c3a1 100644 --- a/lib/SP/Util/Checks.php +++ b/lib/SP/Util/Checks.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Util/Connection.php b/lib/SP/Util/Connection.php index 761aaa95..818e3efe 100644 --- a/lib/SP/Util/Connection.php +++ b/lib/SP/Util/Connection.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Util/ConnectionInterface.php b/lib/SP/Util/ConnectionInterface.php index cec5db2f..c2243a40 100644 --- a/lib/SP/Util/ConnectionInterface.php +++ b/lib/SP/Util/ConnectionInterface.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Util/DateUtil.php b/lib/SP/Util/DateUtil.php index 55c1ffa7..22bdb30e 100644 --- a/lib/SP/Util/DateUtil.php +++ b/lib/SP/Util/DateUtil.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Util/ErrorUtil.php b/lib/SP/Util/ErrorUtil.php index 78f6aabc..5801c924 100644 --- a/lib/SP/Util/ErrorUtil.php +++ b/lib/SP/Util/ErrorUtil.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Util/Filter.php b/lib/SP/Util/Filter.php index b18a220f..de1fb2a0 100644 --- a/lib/SP/Util/Filter.php +++ b/lib/SP/Util/Filter.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Util/HttpUtil.php b/lib/SP/Util/HttpUtil.php index dbdbdbbb..28f3fe74 100644 --- a/lib/SP/Util/HttpUtil.php +++ b/lib/SP/Util/HttpUtil.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Util/ImageUtil.php b/lib/SP/Util/ImageUtil.php index 81b766e6..ac229185 100644 --- a/lib/SP/Util/ImageUtil.php +++ b/lib/SP/Util/ImageUtil.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Util/Json.php b/lib/SP/Util/Json.php index 5def9f11..be420fef 100644 --- a/lib/SP/Util/Json.php +++ b/lib/SP/Util/Json.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Util/Util.php b/lib/SP/Util/Util.php index 622a6bf4..86380575 100644 --- a/lib/SP/Util/Util.php +++ b/lib/SP/Util/Util.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Util/Wiki/DokuWikiApi.php b/lib/SP/Util/Wiki/DokuWikiApi.php index de73595c..14ed5bec 100644 --- a/lib/SP/Util/Wiki/DokuWikiApi.php +++ b/lib/SP/Util/Wiki/DokuWikiApi.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Util/Wiki/DokuWikiApiBase.php b/lib/SP/Util/Wiki/DokuWikiApiBase.php index e71cacb0..b8102917 100644 --- a/lib/SP/Util/Wiki/DokuWikiApiBase.php +++ b/lib/SP/Util/Wiki/DokuWikiApiBase.php @@ -2,9 +2,9 @@ /** * sysPass * - * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @author nuxsmin + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/lib/SP/Util/Wiki/DokuWikiApiParse.php b/lib/SP/Util/Wiki/DokuWikiApiParse.php index a3446e7e..21f62028 100644 --- a/lib/SP/Util/Wiki/DokuWikiApiParse.php +++ b/lib/SP/Util/Wiki/DokuWikiApiParse.php @@ -3,8 +3,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * diff --git a/public/js/app-actions.js b/public/js/app-actions.js index f6553150..79e233a1 100644 --- a/public/js/app-actions.js +++ b/public/js/app-actions.js @@ -2,8 +2,8 @@ * sysPass * * @author nuxsmin - * @link http://syspass.org - * @copyright 2012-2017, Rubén Domínguez nuxsmin@$syspass.org + * @link https://syspass.org + * @copyright 2012-2018, Rubén Domínguez nuxsmin@$syspass.org * * This file is part of sysPass. * @@ -599,13 +599,13 @@ sysPass.Actions = function (Common) { log.info("user:passreset"); const opts = Common.appRequests().getRequestOpts(); - opts.url = ajaxUrl.user.passreset; + opts.url = ajaxUrl.entrypoint + "/?r=" + $obj.data("action-route"); opts.data = $obj.serialize(); Common.appRequests().getActionCall(opts, function (json) { Common.msg.out(json); - if (json.status == 0) { + if (json.status === 0) { setTimeout(function () { Common.redirect("index.php"); }, 2000); diff --git a/public/js/app-actions.min.js b/public/js/app-actions.min.js index abd0851d..c4451acc 100644 --- a/public/js/app-actions.min.js +++ b/public/js/app-actions.min.js @@ -1,5 +1,5 @@ var $jscomp={scope:{},findInternal:function(c,e,l){c instanceof String&&(c=String(c));for(var f=c.length,g=0;g

'+c.config().LANG[48]+"

";mdlDialog().show({text:k,negative:{title:c.config().LANG[44],onClick:function(e){e.preventDefault();c.appRequests().getActionCall(d,function(d){c.msg.out(d);0===d.status&&g({r:a.data("action-next")+"/"+b})})}},positive:{title:c.config().LANG[43],onClick:function(e){e.preventDefault();d.data.notify=1;c.appRequests().getActionCall(d,function(d){c.msg.out(d);0===d.status&&g({r:a.data("action-next")+"/"+b})})}}})},refresh:function(a){e.info("link:refresh"); -h.state.update(a);var b=a.data("item-id"),d=c.appRequests().getRequestOpts();d.url=f.entrypoint;d.data={r:a.data("action-route")+"/"+b,sk:c.sk.get(),isAjax:1};c.appRequests().getActionCall(d,function(d){c.msg.out(d);0===d.status&&((d=a.data("action-next"))?g({r:d+"/"+b}):g({r:h.state.tab.route,tabIndex:h.state.tab.index}))})}},eventlog:{search:function(a){e.info("eventlog:search");m.search(a)},nav:function(a){e.info("eventlog:nav");m.nav(a)},clear:function(a){var b='

'+ -c.config().LANG[20]+"

";mdlDialog().show({text:b,negative:{title:c.config().LANG[44],onClick:function(a){a.preventDefault();c.msg.error(c.config().LANG[44])}},positive:{title:c.config().LANG[43],onClick:function(b){b.preventDefault();b=c.appRequests().getRequestOpts();b.url=f.entrypoint+"?r="+a.data("action-route");b.method="get";b.data={sk:c.sk.get(),isAjax:1};c.appRequests().getActionCall(b,function(b){c.msg.out(b);0===b.status&&g({r:a.data("nextaction")});c.sk.set(b.csrf)})}}})}},ajaxUrl:f, -plugin:{toggle:function(a){e.info("plugin:enable");a={itemId:a.data("item-id"),actionId:a.data("action-id"),sk:c.sk.get(),activeTab:a.data("activetab")};var b=c.appRequests().getRequestOpts();b.url=f.appMgmt.save;b.data=a;c.appRequests().getActionCall(b,function(a){c.msg.out(a);0===a.status&&setTimeout(function(){c.redirect("index.php")},2E3)})},reset:function(a){e.info("plugin:reset");var b='

'+c.config().LANG[58]+"

";mdlDialog().show({text:b,negative:{title:c.config().LANG[44], -onClick:function(a){a.preventDefault();c.msg.error(c.config().LANG[44])}},positive:{title:c.config().LANG[43],onClick:function(b){b.preventDefault();b={itemId:a.data("item-id"),actionId:a.data("action-id"),sk:c.sk.get(),activeTab:a.data("activetab")};var d=c.appRequests().getRequestOpts();d.url=f.appMgmt.save;d.data=b;c.appRequests().getActionCall(d,function(a){c.msg.out(a)})}}})}},notification:{check:function(a){e.info("notification:check");var b=c.appRequests().getRequestOpts();b.url=f.entrypoint; -b.method="get";b.data={r:a.data("action-route")+"/"+a.data("item-id"),sk:c.sk.get(),isAjax:1};c.appRequests().getActionCall(b,function(b){c.msg.out(b);0===b.status&&g({r:a.data("nextaction")});c.sk.set(b.csrf)})},search:function(a){e.info("notification:search");m.search(a)},show:function(a){e.info("notification:show");u.show(a)},save:function(a){e.info("notification:save");var b=c.appRequests().getRequestOpts();b.url=f.entrypoint+"?r="+a.data("route");b.data=a.serialize();c.appRequests().getActionCall(b, -function(b){c.msg.out(b);0===b.status&&(g({r:a.data("nextaction")}),$.magnificPopup.close())})},"delete":function(a){e.info("notification:delete");m["delete"](a,function(b){0";mdlDialog().show({text:k,negative:{title:c.config().LANG[44],onClick:function(e){e.preventDefault();c.appRequests().getActionCall(d,function(d){c.msg.out(d);0===d.status&&g({r:a.data("action-next")+"/"+b})})}},positive:{title:c.config().LANG[43],onClick:function(e){e.preventDefault();d.data.notify=1;c.appRequests().getActionCall(d,function(d){c.msg.out(d);0===d.status&&g({r:a.data("action-next")+"/"+ +b})})}}})},refresh:function(a){e.info("link:refresh");h.state.update(a);var b=a.data("item-id"),d=c.appRequests().getRequestOpts();d.url=f.entrypoint;d.data={r:a.data("action-route")+"/"+b,sk:c.sk.get(),isAjax:1};c.appRequests().getActionCall(d,function(d){c.msg.out(d);0===d.status&&((d=a.data("action-next"))?g({r:d+"/"+b}):g({r:h.state.tab.route,tabIndex:h.state.tab.index}))})}},eventlog:{search:function(a){e.info("eventlog:search");m.search(a)},nav:function(a){e.info("eventlog:nav");m.nav(a)},clear:function(a){var b= +'

'+c.config().LANG[20]+"

";mdlDialog().show({text:b,negative:{title:c.config().LANG[44],onClick:function(a){a.preventDefault();c.msg.error(c.config().LANG[44])}},positive:{title:c.config().LANG[43],onClick:function(b){b.preventDefault();b=c.appRequests().getRequestOpts();b.url=f.entrypoint+"?r="+a.data("action-route");b.method="get";b.data={sk:c.sk.get(),isAjax:1};c.appRequests().getActionCall(b,function(b){c.msg.out(b);0===b.status&&g({r:a.data("nextaction")}); +c.sk.set(b.csrf)})}}})}},ajaxUrl:f,plugin:{toggle:function(a){e.info("plugin:enable");a={itemId:a.data("item-id"),actionId:a.data("action-id"),sk:c.sk.get(),activeTab:a.data("activetab")};var b=c.appRequests().getRequestOpts();b.url=f.appMgmt.save;b.data=a;c.appRequests().getActionCall(b,function(a){c.msg.out(a);0===a.status&&setTimeout(function(){c.redirect("index.php")},2E3)})},reset:function(a){e.info("plugin:reset");var b='

'+c.config().LANG[58]+"

"; +mdlDialog().show({text:b,negative:{title:c.config().LANG[44],onClick:function(a){a.preventDefault();c.msg.error(c.config().LANG[44])}},positive:{title:c.config().LANG[43],onClick:function(b){b.preventDefault();b={itemId:a.data("item-id"),actionId:a.data("action-id"),sk:c.sk.get(),activeTab:a.data("activetab")};var d=c.appRequests().getRequestOpts();d.url=f.appMgmt.save;d.data=b;c.appRequests().getActionCall(d,function(a){c.msg.out(a)})}}})}},notification:{check:function(a){e.info("notification:check"); +var b=c.appRequests().getRequestOpts();b.url=f.entrypoint;b.method="get";b.data={r:a.data("action-route")+"/"+a.data("item-id"),sk:c.sk.get(),isAjax:1};c.appRequests().getActionCall(b,function(b){c.msg.out(b);0===b.status&&g({r:a.data("nextaction")});c.sk.set(b.csrf)})},search:function(a){e.info("notification:search");m.search(a)},show:function(a){e.info("notification:show");u.show(a)},save:function(a){e.info("notification:save");var b=c.appRequests().getRequestOpts();b.url=f.entrypoint+"?r="+a.data("route"); +b.data=a.serialize();c.appRequests().getActionCall(b,function(b){c.msg.out(b);0===b.status&&(g({r:a.data("nextaction")}),$.magnificPopup.close())})},"delete":function(a){e.info("notification:delete");m["delete"](a,function(b){0