Removes some hardcoded Jilo app name strings
parent
b388edbb60
commit
0c5a48d851
|
|
@ -11,7 +11,7 @@ class Maintenance
|
||||||
|
|
||||||
public static function isEnabled(): bool
|
public static function isEnabled(): bool
|
||||||
{
|
{
|
||||||
if (getenv('JILO_MAINTENANCE') === '1') {
|
if (getenv('APP_MAINTENANCE') === '1') {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
// Prefer DB settings if available in the current request
|
// Prefer DB settings if available in the current request
|
||||||
|
|
@ -75,7 +75,7 @@ class Maintenance
|
||||||
if (!self::isEnabled()) {
|
if (!self::isEnabled()) {
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
$envMsg = getenv('JILO_MAINTENANCE_MESSAGE');
|
$envMsg = getenv('APP_MAINTENANCE_MESSAGE');
|
||||||
if ($envMsg) {
|
if ($envMsg) {
|
||||||
return trim($envMsg);
|
return trim($envMsg);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ if (is_array($navSettingsDotsPayload)) {
|
||||||
<div class="logo-section">
|
<div class="logo-section">
|
||||||
<a href="<?= htmlspecialchars($app_root) ?>?platform=<?= htmlspecialchars($platform_id) ?>" class="modern-logo-link">
|
<a href="<?= htmlspecialchars($app_root) ?>?platform=<?= htmlspecialchars($platform_id) ?>" class="modern-logo-link">
|
||||||
<div class="modern-logo">
|
<div class="modern-logo">
|
||||||
<img src="<?= htmlspecialchars($app_root) ?>static/jilo-logo.png" alt="<?= htmlspecialchars($config['site_name']); ?>"/>
|
<img src="<?= htmlspecialchars($app_root) ?>static/logo.png" alt="<?= htmlspecialchars($config['site_name']); ?>"/>
|
||||||
</div>
|
</div>
|
||||||
<div class="brand-info">
|
<div class="brand-info">
|
||||||
<h1 class="brand-name"><?= htmlspecialchars($config['site_name']); ?></h1>
|
<h1 class="brand-name"><?= htmlspecialchars($config['site_name']); ?></h1>
|
||||||
|
|
|
||||||
|
|
@ -53,8 +53,8 @@ Notes:
|
||||||
|
|
||||||
- The maintenance flag is stored at `app/.maintenance.flag`.
|
- The maintenance flag is stored at `app/.maintenance.flag`.
|
||||||
- You can also control maintenance via environment variables (useful when the filesystem is read-only):
|
- You can also control maintenance via environment variables (useful when the filesystem is read-only):
|
||||||
- `JILO_MAINTENANCE=1` enables maintenance mode
|
- `APP_MAINTENANCE=1` enables maintenance mode
|
||||||
- `JILO_MAINTENANCE_MESSAGE="Your message"` sets the banner message
|
- `APP_MAINTENANCE_MESSAGE="Your message"` sets the banner message
|
||||||
|
|
||||||
## Authoring new migrations
|
## Authoring new migrations
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -40,13 +40,6 @@ $config = ConfigLoader::loadConfig([
|
||||||
'/opt/jilo-web/jilo-web.conf.php',
|
'/opt/jilo-web/jilo-web.conf.php',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
// Ensure we have value for site name
|
|
||||||
$siteName = trim((string)($config['site_name'] ?? ''));
|
|
||||||
if ($siteName === '') {
|
|
||||||
$siteName = 'Website';
|
|
||||||
}
|
|
||||||
$config['site_name'] = $siteName;
|
|
||||||
|
|
||||||
// Make config available globally
|
// Make config available globally
|
||||||
$GLOBALS['config'] = $config; // FIXME we use old globals and includes before migrating fully to App\App
|
$GLOBALS['config'] = $config; // FIXME we use old globals and includes before migrating fully to App\App
|
||||||
App::set('config', $config);
|
App::set('config', $config);
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
Loading…
Reference in New Issue