From d29415a6e2f1b89e7e9463ce337946d7bf78aa5c Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 7 Sep 2018 14:23:16 +0200
Subject: provide a noscript_content switch for mod channel and display

---
 Zotlabs/Module/Display.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'Zotlabs/Module/Display.php')

diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php
index bdaed0933..1d21b64ac 100644
--- a/Zotlabs/Module/Display.php
+++ b/Zotlabs/Module/Display.php
@@ -12,8 +12,9 @@ class Display extends \Zotlabs\Web\Controller {
 
 	function get($update = 0, $load = false) {
 
-		$module_format = 'html';
+		$noscript_content = get_config('system', 'noscript_content', '1');
 
+		$module_format = 'html';
 
 		if(argc() > 1) {
 			$module_format = substr(argv(1),strrpos(argv(1),'.') + 1);
@@ -251,7 +252,7 @@ class Display extends \Zotlabs\Web\Controller {
 
 		$sql_extra = public_permissions_sql($observer_hash);
 
-		if((! $update) || ($load)) {
+		if($noscript_content || $load) {
 
 			$r = null;
 
@@ -367,7 +368,12 @@ class Display extends \Zotlabs\Web\Controller {
 			}
 			else {
 				$o .= '<noscript>';
-				$o .= conversation($items, 'display', $update, 'traditional');
+				if($noscript_content) {
+					$o .= conversation($items, 'display', $update, 'traditional');
+				}
+				else {
+					$o .= '<div class="section-content-warning-wrapper">' . t('You must enable javascript for your browser to be able to view this content.') . '</div>';
+				}
 				$o .= '</noscript>';
 
 				if ($items[0]['title'])
@@ -429,7 +435,7 @@ class Display extends \Zotlabs\Web\Controller {
 
 		$o .= '<div id="content-complete"></div>';
 
-		if(((! $update) || ($load)) && (! $items))  {
+		if((($update && $load) || $noscript_content) && (! $items)) {
 			
 			$r = q("SELECT id, item_deleted FROM item WHERE mid = '%s' LIMIT 1",
 				dbesc($item_hash)
-- 
cgit v1.2.3