Permalink
Browse files

Track down all class.*.php and interface.*.php namings

  • Loading branch information...
1 parent e64181a commit 1d4f1c9ceaa88efcf9b6543e6ba9c6a358ab6c6c @cdujeu cdujeu committed Jun 22, 2016
Showing with 646 additions and 477 deletions.
  1. +6 −14 core/src/conf/bootstrap_context.php
  2. +3 −3 core/src/core/src/lib/HttpClient.php
  3. +3 −3 core/src/core/src/pydio/Core/Controller/CliRunner.php
  4. +3 −3 core/src/core/src/pydio/Core/Controller/Controller.php
  5. +3 −3 core/src/core/src/pydio/Core/Controller/ShutdownScheduler.php
  6. +3 −3 core/src/core/src/pydio/Core/Http/Cli/AuthCliMiddleware.php
  7. +4 −4 core/src/core/src/pydio/Core/Http/Dav/AuthBackendBasic.php
  8. +3 −3 core/src/core/src/pydio/Core/Http/Dav/AuthBackendDigest.php
  9. +3 −3 core/src/core/src/pydio/Core/Http/Dav/Collection.php
  10. +3 −3 core/src/core/src/pydio/Core/Http/Dav/DAVServer.php
  11. +2 −2 core/src/core/src/pydio/Core/Http/Middleware/SessionRepositoryMiddleware.php
  12. +4 −4 core/src/core/src/pydio/Core/Http/Response/FileReaderResponse.php
  13. +2 −2 core/src/core/src/pydio/Core/Http/Rest/RestAuthMiddleware.php
  14. +2 −2 core/src/core/src/pydio/Core/Http/Server.php
  15. +2 −2 core/src/core/src/pydio/Core/Model/FilteredRepositoriesList.php
  16. +2 −2 core/src/core/src/pydio/Core/Model/RepositoryInterface.php
  17. +6 −8 core/src/core/src/pydio/Core/Model/UserInterface.php
  18. +6 −6 core/src/core/src/pydio/Core/PluginFramework/Plugin.php
  19. +3 −3 core/src/core/src/pydio/Core/PluginFramework/PluginsService.php
  20. +8 −8 core/src/core/src/pydio/Core/Services/AuthService.php
  21. +4 −4 core/src/core/src/pydio/Core/Services/RepositoryService.php
  22. +7 −7 core/src/core/src/pydio/Core/Services/UsersService.php
  23. +2 −2 core/src/core/src/pydio/Core/Utils/BruteForceHelper.php
  24. +2 −2 core/src/core/src/pydio/Core/Utils/Utils.php
  25. +8 −9 core/src/plugins/access.ajxp_conf/{class.ajxp_confAccessDriver.php → ConfAccessDriver.php}
  26. +1 −1 core/src/plugins/access.ajxp_conf/manifest.xml
  27. 0 core/src/plugins/access.ajxp_home/{class.HomePagePlugin.php → HomePagePlugin.php}
  28. +1 −1 core/src/plugins/access.ajxp_home/manifest.xml
  29. 0 core/src/plugins/access.ajxp_user/{class.UserDashboardDriver.php → UserDashboardDriver.php}
  30. +1 −1 core/src/plugins/access.ajxp_user/manifest.xml
  31. +1 −1 core/src/plugins/access.demo/{class.demoAccessDriver.php → DemoAccessDriver.php}
  32. +2 −2 core/src/plugins/access.demo/manifest.xml
  33. +2 −2 core/src/plugins/access.dropbox/src/Driver.php
  34. +7 −7 core/src/plugins/access.fs/{class.fsAccessDriver.php → FsAccessDriver.php}
  35. +7 −7 core/src/plugins/access.fs/{class.fsAccessWrapper.php → FsAccessWrapper.php}
  36. +2 −2 core/src/plugins/access.fs/manifest.xml
  37. +3 −3 core/src/plugins/access.ftp/{class.ftpAccessDriver.php → FtpAccessDriver.php}
  38. +16 −16 core/src/plugins/access.ftp/{class.ftpAccessWrapper.php → FtpAccessWrapper.php}
  39. +2 −2 core/src/plugins/access.ftp/manifest.xml
  40. +2 −2 core/src/plugins/access.ftp/test.ftpAccess.php
  41. +7 −7 core/src/plugins/access.imap/{class.imapAccessDriver.php → ImapAccessDriver.php}
  42. +7 −7 core/src/plugins/access.imap/{class.imapAccessWrapper.php → ImapAccessWrapper.php}
  43. +2 −2 core/src/plugins/access.imap/manifest.xml
  44. +2 −2 core/src/plugins/access.inbox/{class.inboxAccessDriver.php → InboxAccessDriver.php}
  45. +4 −4 core/src/plugins/access.inbox/{class.inboxAccessWrapper.php → InboxAccessWrapper.php}
  46. +2 −2 core/src/plugins/access.inbox/manifest.xml
  47. +5 −3 core/src/plugins/access.jsapi/{class.jsapiAccessDriver.php → JsapiAccessDriver.php}
  48. +1 −1 core/src/plugins/access.jsapi/manifest.xml
  49. +1 −1 core/src/plugins/access.mysql/{class.mysqlAccessDriver.php → MysqlAccessDriver.php}
  50. +1 −1 core/src/plugins/access.mysql/manifest.xml
  51. +5 −1 core/src/plugins/access.s3/ForcePathStyleListener.php
  52. +5 −3 core/src/plugins/access.s3/{class.pydioS3Client.php → PydioS3Client.php}
  53. +16 −2 core/src/plugins/access.s3/{class.s3AccessDriver.php → S3AccessDriver.php}
  54. +17 −17 core/src/plugins/access.s3/{class.s3AccessWrapper.php → S3AccessWrapper.php}
  55. +1 −1 core/src/plugins/access.s3/{class.s3CacheService.php → S3CacheService.php}
  56. +3 −3 core/src/plugins/access.sftp/{class.sftpAccessDriver.php → SFTPAccessDriver.php}
  57. +9 −9 core/src/plugins/access.sftp/{class.sftpAccessWrapper.php → SFTPAccessWrapper.php}
  58. +2 −2 core/src/plugins/access.sftp/manifest.xml
  59. +2 −2 core/src/plugins/access.sftp_psl/{class.sftpPSLAccessDriver.php → SftpPSLAccessDriver.php}
  60. +5 −5 core/src/plugins/access.sftp_psl/{class.sftpPSLAccessWrapper.php → SftpPSLAccessWrapper.php}
  61. +2 −2 core/src/plugins/access.sftp_psl/manifest.xml
  62. +2 −2 core/src/plugins/access.smb/{class.smbAccessDriver.php → SMBAccessDriver.php}
  63. +5 −5 core/src/plugins/access.smb/{class.smbAccessWrapper.php → SMBAccessWrapper.php}
  64. +2 −2 core/src/plugins/access.smb/manifest.xml
  65. +7 −5 core/src/plugins/access.smb/smb.php
  66. +2 −2 core/src/plugins/access.swift/{class.swiftAccessDriver.php → SwiftAccessDriver.php}
  67. +5 −5 core/src/plugins/access.swift/{class.swiftAccessWrapper.php → SwiftAccessWrapper.php}
  68. +2 −2 core/src/plugins/access.swift/manifest.xml
  69. +2 −2 core/src/plugins/access.webdav/src/Driver.php
  70. 0 core/src/plugins/access.wms/{class.WmsBrowser.php → WmsBrowser.php}
  71. +1 −1 core/src/plugins/access.wms/manifest.xml
  72. +2 −2 core/src/plugins/action.disclaimer/DisclaimerProvider.php
  73. +4 −4 core/src/plugins/action.powerfs/PowerFSController.php
  74. +2 −2 core/src/plugins/action.share/src/ShareCenter.php
  75. +4 −4 core/src/plugins/action.share/src/Store/ShareStore.php
  76. +1 −1 core/src/plugins/action.updater/UpgradeManager.php
  77. +2 −2 core/src/plugins/auth.ftp/FtpSonWrapper.php
  78. +20 −20 core/src/plugins/auth.radius/RadiusAuthDriver.php
  79. +2 −2 core/src/plugins/auth.remote/cms_auth_functions.php
  80. +2 −2 core/src/plugins/auth.remote/glueCode.php
  81. +5 −5 core/src/plugins/auth.remote/sessionSwitcher.php
  82. +12 −12 core/src/plugins/authfront.cas/CasAuthFrontend.php
  83. +5 −5 core/src/plugins/authfront.keystore/KeystoreAuthFrontend.php
  84. +2 −2 core/src/plugins/authfront.session_login/SessionLoginFrontend.php
  85. +6 −6 core/src/plugins/boot.conf/BootConfLoader.php
  86. +6 −6 core/src/plugins/cache.doctrine/DoctrineCacheDriver.php
  87. +9 −9 core/src/plugins/conf.sql/{class.sqlConfDriver.php → SqlConfDriver.php}
  88. +14 −21 core/src/plugins/conf.sql/{class.AJXP_SqlUser.php → SqlUser.php}
  89. +1 −1 core/src/plugins/conf.sql/manifest.xml
  90. +3 −3 core/src/plugins/core.access/src/AbstractAccessDriver.php
  91. +3 −3 core/src/plugins/core.auth/AbstractAuthDriver.php
  92. +2 −2 core/src/plugins/core.authfront/FrontendsLoader.php
  93. 0 core/src/plugins/core.cache/{class.AbstractCacheDriver.php → AbstractCacheDriver.php}
  94. 0 core/src/plugins/core.cache/{class.CacheStreamLayer.php → CacheStreamLayer.php}
  95. 0 core/src/plugins/core.cache/{class.CoreCacheLoader.php → CoreCacheLoader.php}
  96. +1 −1 core/src/plugins/core.cache/manifest.xml
  97. +1 −1 core/src/plugins/core.conf/{class.AJXP_Role.php → AJXP_Role.php}
  98. +7 −7 core/src/plugins/core.conf/{class.AbstractConfDriver.php → AbstractConfDriver.php}
  99. +162 −8 core/src/plugins/core.conf/{class.AbstractAjxpUser.php → AbstractUser.php}
  100. +1 −1 core/src/plugins/core.conf/{class.AjxpRole.php → AjxpRole.php}
  101. +8 −4 core/src/plugins/core.conf/{class.CoreConfLoader.php → CoreConfLoader.php}
  102. +1 −1 core/src/plugins/core.conf/{interface.AjxpGroupPathProvider.php → IGroupPathProvider.php}
  103. +1 −1 core/src/plugins/core.conf/manifest.xml
  104. 0 core/src/plugins/core.log/{class.AbstractLogDriver.php → AbstractLogDriver.php}
  105. +4 −5 core/src/plugins/core.log/{class.AJXP_Logger.php → Logger.php}
  106. +1 −1 core/src/plugins/core.log/manifest.xml
  107. +3 −3 core/src/plugins/core.mailer/Mailer.php
  108. +2 −2 core/src/plugins/core.notifications/Notification.php
  109. +2 −2 core/src/plugins/core.ocs/src/Model/SQLStore.php
  110. +2 −2 core/src/plugins/core.ocs/src/Server/Dav/Server.php
  111. +3 −3 core/src/plugins/core.tasks/src/Providers/MockTasksProvider.php
  112. +3 −3 core/src/plugins/core.tasks/src/Providers/SqlTasksProvider.php
  113. +4 −4 core/src/plugins/core.tasks/src/TaskService.php
  114. +46 −40 core/src/plugins/cypher.encfs/{class.EncfsMounter.php → EncfsMounter.php}
  115. +1 −1 core/src/plugins/cypher.encfs/manifest.xml
  116. +1 −1 core/src/plugins/editor.diaporama/manifest.xml
  117. +3 −3 core/src/plugins/editor.zoho/ZohoEditor.php
  118. +1 −1 core/src/plugins/meta.simple_lock/SimpleLockManager.php
  119. +5 −5 core/src/plugins/meta.syncable/ChangesTracker.php
  120. +3 −3 core/src/plugins/meta.user/UserMetaManager.php
  121. +5 −5 core/src/plugins/uploader.jumploader/Jumploader.php
