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

Reorganizes helper include files

main
Yasen Pramatarov 2025-02-17 16:50:57 +02:00
parent 3953546ace
commit 363fbf2a6b
23 changed files with 64 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/helpers/feedback.php 100644
View File

@ -0,0 +1,36 @@
<?php
/**
* Feedback Helper
*
* Combines functionality to handle retrieving and displaying feedback messages.
*/
// Get any flash messages from previous request
$flash_messages = Feedback::getFlash();
if (!empty($flash_messages)) {
$system_messages = array_merge($system_messages ?? [], array_map(function($flash) {
return [
'category' => $flash['category'],
'key' => $flash['key'],
'custom_message' => $flash['custom_message'] ?? null,
'dismissible' => $flash['dismissible'] ?? false,
'small' => $flash['small'] ?? false
];
}, $flash_messages));
}
// Show feedback messages
if (isset($system_messages) && is_array($system_messages)) {
foreach ($system_messages as $msg) {
echo Feedback::render(
$msg['category'],
$msg['key'],
$msg['custom_message'] ?? null,
$msg['dismissible'] ?? false,
$msg['small'] ?? false
);
}
}
?>

10
app/helpers/securityhelper.php → app/helpers/security.php
View File

@ -1,7 +1,11 @@
<?php <?php
// Security helper, to be used with all the forms in the app /**
* Security Helper
*
* Security helper, to be used with all the forms in the app.
* Implements singleton pattern for consistent state management.
*/
class SecurityHelper { class SecurityHelper {
private static $instance = null; private static $instance = null;
private $session; private $session;
@ -13,7 +17,7 @@ class SecurityHelper {
public static function getInstance() { public static function getInstance() {
if (self::$instance === null) { if (self::$instance === null) {
self::$instance = new SecurityHelper(); self::$instance = new Security();
} }
return self::$instance; return self::$instance;
} }

2
app/includes/csrf_middleware.php
View File

@ -1,6 +1,6 @@
<?php <?php
require_once __DIR__ . '/../helpers/securityhelper.php'; require_once __DIR__ . '/../helpers/security.php';
function verifyCsrfToken() { function verifyCsrfToken() {
$security = SecurityHelper::getInstance(); $security = SecurityHelper::getInstance();

17
app/includes/feedback-get.php
View File

@ -1,17 +0,0 @@
<?php
// Get any flash messages from previous request
$flash_messages = Feedback::getFlash();
if (!empty($flash_messages)) {
$system_messages = array_merge($system_messages, array_map(function($flash) {
return [
'category' => $flash['category'],
'key' => $flash['key'],
'custom_message' => $flash['custom_message'] ?? null,
'dismissible' => $flash['dismissible'] ?? false,
'small' => $flash['small'] ?? false
];
}, $flash_messages));
}
?>

15
app/includes/feedback-show.php
View File

@ -1,15 +0,0 @@
<?php
if (isset($system_messages) && is_array($system_messages)) {
foreach ($system_messages as $msg) {
echo Feedback::render(
$msg['category'],
$msg['key'],
$msg['custom_message'] ?? null,
$msg['dismissible'] ?? false,
$msg['small'] ?? false
);
}
}
?>

3
app/pages/agents.php
View File

@ -167,8 +167,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
} }
// Get any new feedback messages // Get any new feedback messages
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
// Load the template // Load the template
include '../app/templates/agents.php'; include '../app/templates/agents.php';

3
app/pages/components.php
View File

@ -101,8 +101,7 @@ if ($response['db'] === null) {
} }
// Get any new feedback messages // Get any new feedback messages
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
// display the widget // display the widget
include '../app/templates/components.php'; include '../app/templates/components.php';

3
app/pages/conferences.php
View File

@ -160,8 +160,7 @@ if ($response['db'] === null) {
} }
// Get any new feedback messages // Get any new feedback messages
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
// display the widget // display the widget
include '../app/templates/conferences.php'; include '../app/templates/conferences.php';

3
app/pages/config.php
View File

@ -7,8 +7,7 @@
*/ */
// Get any new feedback messages // Get any new feedback messages
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
require '../app/classes/config.php'; require '../app/classes/config.php';
$configObject = new Config(); $configObject = new Config();

3
app/pages/dashboard.php
View File

@ -10,8 +10,7 @@
*/ */
// Get any new feedback messages // Get any new feedback messages
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
require '../app/classes/conference.php'; require '../app/classes/conference.php';
require '../app/classes/participant.php'; require '../app/classes/participant.php';

3
app/pages/graphs.php
View File

@ -85,8 +85,7 @@ $widget['name'] = 'Graphs';
$widget['title'] = 'Jitsi graphs'; $widget['title'] = 'Jitsi graphs';
// Get any new feedback messages // Get any new feedback messages
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
// Load the template // Load the template
include '../app/templates/graphs.php'; include '../app/templates/graphs.php';

3
app/pages/help.php
View File

@ -1,8 +1,7 @@
<?php <?php
// Get any new feedback messages // Get any new feedback messages
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
include '../app/templates/help.php'; include '../app/templates/help.php';

3
app/pages/latest.php
View File

@ -100,8 +100,7 @@ foreach ($hosts as $host) {
} }
// Get any new feedback messages // Get any new feedback messages
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
// Load the template // Load the template
include '../app/templates/latest.php'; include '../app/templates/latest.php';

