Fach- und Themendaten umstrukturiert
This commit is contained in:
committed by
Eric Blommel
parent
294260c019
commit
7a146d8982
@@ -1,4 +1,5 @@
|
||||
<?php
|
||||
require_once("Config.php");
|
||||
require_once("Util.php");
|
||||
|
||||
class TopicData
|
||||
@@ -52,8 +53,7 @@ class TopicData
|
||||
{
|
||||
$result = array();
|
||||
|
||||
$topicDirectory = "config/subjects/$subjectId/topics";
|
||||
$topicNames = scandir($topicDirectory);
|
||||
$topicNames = scandir(Config::getTopicsDirectory($subjectId));
|
||||
|
||||
usort($topicNames, function ($a, $b) {
|
||||
return strcmp($a, $b);
|
||||
@@ -87,9 +87,7 @@ class TopicData
|
||||
$subjectId = Util::removeIllegalCharacters($subjectId);
|
||||
$topicId = Util::removeIllegalCharacters($topicId);
|
||||
|
||||
$topicsDirectory = "config/subjects/$subjectId/topics";
|
||||
$topicDataDirectory = "$topicsDirectory/$topicId";
|
||||
$data = Util::parseJsonFromFile("$topicDataDirectory/properties.json");
|
||||
$data = Util::parseJsonFromFile(Config::getTopicDirectory($subjectId, $topicId) . "properties.json");
|
||||
if (!isset($data)) {
|
||||
return null;
|
||||
}
|
||||
@@ -126,15 +124,14 @@ class TopicData
|
||||
$result->files = array();
|
||||
}
|
||||
|
||||
$article = Util::readFileContent("$topicDataDirectory/article.html");
|
||||
$article = Util::readFileContent(Config::getTopicDirectory($subjectId, $topicId) . "article.html");
|
||||
if (!isset($article)) {
|
||||
$article = "Kein Erklärtext vorhanden";
|
||||
}
|
||||
$article = str_replace('$TOPICPATH', $topicDataDirectory, $article);
|
||||
$article = str_replace('$TOPICPATH', Config::getTopicDirectory($subjectId, $topicId), $article);
|
||||
|
||||
$result->article = $article;
|
||||
|
||||
return $result;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user