Fix white spaces

[friendica-addons.git] / blackout / blackout.php

diff --git a/blackout/blackout.php b/blackout/blackout.php
index eb0b6ce8138db116b8463dc562f43f363ea5340d..55fb8d32c1b2f8b6d0e02c85cfea3e103210d338 100644 (file)
--- a/blackout/blackout.php
+++ b/blackout/blackout.php
@@ -44,7 +44,7 @@
  * THE SOFTWARE.
  */
 
-use Friendica\Core\Config;
+use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -55,12 +55,10 @@ function blackout_install() {
        Hook::register('page_header', 'addon/blackout/blackout.php', 'blackout_redirect');
 }
 
-function blackout_uninstall() {
-       Hook::unregister('page_header', 'addon/blackout/blackout.php', 'blackout_redirect');
-}
-function blackout_redirect ($a, $b) {
+function blackout_redirect ($b)
+{
        // if we have a logged in user, don't throw her out
-       if (local_user()) {
+       if (DI::userSession()->getLocalUserId()) {
                return true;
        }
 
@@ -71,51 +69,52 @@ function blackout_redirect ($a, $b) {
        $now = time();
        $date1 = DateTime::createFromFormat('Y-m-d G:i', $mystart);
        $date2 = DateTime::createFromFormat('Y-m-d G:i', $myend);
-       if ( $date1 && $date2 ) {
+       if ($date1 && $date2) {
                $date1 = DateTime::createFromFormat('Y-m-d G:i', $mystart)->format('U');
                $date2 = DateTime::createFromFormat('Y-m-d G:i', $myend)->format('U');
        } else {
-                  $date1 = 0;
-                  $date2 = 0;
+               $date1 = 0;
+               $date2 = 0;
        }
+
        if (( $date1 <= $now ) && ( $now <= $date2 )) {
-               Logger::log('redirecting user to blackout page');
+               Logger::notice('redirecting user to blackout page');
                System::externalRedirect($myurl);
        }
 }
 
-function blackout_addon_admin(&$a, &$o) {
+function blackout_addon_admin(string &$o)
+{
        $mystart = DI::config()->get('blackout','begindate');
-       if (! is_string($mystart)) { $mystart = "YYYY-MM-DD hh:mm"; }
+       if (! is_string($mystart)) { $mystart = 'YYYY-MM-DD hh:mm'; }
        $myend   = DI::config()->get('blackout','enddate');
-       if (! is_string($myend)) { $myend = "YYYY-MM-DD hh:mm"; }
+       if (! is_string($myend)) { $myend = 'YYYY-MM-DD hh:mm'; }
        $myurl   = DI::config()->get('blackout','url');
-       if (! is_string($myurl)) { $myurl = "https://www.example.com"; }
-       $t = Renderer::getMarkupTemplate( "admin.tpl", "addon/blackout/" );
+       if (! is_string($myurl)) { $myurl = 'https://www.example.com'; }
+       $t = Renderer::getMarkupTemplate( 'admin.tpl', 'addon/blackout/' );
 
        $date1 = DateTime::createFromFormat('Y-m-d G:i', $mystart);
        $date2 = DateTime::createFromFormat('Y-m-d G:i', $myend);
        // a note for the admin
-       $adminnote = "";
+       $adminnote = '';
        if ($date2 < $date1) {
-               $adminnote = DI::l10n()->t("The end-date is prior to the start-date of the blackout, you should fix this");
+               $adminnote = DI::l10n()->t("The end-date is prior to the start-date of the blackout, you should fix this.");
        } else {
-               $adminnote = DI::l10n()->t("Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>.", $mystart, $myend);
+               $adminnote = DI::l10n()->t("Please double check the current settings for the blackout. It will begin on <strong>%s</strong> and end on <strong>%s</strong>.", $mystart, $myend);
        }
        $o = Renderer::replaceMacros($t, [
                '$submit' => DI::l10n()->t('Save Settings'),
-               '$rurl' => ["rurl", DI::l10n()->t("Redirect URL"), $myurl, DI::l10n()->t("all your visitors from the web will be redirected to this URL"), "", "", "url"],
-               '$startdate' => ["startdate", DI::l10n()->t("Begin of the Blackout"), $mystart, DI::l10n()->t("Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.")],
-               '$enddate' => ["enddate", DI::l10n()->t("End of the Blackout"), $myend, ""],
+               '$rurl' => ['rurl', DI::l10n()->t("Redirect URL"), $myurl, DI::l10n()->t("All your visitors from the web will be redirected to this URL."), '', '', 'url'],
+               '$startdate' => ['startdate', DI::l10n()->t("Begin of the Blackout"), $mystart, DI::l10n()->t("Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.")],
+               '$enddate' => ['enddate', DI::l10n()->t("End of the Blackout"), $myend, ''],
                '$adminnote' => $adminnote,
-               '$aboutredirect' => DI::l10n()->t("<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out should the blackout is still in place."),
+               '$aboutredirect' => DI::l10n()->t("<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out while the blackout is still in place."),
        ]);
 }
-function blackout_addon_admin_post (&$a) {
-       $begindate = trim($_POST['startdate']);
-       $enddate = trim($_POST['enddate']);
-       $url = trim($_POST['rurl']);
-       DI::config()->set('blackout','begindate',$begindate);
-       DI::config()->set('blackout','enddate',$enddate);
-       DI::config()->set('blackout','url',$url);
+
+function blackout_addon_admin_post ()
+{
+       DI::config()->set('blackout', 'begindate', trim($_POST['startdate']));
+       DI::config()->set('blackout', 'enddate', trim($_POST['enddate']));
+       DI::config()->set('blackout', 'url', trim($_POST['rurl']));
 }