FE: replace write_notification calls with displayInAppNoti for consistent notification handling

This commit is contained in:
Jokob @NetAlertX
2026-01-11 03:39:48 +00:00
parent 8458bbb0ed
commit 206c2e76d0
3 changed files with 63 additions and 88 deletions

View File

@@ -97,7 +97,7 @@ function SQLite3_connect($trytoreconnect = true, $retryCount = 0) {
} else { } else {
// Maximum retries reached, hide loading spinner and show failure alert // Maximum retries reached, hide loading spinner and show failure alert
$message = 'Failed to connect to database after ' . $retryCount . ' retries.'; $message = 'Failed to connect to database after ' . $retryCount . ' retries.';
write_notification($message); displayInAppNoti($message);
return false; // Or handle the failure appropriately return false; // Or handle the failure appropriately
} }
} }
@@ -218,7 +218,7 @@ function OpenDB($DBPath = null) {
if (strlen($DBFILE) == 0) { if (strlen($DBFILE) == 0) {
$message = 'Database not available'; $message = 'Database not available';
echo '<script>alert("'.$message.'")</script>'; echo '<script>alert("'.$message.'")</script>';
write_notification($message); displayInAppNoti($message);
die('<div style="padding-left:150px">'.$message.'</div>'); die('<div style="padding-left:150px">'.$message.'</div>');
} }
@@ -228,7 +228,7 @@ function OpenDB($DBPath = null) {
} catch (Exception $e) { } catch (Exception $e) {
$message = "Error connecting to the database"; $message = "Error connecting to the database";
echo '<script>alert("'.$message.': '.$e->getMessage().'")</script>'; echo '<script>alert("'.$message.': '.$e->getMessage().'")</script>';
write_notification($message); displayInAppNoti($message);
die('<div style="padding-left:150px">'.$message.'</div>'); die('<div style="padding-left:150px">'.$message.'</div>');
} }

View File

