From 212d8b6cfd28151b5b8abdd3f1fcd3b3daeeb0da Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 14 Jun 2016 20:30:34 -0700 Subject: support cookie auth in Sabre DAV --- Zotlabs/Web/Controller.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Zotlabs/Web') diff --git a/Zotlabs/Web/Controller.php b/Zotlabs/Web/Controller.php index ac835e008..2d0f58891 100644 --- a/Zotlabs/Web/Controller.php +++ b/Zotlabs/Web/Controller.php @@ -9,4 +9,5 @@ class Controller { function post() {} function get() {} -} \ No newline at end of file +} + -- cgit v1.2.3 From 415a8d1e01107e8bcff1a1ac1bdd8beb2d461408 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 21 Jun 2016 19:42:08 -0700 Subject: channel homepage not providing content when javascript disabled --- Zotlabs/Web/CheckJS.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Zotlabs/Web') diff --git a/Zotlabs/Web/CheckJS.php b/Zotlabs/Web/CheckJS.php index 5f9856a8c..109790fa5 100644 --- a/Zotlabs/Web/CheckJS.php +++ b/Zotlabs/Web/CheckJS.php @@ -21,6 +21,9 @@ class CheckJS { $page = urlencode(\App::$query_string); if($test) { + self::$jsdisabled = 1; + if(array_key_exists('jsdisabled',$_COOKIE)) + self::$jsdisabled = $_COOKIE['jsdisabled']; if(! array_key_exists('jsdisabled',$_COOKIE)) { \App::$page['htmlhead'] .= "\r\n" . '' . "\r\n"; -- cgit v1.2.3 From fb36561a6841c165dc8644a61c4c37a771461e2b Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 11 Jul 2016 13:27:44 -0700 Subject: force non-null sess_data --- Zotlabs/Web/SessionHandler.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Zotlabs/Web') diff --git a/Zotlabs/Web/SessionHandler.php b/Zotlabs/Web/SessionHandler.php index 6e7333b4b..93b27a7e8 100644 --- a/Zotlabs/Web/SessionHandler.php +++ b/Zotlabs/Web/SessionHandler.php @@ -24,7 +24,8 @@ class SessionHandler implements \SessionHandlerInterface { return $r[0]['sess_data']; } else { - q("INSERT INTO `session` (sid, expire) values ('%s', '%s')", + q("INSERT INTO `session` (sess_data, sid, expire) values ('%s', '%s', '%s')", + dbesc(''), dbesc($id), dbesc(time() + 300) ); -- cgit v1.2.3 From f3eb9af046b155c53a194db6104a24b6d6756072 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 14 Jul 2016 19:43:47 -0700 Subject: more ZAT work --- Zotlabs/Web/WebServer.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'Zotlabs/Web') diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php index 88ab4995b..d4f3cb9ea 100644 --- a/Zotlabs/Web/WebServer.php +++ b/Zotlabs/Web/WebServer.php @@ -59,7 +59,14 @@ class WebServer { \App::$query_string = strip_zids(\App::$query_string); if(! local_channel()) { $_SESSION['my_address'] = $_GET['zid']; - zid_init($a); + zid_init(); + } + } + + if((x($_GET,'zat')) && (! \App::$install)) { + \App::$query_string = strip_zats(\App::$query_string); + if(! local_channel()) { + zat_init(); } } -- cgit v1.2.3 From db176eec409b73c290ee4d7580867e97dead41fb Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 26 Jul 2016 17:24:17 -0700 Subject: set App::$error on 404 so we don't get two 'Page not found.' page bodies. --- Zotlabs/Web/Router.php | 1 + 1 file changed, 1 insertion(+) (limited to 'Zotlabs/Web') diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php index f9290ac30..4ba2a450d 100644 --- a/Zotlabs/Web/Router.php +++ b/Zotlabs/Web/Router.php @@ -152,6 +152,7 @@ class Router { // pretend this is a module so it will initialise the theme \App::$module = '404'; \App::$module_loaded = true; + \App::$error = true; } } } -- cgit v1.2.3 From 80e433831430e9edc3829d2760551e03643cc598 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 26 Jul 2016 19:28:28 -0700 Subject: missing s --- Zotlabs/Web/WebServer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs/Web') diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php index d4f3cb9ea..5bb0e08e8 100644 --- a/Zotlabs/Web/WebServer.php +++ b/Zotlabs/Web/WebServer.php @@ -124,7 +124,7 @@ class WebServer { // now that we've been through the module content, see if the page reported // a permission problem and if so, a 403 response would seem to be in order. - if(stristr(implode("", $_SESSION['sysmsg']), t('Permission denied'))) { + if(is_array($_SESSION['sysmsg']) && stristr(implode("", $_SESSION['sysmsg']), t('Permission denied'))) { header($_SERVER['SERVER_PROTOCOL'] . ' 403 ' . t('Permission denied.')); } -- cgit v1.2.3 From bc74425872704ad955b37de18639ec831a245761 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 28 Jul 2016 16:02:51 -0700 Subject: Revert "Merge branch '1.10RC' of https://github.com/redmatrix/hubzilla into 1.10RC_merge" This reverts commit 35f17acb388f68745068d6a60e12c7b777b92282, reversing changes made to 58cf5f310d89026fb526e201c301075725044e48. --- Zotlabs/Web/Router.php | 1 - Zotlabs/Web/WebServer.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'Zotlabs/Web') diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php index 4ba2a450d..f9290ac30 100644 --- a/Zotlabs/Web/Router.php +++ b/Zotlabs/Web/Router.php @@ -152,7 +152,6 @@ class Router { // pretend this is a module so it will initialise the theme \App::$module = '404'; \App::$module_loaded = true; - \App::$error = true; } } } diff --git a/Zotlabs/Web/WebServer.php b/Zotlabs/Web/WebServer.php index 5bb0e08e8..d4f3cb9ea 100644 --- a/Zotlabs/Web/WebServer.php +++ b/Zotlabs/Web/WebServer.php @@ -124,7 +124,7 @@ class WebServer { // now that we've been through the module content, see if the page reported // a permission problem and if so, a 403 response would seem to be in order. - if(is_array($_SESSION['sysmsg']) && stristr(implode("", $_SESSION['sysmsg']), t('Permission denied'))) { + if(stristr(implode("", $_SESSION['sysmsg']), t('Permission denied'))) { header($_SERVER['SERVER_PROTOCOL'] . ' 403 ' . t('Permission denied.')); } -- cgit v1.2.3