diff options
| author | Harald Eilertsen <haraldei@anduin.net> | 2023-12-16 16:05:52 +0100 |
|---|---|---|
| committer | Harald Eilertsen <haraldei@anduin.net> | 2023-12-16 16:05:52 +0100 |
| commit | 19dd1fe86605bc85e8a0bf4efd6f195db258f60a (patch) | |
| tree | 5d5b1fac3ad1760189ea0daf1bf5639e4ba0d100 /Zotlabs/Web | |
| parent | 6a5f78543fb2f5329e54209253b8c0d0f1d7a91d (diff) | |
| parent | 69266cd6c65d228320dede32a343a9d3f3ea63df (diff) | |
| download | volse-hubzilla-19dd1fe86605bc85e8a0bf4efd6f195db258f60a.tar.gz volse-hubzilla-19dd1fe86605bc85e8a0bf4efd6f195db258f60a.tar.bz2 volse-hubzilla-19dd1fe86605bc85e8a0bf4efd6f195db258f60a.zip | |
Merge branch 'dev' into tests/test-db-setup-wip
Diffstat (limited to 'Zotlabs/Web')
| -rw-r--r-- | Zotlabs/Web/HTTPSig.php | 5 | ||||
| -rw-r--r-- | Zotlabs/Web/Router.php | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php index 531b18649..36a00528e 100644 --- a/Zotlabs/Web/HTTPSig.php +++ b/Zotlabs/Web/HTTPSig.php @@ -212,7 +212,8 @@ class HTTPSig { if (in_array('digest', $signed_headers)) { $result['content_signed'] = true; - $digest = explode('=', $headers['digest'], 2); + $digest = explode('=', $headers['digest'], 2); + $digest[0] = strtoupper($digest[0]); if ($digest[0] === 'SHA-256') $hashalg = 'sha256'; if ($digest[0] === 'SHA-512') @@ -324,7 +325,7 @@ class HTTPSig { } // The record wasn't in cache. Fetch it now. - $r = Activity::fetch($id); + $r = Activity::get_actor($id); $signatureAlgorithm = EMPTY_STR; if ($r) { diff --git a/Zotlabs/Web/Router.php b/Zotlabs/Web/Router.php index a6a841ccb..2876fcc3c 100644 --- a/Zotlabs/Web/Router.php +++ b/Zotlabs/Web/Router.php @@ -224,7 +224,7 @@ class Router { } elseif(function_exists(App::$module . '_init')) { $func = App::$module . '_init'; - $func($a); + $func(); } } @@ -257,13 +257,13 @@ class Router { if(function_exists(str_replace('-', '_', $current_theme[0]) . '_init')) { $func = str_replace('-', '_', $current_theme[0]) . '_init'; - $func($a); + $func(); } elseif (x(App::$theme_info, 'extends') && file_exists('view/theme/' . App::$theme_info['extends'] . '/php/theme.php')) { require_once('view/theme/' . App::$theme_info['extends'] . '/php/theme.php'); if(function_exists(str_replace('-', '_', App::$theme_info['extends']) . '_init')) { $func = str_replace('-', '_', App::$theme_info['extends']) . '_init'; - $func($a); + $func(); } } @@ -275,7 +275,7 @@ class Router { } elseif(function_exists(App::$module . '_post')) { $func = App::$module . '_post'; - $func($a); + $func(); } } @@ -289,7 +289,7 @@ class Router { } elseif(function_exists(App::$module . '_content')) { $func = App::$module . '_content'; - $arr = array('content' => $func($a)); + $arr = array('content' => $func()); } } call_hooks(App::$module . '_mod_aftercontent', $arr); |