3
app/pages/livejs.php
View File

@ -10,8 +10,7 @@ $settingsObject = new Settings();
$livejsData = $settingsObject->getPlatformJsFile($platformDetails[0]['jitsi_url'], $item, $raw); $livejsData = $settingsObject->getPlatformJsFile($platformDetails[0]['jitsi_url'], $item, $raw);
// Get any new feedback messages // Get any new feedback messages
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
// Load the template // Load the template
include '../app/templates/livejs.php'; include '../app/templates/livejs.php';

3
app/pages/login.php
View File

@ -144,8 +144,7 @@ if (!empty($config['login_message'])) {
} }
// Get any new feedback messages // Get any new feedback messages
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
// Load the template // Load the template
include '../app/templates/form-login.php'; include '../app/templates/form-login.php';

3
app/pages/logs.php
View File

@ -9,8 +9,7 @@
*/ */
// Get any new feedback messages // Get any new feedback messages
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
// Check for rights; user or system // Check for rights; user or system
$has_system_access = ($userObject->hasRight($user_id, 'superuser') || $has_system_access = ($userObject->hasRight($user_id, 'superuser') ||

3
app/pages/participants.php
View File

@ -170,8 +170,7 @@ if ($response['db'] === null) {
} }
// Get any new feedback messages // Get any new feedback messages
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
// display the widget // display the widget
include '../app/templates/participants.php'; include '../app/templates/participants.php';

6
app/pages/profile.php
View File

@ -145,8 +145,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
$isTimezoneSet = !empty($userDetails[0]['timezone']); $isTimezoneSet = !empty($userDetails[0]['timezone']);
// Get any new feedback messages // Get any new feedback messages
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
// Load the template // Load the template
include '../app/templates/profile-edit.php'; include '../app/templates/profile-edit.php';
@ -154,8 +153,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
default: default:
// Get any new feedback messages // Get any new feedback messages
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
// Load the template // Load the template
include '../app/templates/profile.php'; include '../app/templates/profile.php';

3
app/pages/register.php
View File

@ -71,8 +71,7 @@ if ($config['registration_enabled'] == true) {
} }
// Get any new feedback messages // Get any new feedback messages
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
// Load the template // Load the template
include '../app/templates/form-register.php'; include '../app/templates/form-register.php';

3
app/pages/security.php
View File

@ -160,8 +160,7 @@ $whitelisted = $rateLimiter->getWhitelistedIps();
$blacklisted = $rateLimiter->getBlacklistedIps(); $blacklisted = $rateLimiter->getBlacklistedIps();
// Get any new feedback messages // Get any new feedback messages
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
// Load the template // Load the template
include '../app/templates/security.php'; include '../app/templates/security.php';

3
app/pages/settings.php
View File

@ -8,8 +8,7 @@
*/ */
// Get any new feedback messages // Get any new feedback messages
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
$action = $_REQUEST['action'] ?? ''; $action = $_REQUEST['action'] ?? '';
$agent = $_REQUEST['agent'] ?? ''; $agent = $_REQUEST['agent'] ?? '';

3
app/pages/status.php
View File

@ -9,8 +9,7 @@
*/ */
// Get any new feedback messages // Get any new feedback messages
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
require '../app/classes/agent.php'; require '../app/classes/agent.php';
require '../app/classes/host.php'; require '../app/classes/host.php';

5
public_html/index.php
View File

@ -26,7 +26,7 @@ session_start();
// Initialize security middleware // Initialize security middleware
require_once '../app/includes/csrf_middleware.php'; require_once '../app/includes/csrf_middleware.php';
require_once '../app/helpers/securityhelper.php'; require_once '../app/helpers/security.php';
$security = SecurityHelper::getInstance(); $security = SecurityHelper::getInstance();
// Verify CSRF token for POST requests // Verify CSRF token for POST requests
@ -126,8 +126,7 @@ try {
} catch (Exception $e) { } catch (Exception $e) {
Feedback::flash('ERROR', 'DEFAULT', getError('Error connecting to the database.', $e->getMessage())); Feedback::flash('ERROR', 'DEFAULT', getError('Error connecting to the database.', $e->getMessage()));
include '../app/templates/page-header.php'; include '../app/templates/page-header.php';
include '../app/includes/feedback-get.php'; include '../app/helpers/feedback.php';
include '../app/includes/feedback-show.php';
include '../app/templates/page-footer.php'; include '../app/templates/page-footer.php';
exit(); exit();
} }