@@ -102,7 +102,11 @@
}
}
-function AjaXplorer_autoload($className)
+/**
+ * Used as autoloader
+ * @param $className
+ */
+function pydioAutoloader($className)
{
// Temp : super dummy autoloader, take only class name
$parts = explode("\\", $className);
@@ -116,20 +120,8 @@ function AjaXplorer_autoload($className)
require_once($corePlugClass[0]);
return;
}
-
- // TODO : should be useless after refactorings
- $corePlugClass = glob(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/core.*/class.".$className.".php", GLOB_NOSORT);
- if ($corePlugClass !== false && count($corePlugClass)) {
- require_once($corePlugClass[0]);
- return;
- }
- $corePlugInterface = glob(AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/core.*/interface.".$className.".php", GLOB_NOSORT);
- if ($corePlugInterface !== false && count($corePlugInterface)) {
- require_once($corePlugInterface[0]);
- return;
- }
}
-spl_autoload_register('AjaXplorer_autoload');
+spl_autoload_register('pydioAutoloader');
include_once(AJXP_INSTALL_PATH . "/core/compat.php");
@@ -1,5 +1,5 @@
<?php
-use Pydio\Log\Core\AJXP_Logger;
+use Pydio\Log\Core\Logger;
/**
* Version 0.9, 6th April 2003 - Simon Willison ( http://simon.incutio.com/ )
@@ -200,7 +200,7 @@ public function doRequest()
if (isSet($this->collectHeaders[$hKey])) {
if($hKey == "content-length" && $hValue == "0") continue;
$this->collectHeaders[$hKey] = $hValue;
- AJXP_Logger::debug("Setting $hKey", $this->collectHeaders);
+ Logger::debug("Setting $hKey", $this->collectHeaders);
}
}
}
@@ -495,7 +495,7 @@ public function debug($msg, $object = false)
$st .= '<pre>'.$content.'</pre>';
}
$st .= '</div>';
- AJXP_Logger::debug($msg . ($object!==false?" - ".print_r($object, true):""));
+ Logger::debug($msg . ($object!==false?" - ".print_r($object, true):""));
}
}
}
@@ -25,7 +25,7 @@
use Pydio\Core\Services\ConfService;
use Pydio\Core\Services\UsersService;
use Pydio\Core\Utils\UnixProcess;
-use Pydio\Log\Core\AJXP_Logger;
+use Pydio\Log\Core\Logger;
use Pydio\Tasks\Task;
use Pydio\Tasks\TaskService;
@@ -140,14 +140,14 @@ public static function runCommandInBackground($cmd, $logFile)
$tmpBat = implode(DIRECTORY_SEPARATOR, array($basePath, "data", "tmp", md5(time()) . ".bat"));
$cmd = "@chcp 1252 > nul \r\n" . $cmd;
$cmd .= "\n DEL " . chr(34) . $tmpBat . chr(34);
- AJXP_Logger::debug("Writing file $cmd to $tmpBat");
+ Logger::debug("Writing file $cmd to $tmpBat");
file_put_contents($tmpBat, $cmd);
pclose(popen('start /b "CLI" "' . $tmpBat . '"', 'r'));
}
return null;
} else {
$process = new UnixProcess($cmd, (AJXP_SERVER_DEBUG ? $logFile : null));
- AJXP_Logger::debug("Starting process and sending output dev null");
+ Logger::debug("Starting process and sending output dev null");
return $process;
}
}
@@ -31,7 +31,7 @@
use Pydio\Core\Services;
use Pydio\Core\PluginFramework\PluginsService;
use Pydio\Core\Services\UsersService;
-use Pydio\Log\Core\AJXP_Logger;
+use Pydio\Log\Core\Logger;
use Pydio\Core\Exception\ActionNotFoundException;
use Pydio\Core\Exception\AuthRequiredException;
@@ -439,7 +439,7 @@ public static function applyHook($hookName, $args, $forceNonDefer = false)
}
}
if($findContext == null){
- AJXP_Logger::error("Controller", "applyHook", "Applying hook $hookName without context");
+ Logger::error("Controller", "applyHook", "Applying hook $hookName without context");
throw new \Exception("No context found for hook $hookName: please make sure to pass at list one ContextInterface or Context Provider object");
}
@@ -492,7 +492,7 @@ public static function applyHook($hookName, $args, $forceNonDefer = false)
try{
self::applyCallback($findContext, $hookCallback, $args, $defer);
}catch(\Exception $e){
- AJXP_Logger::error("[Hook $hookName]", "[Callback ".$plugId.".".$methodName."]", $e->getMessage());
+ Logger::error("[Hook $hookName]", "[Callback ".$plugId.".".$methodName."]", $e->getMessage());
}
}else{
self::applyCallback($findContext, $hookCallback, $args, $defer);
@@ -20,7 +20,7 @@
*/
namespace Pydio\Core\Controller;
-use Pydio\Log\Core\AJXP_Logger;
+use Pydio\Log\Core\Logger;
defined('AJXP_EXEC') or die('Access not allowed');
/**
@@ -103,11 +103,11 @@ public function callRegisteredShutdown()
try {
call_user_func_array($callback, $arguments);
} catch (\Exception $e) {
- AJXP_Logger::error(__CLASS__, __FUNCTION__, array("context" => "Applying hook " . get_class($callback[0]) . "::" . $callback[1], "message" => $e->getMessage()));
+ Logger::error(__CLASS__, __FUNCTION__, array("context" => "Applying hook " . get_class($callback[0]) . "::" . $callback[1], "message" => $e->getMessage()));
}
$index++;
if($index > 200) {
- AJXP_Logger::error(__CLASS__, __FUNCTION__, "Breaking ShutdownScheduler loop, seems too big (200)");
+ Logger::error(__CLASS__, __FUNCTION__, "Breaking ShutdownScheduler loop, seems too big (200)");
break;
}
}
@@ -36,7 +36,7 @@
use Pydio\Core\Services\UsersService;
use Pydio\Core\Utils\TextEncoder;
use Pydio\Core\Utils\Utils;
-use Pydio\Log\Core\AJXP_Logger;
+use Pydio\Log\Core\Logger;
use Zend\Diactoros\Response;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -173,7 +173,7 @@ public static function handleRequest(ServerRequestInterface $requestInterface, R
$ctx->setUserObject($loggedUser);
$ctx->setRepositoryId($optRepoId);
$requestInterface = $requestInterface->withAttribute("ctx", $ctx);
- AJXP_Logger::updateContext($ctx);
+ Logger::updateContext($ctx);
$subResponse = Server::callNextMiddleWareAndRewind(function($middleware){
return (is_array($middleware) && $middleware["0"] == "Pydio\\Core\\Http\\Cli\\AuthCliMiddleware" && $middleware[1] == "handleRequest");
@@ -200,7 +200,7 @@ public static function handleRequest(ServerRequestInterface $requestInterface, R
$ctx->setUserObject($loggedUser);
$ctx->setRepositoryObject($repoObject);
$requestInterface = $requestInterface->withAttribute("ctx", $ctx);
- AJXP_Logger::updateContext($ctx);
+ Logger::updateContext($ctx);
TextEncoder::updateContext($ctx);
return Server::callNextMiddleWare($requestInterface, $responseInterface, $next);
@@ -35,7 +35,7 @@
use Pydio\Core\Services\UsersService;
use Pydio\Core\Utils\TextEncoder;
-use Pydio\Log\Core\AJXP_Logger;
+use Pydio\Log\Core\Logger;
use \Sabre;
defined('AJXP_EXEC') or die( 'Access not allowed');
@@ -96,7 +96,7 @@ public function authenticate(Sabre\DAV\Server $server, $realm)
$webdavData = $userObject->getPref("AJXP_WEBDAV_DATA");
if (empty($webdavData) || !isset($webdavData["ACTIVE"]) || $webdavData["ACTIVE"] !== true) {
- AJXP_Logger::warning(__CLASS__, "Login failed", array("user" => $userpass[0], "error" => "WebDAV user not found or disabled"));
+ Logger::warning(__CLASS__, "Login failed", array("user" => $userpass[0], "error" => "WebDAV user not found or disabled"));
throw new Sabre\DAV\Exception\NotAuthenticated();
}
// check if there are cached credentials. prevents excessive authentication calls to external
@@ -111,7 +111,7 @@ public function authenticate(Sabre\DAV\Server $server, $realm)
if (!$cachedPasswordValid && (!$this->validateUserPass($userpass[0],$userpass[1]))) {
- AJXP_Logger::warning(__CLASS__, "Login failed", array("user" => $userpass[0], "error" => "Invalid WebDAV user or password"));
+ Logger::warning(__CLASS__, "Login failed", array("user" => $userpass[0], "error" => "Invalid WebDAV user or password"));
$auth->requireLogin();
throw new Sabre\DAV\Exception\NotAuthenticated('Username or password does not match');
}
@@ -145,7 +145,7 @@ public function authenticate(Sabre\DAV\Server $server, $realm)
MemorySafe::storeCredentials($this->currentUser, $userpass[1]);
}
//PluginsService::getInstance($this->context);
- AJXP_Logger::updateContext($this->context);
+ Logger::updateContext($this->context);
TextEncoder::updateContext($this->context);
// the method used here will invalidate the cached password every minute on the minute
@@ -34,7 +34,7 @@
use Pydio\Core\Model\ContextInterface;
use Pydio\Core\Services\AuthService;
use Pydio\Core\Services\ConfService;
-use Pydio\Log\Core\AJXP_Logger;
+use Pydio\Log\Core\Logger;
defined('AJXP_EXEC') or die( 'Access not allowed');
@@ -122,7 +122,7 @@ public function authenticate(Sabre\DAV\Server $server, $realm)
$this->updateCurrentUserRights($loggedUser);
} else {
if ($success === false) {
- AJXP_Logger::warning(__CLASS__, "Login failed", array("user" => $this->currentUser, "error" => "Invalid WebDAV user or password"));
+ Logger::warning(__CLASS__, "Login failed", array("user" => $this->currentUser, "error" => "Invalid WebDAV user or password"));
}
throw new Sabre\DAV\Exception\NotAuthenticated($errmsg);
}
@@ -149,7 +149,7 @@ public function authenticate(Sabre\DAV\Server $server, $realm)
// NOW UPDATE CONTEXT
$this->context->setUserObject($loggedUser);
- AJXP_Logger::updateContext($this->context);
+ Logger::updateContext($this->context);
TextEncoder::updateContext($this->context);
return true;
@@ -23,7 +23,7 @@
use \Sabre;
use Pydio\Access\Core\Model\AJXP_Node;
use Pydio\Core\Controller\Controller;
-use Pydio\Log\Core\AJXP_Logger;
+use Pydio\Log\Core\Logger;
defined('AJXP_EXEC') or die( 'Access not allowed');
@@ -64,7 +64,7 @@ public function createFile($name, $data = null)
{
try {
$name = ltrim($name, "/");
- AJXP_Logger::debug("CREATE FILE $name");
+ Logger::debug("CREATE FILE $name");
$request = new \Zend\Diactoros\ServerRequest();
$request = $request
@@ -103,7 +103,7 @@ public function createFile($name, $data = null)
return $node->getETag();
} catch (\Exception $e) {
- AJXP_Logger::debug("Error ".$e->getMessage(), $e->getTraceAsString());
+ Logger::debug("Error ".$e->getMessage(), $e->getTraceAsString());
return null;
}
@@ -25,7 +25,7 @@
use Pydio\Core\PluginFramework\PluginsService;
use Pydio\Core\Services\ConfService;
use Pydio\Core\Services\RepositoryService;
-use Pydio\Log\Core\AJXP_Logger;
+use Pydio\Log\Core\Logger;
use Sabre\DAV as DAV;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -80,7 +80,7 @@ public static function handleRoute($baseURI, $davRoute){
}
}
if ($repository == null) {
- AJXP_Logger::debug("not found, dying $repositoryId");
+ Logger::debug("not found, dying $repositoryId");
die('You are not allowed to access this service');
}
@@ -128,7 +128,7 @@ public static function handleRoute($baseURI, $davRoute){
try {
$server->exec();
} catch ( \Exception $e ) {
- AJXP_Logger::error(__CLASS__,"Exception",$e->getMessage());
+ Logger::error(__CLASS__,"Exception",$e->getMessage());
}
}
}
@@ -34,7 +34,7 @@
use Pydio\Core\Services\SessionService;
use Pydio\Core\Services\UsersService;
use Pydio\Core\Utils\Utils;
-use Pydio\Log\Core\AJXP_Logger;
+use Pydio\Log\Core\Logger;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -80,7 +80,7 @@ public static function handleRequest(ServerRequestInterface &$requestInterface,
}
SessionMiddleware::updateContext($ctx);
- AJXP_Logger::updateContext($ctx);
+ Logger::updateContext($ctx);
//Set language
if($ctx->hasUser() && $ctx->getUser()->getPref("lang") != "") {
@@ -22,13 +22,13 @@
use Pydio\Access\Core\AJXP_MetaStreamWrapper;
use Pydio\Access\Core\Model\AJXP_Node;
-use Pydio\Access\Driver\StreamProvider\FS\fsAccessWrapper;
+use Pydio\Access\Driver\StreamProvider\FS\FsAccessWrapper;
use Pydio\Core\Controller\HTMLWriter;
use Pydio\Core\Services\ConfService;
use Pydio\Core\Utils\StatHelper;
use Pydio\Core\Utils\TextEncoder;
use Pydio\Core\Utils\Utils;
-use Pydio\Log\Core\AJXP_Logger;
+use Pydio\Log\Core\Logger;
use Zend\Diactoros\ServerRequestFactory;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -94,7 +94,7 @@ public function __construct($nodeOrFile = null, $data = null)
* @param array $params
*/
protected function logDebug($message, $params = []){
- AJXP_Logger::getInstance()->logDebug("FileReader", $message, $params);
+ Logger::getInstance()->logDebug("FileReader", $message, $params);
}
/**
@@ -185,7 +185,7 @@ public function readFile($node = null, $filePath = null, $data = null, $headerTy
if ($node !== null && !$node->wrapperIsRemote()) {
$originalFilePath = $filePathOrData;
- $filePathOrData = fsAccessWrapper::patchPathForBaseDir($filePathOrData);
+ $filePathOrData = FsAccessWrapper::patchPathForBaseDir($filePathOrData);
}
session_write_close();
@@ -34,7 +34,7 @@
use Pydio\Core\Services\RolesService;
use Pydio\Core\Services\UsersService;
use Pydio\Core\Utils\Utils;
-use Pydio\Log\Core\AJXP_Logger;
+use Pydio\Log\Core\Logger;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -87,7 +87,7 @@ public static function handleRequest(\Psr\Http\Message\ServerRequestInterface &$
$ctx->setRepositoryObject($repo);
$requestInterface = $requestInterface->withAttribute("ctx", $ctx);
- AJXP_Logger::updateContext($ctx);
+ Logger::updateContext($ctx);
if(UsersService::usersEnabled() && Utils::detectApplicationFirstRun()){
RolesService::bootSequence();
@@ -31,7 +31,7 @@
use Pydio\Core\Http\Response\SerializableResponseChunk;
use Pydio\Core\Http\Response\SerializableResponseStream;
use Pydio\Core\Model\Context;
-use Pydio\Log\Core\AJXP_Logger;
+use Pydio\Log\Core\Logger;
use Zend\Diactoros\Response;
use Zend\Diactoros\ServerRequestFactory;
@@ -201,7 +201,7 @@ public function catchError($code, $message, $fichier, $ligne, $context)
if(error_reporting() == 0) {
return ;
}
- AJXP_Logger::error(basename($fichier), "error l.$ligne", array("message" => $message));
+ Logger::error(basename($fichier), "error l.$ligne", array("message" => $message));
if(AJXP_SERVER_DEBUG){
if($context instanceof \Exception){
$message .= $context->getTraceAsString();
@@ -24,7 +24,7 @@
use Pydio\Core\PluginFramework\PluginsService;
use Pydio\Core\Services\ConfService;
use Pydio\Core\Services\RepositoryService;
-use Pydio\Log\Core\AJXP_Logger;
+use Pydio\Log\Core\Logger;
defined('AJXP_EXEC') or die('Access not allowed');
@@ -118,7 +118,7 @@ public function load()
$drvList[$repoId] = $repoObject;
}
if($repoObject->hasParent() && !RepositoryService::findRepositoryByIdOrAlias($repoObject->getParentId())){
- AJXP_Logger::error(__CLASS__, __FUNCTION__, "Disabling repository ".$repoObject->getSlug()." as parent cannot be correctly loaded.");
+ Logger::error(__CLASS__, __FUNCTION__, "Disabling repository ".$repoObject->getSlug()." as parent cannot be correctly loaded.");
unset($drvList[$repoId]);
}
}
Oops, something went wrong.

0 comments on commit 1d4f1c9

Please sign in to comment.