diff options
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Logout.php | 12 | ||||
| -rw-r--r-- | Zotlabs/Module/Setup.php | 2 | ||||
| -rw-r--r-- | Zotlabs/Render/Comanche.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Web/HTTPSig.php | 3 |
4 files changed, 19 insertions, 2 deletions
diff --git a/Zotlabs/Module/Logout.php b/Zotlabs/Module/Logout.php new file mode 100644 index 000000000..6aa11d110 --- /dev/null +++ b/Zotlabs/Module/Logout.php @@ -0,0 +1,12 @@ +<?php + +namespace Zotlabs\Module; + +class Logout extends \Zotlabs\Web\Controller { + + function init() { + \App::$session->nuke(); + goaway(z_root()); + + } +}
\ No newline at end of file diff --git a/Zotlabs/Module/Setup.php b/Zotlabs/Module/Setup.php index 2134288d6..8e7fbbddf 100644 --- a/Zotlabs/Module/Setup.php +++ b/Zotlabs/Module/Setup.php @@ -38,7 +38,7 @@ class Setup extends \Zotlabs\Web\Controller { ini_set('log_errors', '0'); ini_set('display_errors', '1'); - // $baseurl/setup/testrwrite to test if rewite in .htaccess is working + // $baseurl/setup/testrewrite to test if rewrite in .htaccess is working if (argc() == 2 && argv(1) == "testrewrite") { echo 'ok'; killme(); diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php index c787b19ae..8831bd117 100644 --- a/Zotlabs/Render/Comanche.php +++ b/Zotlabs/Render/Comanche.php @@ -153,6 +153,7 @@ class Comanche { * $observer.address - xchan_addr or false * $observer.name - xchan_name or false * $observer - xchan_hash of observer or empty string + * $local_channel - logged in channel_id or false */ function get_condition_var($v) { @@ -162,6 +163,9 @@ class Comanche { return get_config($x[1],$x[2]); elseif($x[0] === 'request') return $_SERVER['REQUEST_URI']; + elseif($x[0] === 'local_channel') { + return local_channel(); + } elseif($x[0] === 'observer') { if(count($x) > 1) { if($x[1] == 'language') diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php index 445ba200b..1c66b8cf4 100644 --- a/Zotlabs/Web/HTTPSig.php +++ b/Zotlabs/Web/HTTPSig.php @@ -72,7 +72,8 @@ class HTTPSig { return $result; } - logger('sig_block: ' . print_r($sig_block,true), LOGGER_DATA); + // Warning: This log statement includes binary data + // logger('sig_block: ' . print_r($sig_block,true), LOGGER_DATA); $result['header_signed'] = true; |