From 2b0a04ea9e91196e2966844be0f6b673bd87f032 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 20 Apr 2016 22:10:00 -0700 Subject: revert the reversal of checkjs logic, but still restrict the behaviour scope to just those urls that require it --- Zotlabs/Module/Nojs.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Zotlabs/Module/Nojs.php') diff --git a/Zotlabs/Module/Nojs.php b/Zotlabs/Module/Nojs.php index 5e48c5b5f..6fd6d8106 100644 --- a/Zotlabs/Module/Nojs.php +++ b/Zotlabs/Module/Nojs.php @@ -5,11 +5,11 @@ namespace Zotlabs\Module; class Nojs extends \Zotlabs\Web\Controller { function init() { - - setcookie('jsdisabled', 1, 0); - $p = $_GET['query']; + $n = ((argc() > 1) ? intval(argv(1)) : 1); + setcookie('jsdisabled', $n, 0, '/'); + $p = $_GET['redir']; $hasq = strpos($p,'?'); - goaway(z_root() . (($p) ? '/' . $p : '') . (($hasq) ? '' : '?f=' ) . '&jsdisabled=1'); + goaway(z_root() . (($p) ? '/' . $p : '') . (($hasq) ? '' : '?f=' ) . '&jsdisabled=' . $n); } } -- cgit v1.2.3