Permalink
Browse files

Move ApplicationState from Utils to Services package.

  • Loading branch information...
1 parent 4709f18 commit 84cc2626e46e2bb918df048ba9e44e2c1a7575d8 @cdujeu cdujeu committed Sep 24, 2016
Showing with 67 additions and 79 deletions.
  1. +1 −1 core/src/core/src/lib/pclzip.lib.php
  2. +1 −1 core/src/core/src/pydio/Core/Controller/XMLWriter.php
  3. +1 −1 core/src/core/src/pydio/Core/Http/Cli/AuthCliMiddleware.php
  4. +1 −1 core/src/core/src/pydio/Core/Http/Message/RegistryMessage.php
  5. +1 −1 core/src/core/src/pydio/Core/Http/Middleware/SessionMiddleware.php
  6. +1 −1 core/src/core/src/pydio/Core/Http/Response/FileReaderResponse.php
  7. +1 −2 core/src/core/src/pydio/Core/Http/Rest/RestApiServer.php
  8. +1 −1 core/src/core/src/pydio/Core/Http/Rest/RestAuthMiddleware.php
  9. +1 −1 core/src/core/src/pydio/Core/Http/Wopi/AuthMiddleware.php
  10. +1 −2 core/src/core/src/pydio/Core/Http/Wopi/Server.php
  11. +1 −2 core/src/core/src/pydio/Core/PluginFramework/PluginsService.php
  12. +1 −1 core/src/core/src/pydio/Core/Serializer/RepositoryXML.php
  13. +1 −1 core/src/core/src/pydio/Core/Serializer/UserXML.php
  14. +1 −2 core/src/core/src/pydio/Core/{Utils → Services}/ApplicationState.php
  15. +0 −1 core/src/core/src/pydio/Core/Services/AuthService.php
  16. +0 −1 core/src/core/src/pydio/Core/Services/ConfService.php
  17. +0 −1 core/src/core/src/pydio/Core/Services/SessionService.php
  18. +1 −1 core/src/core/src/pydio/Core/Utils/Http/BruteForceHelper.php
  19. +1 −1 core/src/core/src/pydio/Core/Utils/Vars/OptionsHelper.php
  20. +1 −1 core/src/plugins/access.fs/FsAccessDriver.php
  21. +1 −1 core/src/plugins/access.fs/FsAccessWrapper.php
  22. +1 −1 core/src/plugins/access.ftp/FtpAccessWrapper.php
  23. +1 −1 core/src/plugins/access.inbox/InboxAccessDriver.php
  24. +1 −1 core/src/plugins/access.inbox/InboxAccessWrapper.php
  25. +1 −1 core/src/plugins/access.s3/S3AccessWrapper.php
  26. +1 −1 core/src/plugins/access.sftp/SFTPAccessWrapper.php
  27. +1 −1 core/src/plugins/access.sftp_psl/SftpPSLAccessWrapper.php
  28. +1 −1 core/src/plugins/access.smb/SMBAccessWrapper.php
  29. +1 −1 core/src/plugins/access.swift/SwiftAccessWrapper.php
  30. +1 −1 core/src/plugins/action.compression/PluginCompression.php
  31. +1 −1 core/src/plugins/action.powerfs/PowerFSController.php
  32. +1 −1 core/src/plugins/action.share/src/Http/MinisiteAuthMiddleware.php
  33. +1 −1 core/src/plugins/action.share/src/Http/MinisiteServer.php
  34. +1 −1 core/src/plugins/action.share/src/Model/CompositeShare.php
  35. +1 −1 core/src/plugins/action.share/src/Model/ShareLink.php
  36. +1 −1 core/src/plugins/action.share/src/ShareCenter.php
  37. +1 −1 core/src/plugins/action.share/src/View/MinisiteRenderer.php
  38. +1 −1 core/src/plugins/action.share/src/View/PublicAccessManager.php
  39. +1 −1 core/src/plugins/action.updater/UpdateController.php
  40. +1 −2 core/src/plugins/authfront.cas/CasAuthFrontend.php
  41. +1 −3 core/src/plugins/authfront.session_login/SessionLoginFrontend.php
  42. +1 −1 core/src/plugins/boot.conf/BootConfLoader.php
  43. +1 −1 core/src/plugins/cache.doctrine/DoctrineCacheDriver.php
  44. +1 −1 core/src/plugins/core.access/src/Stream/StreamWrapper.php
  45. +1 −2 core/src/plugins/core.authfront/FrontendsLoader.php
  46. +1 −1 core/src/plugins/core.cache/AbstractCacheDriver.php
  47. +1 −1 core/src/plugins/core.cache/CoreCacheLoader.php
  48. +1 −1 core/src/plugins/core.conf/AbstractConfDriver.php
  49. +1 −1 core/src/plugins/core.index/AbstractSearchEngineIndexer.php
  50. +1 −2 core/src/plugins/core.index/CoreIndexer.php
  51. +1 −1 core/src/plugins/core.mq/src/MqManager.php
  52. +1 −1 core/src/plugins/core.notifications/Notification.php
  53. +1 −1 core/src/plugins/core.ocs/src/Client/OCSClient.php
  54. +1 −1 core/src/plugins/core.ocs/src/OCSPlugin.php
  55. +1 −1 core/src/plugins/core.tasks/src/TaskService.php
  56. +1 −1 core/src/plugins/editor.diaporama/PThumb.lib.php
  57. +1 −1 core/src/plugins/editor.eml/EmlParser.php
  58. +1 −1 core/src/plugins/editor.imagick/IMagickPreviewer.php
  59. +1 −1 core/src/plugins/editor.pixlr/PixlrEditor.php
  60. +1 −1 core/src/plugins/gui.ios/MobileNativeRedirect.php
  61. +1 −1 core/src/plugins/gui.user/UserGuiController.php
  62. +1 −1 core/src/plugins/index.elasticsearch/ElasticSearchIndexer.php
  63. +1 −1 core/src/plugins/index.lucene/LuceneIndexer.php
  64. +1 −1 core/src/plugins/meta.exif/ExifMetaManager.php
  65. +1 −1 core/src/plugins/meta.filehasher/FileHasher.php
  66. +1 −1 core/src/plugins/meta.git/GitManager.php
  67. +1 −1 core/src/plugins/meta.syncable/ChangesTracker.php
  68. +1 −1 core/src/plugins/uploader.jumploader/Jumploader.php
  69. +1 −1 core/src/plugins/uploader.plupload/Pluploader.php
  70. +1 −1 core/src/worker.php
