Permalink
Browse files

Code clean, unused imports, unreachable statements, etc.

  • Loading branch information...
1 parent 4907af8 commit b8282a956a3bc098346187c2b340e38a7de25236 @cdujeu cdujeu committed Jun 10, 2016
Showing with 335 additions and 323 deletions.
  1. +1 −1 core/src/core/src/pydio/Core/Controller/CliRunner.php
  2. +8 −5 core/src/core/src/pydio/Core/Controller/XMLWriter.php
  3. +1 −1 core/src/core/src/pydio/Core/Exception/AuthRequiredException.php
  4. +1 −1 core/src/core/src/pydio/Core/Exception/PydioUserAlertException.php
  5. +1 −1 core/src/core/src/pydio/Core/Http/Cli/AuthCliMiddleware.php
  6. +2 −2 core/src/core/src/pydio/Core/Http/Dav/AuthBackendBasic.php
  7. +2 −2 core/src/core/src/pydio/Core/Http/Dav/AuthBackendDigest.php
  8. +0 −1 core/src/core/src/pydio/Core/Http/Dav/Collection.php
  9. +2 −1 core/src/core/src/pydio/Core/Http/Dav/Node.php
  10. +1 −1 core/src/core/src/pydio/Core/Http/Dav/RootCollection.php
  11. +4 −8 core/src/core/src/pydio/Core/Http/Middleware/AuthMiddleware.php
  12. +1 −1 core/src/core/src/pydio/Core/Http/Middleware/SapiMiddleware.php
  13. +1 −1 core/src/core/src/pydio/Core/Http/Response/FileReaderResponse.php
  14. +1 −1 core/src/core/src/pydio/Core/Http/Response/JSONSerializableResponseChunk.php
  15. +1 −1 core/src/core/src/pydio/Core/Http/Response/XMLSerializableResponseChunk.php
  16. +1 −1 core/src/core/src/pydio/Core/Http/Rest/ApiRouter.php
  17. +2 −2 core/src/core/src/pydio/Core/Http/Rest/RestAuthMiddleware.php
  18. +1 −1 core/src/core/src/pydio/Core/Http/Server.php
  19. +1 −1 core/src/core/src/pydio/Core/Http/SimpleRestResourceRouter.php
  20. +1 −1 core/src/core/src/pydio/Core/Http/TopLevelRouter.php
  21. +1 −1 core/src/core/src/pydio/Core/Model/Context.php
  22. +2 −2 core/src/core/src/pydio/Core/PluginFramework/Plugin.php
  23. +3 −3 core/src/core/src/pydio/Core/PluginFramework/PluginsService.php
  24. +3 −3 core/src/core/src/pydio/Core/Services/ConfService.php
  25. +1 −1 core/src/core/src/pydio/Core/Utils/BruteForceHelper.php
  26. +1 −0 core/src/core/src/pydio/Core/Utils/PydioSdkGenerator.php
  27. +1 −1 core/src/core/src/pydio/Core/Utils/TextEncoder.php
  28. +3 −2 core/src/core/src/pydio/Core/Utils/Utils.php
  29. +2 −2 core/src/core/src/pydio/Core/Utils/VarsFilter.php
  30. +1 −1 core/src/core/src/pydio/Tests/UsersConfig.php
  31. +1 −1 core/src/plugins/access.demo/class.demoAccessDriver.php
  32. +1 −1 core/src/plugins/access.dropbox/class.dropboxAccessDriver.php
  33. +1 −1 core/src/plugins/access.dropbox/class.dropboxWrapper.php
  34. +10 −1 core/src/plugins/access.fs/class.fsAccessDriver.php
  35. +2 −1 core/src/plugins/access.fs/class.fsAccessWrapper.php
  36. +1 −1 core/src/plugins/access.fs/test.fsAccess.php
  37. +1 −1 core/src/plugins/access.ftp/class.ftpAccessDriver.php
  38. +3 −3 core/src/plugins/access.ftp/class.ftpAccessWrapper.php
  39. +1 −4 core/src/plugins/access.imap/class.imapAccessWrapper.php
  40. +1 −1 core/src/plugins/access.inbox/class.inboxAccessDriver.php
  41. +1 −1 core/src/plugins/access.inbox/class.inboxAccessWrapper.php
  42. +1 −1 core/src/plugins/access.jsapi/class.jsapiAccessDriver.php
  43. +2 −1 core/src/plugins/access.mysql/class.mysqlAccessDriver.php
  44. +1 −1 core/src/plugins/access.s3/class.s3AccessDriver.php
  45. +1 −1 core/src/plugins/access.s3/class.s3AccessWrapper.php
  46. +1 −1 core/src/plugins/access.sftp/class.sftpAccessDriver.php
  47. +3 −4 core/src/plugins/access.sftp/class.sftpAccessWrapper.php
  48. +2 −2 core/src/plugins/access.sftp_psl/class.sftpPSLAccessWrapper.php
  49. +5 −6 core/src/plugins/access.smb/class.smbAccessDriver.php
  50. +2 −2 core/src/plugins/access.smb/class.smbAccessWrapper.php
  51. +1 −3 core/src/plugins/access.swift/class.swiftAccessWrapper.php
  52. +1 −1 core/src/plugins/access.webdav/src/Driver.php
  53. +4 −4 core/src/plugins/action.antivirus/class.AntivirusScanner.php
  54. +1 −1 core/src/plugins/action.avatar/class.AvatarProvider.php
  55. +3 −3 core/src/plugins/action.compression/class.PluginCompression.php
  56. +2 −3 core/src/plugins/action.powerfs/class.PowerFSController.php
  57. +1 −1 core/src/plugins/action.scheduler/class.AjxpScheduler.php
  58. +4 −4 core/src/plugins/action.share/src/Legacy/LegacyPubliclet.php
  59. +2 −2 core/src/plugins/action.share/src/Model/CompositeShare.php
  60. +1 −1 core/src/plugins/action.share/src/Model/ShareLink.php
  61. +2 −3 core/src/plugins/action.share/src/ShareCenter.php
  62. +1 −1 core/src/plugins/action.share/src/Store/ShareMetaManager.php
  63. +4 −4 core/src/plugins/action.share/src/Store/ShareRightsManager.php
  64. +3 −3 core/src/plugins/action.share/src/Store/ShareStore.php
  65. +2 −2 core/src/plugins/action.timestamp/class.TimestampCreator.php
  66. +47 −44 core/src/plugins/action.updater/class.AjaXplorerUpgrader.php
  67. +1 −1 core/src/plugins/auth.ftp/class.ftpAuthDriver.php
  68. +1 −1 core/src/plugins/auth.multi/class.multiAuthDriver.php
  69. +1 −1 core/src/plugins/auth.remote/class.remoteAuthDriver.php
  70. +7 −4 core/src/plugins/auth.remote/cms_auth_functions.php
  71. +2 −0 core/src/plugins/auth.remote/sessionSwitcher.php
  72. +2 −2 core/src/plugins/auth.smb/class.smbAuthDriver.php
  73. +1 −1 core/src/plugins/auth.sql/class.sqlAuthDriver.php
  74. +1 −1 core/src/plugins/authfront.cyphered/class.CypheredAuthFrontend.php
  75. +1 −1 core/src/plugins/authfront.keystore/class.KeystoreAuthFrontend.php
  76. +1 −0 core/src/plugins/boot.conf/class.BootConfLoader.php
  77. +1 −0 core/src/plugins/conf.serial/class.AJXP_SerialUser.php
  78. +1 −1 core/src/plugins/conf.serial/class.serialConfDriver.php
  79. +2 −0 core/src/plugins/conf.sql/class.AJXP_SqlUser.php
  80. +9 −3 core/src/plugins/conf.sql/class.sqlConfDriver.php
  81. +2 −2 core/src/plugins/core.access/src/AJXP_MetaStreamWrapper.php
  82. +1 −1 core/src/plugins/core.access/src/AbstractAccessDriver.php
  83. +1 −1 core/src/plugins/core.access/src/Filter/AJXP_PermissionMask.php
  84. +0 −1 core/src/plugins/core.access/src/Filter/ContentFilter.php
  85. +2 −2 core/src/plugins/core.access/src/Model/AJXP_Node.php
  86. +1 −1 core/src/plugins/core.access/src/Model/NodesDiff.php
  87. +2 −3 core/src/plugins/core.access/src/Model/Repository.php
  88. +3 −3 core/src/plugins/core.access/src/Model/UserSelection.php
  89. +0 −1 core/src/plugins/core.access/src/Stream/AuthWrapper.php
  90. +2 −2 core/src/plugins/core.cache/class.AbstractCacheDriver.php
  91. +1 −1 core/src/plugins/core.cache/class.CacheStreamLayer.php
  92. +1 −1 core/src/plugins/core.conf/class.AJXP_Role.php
  93. +1 −3 core/src/plugins/core.conf/class.AbstractConfDriver.php
  94. +6 −9 core/src/plugins/core.index/class.CoreIndexer.php
  95. +1 −1 core/src/plugins/core.log/class.AJXP_Logger.php
  96. +1 −1 core/src/plugins/core.meta/class.AJXP_AbstractMetaSource.php
  97. +1 −1 core/src/plugins/core.metastore/interface.MetaStoreProvider.php
  98. +1 −1 core/src/plugins/core.notifications/class.AJXP_Notification.php
  99. +1 −1 core/src/plugins/core.notifications/interface.AJXP_FeedStore.php
  100. +0 −9 core/src/plugins/core.ocs/src/Client/OCSClient.php
  101. +1 −1 core/src/plugins/core.ocs/src/Model/RemoteShare.php
  102. +3 −1 core/src/plugins/core.ocs/src/Server/Dav/AuthSharingBackend.php
  103. +3 −1 core/src/plugins/core.ocs/src/Server/Dav/Server.php
  104. +2 −2 core/src/plugins/core.tasks/src/ITasksProvider.php
  105. +1 −1 core/src/plugins/core.tasks/src/Providers/SqlTasksProvider.php
  106. +3 −3 core/src/plugins/core.tasks/src/TaskController.php
  107. +1 −1 core/src/plugins/core.tasks/src/TaskService.php
  108. +2 −2 core/src/plugins/editor.audio/class.AudioPreviewer.php
  109. +1 −1 core/src/plugins/editor.browser/class.FileMimeSender.php
  110. +0 −6 core/src/plugins/editor.diaporama/PThumb.lib.php
  111. +8 −1 core/src/plugins/editor.diaporama/class.ImagePreviewer.php
  112. +2 −3 core/src/plugins/editor.eml/class.EmlParser.php
  113. +2 −2 core/src/plugins/editor.etherpad/class.EtherpadClient.php
  114. +8 −7 core/src/plugins/editor.imagick/class.IMagickPreviewer.php
  115. +3 −3 core/src/plugins/editor.pixlr/class.PixlrEditor.php
  116. +1 −1 core/src/plugins/editor.video/class.VideoReader.php
  117. +1 −2 core/src/plugins/editor.zoho/class.ZohoEditor.php
  118. +2 −2 core/src/plugins/feed.sql/class.AJXP_SqlFeedStore.php
  119. +18 −18 core/src/plugins/index.lucene/class.AjxpLuceneIndexer.php
  120. +8 −5 core/src/plugins/log.sql/class.sqlLogDriver.php
  121. +2 −0 core/src/plugins/log.syslog/class.sysLogDriver.php
  122. +4 −7 core/src/plugins/meta.exif/class.ExifMetaManager.php
  123. +17 −17 core/src/plugins/meta.exif/class.GeoConversion.php
  124. +1 −1 core/src/plugins/meta.git/class.GitManager.php
  125. +1 −1 core/src/plugins/meta.monitor_fs/class.FSMonitoringManager.php
  126. +1 −1 core/src/plugins/meta.svn/class.SvnManager.php
  127. +1 −1 core/src/plugins/meta.user/class.UserMetaManager.php
  128. +2 −2 core/src/plugins/metastore.s3/class.s3MetaStore.php
  129. +3 −1 core/src/plugins/metastore.xattr/class.xAttrMetaStore.php
  130. +1 −1 core/src/plugins/mq.sql/class.AJXP_SqlMessageExchanger.php
  131. +1 −1 core/src/plugins/uploader.plupload/class.PluploadProcessor.php
  132. +1 −1 core/src/worker.php
