lindeas
/
jilo-web
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Compare commits

base: lindeas:5f9a0fe75b51dc37ce193f0ff613b106f1e12801
Branches Tags
lindeas:main
lindeas:v0.4
lindeas:v0.3
lindeas:v0.2.1
lindeas:v0.2
lindeas:v0.1.1
lindeas:v0.1
..
compare: lindeas:77be82d8e60bffabf61bc860b67ff7ec2983b149
Branches Tags
lindeas:main
lindeas:v0.4
lindeas:v0.3
lindeas:v0.2.1
lindeas:v0.2
lindeas:v0.1.1
lindeas:v0.1

No commits in common. "5f9a0fe75b51dc37ce193f0ff613b106f1e12801" and "77be82d8e60bffabf61bc860b67ff7ec2983b149" have entirely different histories.
5f9a0fe75b ... 77be82d8e6

3 changed files with 6 additions and 9 deletions
Show Stats Expand all files Collapse all files

5
app/classes/feedback.php
View File

@ -213,7 +213,7 @@ class Feedback {
* Store feedback message in session for display after redirect * Store feedback message in session for display after redirect
*/ */
// Usage: Feedback::flash('LOGIN', 'LOGIN_SUCCESS', 'custom message [or null]', true [for dismissible; or null], true [for small; or omit]); // Usage: Feedback::flash('LOGIN', 'LOGIN_SUCCESS', 'custom message [or null]', true [for dismissible; or null], true [for small; or omit]);
public static function flash($category, $key, $customMessage = null, $dismissible = null, $small = false, $sanitize = true) { public static function flash($category, $key, $customMessage = null, $dismissible = null, $small = false) {
if (!isset($_SESSION['flash_messages'])) { if (!isset($_SESSION['flash_messages'])) {
$_SESSION['flash_messages'] = []; $_SESSION['flash_messages'] = [];
} }
@ -227,8 +227,7 @@ class Feedback {
'key' => $key, 'key' => $key,
'custom_message' => $customMessage, 'custom_message' => $customMessage,
'dismissible' => $isDismissible, 'dismissible' => $isDismissible,
'small' => $small, 'small' => $small
'sanitize' => $sanitize
]; ];
} }

6
app/helpers/feedback.php
View File

@ -15,8 +15,7 @@ if (!empty($flash_messages)) {
'key' => $flash['key'], 'key' => $flash['key'],
'custom_message' => $flash['custom_message'] ?? null, 'custom_message' => $flash['custom_message'] ?? null,
'dismissible' => $flash['dismissible'] ?? false, 'dismissible' => $flash['dismissible'] ?? false,
'small' => $flash['small'] ?? false, 'small' => $flash['small'] ?? false
'sanitize' => $flash['sanitize'] ?? true
]; ];
}, $flash_messages)); }, $flash_messages));
} }
@ -29,8 +28,7 @@ if (isset($system_messages) && is_array($system_messages)) {
$msg['key'], $msg['key'],
$msg['custom_message'] ?? null, $msg['custom_message'] ?? null,
$msg['dismissible'] ?? false, $msg['dismissible'] ?? false,
$msg['small'] ?? false, $msg['small'] ?? false
$msg['sanitize'] ?? true
); );
} }
} }

4
public_html/index.php
View File

@ -192,10 +192,10 @@ try {
$runner = new \App\Core\MigrationRunner($db, $migrationsDir); $runner = new \App\Core\MigrationRunner($db, $migrationsDir);
if ($runner->hasPendingMigrations()) { if ($runner->hasPendingMigrations()) {
$pending = $runner->listPendingMigrations(); $pending = $runner->listPendingMigrations();
$msg = 'Database schema is out of date. There are pending migrations. Run "<code>php scripts/migrate.php up</code>" or use the <a href="?page=admin-tools">Admin tools</a>'; $msg = 'Database schema is out of date. Pending migrations: ' . implode(', ', $pending) . '. Run: php scripts/migrate.php up';
// Log and show as a system message // Log and show as a system message
$logObject->log('warning', $msg, ['scope' => 'system']); $logObject->log('warning', $msg, ['scope' => 'system']);
Feedback::flash('SYSTEM', 'MIGRATIONS_PENDING', $msg, false, true, false); Feedback::flash('SYSTEM', 'MIGRATIONS_PENDING', $msg, false, true);
} }
} }
} catch (\Throwable $e) { } catch (\Throwable $e) {