viscous/espocrm
1
0
Fork 0
mirror of https://github.com/espocrm/espocrm.git synced 2026-06-28 23:16:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix entryPoint error messages

Browse Source
This commit is contained in:
yuri
2015-05-26 10:34:57 +03:00
parent 0cd3666a96
commit 7cfebbf87e
2 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
application/Espo/Core/Application.php
View File

@@ -108,19 +108,19 @@ class Application
$entryPointManager = new \Espo\Core\EntryPointManager($container);
$auth = $this->getAuth();
$apiAuth = new \Espo\Core\Utils\Api\Auth($auth, $entryPointManager->checkAuthRequired($entryPoint), true);
$slim->add($apiAuth);
try {
$auth = $this->getAuth();
$apiAuth = new \Espo\Core\Utils\Api\Auth($auth, $entryPointManager->checkAuthRequired($entryPoint), true);
$slim->add($apiAuth);
$slim->hook('slim.before.dispatch', function () use ($entryPoint, $entryPointManager, $container) {
try {
$slim->hook('slim.before.dispatch', function () use ($entryPoint, $entryPointManager, $container) {
$entryPointManager->run($entryPoint);
} catch (\Exception $e) {
$container->get('output')->processError($e->getMessage(), $e->getCode(), true);
}
});
});
$slim->run();
$slim->run();
} catch (\Exception $e) {
$container->get('output')->processError($e->getMessage(), $e->getCode(), true);
}
}
public function runCron()

31
application/Espo/Core/EntryPointManager.php
View File

@@ -28,9 +28,9 @@ use \Espo\Core\Exceptions\NotFound,
class EntryPointManager
{
private $container;
private $fileManager;
private $container;
private $fileManager;
protected $data = null;
@@ -38,7 +38,7 @@ class EntryPointManager
protected $allowedMethods = array(
'run',
);
);
/**
* @var array - path to entryPoint files
@@ -46,14 +46,14 @@ class EntryPointManager
private $paths = array(
'corePath' => 'application/Espo/EntryPoints',
'modulePath' => 'application/Espo/Modules/{*}/EntryPoints',
'customPath' => 'custom/Espo/Custom/EntryPoints',
'customPath' => 'custom/Espo/Custom/EntryPoints',
);
public function __construct(\Espo\Core\Container $container)
{
$this->container = $container;
$this->fileManager = $container->get('fileManager');
$this->container = $container;
$this->fileManager = $container->get('fileManager');
}
protected function getContainer()
@@ -69,16 +69,16 @@ class EntryPointManager
public function checkAuthRequired($name)
{
$className = $this->getClassName($name);
if ($className === false) {
if (!$className) {
throw new NotFound();
}
return $className::$authRequired;
return $className::$authRequired;
}
public function run($name)
public function run($name)
{
$className = $this->getClassName($name);
if ($className === false) {
if (!$className) {
throw new NotFound();
}
$entryPoint = new $className($this->container);
@@ -89,7 +89,7 @@ class EntryPointManager
protected function getClassName($name)
{
$name = Util::normilizeClassName($name);
if (!isset($this->data)) {
$this->init();
}
@@ -98,8 +98,8 @@ class EntryPointManager
if (isset($this->data[$name])) {
return $this->data[$name];
}
return false;
return false;
}
@@ -108,8 +108,7 @@ class EntryPointManager
$classParser = $this->getContainer()->get('classParser');
$classParser->setAllowedMethods($this->allowedMethods);
$this->data = $classParser->getData($this->paths, $this->cacheFile);
}
}
}