@@ -26,7 +26,7 @@
// --------------------------------------------------------------------------------
// ----- Constants
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\Utils;
if (!defined('PCLZIP_READ_BLOCK_SIZE')) {
@@ -24,7 +24,7 @@
use Pydio\Access\Core\IAjxpWrapperProvider;
use Pydio\Core\Model\ContextInterface;
use Pydio\Core\Services\LocaleService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\Vars\InputFilter;
use Pydio\Core\Utils\Vars\StatHelper;
use Pydio\Core\Utils\Vars\StringHelper;
@@ -34,7 +34,7 @@
use Pydio\Core\Services\ConfService;
use Pydio\Core\Services\RolesService;
use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\Crypto;
use Pydio\Core\Utils\TextEncoder;
use Pydio\Log\Core\Logger;
@@ -23,7 +23,7 @@
use Pydio\Core\Controller\XMLWriter;
use Pydio\Core\Http\Response\JSONSerializableResponseChunk;
use Pydio\Core\Http\Response\XMLDocSerializableResponseChunk;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -23,7 +23,7 @@
use Pydio\Core\Http\Server;
use Pydio\Core\Model\ContextInterface;
use Pydio\Core\Services\SessionService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -26,7 +26,7 @@
use Pydio\Core\Services\ApiKeysService;
use Pydio\Core\Services\AuthService;
use Pydio\Core\Services\ConfService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\FileHelper;
use Pydio\Core\Utils\Vars\PathUtils;
use Pydio\Core\Utils\Vars\StatHelper;
@@ -22,8 +22,7 @@
namespace Pydio\Core\Http\Rest;
use Pydio\Core\Http\Server;
-use Pydio\Core\Services\ConfService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -35,7 +35,7 @@
use Pydio\Core\Services\RolesService;
use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Log\Core\Logger;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -34,7 +34,7 @@
use Pydio\Core\Services\RolesService;
use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Log\Core\Logger;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -22,8 +22,7 @@
namespace Pydio\Core\Http\Wopi;
use Pydio\Core\Http\Server as HttpServer;
-use Pydio\Core\Services\ConfService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -37,9 +37,8 @@
use Pydio\Core\Model\RepositoryInterface;
use Pydio\Core\Services\CacheService;
-use Pydio\Core\Services\ConfService;
use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\FileHelper;
use Pydio\Log\Core\Logger;
use Pydio\Access\Meta\Core\AbstractMetaSource;
@@ -26,7 +26,7 @@
use Pydio\Core\Model\UserInterface;
use Pydio\Core\PluginFramework\PluginsService;
use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\Vars\StringHelper;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -24,7 +24,7 @@
use Pydio\Core\PluginFramework\PluginsService;
use Pydio\Core\Services\ConfService;
use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -18,10 +18,9 @@
*
* The latest code can be found at <https://pydio.com/>.
*/
-namespace Pydio\Core\Utils;
+namespace Pydio\Core\Services;
use Pydio\Core\Model\RepositoryInterface;
-use Pydio\Core\Services\ConfService;
use Pydio\Core\Utils\Vars\PathUtils;
use Pydio\Log\Core\Logger;
@@ -24,7 +24,6 @@
use Pydio\Core\Exception\LoginException;
use Pydio\Core\Model\Context;
use Pydio\Core\Model\UserInterface;
-use Pydio\Core\Utils\ApplicationState;
use Pydio\Core\Utils\Http\BruteForceHelper;
use Pydio\Core\Utils\Http\CookiesHelper;
use Pydio\Core\Utils\Vars\InputFilter;
@@ -29,7 +29,6 @@
use Pydio\Core\Model\ContextInterface;
use Pydio\Core\PluginFramework\CoreInstanceProvider;
-use Pydio\Core\Utils\ApplicationState;
use Pydio\Core\Utils\Vars\VarsFilter;
use Pydio\Core\PluginFramework\Plugin;
use Pydio\Core\PluginFramework\PluginsService;
@@ -24,7 +24,6 @@
use Psr\Http\Message\ServerRequestInterface;
use Pydio\Core\Model\RepositoryInterface;
use Pydio\Core\Model\UserInterface;
-use Pydio\Core\Utils\ApplicationState;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -22,7 +22,7 @@
use Pydio\Core\Services\ConfService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Log\Core\Logger;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -23,7 +23,7 @@
use Pydio\Core\Model\Context;
use Pydio\Core\Model\ContextInterface;
use Pydio\Core\Services\ConfService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\Crypto;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -49,7 +49,7 @@
use Pydio\Core\Exception\PydioException;
use Pydio\Core\Services\LocaleService;
use Pydio\Core\Services\SessionService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\Vars\InputFilter;
use Pydio\Core\Utils\Vars\PathUtils;
use Pydio\Core\Utils\Vars\StatHelper;
@@ -29,7 +29,7 @@
use Pydio\Core\Services\ConfService;
use Pydio\Core\Exception\PydioException;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\Vars\InputFilter;
use Pydio\Core\Utils\Vars\PathUtils;
use Pydio\Core\Utils\Vars\UrlUtils;
@@ -30,7 +30,7 @@
use Pydio\Core\Exception\PydioException;
use Pydio\Core\Services\SessionService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\FileHelper;
use Pydio\Core\Utils\Vars\InputFilter;
use Pydio\Core\Utils\Vars\PathUtils;
@@ -29,7 +29,7 @@
use Pydio\Core\Controller\Controller;
use Pydio\Core\Services\LocaleService;
use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\Vars\StatHelper;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -25,7 +25,7 @@
use Pydio\Access\Core\Model\AJXP_Node;
use Pydio\Access\Core\IAjxpWrapper;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -26,7 +26,7 @@
use Pydio\Access\Driver\StreamProvider\FS\FsAccessWrapper;
use Pydio\Core\Model\ContextInterface;
use Pydio\Core\Services\ConfService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\FileHelper;
use Pydio\Log\Core\Logger;
@@ -28,7 +28,7 @@
use Pydio\Auth\Core\MemorySafe;
use Pydio\Core\Model\ContextInterface;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\Vars\InputFilter;
use Pydio\Log\Core\Logger;
@@ -29,7 +29,7 @@
use Pydio\Auth\Core\MemorySafe;
use Pydio\Core\Exception\PydioException;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\Vars\InputFilter;
use Pydio\Core\Utils\Vars\UrlUtils;
use Pydio\Log\Core\Logger;
@@ -26,7 +26,7 @@
use Pydio\Auth\Core\MemorySafe;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\Vars\VarsFilter;
use Pydio\Log\Core\Logger;
@@ -24,7 +24,7 @@
use Pydio\Access\Core\Model\AJXP_Node;
use Pydio\Access\Driver\StreamProvider\FS\FsAccessWrapper;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\FileHelper;
use Pydio\Log\Core\Logger;
@@ -31,7 +31,7 @@
use Pydio\Core\Controller\Controller;
use Pydio\Core\Exception\PydioException;
use Pydio\Core\Services\LocaleService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\Vars\InputFilter;
use Pydio\Core\Utils\Vars\PathUtils;
@@ -27,7 +27,7 @@
use Pydio\Core\Controller\Controller;
use Pydio\Core\Services\LocaleService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\Vars\InputFilter;
use Pydio\Core\PluginFramework\Plugin;
use Pydio\Core\PluginFramework\PluginsService;
@@ -28,7 +28,7 @@
use Pydio\Core\Services\AuthService;
use Pydio\Core\Services\SessionService;
use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -24,7 +24,7 @@
use Pydio\Core\Http\Server;
use Pydio\Core\Model\Context;
use Pydio\Core\Services\ConfService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Share\View\MinisiteRenderer;
use Zend\Diactoros\Response;
@@ -29,7 +29,7 @@
use Pydio\Core\Services\RepositoryService;
use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Share\Store\ShareRightsManager;
use Pydio\Share\View\PublicAccessManager;
@@ -23,7 +23,7 @@
use Pydio\Core\Services\LocaleService;
use Pydio\Core\Services\RepositoryService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\Vars\InputFilter;
use Pydio\Share\Store\ShareStore;
use Pydio\Share\View\PublicAccessManager;
@@ -45,7 +45,7 @@
use Pydio\Core\Services\RepositoryService;
use Pydio\Core\Services\SessionService;
use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\Vars\InputFilter;
use Pydio\Core\Controller\XMLWriter;
use Pydio\Core\PluginFramework\Plugin;
@@ -31,7 +31,7 @@
use Pydio\Core\Services\ConfService;
use Pydio\Core\Controller\Controller;
use Pydio\Core\Services\RepositoryService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\Http\UserAgent;
use Pydio\Core\Controller\XMLWriter;
use Pydio\Core\Controller\HTMLWriter;
@@ -22,7 +22,7 @@
use Pydio\Core\Services\ConfService;
use Pydio\Core\Services\LocaleService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -26,7 +26,7 @@
use Pydio\Core\Model\ContextInterface;
use Pydio\Core\Services\LocaleService;
use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\PluginFramework\Plugin;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -30,9 +30,8 @@
use Pydio\Core\Services\ConfService;
use Pydio\Conf\Sql\SqlConfDriver;
use Pydio\Core\Services\RolesService;
-use Pydio\Core\Services\SessionService;
use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\DBHelper;
use Pydio\Log\Core\Logger;
@@ -20,7 +20,6 @@
*/
namespace Pydio\Auth\Frontend;
-use __PHP_Incomplete_Class;
use Exception;
use Pydio\Core\Model\Context;
use Pydio\Core\Model\UserInterface;
@@ -29,10 +28,9 @@
use Pydio\Core\Services\ConfService;
use Pydio\Core\Services\SessionService;
use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\Http\BruteForceHelper;
use Pydio\Core\Utils\Http\CookiesHelper;
-use Pydio\Core\Utils\Vars\InputFilter;
use Pydio\Core\Controller\XMLWriter;
use Pydio\Core\Utils\Http\CaptchaProvider;
@@ -37,7 +37,7 @@
use Pydio\Core\Services\LocaleService;
use Pydio\Core\Services\RolesService;
use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\ApplicationState;
+use Pydio\Core\Services\ApplicationState;
use Pydio\Core\Utils\FileHelper;
use Pydio\Core\Utils\Vars\InputFilter;
use Pydio\Core\Utils\Vars\OptionsHelper;
Oops, something went wrong.

0 comments on commit 84cc262

Please sign in to comment.