diff --git a/saml/README.md b/saml/README.md old mode 100755 new mode 100644 diff --git a/saml/saml.php b/saml/saml.php old mode 100755 new mode 100644 index d511d90e..601a5d69 --- a/saml/saml.php +++ b/saml/saml.php @@ -12,6 +12,7 @@ use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\Core\Session; +use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\User; @@ -96,7 +97,7 @@ if (target.length) { target.append("
$fragment
"); } EOL; } -function saml_is_configured() +function saml_is_configured(): bool { return DI::config()->get('saml', 'idp_id') && @@ -119,10 +120,7 @@ function saml_sso_initiate(App $a, array &$b) $auth = new \OneLogin\Saml2\Auth(saml_settings()); $ssoBuiltUrl = $auth->login(null, [], false, false, true); $_SESSION['AuthNRequestID'] = $auth->getLastRequestID(); - header('Pragma: no-cache'); - header('Cache-Control: no-cache, must-revalidate'); - header('Location: ' . $ssoBuiltUrl); - exit(); + System::externalRedirect($ssoBuiltUrl); } function saml_sso_reply(App $a) @@ -182,13 +180,9 @@ function saml_slo_initiate(App $a, array &$b) } $auth = new \OneLogin\Saml2\Auth(saml_settings()); - $sloBuiltUrl = $auth->logout(); $_SESSION['LogoutRequestID'] = $auth->getLastRequestID(); - header('Pragma: no-cache'); - header('Cache-Control: no-cache, must-revalidate'); - header('Location: ' . $sloBuiltUrl); - exit(); + System::externalRedirect($sloBuiltUrl); } function saml_slo_reply() @@ -212,7 +206,7 @@ function saml_slo_reply() } } -function saml_input($key, $label, $description) +function saml_input($key, $label, $description): array { return [ '$' . $key => [ @@ -338,7 +332,7 @@ function saml_create_user($username, $email, $name) } } -function saml_settings() +function saml_settings(): array { return [ diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index de980598..02fc38df 100644 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -14,6 +14,7 @@ use Friendica\Content\Text\BBCode; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Renderer; +use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Post; @@ -45,11 +46,11 @@ function tumblr_content(App $a) if (isset(DI::args()->getArgv()[1])) { switch (DI::args()->getArgv()[1]) { - case "connect": + case 'connect': $o = tumblr_connect($a); break; - case "callback": + case 'callback': $o = tumblr_callback($a); break; @@ -66,7 +67,7 @@ function tumblr_content(App $a) function tumblr_addon_admin(App $a, string &$o) { - $t = Renderer::getMarkupTemplate( "admin.tpl", "addon/tumblr/" ); + $t = Renderer::getMarkupTemplate( 'admin.tpl', 'addon/tumblr/' ); $o = Renderer::replaceMacros($t, [ '$submit' => DI::l10n()->t('Save Settings'), @@ -119,7 +120,7 @@ function tumblr_connect(App $a) $url = $tum_oauth->getAuthorizeURL($token); // Redirect the user to the login URL given to us by Tumblr - header('Location: ' . $url); + System::externalRedirect($url); /* * That's it for our side. The user is sent to a Tumblr Login page and @@ -174,8 +175,8 @@ function tumblr_callback(App $a) DI::pConfig()->set(local_user(), 'tumblr', 'oauth_token', $access_token['oauth_token']); DI::pConfig()->set(local_user(), 'tumblr', 'oauth_token_secret', $access_token['oauth_token_secret']); - $o = DI::l10n()->t("You are now authenticated to tumblr."); - $o .= '".$params['caption']."
"; + if (isset($params['caption']) && (trim($title) != '')) { + $params['caption'] = '' . $params['caption'] . '
'; } - if (empty($params['caption']) && !empty($siteinfo["description"])) { - $params['caption'] = BBCode::convertForUriId($b['uri-id'], "[quote]" . $siteinfo["description"] . "[/quote]", BBCode::CONNECTORS); + if (empty($params['caption']) && !empty($siteinfo['description'])) { + $params['caption'] = BBCode::convertForUriId($b['uri-id'], '[quote]' . $siteinfo['description'] . '[/quote]', BBCode::CONNECTORS); } $consumer_key = DI::config()->get('tumblr','consumer_key');