M_Viper/ts-website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More minor improvements

Browse Source 
- more type declarations
- remove config caching, it was a minor speed improvement, but a big confusion when website didnt updated after editing config
- fix issue where DB problems will display a PHP recursion error instead of the error template
This commit is contained in:
Wruczek
2020-10-06 17:05:08 +02:00
parent 16b6e829fe
commit 502a7d2fde
3 changed files with 73 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/private/php/Utils/TemplateUtils.php
View File

@ -85,31 +85,34 @@ class TemplateUtils {
$data["userLanguage"] = $userlang;
}
if ($timestamp = $this->getOldestCacheTimestamp())
if ($timestamp = $this->getOldestCacheTimestamp()) {
$data["oldestTimestamp"] = $timestamp;
}
$data["tsExceptions"] = TeamSpeakUtils::i()->getExceptionsList();
if(@$dbutils->isInitialised())
$data["sqlCount"] = @$dbutils->getDb()->query("SHOW SESSION STATUS LIKE 'Questions'")->fetch()["Value"];
else
$data["sqlCount"] = "none";
$data["config"] = [];
$data["sqlCount"] = "none";
$data["config"] = Config::i()->getConfig();
// only fetch those when DB connection is established
if($dbutils->isInitialised()) {
$data["config"] = Config::i()->getConfig();
$data["sqlCount"] = @$dbutils->getDb()->query("SHOW SESSION STATUS LIKE 'Questions'")->fetchColumn(1);
if (Config::get("adminstatus_enabled")) {
$data["adminStatus"] = AdminStatus::i()->getStatus(
Config::get("adminstatus_groups"),
Config::get("adminstatus_mode"),
Config::get("adminstatus_hideoffline"),
Config::get("adminstatus_ignoredusers")
);
}
}
$csrfToken = CsrfUtils::getToken();
$data["csrfToken"] = $csrfToken;
$data["csrfField"] = new Html('<input type="hidden" name="csrf-token" value="' . $csrfToken . '">');
if (Config::get("adminstatus_enabled")) {
$data["adminStatus"] = AdminStatus::i()->getStatus(
Config::get("adminstatus_groups"),
Config::get("adminstatus_mode"),
Config::get("adminstatus_hideoffline"),
Config::get("adminstatus_ignoredusers")
);
}
return $this->getLatte()->renderToString(__TEMPLATES_DIR . "/$templateName.latte", $data);
}