@@ -134,7 +134,7 @@ public static function runCommandInBackground($cmd, $logFile)
if (AJXP_SERVER_DEBUG) $cmd .= " > " . $logFile;
if (class_exists("COM") && ConfService::getCoreConf("CLI_USE_COM")) {
$WshShell = new COM("WScript.Shell");
- $oExec = $WshShell->Run("cmd /C $cmd", 0, false);
+ $WshShell->Run("cmd /C $cmd", 0, false);
} else {
$basePath = str_replace("/", DIRECTORY_SEPARATOR, AJXP_INSTALL_PATH);
$tmpBat = implode(DIRECTORY_SEPARATOR, array($basePath, "data", "tmp", md5(time()) . ".bat"));
@@ -24,6 +24,8 @@
use Pydio\Access\Core\IAjxpWrapperProvider;
use Pydio\Core\Model\Context;
use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\RepositoryInterface;
+use Pydio\Core\Model\UserInterface;
use Pydio\Core\Services\LocaleService;
use Pydio\Core\Services\UsersService;
use Pydio\Core\Utils\Utils;
@@ -79,6 +81,7 @@ public static function close($docNode="tree", $print = true)
{
if($print){
print("</$docNode>");
+ return "";
}else{
return "</$docNode>";
}
@@ -615,10 +618,10 @@ public static function writeRepositoriesData(ContextInterface $ctx)
/**
* @param string $repoId
- * @param \Pydio\Access\Core\Model\Repository $repoObject
+ * @param RepositoryInterface $repoObject
* @param array $exposed
* @param array $streams
- * @param AbstractAjxpUser $loggedUser
+ * @param UserInterface $loggedUser
* @param string $accessStatus
* @return string
* @throws \Exception
@@ -638,7 +641,7 @@ public static function repositoryToXML($repoId, $repoObject, $exposed, $streams,
}
$streamString = "";
- if (in_array($repoObject->accessType, $streams)) {
+ if (in_array($repoObject->getAccessType(), $streams)) {
$streamString = "allowCrossRepositoryCopy=\"true\"";
}
if ($repoObject->getUniqueUser()) {
@@ -678,7 +681,7 @@ public static function repositoryToXML($repoId, $repoObject, $exposed, $streams,
$ctx = Context::contextWithObjects($loggedUser, $repoObject);
$roleString="";
if($loggedUser != null){
- $merged = $loggedUser->mergedRole;
+ $merged = $loggedUser->getMergedRole();
$params = array();
foreach($exposed as $exposed_prop){
$metaOptions = $repoObject->getContextOption($ctx, "META_SOURCES");
@@ -701,7 +704,7 @@ public static function repositoryToXML($repoId, $repoObject, $exposed, $streams,
$roleString.= ' hasMask="true" ';
}
}
- return "<repo access_type=\"".$repoObject->accessType."\" id=\"".$repoId."\"$statusString $streamString $slugString $isSharedString $roleString><label>".TextEncoder::toUTF8(Utils::xmlEntities($repoObject->getDisplay()))."</label>".$descTag.$repoObject->getClientSettings($ctx)."</repo>";
+ return "<repo access_type=\"".$repoObject->getAccessType()."\" id=\"".$repoId."\"$statusString $streamString $slugString $isSharedString $roleString><label>".TextEncoder::toUTF8(Utils::xmlEntities($repoObject->getDisplay()))."</label>".$descTag.$repoObject->getClientSettings($ctx)."</repo>";
}
@@ -23,7 +23,7 @@
use Pydio\Core\Http\Message\UserMessage;
use Pydio\Core\Http\Response\JSONSerializableResponseChunk;
use Pydio\Core\Http\Response\XMLSerializableResponseChunk;
-use Pydio\Core\Services\ConfService;
+
use Pydio\Core\Services\LocaleService;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -20,7 +20,7 @@
*/
namespace Pydio\Core\Exception;
-use Pydio\Core\Exception\PydioException;
+
defined('AJXP_EXEC') or die('Access not allowed');
@@ -23,7 +23,7 @@
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Pydio\Auth\Core\AJXP_Safe;
-use Pydio\Core\Controller\Controller;
+
use Pydio\Core\Exception\AuthRequiredException;
use Pydio\Core\Exception\LoginException;
use Pydio\Core\Http\Server;
@@ -28,10 +28,10 @@
use Pydio\Core\Exception\WorkspaceNotFoundException;
use Pydio\Core\Model\ContextInterface;
use Pydio\Core\Model\UserInterface;
-use Pydio\Core\PluginFramework\PluginsService;
+
use Pydio\Core\Services\AuthService;
use Pydio\Core\Services\ConfService;
-use Pydio\Core\Services\RepositoryService;
+
use Pydio\Core\Services\UsersService;
use Pydio\Core\Utils\TextEncoder;
use Pydio\Log\Core\AJXP_Logger;
@@ -24,8 +24,8 @@
use Pydio\Core\Exception\RepositoryLoadException;
use Pydio\Core\Exception\WorkspaceForbiddenException;
use Pydio\Core\Exception\WorkspaceNotFoundException;
-use Pydio\Core\PluginFramework\PluginsService;
-use Pydio\Core\Services\RepositoryService;
+
+
use Pydio\Core\Services\UsersService;
use Pydio\Core\Utils\TextEncoder;
use \Sabre;
@@ -166,7 +166,6 @@ public function getChildren()
$contents = array();
- $errors = array();
$nodes = scandir($this->getUrl());
@@ -20,6 +20,7 @@
*/
namespace Pydio\Core\Http\Dav;
+use Pydio\Core\Exception\PydioException;
use \Sabre;
use Pydio\Access\Core\Model\AJXP_Node;
use Pydio\Access\Core\IAjxpWrapperProvider;
@@ -89,7 +90,7 @@ public function getAccessDriver()
$n = new AJXP_Node($this->getUrl());
return $n->getDriver();
}
- throw new \Exception("Cannot find driver instance for current node! ".$this->path);
+ throw new \Sabre\DAV\Exception\NotFound("Cannot find driver instance for current node! ".$this->path);
}
/**
@@ -23,7 +23,7 @@
use Pydio\Core\Model\FilteredRepositoriesList;
use \Sabre;
use Pydio\Core\Model\ContextInterface;
-use Pydio\Core\Services\ConfService;
+
use Pydio\Core\PluginFramework\PluginsService;
defined('AJXP_EXEC') or die( 'Access not allowed');
@@ -26,19 +26,15 @@
use Pydio\Core\Exception\AuthRequiredException;
use Pydio\Core\Exception\NoActiveWorkspaceException;
use Pydio\Core\Exception\PydioException;
-use Pydio\Core\Exception\RepositoryLoadException;
+
use Pydio\Core\Http\Server;
use Pydio\Core\Model\Context;
use Pydio\Core\Model\ContextInterface;
use Pydio\Core\PluginFramework\PluginsService;
-use Pydio\Core\Services\AuthService;
+
use Pydio\Core\Services\ConfService;
-use Pydio\Core\Services\LocaleService;
-use Pydio\Core\Services\RolesService;
-use Pydio\Core\Services\SessionService;
-use Pydio\Core\Services\UsersService;
-use Pydio\Core\Utils\Utils;
-use Pydio\Log\Core\AJXP_Logger;
+
+
use Zend\Diactoros\Response\EmptyResponse;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -23,7 +23,7 @@
use \Psr\Http\Message\ServerRequestInterface;
use \Psr\Http\Message\ResponseInterface;
use Pydio\Core\Exception\PydioException;
-use Pydio\Core\Http\Rest\ApiRouter;
+
use Pydio\Core\Http\Response\SerializableResponseStream;
use Pydio\Core\Http\Server;
use Pydio\Core\Utils\Utils;
@@ -178,7 +178,7 @@ public function readFile($node = null, $filePath = null, $data = null, $headerTy
} else {
$size = $byteLength;
}
- if ($confGzip && ($size > $confGzipLimit || !function_exists("gzencode") || @strpos($serverParams['HTTP_ACCEPT_ENCODING'], 'gzip') === FALSE)) {
+ if ($confGzip && ($size > $confGzipLimit || !function_exists("gzencode") || (isSet($serverParams['HTTP_ACCEPT_ENCODING']) && strpos($serverParams['HTTP_ACCEPT_ENCODING'], 'gzip') === FALSE))) {
$confGzip = false;
}
@@ -20,7 +20,7 @@
*/
namespace Pydio\Core\Http\Response;
-use Pydio\Core\Http\Response\SerializableResponseChunk;
+
defined('AJXP_EXEC') or die('Access not allowed');
@@ -20,7 +20,7 @@
*/
namespace Pydio\Core\Http\Response;
-use Pydio\Core\Http\Response\SerializableResponseChunk;
+
defined('AJXP_EXEC') or die('Access not allowed');
@@ -100,7 +100,7 @@ public function route(ServerRequestInterface &$request, ResponseInterface &$resp
//$response = $response->withStatus(404);
break;
case \FastRoute\Dispatcher::METHOD_NOT_ALLOWED:
- $allowedMethods = $routeInfo[1];
+ //$allowedMethods = $routeInfo[1];
//$response = $response->withStatus(405);
break;
case \FastRoute\Dispatcher::FOUND:
@@ -25,12 +25,12 @@
use Pydio\Core\Exception\NoActiveWorkspaceException;
use Pydio\Core\Exception\PydioException;
use Pydio\Core\Exception\WorkspaceForbiddenException;
-use Pydio\Core\Exception\WorkspaceNotFoundException;
+
use Pydio\Core\Model\Context;
use Pydio\Core\Model\ContextInterface;
use Pydio\Core\PluginFramework\PluginsService;
use Pydio\Core\Services\ConfService;
-use Pydio\Core\Services\RepositoryService;
+
use Pydio\Core\Services\RolesService;
use Pydio\Core\Services\UsersService;
use Pydio\Core\Utils\Utils;
@@ -23,7 +23,7 @@
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Pydio\Core\Exception\PydioException;
-use Pydio\Core\Http\Cli\CliMiddleware;
+
use Pydio\Core\Http\Message\PromptMessage;
use Pydio\Core\Http\Message\UserMessage;
use Pydio\Core\Http\Middleware\ITopLevelMiddleware;
@@ -141,7 +141,7 @@ public function route(ServerRequestInterface &$request, ResponseInterface &$resp
//$response = $response->withStatus(404);
break;
case \FastRoute\Dispatcher::METHOD_NOT_ALLOWED:
- $allowedMethods = $routeInfo[1];
+ //$allowedMethods = $routeInfo[1];
//$response = $response->withStatus(405);
break;
case \FastRoute\Dispatcher::FOUND:
@@ -23,7 +23,7 @@
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Pydio\Core\Exception\PydioException;
-use Pydio\Core\Utils\Utils;
+
use Zend\Diactoros\ServerRequestFactory;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -20,7 +20,7 @@
*/
namespace Pydio\Core\Model;
-use Pydio\Core\Services\AuthService;
+
use Pydio\Core\Services\ConfService;
use Pydio\Core\Services\RepositoryService;
@@ -23,8 +23,8 @@
use Pydio\Access\Core\AJXP_MetaStreamWrapper;
use Pydio\Core\Model\Context;
use Pydio\Core\Model\ContextInterface;
-use Pydio\Core\Model\RepositoryInterface;
-use Pydio\Core\Services\AuthService;
+
+
use Pydio\Core\Services\ConfService;
use Pydio\Core\Controller\XMLWriter;
use Pydio\Log\Core\AJXP_Logger;
@@ -31,10 +31,10 @@
use Pydio\Core\Exception\RepositoryLoadException;
use Pydio\Core\Model\Context;
use Pydio\Core\Model\ContextInterface;
-use Pydio\Core\Model\RepositoryInterface;
-use Pydio\Core\Services\AuthService;
+
+
use Pydio\Core\Services\CacheService;
-use Pydio\Core\Services\ConfService;
+
use Pydio\Core\Services\UsersService;
use Pydio\Core\Utils\Utils;
use Pydio\Log\Core\AJXP_Logger;
@@ -20,16 +20,16 @@
*/
namespace Pydio\Core\Services;
-use Pydio\Access\Core\AbstractAccessDriver;
+
use Pydio\Access\Core\AJXP_MetaStreamWrapper;
use Pydio\Access\Core\Model\AJXP_Node;
use Pydio\Auth\Core\AbstractAuthDriver;
use Pydio\Cache\Core\AbstractCacheDriver;
use Pydio\Conf\Core\AbstractAjxpUser;
use Pydio\Conf\Core\AbstractConfDriver;
-use Pydio\Core\Exception\PydioException;
+
use Pydio\Core\Model\Context;
-use Pydio\Core\Model\RepositoryInterface;
+
use Pydio\Core\Model\UserInterface;
use Pydio\Core\PluginFramework\CoreInstanceProvider;
use Pydio\Core\Utils\Utils;
@@ -20,7 +20,7 @@
*/
namespace Pydio\Core\Utils;
-use Pydio\Core\Services\AuthService;
+
use Pydio\Core\Services\ConfService;
use Pydio\Log\Core\AJXP_Logger;
@@ -30,6 +30,7 @@
namespace Pydio\Core\Utils;
//define("JSON_DIR", AJXP_INSTALL_PATH."/core/doc/api");
+use Pydio\Core\PluginFramework\Plugin;
use Pydio\Core\PluginFramework\PluginsService;
define("JSON_DIR", AJXP_INSTALL_PATH."/../api");
@@ -21,7 +21,7 @@
namespace Pydio\Core\Utils;
use Pydio\Core\Model\ContextInterface;
-use Pydio\Core\Services\ConfService;
+
use Pydio\Core\Services\SessionService;
defined('AJXP_EXEC') or die( 'Access not allowed');
@@ -21,9 +21,10 @@
namespace Pydio\Core\Utils;
use Psr\Http\Message\UploadedFileInterface;
-use Pydio\Access\Core\Model\Repository;
+
use Pydio\Core\Model\Context;
use Pydio\Core\Model\ContextInterface;
+use Pydio\Core\Model\RepositoryInterface;
use Pydio\Core\Services\AuthService;
use Pydio\Core\Services\ConfService;
use Pydio\Core\PluginFramework\Plugin;
@@ -915,7 +916,7 @@ public static function detectServerURL($withURI = false)
}
/**
- * @param Repository $repository
+ * @param RepositoryInterface $repository
* @return string
*/
public static function getWorkspaceShortcutURL($repository){
@@ -24,8 +24,8 @@
use Pydio\Core\Exception\PydioException;
use Pydio\Core\Model\ContextInterface;
use Pydio\Core\Services;
-use Pydio\Core\Services\AuthService;
-use Pydio\Conf\Core\AbstractAjxpUser;
+
+
use Pydio\Core\Services\ConfService;
use Pydio\Core\Services\UsersService;
@@ -20,7 +20,7 @@
*/
namespace Pydio\Tests;
-use Pydio\Core\Services\AuthService;
+
use Pydio\Core\Services\ConfService;
use Pydio\Core\Services\UsersService;
@@ -24,7 +24,7 @@
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
use Pydio\Access\Core\Model\Repository;
-use Pydio\Core\Controller\XMLWriter;
+
use Pydio\Core\Exception\PydioException;
defined('AJXP_EXEC') or die( 'Access not allowed');
Oops, something went wrong.

0 comments on commit b8282a9

Please sign in to comment.