Added Update checks
- Logging - Console - Admin overview
This commit is contained in:
parent
3cf0cb71f1
commit
23654ce566
12 changed files with 215 additions and 60 deletions
17
src/App.php
17
src/App.php
|
@ -75,11 +75,6 @@ class App
|
|||
*/
|
||||
private $mode;
|
||||
|
||||
/**
|
||||
* @var string The App base path
|
||||
*/
|
||||
private $basePath;
|
||||
|
||||
/**
|
||||
* @var string The App URL path
|
||||
*/
|
||||
|
@ -142,7 +137,7 @@ class App
|
|||
*/
|
||||
public function getBasePath()
|
||||
{
|
||||
return $this->basePath;
|
||||
return $this->config->get('system', 'basepath');
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -216,7 +211,6 @@ class App
|
|||
/**
|
||||
* @brief App constructor.
|
||||
*
|
||||
* @param string $basePath The basedir of the app
|
||||
* @param Configuration $config The Configuration
|
||||
* @param App\Mode $mode The mode of this Friendica app
|
||||
* @param LoggerInterface $logger The current app logger
|
||||
|
@ -225,7 +219,7 @@ class App
|
|||
*
|
||||
* @throws Exception if the Basepath is not usable
|
||||
*/
|
||||
public function __construct($basePath, Configuration $config, App\Mode $mode, LoggerInterface $logger, Profiler $profiler, $isBackend = true)
|
||||
public function __construct(Configuration $config, App\Mode $mode, LoggerInterface $logger, Profiler $profiler, $isBackend = true)
|
||||
{
|
||||
BaseObject::setApp($this);
|
||||
|
||||
|
@ -233,13 +227,6 @@ class App
|
|||
$this->config = $config;
|
||||
$this->profiler = $profiler;
|
||||
$this->mode = $mode;
|
||||
$cfgBasePath = $this->config->get('system', 'basepath');
|
||||
$this->basePath = !empty($cfgBasePath) ? $cfgBasePath : $basePath;
|
||||
|
||||
if (!Core\System::isDirectoryUsable($this->getBasePath(), false)) {
|
||||
throw new Exception('Basepath \'' . $this->getBasePath() . '\' isn\'t usable.');
|
||||
}
|
||||
$this->basePath = rtrim($this->getBasePath(), DIRECTORY_SEPARATOR);
|
||||
|
||||
$this->checkBackend($isBackend);
|
||||
$this->checkFriendicaApp();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue