Changes:

- converted double-quotes to single
- added some more spaces for better readability
- removed some redudant empty lines
- fixed indenting (4 spaces to tab)

diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 2116ac44b84e7c9286dc134d6f6fa3693079b635..5da7a196a99addb61297b6d1c89a7d758283c733 100644 (file)
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -18,7 +18,7 @@ use Friendica\Model\Photo;
 use Friendica\Model\Profile;
 use Friendica\Network\HTTPException\NotFoundException;
 
-define("CATAVATAR_SIZE", 256);
+define('CATAVATAR_SIZE', 256);
 
 /**
  * Installs the addon hook

diff --git a/discourse/discourse.php b/discourse/discourse.php
index 3d27c5b0b09afc4a45fdf5787622d232c6748fb6..6f1cc041226ff363d821b40a13168646826f23b2 100644 (file)
--- a/discourse/discourse.php
+++ b/discourse/discourse.php
@@ -61,8 +61,8 @@ function discourse_settings(array &$data)
 function discourse_settings_post()
 {
        if (!DI::userSession()->getLocalUserId() || empty($_POST['discourse-submit'])) {
-                return;
-        }
+               return;
+       }
 
        DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'discourse', 'enabled', intval($_POST['enabled']));
 }

diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 0d5a5b16b1f19ce91e9171b0fe45db3c45750867..8c01170449c6450338e5370deca8a0c8d9f190af 100644 (file)
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -53,7 +53,7 @@ function fromapp_settings(array &$data)
        ];
 }
 
-function fromapp_post_hook(&$item)
+function fromapp_post_hook(array &$item)
 {
        if (!DI::userSession()->getLocalUserId()) {
                return;
@@ -76,6 +76,6 @@ function fromapp_post_hook(&$item)
 
        $apps = explode(',', $app);
        $item['app'] = trim($apps[mt_rand(0, count($apps)-1)]);
-       
+
        return;
 }

diff --git a/irc/irc.php b/irc/irc.php
index d4435851151cff64e3057142cbffd04737bf9a0e..f58163e87fffa2ac945fec2ede133e0e1cc87845 100644 (file)
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -99,13 +99,14 @@ function irc_content()
        }
        DI::page()['aside'] .= '</ul></div>';
 
-        /* setting the channel(s) to auto connect */
+       /* setting the channel(s) to auto connect */
        if (DI::userSession()->getLocalUserId()) {
-           $autochans = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'irc', 'autochans');
-           if (!$autochans)
-               $autochans = DI::config()->get('irc','autochans');
+               $autochans = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'irc', 'autochans');
+               if (!$autochans) {
+                       $autochans = DI::config()->get('irc','autochans');
+               }
        } else {
-           $autochans = DI::config()->get('irc','autochans');
+               $autochans = DI::config()->get('irc','autochans');
        }
 
        if ($autochans) {

diff --git a/libertree/libertree.php b/libertree/libertree.php
index c0f896c0c43346e295af163f63aeb29bb5538033..ef8760aa30ff8b2fcdf50bf9ce675fbbd7b8d915 100644 (file)
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -56,10 +56,10 @@ function libertree_settings(array &$data)
 
        $t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/libertree/');
        $html = Renderer::replaceMacros($t, [
-               '$enabled'         => ['libertree', DI::l10n()->t('Enable Libertree Post Addon'), $enabled],
-               '$ltree_url'       => ['libertree_url', DI::l10n()->t('Libertree site URL'), $ltree_url],
+               '$enabled'         => ['libertree',           DI::l10n()->t('Enable Libertree Post Addon'), $enabled],
+               '$ltree_url'       => ['libertree_url',       DI::l10n()->t('Libertree site URL'), $ltree_url],
                '$ltree_api_token' => ['libertree_api_token', DI::l10n()->t('Libertree API token'), $ltree_api_token],
-               '$bydefault'       => ['ij_bydefault', DI::l10n()->t('Post to Libertree by default'), $def_enabled],
+               '$bydefault'       => ['ij_bydefault',        DI::l10n()->t('Post to Libertree by default'), $def_enabled],
        ]);
 
        $data = [
@@ -74,11 +74,10 @@ function libertree_settings(array &$data)
 function libertree_settings_post(array &$b)
 {
        if (!empty($_POST['libertree-submit'])) {
-               DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','post',intval($_POST['libertree']));
-               DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','post_by_default',intval($_POST['libertree_bydefault']));
-               DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','libertree_api_token',trim($_POST['libertree_api_token']));
-               DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','libertree_url',trim($_POST['libertree_url']));
-
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'libertree', 'post'               , intval($_POST['libertree']));
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'libertree', 'post_by_default'    , intval($_POST['libertree_bydefault']));
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'libertree', 'libertree_api_token', trim($_POST['libertree_api_token']));
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'libertree', 'libertree_url'      , trim($_POST['libertree_url']));
        }
 
 }
@@ -115,11 +114,11 @@ function libertree_post_local(array &$b)
                return;
        }
 
-       $ltree_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'libertree','post'));
+       $ltree_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'post'));
 
        $ltree_enable = (($ltree_post && !empty($_REQUEST['libertree_enable'])) ? intval($_REQUEST['libertree_enable']) : 0);
 
-       if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'libertree','post_by_default'))) {
+       if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'post_by_default'))) {
                $ltree_enable = 1;
        }
 

diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index f6f2b79aaa87d93a290dc5220882bb84f7705660..fee48e2e93f261b7c9d6278e73916619f288d250 100644 (file)
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -67,10 +67,10 @@ function ljpost_settings(array &$data)
 
        $data = [
                'connector' => 'ljpost',
-               'title' => DI::l10n()->t('LiveJournal Export'),
-               'image' => 'addon/ljpost/livejournal.png',
+               'title'     => DI::l10n()->t('LiveJournal Export'),
+               'image'     => 'addon/ljpost/livejournal.png',
                'enabled'   => $enabled,
-               'html'  => $html,
+               'html'      => $html,
        ];
 }
 

diff --git a/opmlexport/opmlexport.php b/opmlexport/opmlexport.php
index fdfacc3e3084bcb312bfd5706c98eabdf6e3c0bf..92d6b7b0a77138bb5337cbcd0dd48d6c4ebebc4a 100644 (file)
--- a/opmlexport/opmlexport.php
+++ b/opmlexport/opmlexport.php
@@ -29,8 +29,8 @@ function opmlexport_install()
 function opmlexport()
 {
        $condition = [
-               'uid' => DI::userSession()->getLocalUserId(),
-               'self' => false,
+               'uid'     => DI::userSession()->getLocalUserId(),
+               'self'    => false,
                'deleted' => false,
                'archive' => false,
                'blocked' => false,

diff --git a/planets/planets.php b/planets/planets.php
index 8a206fb51641c2bd46df0f514b39a403b4fe9aaa..2937c0360ed3c32596638b66665e0126df576060 100644 (file)
--- a/planets/planets.php
+++ b/planets/planets.php
@@ -81,38 +81,28 @@ function planets_post_hook(&$item)
        return;
 }
 
-
-
-
 /**
- *
  * Callback from the settings post function.
  * $post contains the $_POST array.
  * We will make sure we've got a valid user account
  * and if so set our configuration setting for this person.
- *
  */
-
-function planets_settings_post($post)
+function planets_settings_post(array $post)
 {
        if (!DI::userSession()->getLocalUserId()) {
                return;
        }
-       if ($_POST['planets-submit']) {
-               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'planets', 'enable' ,intval($_POST['planets']));
+       if ($post['planets-submit']) {
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'planets', 'enable' ,intval($post['planets']));
        }
 }
 
 
 /**
- *
  * Called from the Addon Setting form.
  * Add our own settings info to the page.
  *
  */
-
-
-
 function planets_settings(array &$data)
 {
        if(!DI::userSession()->getLocalUserId()) {

diff --git a/public_server/public_server.php b/public_server/public_server.php
index 7591c7d0d32fe23a2b8ce8bd3c5301b14ee816d1..545f4f807750019d56a7b34d282125e6acd186d4 100644 (file)
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -140,14 +140,14 @@ function public_server_addon_admin(string &$o)
        $token = BaseModule::getFormSecurityToken('publicserver');
        $t = Renderer::getMarkupTemplate('admin.tpl', 'addon/public_server');
        $o = Renderer::replaceMacros($t, [
-               '$submit' => DI::l10n()->t('Save Settings'),
+               '$submit'              => DI::l10n()->t('Save Settings'),
                '$form_security_token' => $token,
-               '$infotext' => DI::l10n()->t('Set any of these options to 0 to deactivate it.'),
-               '$expiredays' => ["expiredays", "Expire Days", intval(DI::config()->get('public_server', 'expiredays')), "When an account is created on the site, it is given a hard "],
-               '$expireposts' => ["expireposts", "Expire Posts", intval(DI::config()->get('public_server', 'expireposts')), "Set the default days for posts to expire here"],
-               '$nologin' => ["nologin", "No Login", intval(DI::config()->get('public_server', 'nologin')), "Remove users who have never logged in after nologin days "],
-               '$flagusers' => ["flagusers", "Flag users", intval(DI::config()->get('public_server', 'flagusers')), "Remove users who last logged in over flagusers days ago"],
-               '$flagposts' => ["flagposts", "Flag posts", intval(DI::config()->get('public_server', 'flagposts')), "For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire "],
-               '$flagpostsexpire' => ["flagpostsexpire", "Flag posts expire", intval(DI::config()->get('public_server', 'flagpostsexpire'))],
+               '$infotext'            => DI::l10n()->t('Set any of these options to 0 to deactivate it.'),
+               '$expiredays'          => ['expiredays', 'Expire Days', intval(DI::config()->get('public_server', 'expiredays')), 'When an account is created on the site, it is given a hard '],
+               '$expireposts'         => ['expireposts', 'Expire Posts', intval(DI::config()->get('public_server', 'expireposts')), 'Set the default days for posts to expire here'],
+               '$nologin'             => ['nologin', 'No Login', intval(DI::config()->get('public_server', 'nologin')), 'Remove users who have never logged in after nologin days '],
+               '$flagusers'           => ['flagusers', 'Flag users', intval(DI::config()->get('public_server', 'flagusers')), 'Remove users who last logged in over flagusers days ago'],
+               '$flagposts'           => ['flagposts', 'Flag posts', intval(DI::config()->get('public_server', 'flagposts')), 'For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire '],
+               '$flagpostsexpire'     => ['flagpostsexpire', 'Flag posts expire', intval(DI::config()->get('public_server', 'flagpostsexpire'))],
        ]);
 }

diff --git a/randplace/randplace.php b/randplace/randplace.php
index 34f48c6c2b601d44809863e2457e33c6a3adaee3..37182ab07f6445f6aac0357afe92e5784aafdd32 100644 (file)
--- a/randplace/randplace.php
+++ b/randplace/randplace.php
@@ -142,7 +142,7 @@ function randplace_settings(array &$data)
                return;
        }
 
