more work on sse sys messages

1 files changed, 14 insertions, 80 deletions

diff --git a/boot.php b/boot.php
index 473de2cef..f205f7a21 100644
--- a/boot.php
+++ b/boot.php
@@ -1897,57 +1897,22 @@ function can_view_public_stream() {
  */
 function notice($s) {
 
-	/*
-		if(! session_id())
-			return;
-
-		if(! x($_SESSION, 'sysmsg')) $_SESSION['sysmsg'] = array();
-
-		// ignore duplicated error messages which haven't yet been displayed
-		// - typically seen as multiple 'permission denied' messages
-		// as a result of auto-reloading a protected page with &JS=1
-
-		if(in_array($s, $_SESSION['sysmsg']))
-			return;
-
-		if(App::$interactive) {
-			$_SESSION['sysmsg'][] = $s;
-		}
-	*/
-
-	$hash   = get_observer_hash();
-	$sse_id = false;
-
-	if (!$hash) {
-		if (session_id()) {
-			$sse_id = true;
-			$hash   = 'sse_id.' . session_id();
-		}
-		else {
-			return;
-		}
+	if (!session_id()) {
+		return;
 	}
 
-	$x = null;
-
-	$t = get_xconfig($hash, 'sse', 'timestamp', NULL_DATE);
-
-	if (datetime_convert('UTC', 'UTC', $t) < datetime_convert('UTC', 'UTC', '- 30 seconds')) {
-		set_xconfig($hash, 'sse', 'notifications', []);
-		$x = [];
+	if (!isset($_SESSION['sysmsg'])) {
+		$_SESSION['sysmsg'] = [];
 	}
 
-	if ($x === null) {
-		$x = get_xconfig($hash, 'sse', 'notifications', []);
-	}
+	// ignore duplicated error messages which haven't yet been displayed
 
-	if (isset($x['notice']) && in_array($s, $x['notice']['notifications'])) {
+	if (in_array($s, $_SESSION['sysmsg'])) {
 		return;
 	}
 
 	if (App::$interactive) {
-		$x['notice']['notifications'][] = $s;
-		set_xconfig($hash, 'sse', 'notifications', $x);
+		$_SESSION['sysmsg'][] = $s;
 	}
 
 }
@@ -1964,53 +1929,22 @@ function notice($s) {
  */
 function info($s) {
 
-	/*
-		if(! session_id())
-			return;
-
-		if(! x($_SESSION, 'sysmsg_info'))
-			$_SESSION['sysmsg_info'] = array();
-
-		if(in_array($s, $_SESSION['sysmsg_info']))
-			return;
-
-		if(App::$interactive)
-			$_SESSION['sysmsg_info'][] = $s;
-	*/
-
-	$hash   = get_observer_hash();
-	$sse_id = false;
-
-	if (!$hash) {
-		if (session_id()) {
-			$sse_id = true;
-			$hash   = 'sse_id.' . session_id();
-		}
-		else {
-			return;
-		}
+	if (!session_id()) {
+		return;
 	}
 
-	$x = null;
-
-	$t = get_xconfig($hash, 'sse', 'timestamp', NULL_DATE);
-
-	if (datetime_convert('UTC', 'UTC', $t) < datetime_convert('UTC', 'UTC', '- 30 seconds')) {
-		set_xconfig($hash, 'sse', 'notifications', []);
-		$x = [];
+	if (!isset($_SESSION['sysmsg_info'])) {
+		$_SESSION['sysmsg_info'] = [];
 	}
 
-	if ($x === null) {
-		$x = get_xconfig($hash, 'sse', 'notifications', []);
-	}
+	// ignore duplicated error messages which haven't yet been displayed
 
-	if (isset($x['info']) && in_array($s, $x['info']['notifications'])) {
+	if (in_array($s, $_SESSION['sysmsg_info'])) {
 		return;
 	}
 
 	if (App::$interactive) {
-		$x['info']['notifications'][] = $s;
-		set_xconfig($hash, 'sse', 'notifications', $x);
+		$_SESSION['sysmsg_info'][] = $s;
 	}
 
 }