From 9676f43813cb9e9d56cdd4ff1bbffb8334324e8b Mon Sep 17 00:00:00 2001 From: nuxsmin Date: Wed, 20 Sep 2017 00:59:53 +0200 Subject: [PATCH] * [ADD] Using composer for dependency management --- inc/Base.php | 18 ------------------ inc/SP/Account/AccountBase.php | 1 - inc/SP/Account/AccountCrypt.php | 4 +--- inc/SP/Account/AccountFavorites.php | 1 - inc/SP/Account/AccountHistory.php | 3 --- inc/SP/Account/AccountHistoryCrypt.php | 4 +--- inc/SP/Account/AccountsSearchItem.php | 1 - inc/SP/Api/ApiUtil.php | 1 - inc/SP/Auth/Auth.php | 1 - inc/SP/Controller/AccountController.php | 2 -- inc/SP/Controller/ControllerBase.php | 1 - inc/SP/Controller/EventlogController.php | 1 - inc/SP/Controller/ItemShowController.php | 2 +- inc/SP/Controller/MainController.php | 6 ------ inc/SP/Controller/NoticeShowController.php | 2 -- inc/SP/Core/Acl.php | 3 --- inc/SP/Core/Crypt/Crypt.php | 1 - inc/SP/Core/Crypt/SecureKeyCookie.php | 1 - inc/SP/Core/CryptMasterPass.php | 2 +- inc/SP/Core/Exceptions/SPException.php | 1 - inc/SP/Core/Init.php | 6 +++--- inc/SP/Core/Language.php | 1 - inc/SP/Core/OldCrypt.php | 3 --- inc/SP/Core/SessionUtil.php | 2 +- inc/SP/Core/Upgrade/Crypt.php | 1 - inc/SP/Core/Upgrade/Upgrade.php | 2 +- inc/SP/Forms/ApiTokenForm.php | 1 - inc/SP/Import/ImportBase.php | 2 +- inc/SP/Import/SyspassImport.php | 4 +--- inc/SP/Log/Email.php | 1 - inc/SP/Mgmt/CustomFields/CustomFieldsUtil.php | 2 +- inc/SP/Mgmt/Users/UserBase.php | 1 - inc/SP/Mgmt/Users/UserPass.php | 2 +- inc/SP/Mgmt/Users/UserPreferences.php | 1 - .../Users/{UserSSO.class.php => UserSSO.php} | 2 -- inc/SP/Util/Util.php | 2 -- vendor/composer/autoload_classmap.php | 2 +- vendor/composer/autoload_static.php | 2 +- 38 files changed, 15 insertions(+), 78 deletions(-) rename inc/SP/Mgmt/Users/{UserSSO.class.php => UserSSO.php} (98%) diff --git a/inc/Base.php b/inc/Base.php index 3fd26abb..e799ec88 100644 --- a/inc/Base.php +++ b/inc/Base.php @@ -43,25 +43,7 @@ define('SQL_PATH', BASE_DIR . DIRECTORY_SEPARATOR . 'sql'); define('DEBUG', true); require VENDOR_PATH . DIRECTORY_SEPARATOR . 'autoload.php'; - -// Required random_compat polyfill for random_bytes() and random_int() -// @see https://github.com/paragonie/random_compat/tree/v2.0.4#random_compat -//require_once EXTENSIONS_PATH . DIRECTORY_SEPARATOR . 'random_compat' . DIRECTORY_SEPARATOR . 'lib' . DIRECTORY_SEPARATOR . 'random.php'; -// require __DIR__ . DIRECTORY_SEPARATOR . 'SplClassLoader.php'; - -// -//$ClassLoader = new SplClassLoader('SP'); -//$ClassLoader->setFileExtension('.class.php'); -//$ClassLoader->addExcluded('SP\\Profile'); -//$ClassLoader->addExcluded('SP\\Mgmt\\User\\Profile'); -//$ClassLoader->addExcluded('SP\\UserPreferences'); -//$ClassLoader->addExcluded('SP\\Mgmt\\User\\UserPreferences'); -//$ClassLoader->addExcluded('SP\\CustomFieldDef'); -//$ClassLoader->addExcluded('SP\\Mgmt\\CustomFieldDef'); -//$ClassLoader->addExcluded('SP\\PublicLink'); -//$ClassLoader->register(); - require __DIR__ . DIRECTORY_SEPARATOR . 'BaseFunctions.php'; // Empezar a calcular la memoria utilizada diff --git a/inc/SP/Account/AccountBase.php b/inc/SP/Account/AccountBase.php index 604a07f5..d96b2ab3 100644 --- a/inc/SP/Account/AccountBase.php +++ b/inc/SP/Account/AccountBase.php @@ -27,7 +27,6 @@ namespace SP\Account; use SP\DataModel\AccountData; use SP\DataModel\AccountExtData; use SP\DataModel\AccountHistoryData; -use SP\Mgmt\Groups\GroupAccountsUtil; defined('APP_ROOT') || die(); diff --git a/inc/SP/Account/AccountCrypt.php b/inc/SP/Account/AccountCrypt.php index 455137a7..9e96e8c5 100644 --- a/inc/SP/Account/AccountCrypt.php +++ b/inc/SP/Account/AccountCrypt.php @@ -27,11 +27,9 @@ namespace SP\Account; use Defuse\Crypto\Exception\CryptoException; use SP\Core\Crypt\Crypt; use SP\Core\Exceptions\QueryException; -use SP\Core\Messages\TaskMessage; -use SP\Core\OldCrypt; use SP\Core\Exceptions\SPException; +use SP\Core\OldCrypt; use SP\Core\Session; -use SP\Core\Task; use SP\Core\TaskFactory; use SP\DataModel\AccountData; use SP\Log\Email; diff --git a/inc/SP/Account/AccountFavorites.php b/inc/SP/Account/AccountFavorites.php index a1d16d95..20d9429d 100644 --- a/inc/SP/Account/AccountFavorites.php +++ b/inc/SP/Account/AccountFavorites.php @@ -24,7 +24,6 @@ namespace SP\Account; -use SP\Core\Exceptions\SPException; use SP\Storage\DB; use SP\Storage\QueryData; diff --git a/inc/SP/Account/AccountHistory.php b/inc/SP/Account/AccountHistory.php index 268d2636..ad9b5ddb 100644 --- a/inc/SP/Account/AccountHistory.php +++ b/inc/SP/Account/AccountHistory.php @@ -25,12 +25,9 @@ namespace SP\Account; use SP\Config\ConfigDB; -use SP\Core\OldCrypt; use SP\Core\Exceptions\SPException; -use SP\Log\Log; use SP\Storage\DB; use SP\Storage\QueryData; -use SP\Util\Checks; defined('APP_ROOT') || die(); diff --git a/inc/SP/Account/AccountHistoryCrypt.php b/inc/SP/Account/AccountHistoryCrypt.php index 95a0a3ac..0e8e160c 100644 --- a/inc/SP/Account/AccountHistoryCrypt.php +++ b/inc/SP/Account/AccountHistoryCrypt.php @@ -28,10 +28,8 @@ use Defuse\Crypto\Exception\CryptoException; use SP\Core\Crypt\Crypt; use SP\Core\Crypt\Hash; use SP\Core\Exceptions\QueryException; -use SP\Core\Messages\TaskMessage; -use SP\Core\OldCrypt; use SP\Core\Exceptions\SPException; -use SP\Core\Task; +use SP\Core\OldCrypt; use SP\Core\TaskFactory; use SP\Log\Email; use SP\Log\Log; diff --git a/inc/SP/Account/AccountsSearchItem.php b/inc/SP/Account/AccountsSearchItem.php index a2cf057f..28128c45 100644 --- a/inc/SP/Account/AccountsSearchItem.php +++ b/inc/SP/Account/AccountsSearchItem.php @@ -27,7 +27,6 @@ namespace SP\Account; defined('APP_ROOT') || die(); use SP\Config\Config; -use SP\Core\Session; use SP\DataModel\AccountSearchData; use SP\Html\Html; use SP\Mgmt\Groups\GroupAccountsUtil; diff --git a/inc/SP/Api/ApiUtil.php b/inc/SP/Api/ApiUtil.php index 9574fec1..7d837430 100644 --- a/inc/SP/Api/ApiUtil.php +++ b/inc/SP/Api/ApiUtil.php @@ -30,7 +30,6 @@ use SP\Core\Exceptions\SPException; use SP\DataModel\TrackData; use SP\Mgmt\Tracks\Track; use SP\Util\HttpUtil; -use SP\Util\Util; /** * Class ApiUtil diff --git a/inc/SP/Auth/Auth.php b/inc/SP/Auth/Auth.php index 08fd24a0..ea4e543e 100644 --- a/inc/SP/Auth/Auth.php +++ b/inc/SP/Auth/Auth.php @@ -33,7 +33,6 @@ use SP\Auth\Ldap\LdapMsAds; use SP\Auth\Ldap\LdapStd; use SP\Config\Config; use SP\Core\Exceptions\SPException; -use SP\DataModel\UserData; use SP\DataModel\UserLoginData; use SP\Util\Checks; diff --git a/inc/SP/Controller/AccountController.php b/inc/SP/Controller/AccountController.php index a6e5d83b..4f6892b8 100644 --- a/inc/SP/Controller/AccountController.php +++ b/inc/SP/Controller/AccountController.php @@ -35,13 +35,11 @@ use SP\Config\Config; use SP\Core\Acl; use SP\Core\ActionsInterface; use SP\Core\Crypt\Crypt; -use SP\Core\OldCrypt; use SP\Core\Exceptions\SPException; use SP\Core\Init; use SP\Core\Session; use SP\Core\SessionUtil; use SP\Core\Template; -use SP\DataModel\AccountData; use SP\DataModel\AccountExtData; use SP\DataModel\CustomFieldData; use SP\DataModel\PublicLinkData; diff --git a/inc/SP/Controller/ControllerBase.php b/inc/SP/Controller/ControllerBase.php index 5449f81c..58906c00 100644 --- a/inc/SP/Controller/ControllerBase.php +++ b/inc/SP/Controller/ControllerBase.php @@ -31,7 +31,6 @@ use SP\Core\DiFactory; use SP\Core\Events\EventDispatcherInterface; use SP\Core\Exceptions\FileNotFoundException; use SP\Core\Exceptions\SPException; -use SP\Core\Init; use SP\Core\Session; use SP\Core\Template; use SP\Core\UI\ThemeIconsBase; diff --git a/inc/SP/Controller/EventlogController.php b/inc/SP/Controller/EventlogController.php index b2999ee0..587279f4 100644 --- a/inc/SP/Controller/EventlogController.php +++ b/inc/SP/Controller/EventlogController.php @@ -27,7 +27,6 @@ namespace SP\Controller; defined('APP_ROOT') || die(); use SP\Core\ActionsInterface; -use SP\Core\Messages\LogMessage; use SP\Core\SessionUtil; use SP\Core\Template; use SP\Html\DataGrid\DataGridActionSearch; diff --git a/inc/SP/Controller/ItemShowController.php b/inc/SP/Controller/ItemShowController.php index f80f58ad..3a9c8cb6 100644 --- a/inc/SP/Controller/ItemShowController.php +++ b/inc/SP/Controller/ItemShowController.php @@ -30,7 +30,6 @@ use SP\Account\Account; use SP\Account\AccountAcl; use SP\Account\AccountHistory; use SP\Config\Config; -use SP\Mgmt\ApiTokens\ApiTokensUtil; use SP\Core\ActionsInterface; use SP\Core\Crypt\Crypt; use SP\Core\Crypt\Session as CryptSession; @@ -53,6 +52,7 @@ use SP\Http\Request; use SP\Log\Email; use SP\Log\Log; use SP\Mgmt\ApiTokens\ApiToken; +use SP\Mgmt\ApiTokens\ApiTokensUtil; use SP\Mgmt\Categories\Category; use SP\Mgmt\Customers\Customer; use SP\Mgmt\CustomFields\CustomField; diff --git a/inc/SP/Controller/MainController.php b/inc/SP/Controller/MainController.php index cd546bd4..008d6cc7 100644 --- a/inc/SP/Controller/MainController.php +++ b/inc/SP/Controller/MainController.php @@ -40,19 +40,13 @@ use SP\Core\Session; use SP\Core\SessionUtil; use SP\Core\Task; use SP\Core\Template; -use SP\Core\Upgrade\Account; use SP\Core\Upgrade\Check; -use SP\Core\Upgrade\Upgrade; use SP\DataModel\NoticeData; use SP\Html\DataGrid\DataGridAction; use SP\Html\Html; use SP\Http\Request; -use SP\Mgmt\Categories\Category; -use SP\Mgmt\Customers\Customer; -use SP\Mgmt\Groups\Group; use SP\Mgmt\Notices\Notice; use SP\Mgmt\PublicLinks\PublicLink; -use SP\Mgmt\Users\User; use SP\Util\Checks; use SP\Util\HttpUtil; use SP\Util\Util; diff --git a/inc/SP/Controller/NoticeShowController.php b/inc/SP/Controller/NoticeShowController.php index 405d9eb1..7e9d6a22 100644 --- a/inc/SP/Controller/NoticeShowController.php +++ b/inc/SP/Controller/NoticeShowController.php @@ -27,7 +27,6 @@ namespace SP\Controller; defined('APP_ROOT') || die(); use SP\Core\ActionsInterface; -use SP\Core\Init; use SP\Core\SessionUtil; use SP\Core\Template; use SP\DataModel\NoticeData; @@ -35,7 +34,6 @@ use SP\Mgmt\Notices\Notice; use SP\Mgmt\Users\User; use SP\Util\Checks; use SP\Util\Json; -use SP\Util\Util; /** * Class NoticeShowController diff --git a/inc/SP/Core/Acl.php b/inc/SP/Core/Acl.php index 95282a14..968009f8 100644 --- a/inc/SP/Core/Acl.php +++ b/inc/SP/Core/Acl.php @@ -25,10 +25,7 @@ namespace SP\Core; -use SP\DataModel\AccountExtData; -use SP\DataModel\UserData; use SP\Log\Log; -use SP\Mgmt\Groups\GroupUsers; defined('APP_ROOT') || die(); diff --git a/inc/SP/Core/Crypt/Crypt.php b/inc/SP/Core/Crypt/Crypt.php index a8d54d54..9d26e399 100644 --- a/inc/SP/Core/Crypt/Crypt.php +++ b/inc/SP/Core/Crypt/Crypt.php @@ -26,7 +26,6 @@ namespace SP\Core\Crypt; use Defuse\Crypto\Crypto; use Defuse\Crypto\Exception\CryptoException; -use Defuse\Crypto\Exception\WrongKeyOrModifiedCiphertextException; use Defuse\Crypto\Key; use Defuse\Crypto\KeyProtectedByPassword; diff --git a/inc/SP/Core/Crypt/SecureKeyCookie.php b/inc/SP/Core/Crypt/SecureKeyCookie.php index 4677d841..803f481f 100644 --- a/inc/SP/Core/Crypt/SecureKeyCookie.php +++ b/inc/SP/Core/Crypt/SecureKeyCookie.php @@ -29,7 +29,6 @@ use Defuse\Crypto\Key; use SP\Core\Init; use SP\Http\Request; use SP\Util\HttpUtil; -use SP\Util\Util; /** * Class SecureKeyCookie diff --git a/inc/SP/Core/CryptMasterPass.php b/inc/SP/Core/CryptMasterPass.php index 71facb88..fc5f2257 100644 --- a/inc/SP/Core/CryptMasterPass.php +++ b/inc/SP/Core/CryptMasterPass.php @@ -25,9 +25,9 @@ namespace SP\Core; use SP\Config\ConfigDB; -use SP\Core\Crypt\Session as CryptSession; use SP\Core\Crypt\Crypt; use SP\Core\Crypt\Hash; +use SP\Core\Crypt\Session as CryptSession; use SP\Log\Log; use SP\Util\Util; diff --git a/inc/SP/Core/Exceptions/SPException.php b/inc/SP/Core/Exceptions/SPException.php index 8f337429..b1a7fad4 100644 --- a/inc/SP/Core/Exceptions/SPException.php +++ b/inc/SP/Core/Exceptions/SPException.php @@ -25,7 +25,6 @@ namespace SP\Core\Exceptions; use Exception; -use Throwable; defined('APP_ROOT') || die(); diff --git a/inc/SP/Core/Init.php b/inc/SP/Core/Init.php index d11eaac4..40db89a4 100644 --- a/inc/SP/Core/Init.php +++ b/inc/SP/Core/Init.php @@ -25,13 +25,13 @@ namespace SP\Core; use Defuse\Crypto\Exception\CryptoException; -use SP\Util\HttpUtil; use SP\Account\AccountAcl; use SP\Auth\Browser\Browser; use SP\Config\Config; use SP\Controller\MainController; -use SP\Core\Crypt\SecureKeyCookie; use SP\Core\Crypt\CryptSessionHandler; +use SP\Core\Crypt\SecureKeyCookie; +use SP\Core\Crypt\Session as CryptSession; use SP\Core\Exceptions\SPException; use SP\Core\Plugin\PluginUtil; use SP\Core\Upgrade\Upgrade; @@ -42,9 +42,9 @@ use SP\Log\Log; use SP\Mgmt\Profiles\Profile; use SP\Storage\DBUtil; use SP\Util\Checks; +use SP\Util\HttpUtil; use SP\Util\Json; use SP\Util\Util; -use SP\Core\Crypt\Session as CryptSession; defined('APP_ROOT') || die(); diff --git a/inc/SP/Core/Language.php b/inc/SP/Core/Language.php index a5a97769..1ef4f880 100644 --- a/inc/SP/Core/Language.php +++ b/inc/SP/Core/Language.php @@ -26,7 +26,6 @@ namespace SP\Core; use SP\Config\Config; use SP\Http\Request; -use SP\Mgmt\Users\UserPreferences; defined('APP_ROOT') || die(); diff --git a/inc/SP/Core/OldCrypt.php b/inc/SP/Core/OldCrypt.php index c18b71d0..46281b1f 100644 --- a/inc/SP/Core/OldCrypt.php +++ b/inc/SP/Core/OldCrypt.php @@ -24,11 +24,8 @@ namespace SP\Core; -use SP\Account\AccountHistory; use SP\Config\Config; -use SP\Config\ConfigDB; use SP\Core\Exceptions\SPException; -use SP\Log\Log; use SP\Util\Checks; defined('APP_ROOT') || die(); diff --git a/inc/SP/Core/SessionUtil.php b/inc/SP/Core/SessionUtil.php index 4c02814e..71bd6cd6 100644 --- a/inc/SP/Core/SessionUtil.php +++ b/inc/SP/Core/SessionUtil.php @@ -25,9 +25,9 @@ namespace SP\Core; use SP\Config\Config; +use SP\Core\Crypt\Session as CryptSession; use SP\DataModel\UserData; use SP\Mgmt\Profiles\Profile; -use SP\Core\Crypt\Session as CryptSession; defined('APP_ROOT') || die(); diff --git a/inc/SP/Core/Upgrade/Crypt.php b/inc/SP/Core/Upgrade/Crypt.php index dd460a8f..7f6f2b95 100644 --- a/inc/SP/Core/Upgrade/Crypt.php +++ b/inc/SP/Core/Upgrade/Crypt.php @@ -30,7 +30,6 @@ use SP\Account\AccountHistoryCrypt; use SP\Config\ConfigDB; use SP\Core\Crypt\Hash; use SP\Core\Exceptions\SPException; -use SP\Core\Init; use SP\Log\Log; use SP\Mgmt\CustomFields\CustomFieldsUtil; use SP\Mgmt\Users\UserMigrate; diff --git a/inc/SP/Core/Upgrade/Upgrade.php b/inc/SP/Core/Upgrade/Upgrade.php index b7bed373..b92fff02 100644 --- a/inc/SP/Core/Upgrade/Upgrade.php +++ b/inc/SP/Core/Upgrade/Upgrade.php @@ -33,6 +33,7 @@ use SP\Core\Exceptions\SPException; use SP\Core\Init; use SP\Core\Session as CoreSession; use SP\Core\TaskFactory; +use SP\Core\Upgrade\User as UserUpgrade; use SP\Http\Request; use SP\Log\Email; use SP\Log\Log; @@ -44,7 +45,6 @@ use SP\Mgmt\Users\UserPreferencesUtil; use SP\Storage\DB; use SP\Storage\QueryData; use SP\Util\Util; -use SP\Core\Upgrade\User as UserUpgrade; defined('APP_ROOT') || die(); diff --git a/inc/SP/Forms/ApiTokenForm.php b/inc/SP/Forms/ApiTokenForm.php index 7960092d..75ac1c65 100644 --- a/inc/SP/Forms/ApiTokenForm.php +++ b/inc/SP/Forms/ApiTokenForm.php @@ -28,7 +28,6 @@ use SP\Core\ActionsInterface; use SP\Core\Exceptions\ValidationException; use SP\DataModel\ApiTokenData; use SP\Http\Request; -use SP\Mgmt\ApiTokens\ApiTokensUtil; /** * Class ApiTokenForm diff --git a/inc/SP/Import/ImportBase.php b/inc/SP/Import/ImportBase.php index a892f1bc..7480f952 100644 --- a/inc/SP/Import/ImportBase.php +++ b/inc/SP/Import/ImportBase.php @@ -27,9 +27,9 @@ namespace SP\Import; use SP\Account\Account; use SP\Account\AccountTags; use SP\Core\Crypt\Crypt; -use SP\Core\OldCrypt; use SP\Core\Exceptions\SPException; use SP\Core\Messages\LogMessage; +use SP\Core\OldCrypt; use SP\DataModel\AccountExtData; use SP\DataModel\CategoryData; use SP\DataModel\CustomerData; diff --git a/inc/SP/Import/SyspassImport.php b/inc/SP/Import/SyspassImport.php index d7a6796c..6240e9a4 100644 --- a/inc/SP/Import/SyspassImport.php +++ b/inc/SP/Import/SyspassImport.php @@ -25,13 +25,11 @@ namespace SP\Import; use DOMXPath; -use SP\Account\AccountTags; use SP\Config\ConfigDB; use SP\Core\Crypt\Crypt; -use SP\Core\OldCrypt; use SP\Core\Crypt\Hash; use SP\Core\Exceptions\SPException; -use SP\DataModel\AccountData; +use SP\Core\OldCrypt; use SP\DataModel\AccountExtData; use SP\DataModel\CategoryData; use SP\DataModel\CustomerData; diff --git a/inc/SP/Log/Email.php b/inc/SP/Log/Email.php index 1f681ace..6f8b1678 100644 --- a/inc/SP/Log/Email.php +++ b/inc/SP/Log/Email.php @@ -24,7 +24,6 @@ namespace SP\Log; -use phpmailer\PHPMailer; use phpmailer\phpmailerException; use SP\Config\Config; use SP\Core\Init; diff --git a/inc/SP/Mgmt/CustomFields/CustomFieldsUtil.php b/inc/SP/Mgmt/CustomFields/CustomFieldsUtil.php index 8a205415..a40c8815 100644 --- a/inc/SP/Mgmt/CustomFields/CustomFieldsUtil.php +++ b/inc/SP/Mgmt/CustomFields/CustomFieldsUtil.php @@ -29,8 +29,8 @@ defined('APP_ROOT') || die(); use Defuse\Crypto\Exception\CryptoException; use SP\Core\Crypt\Crypt; use SP\Core\Exceptions\QueryException; -use SP\Core\OldCrypt; use SP\Core\Exceptions\SPException; +use SP\Core\OldCrypt; use SP\DataModel\CustomFieldData; use SP\DataModel\CustomFieldDefData; use SP\Log\Log; diff --git a/inc/SP/Mgmt/Users/UserBase.php b/inc/SP/Mgmt/Users/UserBase.php index 4476d853..015638c7 100644 --- a/inc/SP/Mgmt/Users/UserBase.php +++ b/inc/SP/Mgmt/Users/UserBase.php @@ -28,7 +28,6 @@ defined('APP_ROOT') || die(); use SP\Core\Exceptions\InvalidClassException; use SP\DataModel\UserData; -use SP\DataModel\UserLoginData; use SP\Mgmt\ItemBaseInterface; use SP\Mgmt\ItemBaseTrait; diff --git a/inc/SP/Mgmt/Users/UserPass.php b/inc/SP/Mgmt/Users/UserPass.php index 0d4b410d..f13292a3 100644 --- a/inc/SP/Mgmt/Users/UserPass.php +++ b/inc/SP/Mgmt/Users/UserPass.php @@ -32,6 +32,7 @@ use SP\Config\ConfigDB; use SP\Controller\LoginController; use SP\Core\Crypt\Crypt; use SP\Core\Crypt\Hash; +use SP\Core\Crypt\Session as CryptSession; use SP\Core\Exceptions\InvalidClassException; use SP\Core\Exceptions\QueryException; use SP\Core\Exceptions\SPException; @@ -43,7 +44,6 @@ use SP\Log\Email; use SP\Log\Log; use SP\Storage\DB; use SP\Storage\QueryData; -use SP\Core\Crypt\Session as CryptSession; /** * Class UserPass para la gestión de las claves de un usuario diff --git a/inc/SP/Mgmt/Users/UserPreferences.php b/inc/SP/Mgmt/Users/UserPreferences.php index 166eb2fc..ca2cdff3 100644 --- a/inc/SP/Mgmt/Users/UserPreferences.php +++ b/inc/SP/Mgmt/Users/UserPreferences.php @@ -26,7 +26,6 @@ namespace SP\Mgmt\Users; defined('APP_ROOT') || die(); -use SP\Core\Exceptions\SPException; use SP\DataModel\UserData; use SP\DataModel\UserPreferencesData; use SP\Mgmt\ItemInterface; diff --git a/inc/SP/Mgmt/Users/UserSSO.class.php b/inc/SP/Mgmt/Users/UserSSO.php similarity index 98% rename from inc/SP/Mgmt/Users/UserSSO.class.php rename to inc/SP/Mgmt/Users/UserSSO.php index 167fe897..3d97ff06 100644 --- a/inc/SP/Mgmt/Users/UserSSO.class.php +++ b/inc/SP/Mgmt/Users/UserSSO.php @@ -27,8 +27,6 @@ namespace SP\Mgmt\Users; use SP\Config\Config; use SP\Core\Crypt\Hash; use SP\Core\Exceptions\SPException; -use SP\DataModel\UserData; -use SP\DataModel\UserLoginData; use SP\Log\Email; use SP\Log\Log; use SP\Storage\DB; diff --git a/inc/SP/Util/Util.php b/inc/SP/Util/Util.php index c3c4fcf3..7077cb40 100644 --- a/inc/SP/Util/Util.php +++ b/inc/SP/Util/Util.php @@ -32,9 +32,7 @@ use SP\Core\Exceptions\SPException; use SP\Core\Init; use SP\Core\Installer; use SP\Core\Session; -use SP\Core\Upgrade\Upgrade; use SP\Html\Html; -use SP\Http\Request; use SP\Log\Log; use SP\Log\LogUtil; diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 24cb1e66..cd5adfd4 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -6,7 +6,6 @@ $vendorDir = dirname(dirname(__FILE__)); $baseDir = dirname($vendorDir); return array( - 'Base2n' => $vendorDir . '/ademarre/binary-to-text-php/Base2n.php', 'Defuse\\Crypto\\Core' => $vendorDir . '/defuse/php-encryption/src/Core.php', 'Defuse\\Crypto\\Crypto' => $vendorDir . '/defuse/php-encryption/src/Crypto.php', 'Defuse\\Crypto\\DerivedKeys' => $vendorDir . '/defuse/php-encryption/src/DerivedKeys.php', @@ -318,6 +317,7 @@ return array( 'SP\\Mgmt\\Users\\UserPreferences' => $baseDir . '/inc/SP/Mgmt/Users/UserPreferences.php', 'SP\\Mgmt\\Users\\UserPreferencesBase' => $baseDir . '/inc/SP/Mgmt/Users/UserPreferencesBase.php', 'SP\\Mgmt\\Users\\UserPreferencesUtil' => $baseDir . '/inc/SP/Mgmt/Users/UserPreferencesUtil.php', + 'SP\\Mgmt\\Users\\UserSSO' => $baseDir . '/inc/SP/Mgmt/Users/UserSSO.php', 'SP\\Mgmt\\Users\\UserSearch' => $baseDir . '/inc/SP/Mgmt/Users/UserSearch.php', 'SP\\Mgmt\\Users\\UserUtil' => $baseDir . '/inc/SP/Mgmt/Users/UserUtil.php', 'SP\\Storage\\DB' => $baseDir . '/inc/SP/Storage/DB.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index a2812db6..b7df7ace 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -60,7 +60,6 @@ class ComposerStaticInit1701764f82c629b16cc164189600cb41 ); public static $classMap = array ( - 'Base2n' => __DIR__ . '/..' . '/ademarre/binary-to-text-php/Base2n.php', 'Defuse\\Crypto\\Core' => __DIR__ . '/..' . '/defuse/php-encryption/src/Core.php', 'Defuse\\Crypto\\Crypto' => __DIR__ . '/..' . '/defuse/php-encryption/src/Crypto.php', 'Defuse\\Crypto\\DerivedKeys' => __DIR__ . '/..' . '/defuse/php-encryption/src/DerivedKeys.php', @@ -372,6 +371,7 @@ class ComposerStaticInit1701764f82c629b16cc164189600cb41 'SP\\Mgmt\\Users\\UserPreferences' => __DIR__ . '/../..' . '/inc/SP/Mgmt/Users/UserPreferences.php', 'SP\\Mgmt\\Users\\UserPreferencesBase' => __DIR__ . '/../..' . '/inc/SP/Mgmt/Users/UserPreferencesBase.php', 'SP\\Mgmt\\Users\\UserPreferencesUtil' => __DIR__ . '/../..' . '/inc/SP/Mgmt/Users/UserPreferencesUtil.php', + 'SP\\Mgmt\\Users\\UserSSO' => __DIR__ . '/../..' . '/inc/SP/Mgmt/Users/UserSSO.php', 'SP\\Mgmt\\Users\\UserSearch' => __DIR__ . '/../..' . '/inc/SP/Mgmt/Users/UserSearch.php', 'SP\\Mgmt\\Users\\UserUtil' => __DIR__ . '/../..' . '/inc/SP/Mgmt/Users/UserUtil.php', 'SP\\Storage\\DB' => __DIR__ . '/../..' . '/inc/SP/Storage/DB.php',