tobias/friendica
1
0
Fork 0
Code Pull requests Activity

re-add App::isBackend()

Browse source
This commit is contained in:
Philipp Holzer 2019-08-12 18:20:22 +02:00
parent 0af9747c6c
commit 4089e17f85
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
2 changed files with 39 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/App.php
View file

@ -100,8 +100,6 @@ class App
/**
* @var bool true, if the call is from an backend node (f.e. worker)
*
* @deprecated 2019.09 - use App\Module->isBackend() instead
*/
private $isBackend;
@ -287,7 +285,7 @@ class App
$this->logger = $logger;
$this->l10n = $l10n;
$this->args = $args;
$this->isBackend = $module->isBackend();
$this->isBackend = $this->checkBackend($module);
$this->profiler->reset();
@ -575,6 +573,29 @@ class App
$this->getBaseURL();
}
/**
* Checks if the site is called via a backend process
*
* @param Module $module The pre-loaded module (just name, not class!)
* @return bool True, if the call is a backend call
*/
private function checkBackend(Module $module)
{
return basename(($_SERVER['PHP_SELF'] ?? ''), '.php') !== 'index' ||
$module->isBackend();
}
/**
* Returns true, if the call is from a backend node (f.e. from a worker)
*
* @return bool Is it a known backend?
*/
public function isBackend()
{
return $this->isBackend;
}
/**
* @brief Checks if the maximum number of database processes is reached
*
@ -668,7 +689,7 @@ class App
*/
public function isMaxLoadReached()
{
if ($this->isBackend) {
if ($this->isBackend()) {
$process = 'backend';
$maxsysload = intval($this->config->get('system', 'maxloadavg'));
if ($maxsysload < 1) {

23
src/App/Module.php
View file

@ -87,7 +87,8 @@ class Module
}
/**
* @return bool
* @return bool True, if the current module is a backend module
* @see Module::BACKEND_MODULES for a list
*/
public function isBackend()
{
@ -124,7 +125,7 @@ class Module
$module = "login";
}
$isBackend = $this->checkBackend($module, $server);
$isBackend = in_array($module, Module::BACKEND_MODULES);;
return new Module($module, $this->module_class, $isBackend, $this->printNotAllowedAddon);
}
@ -258,22 +259,4 @@ class Module
Core\Hook::callAll($this->module . '_mod_afterpost', $placeholder);
call_user_func([$this->module_class, 'afterpost']);
}
/**
* @brief Checks if the site is called via a backend process
*
* This isn't a perfect solution. But we need this check very early.
* So we cannot wait until the modules are loaded.
*
* @param string $module The determined module
* @param array $server The $_SERVER variable
*
* @return bool True, if the current module is called at backend
*/
private function checkBackend($module, array $server)
{
// Check if current module is in backend or backend flag is set
return basename(($server['PHP_SELF'] ?? ''), '.php') !== 'index' &&
in_array($module, Module::BACKEND_MODULES);
}
}