@@ -44,67 +44,7 @@ switch ($FUNCTION) {
} }
// ----------------------------------------------------------------------------------------
// 🔺----- API ENDPOINTS SUPERSEDED -----🔺
// check server/api_server/api_server_start.py for equivalents
// equivalent: /messaging/in-app/write
// 🔺----- API ENDPOINTS SUPERSEDED -----🔺
function displayMessage($message, $logAlert = FALSE, $logConsole = TRUE, $logFile = TRUE, $logEcho = FALSE)
{
global $logFolderPath, $log_file, $timestamp;
// sanitize
$message = str_replace(array("\n", "\r", PHP_EOL), '', $message);
echo "<script>function escape(html, encode) {
return html.replace(!encode ? /&(?!#?\w+;)/g : /&/g, '&amp;')
.replace(/\t/g, '')
}</script>";
// Javascript Alert pop-up
if($logAlert)
{
echo '<script>alert(escape("'.$message.'"));</script>';
}
// F12 Browser dev console
if($logConsole)
{
echo '<script>console.log(escape("'.str_replace('"',"'",$message).'"));</script>';
}
//File
if($logFile)
{
if (is_writable($logFolderPath.$log_file)) {
if(file_exists($logFolderPath.$log_file) != 1) // file doesn't exist, create one
{
$log = fopen($logFolderPath.$log_file, "w") or die("Unable to open file!");
}else // file exists, append
{
$log = fopen($logFolderPath.$log_file, "a") or die("Unable to open file - Permissions issue!");
}
fwrite($log, "[".$timestamp. "] " . str_replace('<br>',"\n ",str_replace('<br/>',"\n ",$message)).PHP_EOL."" );
fclose($log);
} else {
echo 'The file is not writable: '.$logFolderPath.$log_file;
}
}
//echo
if($logEcho)
{
echo $message;
}
}
// ------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------
@@ -118,12 +58,12 @@ function saveSettings()
if(file_exists( $fullConfPath) != 1) if(file_exists( $fullConfPath) != 1)
{ {
displayMessage('File "'.$fullConfPath.'" not found or missing read permissions. Creating a new <code>'.$config_file.'</code> file.', FALSE, TRUE, TRUE, TRUE); displayInAppNoti('File "'.$fullConfPath.'" not found or missing read permissions. Creating a new config file.', 'warning');
} }
// create a backup copy // create a backup copy
elseif (!copy($fullConfPath, $new_location)) elseif (!copy($fullConfPath, $new_location))
{ {
displayMessage("Failed to copy file ".$fullConfPath." to ".$new_location." <br/> Check your permissions to allow read/write access to the /config folder.", FALSE, TRUE, TRUE, TRUE); displayInAppNoti("Failed to copy file ".$fullConfPath." to ".$new_location." Check your permissions to allow read/write access to the /config folder.", 'error');
} }
@@ -277,5 +217,40 @@ function encode_single_quotes ($val) {
$result = str_replace ('\'','{s-quote}',$val); $result = str_replace ('\'','{s-quote}',$val);
return $result; return $result;
} }
// -------------------------------------------------------------------------------------------
// Helper function to send notifications via the backend API endpoint
// -------------------------------------------------------------------------------------------
function displayInAppNoti($message, $level = 'error') {
try {
$apiBase = getSettingValue('BACKEND_API_URL') ?: 'http://localhost:20212';
$apiToken = getSettingValue('API_TOKEN') ?: '';
if (empty($apiToken)) {
// If no token available, silently fail (don't break the application)
return;
}
$url = rtrim($apiBase, '/') . '/messaging/in-app/write';
$payload = json_encode([
'message' => $message,
'level' => $level
]);
$ch = curl_init($url);
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
curl_setopt($ch, CURLOPT_POSTFIELDS, $payload);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_HTTPHEADER, [
'Content-Type: application/json',
'Authorization: Bearer ' . $apiToken,
'Content-Length: ' . strlen($payload)
]);
curl_setopt($ch, CURLOPT_TIMEOUT, 5);
curl_exec($ch);
curl_close($ch);
} catch (Exception $e) {
// Silently fail if notification sending fails
}
}
?> ?>

View File

@@ -17,7 +17,7 @@ function checkAuthorization($method) {
if ($auth_header !== $expected_token) { if ($auth_header !== $expected_token) {
http_response_code(403); http_response_code(403);
echo 'Forbidden'; echo 'Forbidden';
write_notification("[Plugin: SYNC] Incoming data: Incorrect API Token (".$method.")", "alert"); displayInAppNoti("[Plugin: SYNC] Incoming data: Incorrect API Token (".$method.")", "error");
exit; exit;
} }
} }
@@ -56,7 +56,7 @@ if ($method === 'GET') {
// Return JSON response // Return JSON response
jsonResponse(200, $response_data, 'OK'); jsonResponse(200, $response_data, 'OK');
write_notification("[Plugin: SYNC] Data sent", "info"); displayInAppNoti("[Plugin: SYNC] Data sent", "info");
} }
// receiving data (this is a HUB) // receiving data (this is a HUB)
@@ -93,11 +93,11 @@ else if ($method === 'POST') {
file_put_contents($file_path_new, $data); file_put_contents($file_path_new, $data);
http_response_code(200); http_response_code(200);
echo 'Data received and stored successfully'; echo 'Data received and stored successfully';
write_notification("[Plugin: SYNC] Data received ({$file_path_new})", "info"); displayInAppNoti("[Plugin: SYNC] Data received ({$file_path_new})", "info");
} else { } else {
http_response_code(405); http_response_code(405);
echo 'Method Not Allowed'; echo 'Method Not Allowed';
write_notification("[Plugin: SYNC] Method Not Allowed", "alert"); displayInAppNoti("[Plugin: SYNC] Method Not Allowed", "error");
} }
?> ?>