Revert "more work on sse sys messages"

This reverts commit 983fc84f283f34783b281ab047dc47c581cb937c

2 files changed, 20 insertions, 60 deletions

diff --git a/Zotlabs/Module/Login.php b/Zotlabs/Module/Login.php
index 721ac15ac..6430939b4 100644
--- a/Zotlabs/Module/Login.php
+++ b/Zotlabs/Module/Login.php
@@ -12,5 +12,5 @@ class Login extends \Zotlabs\Web\Controller {
 
 		return login(true);
 	}
-
+	
 }
diff --git a/Zotlabs/Module/Sse.php b/Zotlabs/Module/Sse.php
index a5b5c7e35..df4a74f7b 100644
--- a/Zotlabs/Module/Sse.php
+++ b/Zotlabs/Module/Sse.php
@@ -23,7 +23,14 @@ class Sse extends Controller {
 			killme();
 		}
 
+		if(! intval(Config::Get('system','open_pubstream',1))) {
+			if(! get_observer_hash()) {
+				killme();
+			}
+		}
+
 		// this is important!
+		session_write_close();
 		ignore_user_abort(true);
 
 		self::$uid = local_channel();
@@ -41,8 +48,6 @@ class Sse extends Controller {
 			}
 		}
 
-
-
 		if (self::$uid) {
 			self::$vnotify = get_pconfig(self::$uid, 'system', 'vnotify');
 		}
@@ -97,6 +102,7 @@ class Sse extends Controller {
 					}
 				}
 
+
 				$result = [];
 
 				XConfig::Load(self::$ob_hash);
@@ -104,19 +110,9 @@ class Sse extends Controller {
 				$lock = XConfig::Get(self::$ob_hash, 'sse', 'lock');
 
 				if (!$lock) {
-					$result_db = XConfig::Get(self::$ob_hash, 'sse', 'notifications', []);
-				}
-
-				if (!empty($_SESSION['sysmsg'])) {
-					$result['notice']['notifications'] = $_SESSION['sysmsg'];
-				}
-
-				if (!empty($_SESSION['sysmsg_info'])) {
-					$result['info']['notifications'] = $_SESSION['sysmsg_info'];
+					$result = XConfig::Get(self::$ob_hash, 'sse', 'notifications', []);
 				}
 
-				$result = array_merge($result, $result_db);
-
 				// We do not have the local_channel in the addon.
 				// Reset pubs here if the app is not installed.
 				if (self::$uid && (!(self::$vnotify & VNOTIFY_PUBS) || !Apps::system_app_installed(self::$uid, 'Public Stream'))) {
@@ -137,36 +133,22 @@ class Sse extends Controller {
 					echo "\n\n";
 				}
 
+				if (ob_get_length() > 0) {
+					ob_end_flush();
+				}
+
+				flush();
+
 				if (connection_status() != CONNECTION_NORMAL || connection_aborted()) {
 					XConfig::Set(self::$ob_hash, 'sse', 'timestamp', NULL_DATE);
 					XConfig::Set(self::$ob_hash, 'sse', 'notifications', []);
-					$_SESSION['sysmsg'] = [];
-					$_SESSION['sysmsg_info'] = [];
-
-					if (ob_get_length() > 0) {
-						ob_end_flush();
-					}
-
-					flush();
-
 					exit;
 				}
 
-				if (ob_get_length() > 0) {
-					ob_flush();
-				}
-
-				flush();
-
 				usleep($sleep);
 
 				if ($result) {
-					if ($result_db) {
-						XConfig::Set(self::$ob_hash, 'sse', 'notifications', []);
-					}
-
-					$_SESSION['sysmsg'] = [];
-					$_SESSION['sysmsg_info'] = [];
+					XConfig::Set(self::$ob_hash, 'sse', 'notifications', []);
 				}
 
 				$i++;
@@ -204,35 +186,13 @@ class Sse extends Controller {
 				}
 			}
 
-			$result = [];
-			$result_db = [];
-
 			XConfig::Load(self::$ob_hash);
 
+			$result = XConfig::Get(self::$ob_hash, 'sse', 'notifications', []);
 			$lock = XConfig::Get(self::$ob_hash, 'sse', 'lock');
 
-			if (!$lock) {
-				$result_db = XConfig::Get(self::$ob_hash, 'sse', 'notifications', []);
-			}
-
-			if (!empty($_SESSION['sysmsg'])) {
-				$result['notice']['notifications'] = $_SESSION['sysmsg'];
-			}
-
-			if (!empty($_SESSION['sysmsg_info'])) {
-				$result['info']['notifications'] = $_SESSION['sysmsg_info'];
-			}
-
-			$result = array_merge($result, $result_db);
-
-			if($result) {
-				if ($result_db) {
-					XConfig::Set(self::$ob_hash, 'sse', 'notifications', []);
-				}
-
-				$_SESSION['sysmsg'] = [];
-				$_SESSION['sysmsg_info'] = [];
-
+			if($result && !$lock) {
+				XConfig::Set(self::$ob_hash, 'sse', 'notifications', []);
 				json_return_and_die($result);
 			}