diff --git a/.gitignore b/.gitignore index 6ed4df6..8b72e38 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,6 @@ runtime/ **/.idea/workspace.xml **/.idea/tasks.xml -**/.idea/dataSources* \ No newline at end of file +**/.idea/dataSources* + +config.php \ No newline at end of file diff --git a/www/internals/.gitignore b/www/internals/.gitignore deleted file mode 100644 index 4e9b47a..0000000 --- a/www/internals/.gitignore +++ /dev/null @@ -1 +0,0 @@ -config.php \ No newline at end of file diff --git a/www/internals/mikeschergitgraph.php b/www/internals/mikeschergitgraph.php index b34c87a..86e55ad 100644 --- a/www/internals/mikeschergitgraph.php +++ b/www/internals/mikeschergitgraph.php @@ -5,18 +5,16 @@ require_once (__DIR__ . '/../extern/egg/ExtendedGitGraph2.php'); class MikescherGitGraph { - /** - * @return ExtendedGitGraph2 - * @throws Exception - */ - public static function create() - { - global $CONFIG; + /** @var ExtendedGitGraph2 */ + private $extgitgraph; - return new ExtendedGitGraph2($CONFIG['extendedgitgraph']); + /** @noinspection PhpUnhandledExceptionInspection */ + public function __construct(Website $site) + { + $this->extgitgraph = new ExtendedGitGraph2($site->config['extendedgitgraph']); } - public static function getPathRenderedData() + public function getPathRenderedData() { return __DIR__ . '/../dynamic/egg/cache_fullrenderer.html'; } @@ -25,16 +23,16 @@ class MikescherGitGraph * @return string|null * @throws Exception */ - public static function get() + public function get() { - $d = self::create()->loadFromCache(); + $d = $this->extgitgraph->loadFromCache(); if ($d === null) return ""; return $d; } - public static function checkConsistency() + public function checkConsistency() { - $p = self::getPathRenderedData(); + $p =$this->getPathRenderedData(); if (!file_exists($p)) return ['result'=>'err', 'message' => 'Rendered data not found']; diff --git a/www/internals/webapp.php b/www/internals/webapps.php similarity index 100% rename from www/internals/webapp.php rename to www/internals/webapps.php diff --git a/www/internals/website.php b/www/internals/website.php index f608e9d..11a1b58 100644 --- a/www/internals/website.php +++ b/www/internals/website.php @@ -23,6 +23,7 @@ class Website /** @var AlephNoteStatistics|null */ private $anstats = null; /** @var UpdatesLog|null */ private $updateslog = null; /** @var WebApps|null */ private $webapps = null; + /** @var MikescherGitGraph|null */ private $extendedgitgraph = null; public function init() { @@ -30,15 +31,8 @@ class Website try { - $this->config = require (__DIR__ . "/config.php"); - } - catch (exception $e) - { - $this->serveServerError("config.php not found", formatException($e), null); - } + $this->config = require (__DIR__ . "/../config.php"); - try - { if (!$this->config['prod']) { ini_set('display_errors', 1); @@ -210,10 +204,16 @@ class Website public function WebApps(): WebApps { - if ($this->webapps === null) { require_once 'webapp.php'; $this->webapps = new WebApps(); } + if ($this->webapps === null) { require_once 'webapps.php'; $this->webapps = new WebApps(); } return $this->webapps; } + public function ExtendedGitGraph(): MikescherGitGraph + { + if ($this->extendedgitgraph === null) { require_once 'mikeschergitgraph.php'; $this->extendedgitgraph = new MikescherGitGraph($this); } + return $this->extendedgitgraph; + } + /** * @return bool */