-       $enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(),'randplace','enable');
+       $enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'randplace', 'enable');
 
        $t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/randplace/');
        $html = Renderer::replaceMacros($t, [

diff --git a/saml/README.md b/saml/README.md
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/saml/saml.php b/saml/saml.php
old mode 100755 (executable)
new mode 100644 (file)
index 56dd0f5..a071099
--- a/saml/saml.php
+++ b/saml/saml.php
@@ -10,6 +10,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\User;
@@ -91,7 +92,7 @@ if (target.length) { target.append("<p>$fragment</p>"); }
 EOL;
 }
 
-function saml_is_configured()
+function saml_is_configured(): bool
 {
        return
                DI::config()->get('saml', 'idp_id') &&
@@ -113,11 +114,8 @@ function saml_sso_initiate(string &$body)
 
        $auth = new \OneLogin\Saml2\Auth(saml_settings());
        $ssoBuiltUrl = $auth->login(null, [], false, false, true);
-       DI::session()->set('AuthNRequestID', $auth->getLastRequestID());
-       header('Pragma: no-cache');
-       header('Cache-Control: no-cache, must-revalidate');
-       header('Location: ' . $ssoBuiltUrl);
-       exit();
+       $_SESSION['AuthNRequestID'] = $auth->getLastRequestID();
+       System::externalRedirect($ssoBuiltUrl, 302, true);
 }
 
 function saml_sso_reply()
@@ -177,13 +175,9 @@ function saml_slo_initiate()
        }
 
        $auth = new \OneLogin\Saml2\Auth(saml_settings());
-
        $sloBuiltUrl = $auth->logout();
-       DI::session()->set('LogoutRequestID', $auth->getLastRequestID());
-       header('Pragma: no-cache');
-       header('Cache-Control: no-cache, must-revalidate');
-       header('Location: ' . $sloBuiltUrl);
-       exit();
+       $_SESSION['LogoutRequestID'] = $auth->getLastRequestID();
+       System::externalRedirect($sloBuiltUrl, 302, true);
 }
 
 function saml_slo_reply()
@@ -207,7 +201,7 @@ function saml_slo_reply()
        }
 }
 
-function saml_input($key, $label, $description)
+function saml_input($key, $label, $description): array
 {
        return [
                '$' . $key => [
@@ -333,7 +327,7 @@ function saml_create_user($username, $email, $name)
        }
 }
 
-function saml_settings()
+function saml_settings(): array
 {
        return [
 

diff --git a/showmore/showmore.php b/showmore/showmore.php
index 8e85925aec8e5f19fa0884af4e587f868bfd4b48..e31e0480196b5df8410d3ee6e43b1398cb6f0c23 100644 (file)
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -108,7 +108,7 @@ function showmore_prepare_body(&$hook_data)
 
        if (get_body_length($hook_data['html']) > $chars) {
                $found = true;
-               $shortened = trim(showmore_cutitem($hook_data['html'], $chars)) . "...";
+               $shortened = trim(showmore_cutitem($hook_data['html'], $chars)) . '...';
        } else {
                $found = false;
        }

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index f0372852af07eb6ba242812a50f019465a86711e..cf4aef2bf2fec321f6fee86c1b3683abb2b8eab8 100644 (file)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -91,8 +91,8 @@ function statusnet_settings_post($post)
        }
 
        if (!empty($_POST['statusnet-disconnect'])) {
-               /*               * *
-                * if the GNU Social-disconnect button is clicked, clear the GNU Social configuration
+               /*
+                * If the GNU Social-disconnect button is clicked, clear the GNU Social configuration
                 */
                DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'consumerkey');
                DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'consumersecret');